fixed justification issue

codegrue · Jul 1, 2020 · 738e08a · 738e08a
1 parent 06c0dd2
commit 738e08a
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 22 deletions.
diff --git a/lib/widgets/card_settings_field.dart b/lib/widgets/card_settings_field.dart
@@ -104,29 +104,38 @@ class CardSettingsField extends StatelessWidget {
   }
 
   Widget _buildLabelBlock(BuildContext context) {
-    return Expanded(
-      child: Container(
-        width: (contentOnNewLine)
-            ? null
-            : labelWidth ?? CardSettings.of(context).labelWidth ?? 120.0,
-        padding: EdgeInsets.only(
-            right: CardSettings.of(context).labelPadding ?? 6.0),
-        child: Row(
-          children: <Widget>[
-            _buildLeftIcon(context),
-            _buildLabelSpacer(context),
-            Expanded(
-              child: Row(
-                children: <Widget>[
-                  _buildLabelText(context),
-                  _buildlabelRequiredIndicator(context),
-                ],
-              ),
+    var padding =
+        EdgeInsets.only(right: CardSettings.of(context).labelPadding ?? 6.0);
+
+    return (contentOnNewLine)
+        ? Expanded(
+            child: Container(
+              padding: padding,
+              child: _buildLabelRow(context),
             ),
-            _buildLabelSuffix(context),
-          ],
+          )
+        : Container(
+            width: labelWidth ?? CardSettings.of(context).labelWidth ?? 120.0,
+            padding: padding,
+            child: _buildLabelRow(context),
+          );
+  }
+
+  Row _buildLabelRow(BuildContext context) {
+    return Row(
+      children: <Widget>[
+        _buildLeftIcon(context),
+        _buildLabelSpacer(context),
+        Expanded(
+          child: Row(
+            children: <Widget>[
+              _buildLabelText(context),
+              _buildlabelRequiredIndicator(context),
+            ],
+          ),
         ),
-      ),
+        _buildLabelSuffix(context),
+      ],
     );
   }
 

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: card_settings
 description: A flutter package for building card based settings forms. This includes a library of pre-built form field widgets.
-version: 1.9.9
+version: 1.9.9+hotfix.1
 homepage: https://github.com/codegrue/card_settings
 
 dependencies: