Various fixes to resolve flutter analyze issues.

awhitford · awhitford · commit 589a96884ab6 · 2020-06-15T13:40:13.000-07:00
diff --git a/lib/src/fields/form_builder_checkbox.dart b/lib/src/fields/form_builder_checkbox.dart
@@ -133,9 +133,9 @@ class _FormBuilderCheckboxState extends State<FormBuilderCheckbox> {
                 ? null
                 : () {
                     FocusScope.of(context).requestFocus(FocusNode());
-                    bool newValue = !(field.value ?? false);
+                    final newValue = !(field.value ?? false);
                     field.didChange(newValue);
-                    if (widget.onChanged != null) widget.onChanged(newValue);
+                    widget.onChanged?.call(newValue);
                   },
           ),
         );
diff --git a/lib/src/fields/form_builder_checkbox_list.dart b/lib/src/fields/form_builder_checkbox_list.dart
@@ -123,8 +123,8 @@ class _FormBuilderCheckboxListState extends State<FormBuilderCheckboxList> {
         }
       },
       builder: (FormFieldState<dynamic> field) {
-        List<Widget> checkboxList = [];
-        for (int i = 0; i < widget.options.length; i++) {
+        final checkboxList = <Widget>[];
+        for (var i = 0; i < widget.options.length; i++) {
           checkboxList.addAll([
             ListTile(
               dense: true,
diff --git a/lib/src/fields/form_builder_color_picker.dart b/lib/src/fields/form_builder_color_picker.dart
@@ -111,7 +111,7 @@ class _FormBuilderColorPickerState extends State<FormBuilderColorPicker> {
   final GlobalKey<FormFieldState> _fieldKey = GlobalKey<FormFieldState>();
   FormBuilderState _formState;
   Color _initialValue;
-  FocusNode _focusNode = FocusNode();
+  final _focusNode = FocusNode();
   TextEditingController _textEditingController;
 
   TextEditingController get _effectiveController =>
@@ -226,7 +226,7 @@ class _FormBuilderColorPickerState extends State<FormBuilderColorPicker> {
     _effectiveController.text = HexColor(color)?.toHex();
   }
 
-  _handleFocus() async {
+  Future<void> _handleFocus() async {
     if (effectiveFocusNode.hasFocus && !_readOnly) {
       await Future.microtask(
           () => FocusScope.of(context).requestFocus(FocusNode()));
diff --git a/lib/src/fields/form_builder_country_picker.dart b/lib/src/fields/form_builder_country_picker.dart
@@ -35,7 +35,7 @@ class FormBuilderCountryPicker extends StatefulWidget {
     Key key,
     @required this.attribute,
     this.defaultSelectedCountryIsoCode = 'US',
-    this.initialValue,
+    @required this.initialValue,
     this.validators = const [],
     this.readOnly = false,
     this.decoration = const InputDecoration(),
diff --git a/lib/src/fields/form_builder_date_range_picker.dart b/lib/src/fields/form_builder_date_range_picker.dart
@@ -243,7 +243,7 @@ class FormBuilderDateRangePickerState
     );
   }
 
-  _handleFocus() async {
+  Future<void> _handleFocus() async {
     if (_effectiveFocusNode.hasFocus) {
       _hideKeyboard();
       var initialFirstDate = value.isEmpty
@@ -252,7 +252,7 @@ class FormBuilderDateRangePickerState
       var initialLastDate = value.isEmpty
           ? (widget.initialLastDate ?? initialFirstDate)
           : (value.length < 2 ? initialFirstDate : value[1]);
-      final List<DateTime> picked = await date_range_picker.showDatePicker(
+      final picked = await date_range_picker.showDatePicker(
         context: context,
         initialFirstDate: initialFirstDate,
         initialLastDate: initialLastDate,
@@ -269,16 +269,16 @@ class FormBuilderDateRangePickerState
     }
   }
 
-  _valueToText() {
+  String _valueToText() {
     if (value.isEmpty) {
       return '';
     } else if (value.length == 1) {
-      return '${format(value[0])}';
+      return format(value[0]);
     }
     return '${format(value[0])} - ${format(value[1])}';
   }
 
-  _setCurrentValue(val) {
+  void _setCurrentValue(val) {
     setState(() {
       _currentValue = val ?? [];
     });
diff --git a/lib/src/fields/form_builder_date_time_picker.dart b/lib/src/fields/form_builder_date_time_picker.dart
@@ -240,7 +240,7 @@ class _FormBuilderDateTimePickerState extends State<FormBuilderDateTimePicker> {
   }
 
   // Hack to avoid manual editing of date - as is in DateTimeField library
-  _handleFocus() async {
+  Future<void> _handleFocus() async {
     setState(() {
       stateCurrentValue = _fieldKey.currentState.value;
     });
diff --git a/lib/src/fields/form_builder_dropdown.dart b/lib/src/fields/form_builder_dropdown.dart
@@ -157,10 +157,10 @@ class _FormBuilderDropdownState extends State<FormBuilderDropdown> {
     );
   }
 
-  _changeValue(FormFieldState field, value) {
+  void _changeValue(FormFieldState field, value) {
     FocusScope.of(context).requestFocus(FocusNode());
     field.didChange(value);
-    if (widget.onChanged != null) widget.onChanged(value);
+    widget.onChanged?.call(value);
   }
 
 /*@override
diff --git a/lib/src/fields/form_builder_radio.dart b/lib/src/fields/form_builder_radio.dart
@@ -111,8 +111,8 @@ class _FormBuilderRadioState extends State<FormBuilderRadio> {
         }
       },
       builder: (FormFieldState<dynamic> field) {
-        List<Widget> radioList = [];
-        for (int i = 0; i < widget.options.length; i++) {
+        final radioList = <Widget>[];
+        for (var i = 0; i < widget.options.length; i++) {
           radioList.addAll([
             ListTile(
               dense: true,
@@ -124,10 +124,9 @@ class _FormBuilderRadioState extends State<FormBuilderRadio> {
               onTap: _readOnly
                   ? null
                   : () {
-                      field.didChange(widget.options[i].value);
-                      if (widget.onChanged != null) {
-                        widget.onChanged(widget.options[i].value);
-                      }
+                      final value = widget.options[i].value;
+                      field.didChange(value);
+                      widget.onChanged?.call(value);
                     },
             ),
             Divider(
diff --git a/lib/src/fields/form_builder_signature_pad.dart b/lib/src/fields/form_builder_signature_pad.dart
@@ -86,7 +86,7 @@ class _FormBuilderSignaturePadState extends State<FormBuilderSignaturePad> {
     super.initState();
   }
 
-  _getControllerValue() async {
+  Future<Uint8List> _getControllerValue() async {
     return await _effectiveController.toImage() != null
         ? await _effectiveController.toPngBytes()
         : null;
diff --git a/lib/src/fields/form_builder_switch.dart b/lib/src/fields/form_builder_switch.dart
@@ -168,9 +168,9 @@ class _FormBuilderSwitchState extends State<FormBuilderSwitch> {
                   ? null
                   : () {
                       FocusScope.of(context).requestFocus(FocusNode());
-                      bool newValue = !(field.value ?? false);
+                      final newValue = !(field.value ?? false);
                       field.didChange(newValue);
-                      if (widget.onChanged != null) widget.onChanged(newValue);
+                      widget.onChanged?.call(newValue);
                     },
             ),
           );
diff --git a/lib/src/fields/form_builder_typeahead.dart b/lib/src/fields/form_builder_typeahead.dart
@@ -4,8 +4,6 @@ import 'package:flutter_form_builder/flutter_form_builder.dart';
 import 'package:flutter_form_builder/src/always_disabled_focus_node.dart';
 import 'package:flutter_typeahead/flutter_typeahead.dart';
 
-typedef String SelectionToTextTransformer<T>(T suggestion);
-
 class FormBuilderTypeAhead<T> extends StatefulWidget {
   final String attribute;
   final List<FormFieldValidator> validators;
@@ -22,7 +20,7 @@ class FormBuilderTypeAhead<T> extends StatefulWidget {
   final WidgetBuilder loadingBuilder;
   final Duration debounceDuration;
   final SuggestionsBoxDecoration suggestionsBoxDecoration;
-  final SelectionToTextTransformer<T> selectionToTextTransformer;
+  final String Function(T) selectionToTextTransformer;
   final ItemBuilder<T> itemBuilder;
   final SuggestionsCallback<T> suggestionsCallback;
   final double suggestionsBoxVerticalOffset;
@@ -123,8 +121,8 @@ class _FormBuilderTypeAheadState<T> extends State<FormBuilderTypeAhead<T>> {
     }
   }
 
-  _handleStringOnChanged() {
-    if (widget.onChanged != null) widget.onChanged(_typeAheadController.text);
+  void _handleStringOnChanged() {
+    widget.onChanged?.call(_typeAheadController.text);
   }
 
   @override
diff --git a/lib/src/form_builder.dart b/lib/src/form_builder.dart
@@ -63,13 +63,13 @@ class FormBuilderState extends State<FormBuilder> {
     });
   }
 
-  registerFieldKey(String attribute, GlobalKey key) {
+  void registerFieldKey(String attribute, GlobalKey key) {
     // assert(_fieldKeys.containsKey(attribute) == false, "Field with attribute '$attribute' already exists. Make sure that two or more fields don't have the same attribute name.");
-    this._fieldKeys[attribute] = key;
+    _fieldKeys[attribute] = key;
   }
 
-  unregisterFieldKey(String attribute) {
-    this._fieldKeys.remove(attribute);
+  void unregisterFieldKey(String attribute) {
+    _fieldKeys.remove(attribute);
   }
 
   /*changeAttributeValue(String attribute, dynamic newValue) {
diff --git a/lib/src/form_builder_validators.dart b/lib/src/form_builder_validators.dart
@@ -204,7 +204,7 @@ class FormBuilderValidators {
   /// validation generates an error message, it it returned, otherwise null.
   static String validateValidators<T>(
       T val, List<FormFieldValidator> validators) {
-    for (int i = 0; i < validators.length; i++) {
+    for (var i = 0; i < validators.length; i++) {
       final validatorResult = validators[i](val);
       if (validatorResult != null) {
         return validatorResult;

Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,7 @@ class _FormBuilderDateTimePickerState extends State<FormBuilderDateTimePicker> {`
`240`	`240`	`}`
`241`	`241`
`242`	`242`	`// Hack to avoid manual editing of date - as is in DateTimeField library`
`243`		`- _handleFocus() async {`
	`243`	`+ Future<void> _handleFocus() async {`
`244`	`244`	`setState(() {`
`245`	`245`	`stateCurrentValue = _fieldKey.currentState.value;`
`246`	`246`	`});`
Original file line number	Diff line number	Diff line change
`@@ -157,10 +157,10 @@ class _FormBuilderDropdownState extends State<FormBuilderDropdown> {`
`157`	`157`	`);`
`158`	`158`	`}`
`159`	`159`
`160`		`- _changeValue(FormFieldState field, value) {`
	`160`	`+ void _changeValue(FormFieldState field, value) {`
`161`	`161`	`FocusScope.of(context).requestFocus(FocusNode());`
`162`	`162`	`field.didChange(value);`
`163`		`- if (widget.onChanged != null) widget.onChanged(value);`
	`163`	`+ widget.onChanged?.call(value);`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`/*@override`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ class _FormBuilderSignaturePadState extends State<FormBuilderSignaturePad> {`
`86`	`86`	`super.initState();`
`87`	`87`	`}`
`88`	`88`
`89`		`- _getControllerValue() async {`
	`89`	`+ Future<Uint8List> _getControllerValue() async {`
`90`	`90`	`return await _effectiveController.toImage() != null`
`91`	`91`	`? await _effectiveController.toPngBytes()`
`92`	`92`	`: null;`