Merge branch 'master' of https://github.com/danvick/flutter_form_builder

Author: danvick

example/lib/main.dart

@@ -368,12 +368,20 @@ class MyHomePageState extends State<MyHomePage> {
                   ),
                   SizedBox(height: 15),
                   FormBuilderRadioGroup(
+                    orientation: GroupedRadioOrientation.wrap,
                     decoration:
                         InputDecoration(labelText: 'My chosen language'),
                     attribute: 'best_language',
                     onChanged: _onChanged,
                     validators: [FormBuilderValidators.required()],
-                    options: ['Dart', 'Kotlin', 'Java', 'Swift', 'Objective-C']
+                    options: [
+                      'Dart',
+                      'Kotlin',
+                      'Java',
+                      'Swift',
+                      'Objective-C',
+                      'A Very long text that would overflow to the next line and crash'
+                    ]
                         .map((lang) => FormBuilderFieldOption(
                               value: lang,
                               child: Text('$lang'),
@@ -562,7 +570,7 @@ class MyHomePageState extends State<MyHomePage> {
                 ],
               ),
             ),
-            Row(
+            ButtonBar(
               children: <Widget>[
                 Expanded(
                   child: MaterialButton(
@@ -583,17 +591,16 @@ class MyHomePageState extends State<MyHomePage> {
                 ),
                 SizedBox(width: 20),
                 Expanded(
-                  child: MaterialButton(
-                    color: Theme.of(context).accentColor,
-                    child: Text(
-                      'Reset',
-                      style: TextStyle(color: Colors.white),
-                    ),
-                    onPressed: () {
-                      _fbKey.currentState.reset();
-                    },
+                    child: MaterialButton(
+                  color: Theme.of(context).accentColor,
+                  child: Text(
+                    'Reset',
+                    style: TextStyle(color: Colors.white),
                   ),
-                ),
+                  onPressed: () {
+                    _fbKey.currentState.reset();
+                  },
+                )),
               ],
             ),
           ],

flutter_form_builder

@@ -0,0 +1 @@
+Subproject commit 01edb2be3db854209046d1fa3ca5e70351e879e5

lib/src/widgets/grouped_radio.dart

@@ -291,10 +291,12 @@ class _GroupedRadioState<T> extends State<GroupedRadio<T>> {
       children: <Widget>[
         if (widget.controlAffinity == ControlAffinity.leading) ...[
           control,
-          label
+          Flexible(child: label),
         ],
         if (widget.controlAffinity == ControlAffinity.trailing) ...[
-          label,
+          Flexible(
+            child: label,
+          ),
           control
         ],
         if (widget.separator != null &&