feat: use FormBuilderChipOption for FormBuilderChoiceChip options

Author: danvick

packages/flutter_form_builder/example/lib/main.dart

@@ -295,6 +295,70 @@ class _CompleteFormState extends State<CompleteForm> {
                         FormBuilderValidators.maxLength(3),
                       ]),
                     ),
+                    FormBuilderFilterChip<String>(
+                      autovalidateMode: AutovalidateMode.onUserInteraction,
+                      decoration: const InputDecoration(
+                          labelText: 'The language of my people'),
+                      name: 'languages_filter',
+                      // initialValue: const ['Dart'],
+                      options: const [
+                        FormBuilderChipOption(
+                          value: 'Dart',
+                          avatar: CircleAvatar(child: Text('D')),
+                        ),
+                        FormBuilderChipOption(
+                          value: 'Kotlin',
+                          avatar: CircleAvatar(child: Text('K')),
+                        ),
+                        FormBuilderChipOption(
+                          value: 'Java',
+                          avatar: CircleAvatar(child: Text('J')),
+                        ),
+                        FormBuilderChipOption(
+                          value: 'Swift',
+                          avatar: CircleAvatar(child: Text('S')),
+                        ),
+                        FormBuilderChipOption(
+                          value: 'Objective-C',
+                          avatar: CircleAvatar(child: Text('O')),
+                        ),
+                      ],
+                      onChanged: _onChanged,
+                      validator: FormBuilderValidators.compose([
+                        FormBuilderValidators.minLength(1),
+                        FormBuilderValidators.maxLength(3),
+                      ]),
+                    ),
+                    FormBuilderChoiceChip<String>(
+                      autovalidateMode: AutovalidateMode.onUserInteraction,
+                      decoration: const InputDecoration(
+                          labelText: 'Ok, if I had to choose one language, it would be:'),
+                      name: 'languages_choice',
+                      initialValue: 'Dart',
+                      options: const [
+                        FormBuilderChipOption(
+                          value: 'Dart',
+                          avatar: CircleAvatar(child: Text('D')),
+                        ),
+                        FormBuilderChipOption(
+                          value: 'Kotlin',
+                          avatar: CircleAvatar(child: Text('K')),
+                        ),
+                        FormBuilderChipOption(
+                          value: 'Java',
+                          avatar: CircleAvatar(child: Text('J')),
+                        ),
+                        FormBuilderChipOption(
+                          value: 'Swift',
+                          avatar: CircleAvatar(child: Text('S')),
+                        ),
+                        FormBuilderChipOption(
+                          value: 'Objective-C',
+                          avatar: CircleAvatar(child: Text('O')),
+                        ),
+                      ],
+                      onChanged: _onChanged,
+                    ),
                   ],
                 ),
               ),

packages/flutter_form_builder/lib/src/fields/form_builder_choice_chips.dart

@@ -7,7 +7,7 @@ class FormBuilderChoiceChip<T> extends FormBuilderField<T> {
   final bool shouldRequestFocus;
 
   /// The list of items the user can select.
-  final List<FormBuilderFieldOption<T>> options;
+  final List<FormBuilderChipOption<T>> options;
 
   // FilterChip Settings
   /// Elevation to be applied on the chip relative to its parent.
@@ -306,7 +306,7 @@ class FormBuilderChoiceChip<T> extends FormBuilderField<T> {
                   textDirection: textDirection,
                   verticalDirection: verticalDirection,
                   children: <Widget>[
-                    for (FormBuilderFieldOption<T> option in options)
+                    for (FormBuilderChipOption<T> option in options)
                       ChoiceChip(
                         label: option,
                         selected: field.value == option.value,
@@ -319,6 +319,7 @@ class FormBuilderChoiceChip<T> extends FormBuilderField<T> {
                                 state.didChange(choice);
                               }
                             : null,
+                        avatar: option.avatar,
                         selectedColor: selectedColor,
                         disabledColor: disabledColor,
                         backgroundColor: backgroundColor,

packages/flutter_form_builder/test/form_builder_choice_chips_test.dart

@@ -12,9 +12,9 @@ void main() {
       shouldRequestFocus: false,
       name: widgetName,
       options: const [
-        FormBuilderFieldOption(key: ValueKey('1'), value: 1),
-        FormBuilderFieldOption(key: ValueKey('2'), value: 2),
-        FormBuilderFieldOption(key: ValueKey('3'), value: 3),
+        FormBuilderChipOption(key: ValueKey('1'), value: 1),
+        FormBuilderChipOption(key: ValueKey('2'), value: 2),
+        FormBuilderChipOption(key: ValueKey('3'), value: 3),
       ],
     );
     await tester.pumpWidget(buildTestableFieldWidget(testWidget));