Merge pull request #1139 from nrallakis/main

Use dart 2.17 super initiliazers to simplify code

Author: deandreamatias

lib/src/fields/form_builder_checkbox.dart

@@ -68,25 +68,24 @@ class FormBuilderCheckbox extends FormBuilderField<bool> {
 
   /// Creates a single Checkbox field
   FormBuilderCheckbox({
-    //From Super
-    Key? key,
-    required String name,
-    FormFieldValidator<bool>? validator,
-    bool? initialValue,
-    InputDecoration decoration = const InputDecoration(
+    super.key,
+    required super.name,
+    super.validator,
+    super.initialValue,
+    super.decoration = const InputDecoration(
       border: InputBorder.none,
       focusedBorder: InputBorder.none,
       enabledBorder: InputBorder.none,
       errorBorder: InputBorder.none,
       disabledBorder: InputBorder.none,
     ),
-    ValueChanged<bool?>? onChanged,
-    ValueTransformer<bool?>? valueTransformer,
-    bool enabled = true,
-    FormFieldSetter<bool?>? onSaved,
-    AutovalidateMode autovalidateMode = AutovalidateMode.disabled,
-    VoidCallback? onReset,
-    FocusNode? focusNode,
+    super.onChanged,
+    super.valueTransformer,
+    super.enabled,
+    super.onSaved,
+    super.autovalidateMode = AutovalidateMode.disabled,
+    super.onReset,
+    super.focusNode,
     required this.title,
     this.activeColor,
     this.autofocus = false,
@@ -99,18 +98,6 @@ class FormBuilderCheckbox extends FormBuilderField<bool> {
     this.subtitle,
     this.tristate = false,
   }) : super(
-          key: key,
-          initialValue: initialValue,
-          name: name,
-          validator: validator,
-          valueTransformer: valueTransformer,
-          onChanged: onChanged,
-          autovalidateMode: autovalidateMode,
-          onSaved: onSaved,
-          enabled: enabled,
-          onReset: onReset,
-          decoration: decoration,
-          focusNode: focusNode,
           builder: (FormFieldState<bool?> field) {
             final state = field as _FormBuilderCheckboxState;
 

lib/src/fields/form_builder_checkbox_group.dart

@@ -27,19 +27,18 @@ class FormBuilderCheckboxGroup<T> extends FormBuilderField<List<T>> {
 
   /// Creates a list of Checkboxes for selecting multiple options
   FormBuilderCheckboxGroup({
-    Key? key,
-    //From Super
-    required String name,
-    FormFieldValidator<List<T>>? validator,
-    List<T>? initialValue,
-    InputDecoration decoration = const InputDecoration(),
-    ValueChanged<List<T>?>? onChanged,
-    ValueTransformer<List<T>?>? valueTransformer,
-    bool enabled = true,
-    FormFieldSetter<List<T>>? onSaved,
-    AutovalidateMode autovalidateMode = AutovalidateMode.disabled,
-    VoidCallback? onReset,
-    FocusNode? focusNode,
+    super.key,
+    required super.name,
+    super.validator,
+    super.initialValue,
+    super.decoration,
+    super.onChanged,
+    super.valueTransformer,
+    super.enabled,
+    super.onSaved,
+    super.autovalidateMode = AutovalidateMode.disabled,
+    super.onReset,
+    super.focusNode,
     required this.options,
     this.activeColor,
     this.checkColor,
@@ -61,18 +60,6 @@ class FormBuilderCheckboxGroup<T> extends FormBuilderField<List<T>> {
     this.orientation = OptionsOrientation.wrap,
     this.shouldRequestFocus = false,
   }) : super(
-          key: key,
-          initialValue: initialValue,
-          name: name,
-          validator: validator,
-          valueTransformer: valueTransformer,
-          onChanged: onChanged,
-          autovalidateMode: autovalidateMode,
-          onSaved: onSaved,
-          enabled: enabled,
-          onReset: onReset,
-          decoration: decoration,
-          focusNode: focusNode,
           builder: (FormFieldState<List<T>?> field) {
             final state = field as _FormBuilderCheckboxGroupState<T>;
 

lib/src/fields/form_builder_choice_chips.dart

@@ -256,16 +256,16 @@ class FormBuilderChoiceChip<T> extends FormBuilderField<T> {
 
   /// Creates a list of `Chip`s that acts like radio buttons
   FormBuilderChoiceChip({
-    AutovalidateMode autovalidateMode = AutovalidateMode.disabled,
-    bool enabled = true,
-    FocusNode? focusNode,
-    FormFieldSetter<T>? onSaved,
-    FormFieldValidator<T>? validator,
-    InputDecoration decoration = const InputDecoration(),
-    Key? key,
-    required String name, //From Super
+    super.autovalidateMode = AutovalidateMode.disabled,
+    super.enabled,
+    super.focusNode,
+    super.onSaved,
+    super.validator,
+    super.decoration,
+    super.key,
+    required super.name,
     required this.options,
-    T? initialValue,
+    super.initialValue,
     this.alignment = WrapAlignment.start,
     this.avatarBorder = const CircleBorder(),
     this.backgroundColor,
@@ -289,70 +289,57 @@ class FormBuilderChoiceChip<T> extends FormBuilderField<T> {
     this.textDirection,
     this.verticalDirection = VerticalDirection.down,
     this.visualDensity,
-    ValueChanged<T?>? onChanged,
-    ValueTransformer<T?>? valueTransformer,
-    VoidCallback? onReset,
-  }) : super(
-            key: key,
-            initialValue: initialValue,
-            name: name,
-            validator: validator,
-            valueTransformer: valueTransformer,
-            onChanged: onChanged,
-            autovalidateMode: autovalidateMode,
-            onSaved: onSaved,
-            enabled: enabled,
-            onReset: onReset,
-            decoration: decoration,
-            focusNode: focusNode,
-            builder: (FormFieldState<T?> field) {
-              final state = field as _FormBuilderChoiceChipState<T>;
+    super.onChanged,
+    super.valueTransformer,
+    super.onReset,
+  }) : super(builder: (FormFieldState<T?> field) {
+          final state = field as _FormBuilderChoiceChipState<T>;
 
-              return InputDecorator(
-                decoration: state.decoration,
-                child: Wrap(
-                  direction: direction,
-                  alignment: alignment,
-                  crossAxisAlignment: crossAxisAlignment,
-                  runAlignment: runAlignment,
-                  runSpacing: runSpacing,
-                  spacing: spacing,
-                  textDirection: textDirection,
-                  verticalDirection: verticalDirection,
-                  children: <Widget>[
-                    for (FormBuilderChipOption<T> option in options)
-                      ChoiceChip(
-                        label: option,
-                        shape: shape,
-                        selected: field.value == option.value,
-                        onSelected: state.enabled
-                            ? (selected) {
-                                final choice = selected ? option.value : null;
-                                if (shouldRequestFocus) {
-                                  state.requestFocus();
-                                }
-                                state.didChange(choice);
-                              }
-                            : null,
-                        avatar: option.avatar,
-                        selectedColor: selectedColor,
-                        disabledColor: disabledColor,
-                        backgroundColor: backgroundColor,
-                        shadowColor: shadowColor,
-                        selectedShadowColor: selectedShadowColor,
-                        elevation: elevation,
-                        pressElevation: pressElevation,
-                        materialTapTargetSize: materialTapTargetSize,
-                        labelStyle: labelStyle,
-                        labelPadding: labelPadding,
-                        padding: padding,
-                        visualDensity: visualDensity,
-                        avatarBorder: avatarBorder,
-                      ),
-                  ],
-                ),
-              );
-            });
+          return InputDecorator(
+            decoration: state.decoration,
+            child: Wrap(
+              direction: direction,
+              alignment: alignment,
+              crossAxisAlignment: crossAxisAlignment,
+              runAlignment: runAlignment,
+              runSpacing: runSpacing,
+              spacing: spacing,
+              textDirection: textDirection,
+              verticalDirection: verticalDirection,
+              children: <Widget>[
+                for (FormBuilderChipOption<T> option in options)
+                  ChoiceChip(
+                    label: option,
+                    shape: shape,
+                    selected: field.value == option.value,
+                    onSelected: state.enabled
+                        ? (selected) {
+                            final choice = selected ? option.value : null;
+                            if (shouldRequestFocus) {
+                              state.requestFocus();
+                            }
+                            state.didChange(choice);
+                          }
+                        : null,
+                    avatar: option.avatar,
+                    selectedColor: selectedColor,
+                    disabledColor: disabledColor,
+                    backgroundColor: backgroundColor,
+                    shadowColor: shadowColor,
+                    selectedShadowColor: selectedShadowColor,
+                    elevation: elevation,
+                    pressElevation: pressElevation,
+                    materialTapTargetSize: materialTapTargetSize,
+                    labelStyle: labelStyle,
+                    labelPadding: labelPadding,
+                    padding: padding,
+                    visualDensity: visualDensity,
+                    avatarBorder: avatarBorder,
+                  ),
+              ],
+            ),
+          );
+        });
 
   @override
   FormBuilderFieldState<FormBuilderChoiceChip<T>, T> createState() =>

lib/src/fields/form_builder_date_range_picker.dart

@@ -64,19 +64,18 @@ class FormBuilderDateRangePicker extends FormBuilderField<DateTimeRange> {
 
   /// Creates field for selecting a range of dates
   FormBuilderDateRangePicker({
-    Key? key,
-    //From Super
-    required String name,
-    FormFieldValidator<DateTimeRange>? validator,
-    DateTimeRange? initialValue,
-    InputDecoration decoration = const InputDecoration(),
-    ValueChanged<DateTimeRange?>? onChanged,
-    ValueTransformer<DateTimeRange?>? valueTransformer,
-    bool enabled = true,
-    FormFieldSetter<DateTimeRange>? onSaved,
-    AutovalidateMode autovalidateMode = AutovalidateMode.disabled,
-    VoidCallback? onReset,
-    FocusNode? focusNode,
+    super.key,
+    required super.name,
+    super.validator,
+    super.initialValue,
+    super.decoration,
+    super.onChanged,
+    super.valueTransformer,
+    super.enabled,
+    super.onSaved,
+    super.autovalidateMode = AutovalidateMode.disabled,
+    super.onReset,
+    super.focusNode,
     required this.firstDate,
     required this.lastDate,
     this.format,
@@ -129,18 +128,6 @@ class FormBuilderDateRangePicker extends FormBuilderField<DateTimeRange> {
     this.allowClear = false,
     this.clearIcon,
   }) : super(
-          key: key,
-          initialValue: initialValue,
-          name: name,
-          validator: validator,
-          valueTransformer: valueTransformer,
-          onChanged: onChanged,
-          autovalidateMode: autovalidateMode,
-          onSaved: onSaved,
-          enabled: enabled,
-          onReset: onReset,
-          decoration: decoration,
-          focusNode: focusNode,
           builder: (FormFieldState<DateTimeRange?> field) {
             final state = field as _FormBuilderDateRangePickerState;
 

lib/src/fields/form_builder_date_time_picker.dart

@@ -127,19 +127,18 @@ class FormBuilderDateTimePicker extends FormBuilderField<DateTime> {
 
   /// Creates field for `Date`, `Time` and `DateTime` input
   FormBuilderDateTimePicker({
-    Key? key,
-    //From Super
-    required String name,
-    FormFieldValidator<DateTime>? validator,
-    DateTime? initialValue,
-    InputDecoration decoration = const InputDecoration(),
-    ValueChanged<DateTime?>? onChanged,
-    ValueTransformer<DateTime?>? valueTransformer,
-    bool enabled = true,
-    FormFieldSetter<DateTime>? onSaved,
-    AutovalidateMode autovalidateMode = AutovalidateMode.disabled,
-    VoidCallback? onReset,
-    FocusNode? focusNode,
+    super.key,
+    required super.name,
+    super.validator,
+    super.initialValue,
+    super.decoration,
+    super.onChanged,
+    super.valueTransformer,
+    super.enabled,
+    super.onSaved,
+    super.autovalidateMode = AutovalidateMode.disabled,
+    super.onReset,
+    super.focusNode,
     this.inputType = InputType.both,
     this.scrollPadding = const EdgeInsets.all(20.0),
     this.cursorWidth = 2.0,
@@ -194,18 +193,6 @@ class FormBuilderDateTimePicker extends FormBuilderField<DateTime> {
     this.anchorPoint,
     this.onEntryModeChanged,
   }) : super(
-          key: key,
-          initialValue: initialValue,
-          name: name,
-          validator: validator,
-          valueTransformer: valueTransformer,
-          onChanged: onChanged,
-          autovalidateMode: autovalidateMode,
-          onSaved: onSaved,
-          enabled: enabled,
-          onReset: onReset,
-          decoration: decoration,
-          focusNode: focusNode,
           builder: (FormFieldState<DateTime?> field) {
             final state = field as _FormBuilderDateTimePickerState;