Converted FormBuilderFieldOption to Widget - allows option to be customized/styled

Author: danvick

lib/src/fields/form_builder_checkbox_list.dart

@@ -126,8 +126,7 @@ class _FormBuilderCheckboxListState extends State<FormBuilderCheckboxList> {
                 contentPadding: EdgeInsets.all(0.0),
                 leading: _leading(field, i),
                 trailing: _trailing(field, i),
-                title: Text(
-                    "${widget.options[i].label ?? widget.options[i].value}"),
+                title: widget.options[i],
                 onTap: _readOnly
                     ? null
                     : () {

lib/src/fields/form_builder_radio.dart

@@ -116,8 +116,7 @@ class _FormBuilderRadioState extends State<FormBuilderRadio> {
               isThreeLine: false,
               contentPadding: EdgeInsets.all(0.0),
               leading: _leading(field, i),
-              title:
-                  Text("${widget.options[i].label ?? widget.options[i].value}"),
+              title: widget.options[i],
               trailing: _trailing(field, i),
               onTap: _readOnly
                   ? null

lib/src/fields/form_builder_segmented_control.dart

@@ -14,6 +14,9 @@ class FormBuilderSegmentedControl extends StatefulWidget {
   final Color borderColor;
   final Color selectedColor;
   final Color pressedColor;
+
+  @Deprecated(
+      "Use `FormBuilderFieldOption`'s `child` property to style your option")
   final TextStyle textStyle;
 
   final List<FormBuilderFieldOption> options;
@@ -113,13 +116,15 @@ class _FormBuilderSegmentedControlState
               groupValue: field.value,
               children: Map.fromIterable(
                 widget.options,
-                key: (v) => v.value,
-                value: (v) => Padding(
+                key: (option) => option.value,
+                value: (option) => Padding(
                   padding: EdgeInsets.symmetric(vertical: 10.0),
-                  child: Text(
-                    "${v.label ?? v.value}",
-                    style: widget.textStyle,
-                  ),
+                  child: widget.textStyle != null
+                      ? Text(
+                          "${option.label ?? option.value}",
+                          style: widget.textStyle,
+                        )
+                      : option,
                 ),
               ),
               padding: widget.padding,

lib/src/form_builder_field_option.dart

@@ -1,8 +1,20 @@
 import 'package:flutter/material.dart';
 
-class FormBuilderFieldOption {
-  String label;
-  dynamic value;
+class FormBuilderFieldOption extends StatelessWidget {
+  @Deprecated("Use `child` instead. Will be removed in the next major version.")
+  final String label;
+  final Widget child;
+  final dynamic value;
 
-  FormBuilderFieldOption({this.label, @required this.value});
+  FormBuilderFieldOption({this.label, @required this.value, this.child})
+      : assert(label == null || child == null);
+
+  @override
+  Widget build(BuildContext context) {
+    if (child != null) {
+      return child;
+    } else {
+      return Text("${label ?? value.toString()}");
+    }
+  }
 }