chore(core): static analysis fixes

danvick · danvick · commit 881879b45b3d · 2022-05-24T10:25:39.000+03:00
diff --git a/packages/flutter_form_builder/CHANGELOG.md b/packages/flutter_form_builder/CHANGELOG.md
@@ -1,3 +1,6 @@
+## [7.2.1] - 23-May-2022
+* Fix bug where `FormBuilder.onChanged` is called before `setInternalFieldValue` is done
+
 ## [7.2.0] - 19-May-2022
 * Added new dropdown attributes: borderRadius, enableFeedback, alignment. Fixes #1011
 * Added more date picker and time picker options
diff --git a/packages/flutter_form_builder/example/lib/code_page.dart b/packages/flutter_form_builder/example/lib/code_page.dart
@@ -14,10 +14,10 @@ class CodePage extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  CodePageState createState() => CodePageState();
+  State<CodePage> createState() => _CodePageState();
 }
 
-class CodePageState extends State<CodePage> {
+class _CodePageState extends State<CodePage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
diff --git a/packages/flutter_form_builder/example/lib/main.dart b/packages/flutter_form_builder/example/lib/main.dart
@@ -29,12 +29,12 @@ class CompleteForm extends StatefulWidget {
   const CompleteForm({Key? key}) : super(key: key);
 
   @override
-  CompleteFormState createState() {
-    return CompleteFormState();
+  State<CompleteForm> createState() {
+    return _CompleteFormState();
   }
 }
 
-class CompleteFormState extends State<CompleteForm> {
+class _CompleteFormState extends State<CompleteForm> {
   bool autoValidate = true;
   bool readOnly = false;
   bool showSegmentedControl = true;
@@ -102,11 +102,12 @@ class CompleteFormState extends State<CompleteForm> {
                         helperText: 'Helper text',
                         hintText: 'Hint text',
                         suffixIcon: IconButton(
-                            icon: const Icon(Icons.close),
-                            onPressed: () {
-                              _formKey.currentState!.fields['date_range']
-                                  ?.didChange(null);
-                            }),
+                          icon: const Icon(Icons.close),
+                          onPressed: () {
+                            _formKey.currentState!.fields['date_range']
+                                ?.didChange(null);
+                          },
+                        ),
                       ),
                     ),
                     FormBuilderSlider(
diff --git a/packages/flutter_form_builder/example/lib/sources/complete_form.dart b/packages/flutter_form_builder/example/lib/sources/complete_form.dart
@@ -7,12 +7,12 @@ class CompleteForm extends StatefulWidget {
   const CompleteForm({Key? key}) : super(key: key);
 
   @override
-  CompleteFormState createState() {
-    return CompleteFormState();
+  State<CompleteForm> createState() {
+    return _CompleteFormState();
   }
 }
 
-class CompleteFormState extends State<CompleteForm> {
+class _CompleteFormState extends State<CompleteForm> {
   bool autoValidate = true;
   bool readOnly = false;
   bool showSegmentedControl = true;
diff --git a/packages/flutter_form_builder/example/lib/sources/custom_fields.dart b/packages/flutter_form_builder/example/lib/sources/custom_fields.dart
@@ -6,10 +6,10 @@ class CustomFields extends StatefulWidget {
   const CustomFields({Key? key}) : super(key: key);
 
   @override
-  CustomFieldsState createState() => CustomFieldsState();
+  State<CustomFields> createState() => _CustomFieldsState();
 }
 
-class CustomFieldsState extends State<CustomFields> {
+class _CustomFieldsState extends State<CustomFields> {
   final _formKey = GlobalKey<FormBuilderState>();
   var options = ["Option 1", "Option 2", "Option 3"];
 
diff --git a/packages/flutter_form_builder/example/lib/sources/signup_form.dart b/packages/flutter_form_builder/example/lib/sources/signup_form.dart
@@ -6,10 +6,10 @@ class SignupForm extends StatefulWidget {
   const SignupForm({Key? key}) : super(key: key);
 
   @override
-  SignupFormState createState() => SignupFormState();
+  State<SignupForm> createState() => _SignupFormState();
 }
 
-class SignupFormState extends State<SignupForm> {
+class _SignupFormState extends State<SignupForm> {
   final _formKey = GlobalKey<FormBuilderState>();
   final _emailFieldKey = GlobalKey<FormBuilderFieldState>();
 
diff --git a/packages/flutter_form_builder/example/pubspec.yaml b/packages/flutter_form_builder/example/pubspec.yaml
@@ -16,6 +16,7 @@ dependencies:
     path: ../../form_builder_validators/
   flutter_localizations:
     sdk: flutter
+  intl: ^0.17.0
 
 dev_dependencies:
   flutter_lints: ^2.0.1
diff --git a/packages/flutter_form_builder/lib/src/fields/form_builder_checkbox.dart b/packages/flutter_form_builder/lib/src/fields/form_builder_checkbox.dart
@@ -112,7 +112,7 @@ class FormBuilderCheckbox extends FormBuilderField<bool> {
           decoration: decoration,
           focusNode: focusNode,
           builder: (FormFieldState<bool?> field) {
-            final state = field as FormBuilderCheckboxState;
+            final state = field as _FormBuilderCheckboxState;
 
             return InputDecorator(
               decoration: state.decoration,
@@ -144,8 +144,9 @@ class FormBuilderCheckbox extends FormBuilderField<bool> {
         );
 
   @override
-  FormBuilderCheckboxState createState() => FormBuilderCheckboxState();
+  FormBuilderFieldState<FormBuilderCheckbox, bool> createState() =>
+      _FormBuilderCheckboxState();
 }
 
-class FormBuilderCheckboxState
+class _FormBuilderCheckboxState
     extends FormBuilderFieldState<FormBuilderCheckbox, bool> {}
diff --git a/packages/flutter_form_builder/lib/src/fields/form_builder_checkbox_group.dart b/packages/flutter_form_builder/lib/src/fields/form_builder_checkbox_group.dart
@@ -74,7 +74,7 @@ class FormBuilderCheckboxGroup<T> extends FormBuilderField<List<T>> {
           decoration: decoration,
           focusNode: focusNode,
           builder: (FormFieldState<List<T>?> field) {
-            final state = field as FormBuilderCheckboxGroupState<T>;
+            final state = field as _FormBuilderCheckboxGroupState<T>;
 
             return InputDecorator(
               decoration: state.decoration,
@@ -113,9 +113,9 @@ class FormBuilderCheckboxGroup<T> extends FormBuilderField<List<T>> {
         );
 
   @override
-  FormBuilderCheckboxGroupState<T> createState() =>
-      FormBuilderCheckboxGroupState<T>();
+  FormBuilderFieldState<FormBuilderCheckboxGroup<T>, List<T>> createState() =>
+      _FormBuilderCheckboxGroupState<T>();
 }
 
-class FormBuilderCheckboxGroupState<T>
+class _FormBuilderCheckboxGroupState<T>
     extends FormBuilderFieldState<FormBuilderCheckboxGroup<T>, List<T>> {}
diff --git a/packages/flutter_form_builder/lib/src/fields/form_builder_choice_chips.dart b/packages/flutter_form_builder/lib/src/fields/form_builder_choice_chips.dart
@@ -292,7 +292,7 @@ class FormBuilderChoiceChip<T> extends FormBuilderField<T> {
             decoration: decoration,
             focusNode: focusNode,
             builder: (FormFieldState<T?> field) {
-              final state = field as FormBuilderChoiceChipState<T>;
+              final state = field as _FormBuilderChoiceChipState<T>;
 
               return InputDecorator(
                 decoration: state.decoration,
@@ -338,9 +338,9 @@ class FormBuilderChoiceChip<T> extends FormBuilderField<T> {
             });
 
   @override
-  FormBuilderChoiceChipState<T> createState() =>
-      FormBuilderChoiceChipState<T>();
+  FormBuilderFieldState<FormBuilderChoiceChip<T>, T> createState() =>
+      _FormBuilderChoiceChipState<T>();
 }
 
-class FormBuilderChoiceChipState<T>
+class _FormBuilderChoiceChipState<T>
     extends FormBuilderFieldState<FormBuilderChoiceChip<T>, T> {}
diff --git a/packages/flutter_form_builder/lib/src/fields/form_builder_date_range_picker.dart b/packages/flutter_form_builder/lib/src/fields/form_builder_date_range_picker.dart
@@ -136,7 +136,7 @@ class FormBuilderDateRangePicker extends FormBuilderField<DateTimeRange> {
           decoration: decoration,
           focusNode: focusNode,
           builder: (FormFieldState<DateTimeRange?> field) {
-            final state = field as FormBuilderDateRangePickerState;
+            final state = field as _FormBuilderDateRangePickerState;
 
             return TextField(
               enabled: state.enabled,
@@ -175,8 +175,8 @@ class FormBuilderDateRangePicker extends FormBuilderField<DateTimeRange> {
         );
 
   @override
-  FormBuilderDateRangePickerState createState() =>
-      FormBuilderDateRangePickerState();
+  FormBuilderFieldState<FormBuilderDateRangePicker, DateTimeRange>
+      createState() => _FormBuilderDateRangePickerState();
 
   static String tryFormat(DateTime date, intl.DateFormat format) {
     try {
@@ -188,7 +188,7 @@ class FormBuilderDateRangePicker extends FormBuilderField<DateTimeRange> {
   }
 }
 
-class FormBuilderDateRangePickerState
+class _FormBuilderDateRangePickerState
     extends FormBuilderFieldState<FormBuilderDateRangePicker, DateTimeRange> {
   late TextEditingController _effectiveController;
 
diff --git a/packages/flutter_form_builder/lib/src/fields/form_builder_date_time_picker.dart b/packages/flutter_form_builder/lib/src/fields/form_builder_date_time_picker.dart
@@ -211,7 +211,7 @@ class FormBuilderDateTimePicker extends FormBuilderField<DateTime> {
           decoration: decoration,
           focusNode: focusNode,
           builder: (FormFieldState<DateTime?> field) {
-            final state = field as FormBuilderDateTimePickerState;
+            final state = field as _FormBuilderDateTimePickerState;
 
             return TextField(
               textDirection: textDirection,
@@ -249,11 +249,11 @@ class FormBuilderDateTimePicker extends FormBuilderField<DateTime> {
         );
 
   @override
-  FormBuilderDateTimePickerState createState() =>
-      FormBuilderDateTimePickerState();
+  FormBuilderFieldState<FormBuilderDateTimePicker, DateTime> createState() =>
+      _FormBuilderDateTimePickerState();
 }
 
-class FormBuilderDateTimePickerState
+class _FormBuilderDateTimePickerState
     extends FormBuilderFieldState<FormBuilderDateTimePicker, DateTime> {
   late TextEditingController _textFieldController;
 
diff --git a/packages/flutter_form_builder/lib/src/fields/form_builder_dropdown.dart b/packages/flutter_form_builder/lib/src/fields/form_builder_dropdown.dart
@@ -278,7 +278,7 @@ class FormBuilderDropdown<T> extends FormBuilderField<T> {
           decoration: decoration,
           focusNode: focusNode,
           builder: (FormFieldState<T?> field) {
-            final state = field as FormBuilderDropdownState<T>;
+            final state = field as _FormBuilderDropdownState<T>;
             // DropdownButtonFormField
             // TextFormField
 
@@ -350,8 +350,9 @@ class FormBuilderDropdown<T> extends FormBuilderField<T> {
         );
 
   @override
-  FormBuilderDropdownState<T> createState() => FormBuilderDropdownState<T>();
+  FormBuilderFieldState<FormBuilderDropdown<T>, T> createState() =>
+      _FormBuilderDropdownState<T>();
 }
 
-class FormBuilderDropdownState<T>
+class _FormBuilderDropdownState<T>
     extends FormBuilderFieldState<FormBuilderDropdown<T>, T> {}
diff --git a/packages/flutter_form_builder/lib/src/fields/form_builder_filter_chips.dart b/packages/flutter_form_builder/lib/src/fields/form_builder_filter_chips.dart
@@ -88,7 +88,7 @@ class FormBuilderFilterChip<T> extends FormBuilderField<List<T>> {
           validator: validator,
           valueTransformer: valueTransformer,
           builder: (FormFieldState<List<T>?> field) {
-            final state = field as FormBuilderFilterChipState<T>;
+            final state = field as _FormBuilderFilterChipState<T>;
 
             return InputDecorator(
               decoration: state.decoration,
@@ -145,9 +145,9 @@ class FormBuilderFilterChip<T> extends FormBuilderField<List<T>> {
         );
 
   @override
-  FormBuilderFilterChipState<T> createState() =>
-      FormBuilderFilterChipState<T>();
+  FormBuilderFieldState<FormBuilderFilterChip<T>, List<T>> createState() =>
+      _FormBuilderFilterChipState<T>();
 }
 
-class FormBuilderFilterChipState<T>
+class _FormBuilderFilterChipState<T>
     extends FormBuilderFieldState<FormBuilderFilterChip<T>, List<T>> {}
diff --git a/packages/flutter_form_builder/lib/src/fields/form_builder_radio_group.dart b/packages/flutter_form_builder/lib/src/fields/form_builder_radio_group.dart
@@ -69,7 +69,7 @@ class FormBuilderRadioGroup<T> extends FormBuilderField<T> {
           focusNode: focusNode,
           decoration: decoration,
           builder: (FormFieldState<T?> field) {
-            final state = field as FormBuilderRadioGroupState<T>;
+            final state = field as _FormBuilderRadioGroupState<T>;
 
             return InputDecorator(
               decoration: state.decoration,
@@ -106,9 +106,9 @@ class FormBuilderRadioGroup<T> extends FormBuilderField<T> {
         );
 
   @override
-  FormBuilderRadioGroupState<T> createState() =>
-      FormBuilderRadioGroupState<T>();
+  FormBuilderFieldState<FormBuilderRadioGroup<T>, T> createState() =>
+      _FormBuilderRadioGroupState<T>();
 }
 
-class FormBuilderRadioGroupState<T>
+class _FormBuilderRadioGroupState<T>
     extends FormBuilderFieldState<FormBuilderRadioGroup<T>, T> {}
diff --git a/packages/flutter_form_builder/lib/src/fields/form_builder_range_slider.dart b/packages/flutter_form_builder/lib/src/fields/form_builder_range_slider.dart
@@ -148,7 +148,7 @@ class FormBuilderRangeSlider extends FormBuilderField<RangeValues> {
             decoration: decoration,
             focusNode: focusNode,
             builder: (FormFieldState<RangeValues?> field) {
-              final state = field as FormBuilderRangeSliderState;
+              final state = field as _FormBuilderRangeSliderState;
               final effectiveNumberFormat =
                   numberFormat ?? NumberFormat.compact();
 
@@ -210,8 +210,9 @@ class FormBuilderRangeSlider extends FormBuilderField<RangeValues> {
             });
 
   @override
-  FormBuilderRangeSliderState createState() => FormBuilderRangeSliderState();
+  FormBuilderFieldState<FormBuilderRangeSlider, RangeValues> createState() =>
+      _FormBuilderRangeSliderState();
 }
 
-class FormBuilderRangeSliderState
+class _FormBuilderRangeSliderState
     extends FormBuilderFieldState<FormBuilderRangeSlider, RangeValues> {}
diff --git a/packages/flutter_form_builder/lib/src/fields/form_builder_segmented_control.dart b/packages/flutter_form_builder/lib/src/fields/form_builder_segmented_control.dart
@@ -75,7 +75,7 @@ class FormBuilderSegmentedControl<T extends Object>
           decoration: decoration,
           focusNode: focusNode,
           builder: (FormFieldState<T?> field) {
-            final state = field as FormBuilderSegmentedControlState<T>;
+            final state = field as _FormBuilderSegmentedControlState<T>;
             final theme = Theme.of(state.context);
 
             return InputDecorator(
@@ -119,9 +119,9 @@ class FormBuilderSegmentedControl<T extends Object>
         );
 
   @override
-  FormBuilderSegmentedControlState<T> createState() =>
-      FormBuilderSegmentedControlState();
+  FormBuilderFieldState<FormBuilderSegmentedControl<T>, T> createState() =>
+      _FormBuilderSegmentedControlState();
 }
 
-class FormBuilderSegmentedControlState<T extends Object>
+class _FormBuilderSegmentedControlState<T extends Object>
     extends FormBuilderFieldState<FormBuilderSegmentedControl<T>, T> {}
diff --git a/packages/flutter_form_builder/lib/src/fields/form_builder_slider.dart b/packages/flutter_form_builder/lib/src/fields/form_builder_slider.dart
@@ -175,7 +175,7 @@ class FormBuilderSlider extends FormBuilderField<double> {
           decoration: decoration,
           focusNode: focusNode,
           builder: (FormFieldState<double?> field) {
-            final state = field as FormBuilderSliderState;
+            final state = field as _FormBuilderSliderState;
             final effectiveNumberFormat =
                 numberFormat ?? NumberFormat.compact();
 
@@ -241,8 +241,9 @@ class FormBuilderSlider extends FormBuilderField<double> {
         );
 
   @override
-  FormBuilderSliderState createState() => FormBuilderSliderState();
+  FormBuilderFieldState<FormBuilderSlider, double> createState() =>
+      _FormBuilderSliderState();
 }
 
-class FormBuilderSliderState
+class _FormBuilderSliderState
     extends FormBuilderFieldState<FormBuilderSlider, double> {}
diff --git a/packages/flutter_form_builder/lib/src/fields/form_builder_switch.dart b/packages/flutter_form_builder/lib/src/fields/form_builder_switch.dart
@@ -124,7 +124,7 @@ class FormBuilderSwitch extends FormBuilderField<bool> {
           decoration: decoration,
           focusNode: focusNode,
           builder: (FormFieldState<bool?> field) {
-            final state = field as FormBuilderSwitchState;
+            final state = field as _FormBuilderSwitchState;
 
             return InputDecorator(
               decoration: state.decoration,
@@ -159,8 +159,9 @@ class FormBuilderSwitch extends FormBuilderField<bool> {
         );
 
   @override
-  FormBuilderSwitchState createState() => FormBuilderSwitchState();
+  FormBuilderFieldState<FormBuilderSwitch, bool> createState() =>
+      _FormBuilderSwitchState();
 }
 
-class FormBuilderSwitchState
+class _FormBuilderSwitchState
     extends FormBuilderFieldState<FormBuilderSwitch, bool> {}
diff --git a/packages/flutter_form_builder/lib/src/fields/form_builder_text_field.dart b/packages/flutter_form_builder/lib/src/fields/form_builder_text_field.dart
diff --git a/packages/flutter_form_builder/lib/src/widgets/grouped_radio.dart b/packages/flutter_form_builder/lib/src/widgets/grouped_radio.dart
diff --git a/packages/flutter_form_builder/pubspec.yaml b/packages/flutter_form_builder/pubspec.yaml

Original file line number	Diff line number	Diff line change
`@@ -7,12 +7,12 @@ class CompleteForm extends StatefulWidget {`
`7`	`7`	`const CompleteForm({Key? key}) : super(key: key);`
`8`	`8`
`9`	`9`	`@override`
`10`		`- CompleteFormState createState() {`
`11`		`- return CompleteFormState();`
	`10`	`+ State<CompleteForm> createState() {`
	`11`	`+ return _CompleteFormState();`
`12`	`12`	`}`
`13`	`13`	`}`
`14`	`14`
`15`		`-class CompleteFormState extends State<CompleteForm> {`
	`15`	`+class _CompleteFormState extends State<CompleteForm> {`
`16`	`16`	`bool autoValidate = true;`
`17`	`17`	`bool readOnly = false;`
`18`	`18`	`bool showSegmentedControl = true;`