Merge pull request #323 from awhitford/pedantic-1.9

awhitford · web-flow · commit 98f87d729dae · 2020-06-15T16:51:06.000-07:00
Pedantic 1.9
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()));
@@ -284,7 +284,7 @@ class _FormBuilderColorPickerState extends State<FormBuilderColorPicker> {
                       },
                     );
                   default:
-                    throw "Unknown ColorPickerType";
+                    throw 'Unknown ColorPickerType';
                 }
               }),
             ),
diff --git a/lib/src/fields/form_builder_country_picker.dart b/lib/src/fields/form_builder_country_picker.dart
@@ -34,8 +34,8 @@ class FormBuilderCountryPicker extends StatefulWidget {
   FormBuilderCountryPicker({
     Key key,
     @required this.attribute,
-    this.defaultSelectedCountryIsoCode = "US",
-    this.initialValue,
+    this.defaultSelectedCountryIsoCode = 'US',
+    @required this.initialValue,
     this.validators = const [],
     this.readOnly = false,
     this.decoration = const InputDecoration(),
@@ -194,7 +194,7 @@ class _FormBuilderCountryPickerState extends State<FormBuilderCountryPicker> {
       child: ListTile(
         contentPadding: EdgeInsets.zero,
         leading: CountryPickerUtils.getDefaultFlagImage(country),
-        title: Text("${country.name}"),
+        title: Text(country.name),
         // visualDensity: VisualDensity.compact, //TODO: Re-enable after Flutter 1.17
       ),
     );
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 "";
+      return '';
     } else if (value.length == 1) {
-      return "${format(value[0])}";
+      return format(value[0]);
     }
-    return "${format(value[0])} - ${format(value[1])}";
+    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
@@ -218,7 +218,7 @@ class _FormBuilderDateTimePickerState extends State<FormBuilderDateTimePicker> {
   final _dateTimeFormats = {
     InputType.both: DateFormat("EEEE, MMMM d, yyyy 'at' h:mma"),
     InputType.date: DateFormat('yyyy-MM-dd'),
-    InputType.time: DateFormat("HH:mm"),
+    InputType.time: DateFormat('HH:mm'),
   };
 
   @override
@@ -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;
     });
@@ -344,7 +344,7 @@ class _FormBuilderDateTimePickerState extends State<FormBuilderDateTimePicker> {
         }
         break;
       default:
-        throw "Unexcepted input type ${widget.inputType}";
+        throw 'Unexcepted input type ${widget.inputType}';
         break;
     }
     newValue = newValue ?? currentValue;
diff --git a/lib/src/fields/form_builder_dropdown.dart b/lib/src/fields/form_builder_dropdown.dart
@@ -123,7 +123,7 @@ class _FormBuilderDropdownState extends State<FormBuilderDropdown> {
                                 .firstWhere((val) => val.value == field.value,
                                     orElse: () => null)
                                 ?.child ??
-                            Text("${field.value.toString()}"))
+                            Text(field.value.toString()))
                         : widget.disabledHint,
                     elevation: widget.elevation,
                     iconSize: widget.iconSize,
@@ -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_phone_field.dart b/lib/src/fields/form_builder_phone_field.dart
@@ -107,7 +107,7 @@ class FormBuilderPhoneField extends StatefulWidget {
     this.titlePadding,
     this.dialogTitle,
     this.isSearchable,
-    this.defaultSelectedCountryIsoCode = "US",
+    this.defaultSelectedCountryIsoCode = 'US',
     this.priorityListByIsoCode,
     this.countryFilterByIsoCode,
     this.dialogTextStyle,
@@ -173,7 +173,7 @@ class FormBuilderPhoneFieldState extends State<FormBuilderPhoneField> {
           _effectiveController.text = parseResult['national_number'];
         }
       } catch (error) {
-        _effectiveController.text = _initialValue.replaceFirst("+", "");
+        _effectiveController.text = _initialValue.replaceFirst('+', '');
       }
     }
   }
@@ -273,7 +273,7 @@ class FormBuilderPhoneFieldState extends State<FormBuilderPhoneField> {
             Icon(Icons.arrow_drop_down),
             CountryPickerUtils.getDefaultFlagImage(_selectedDialogCountry),
             Text(
-              "+${_selectedDialogCountry.phoneCode} ",
+              '+${_selectedDialogCountry.phoneCode} ',
               style: widget.style ?? Theme.of(context).textTheme.subtitle1,
             ),
           ],
@@ -359,9 +359,9 @@ class FormBuilderPhoneFieldState extends State<FormBuilderPhoneField> {
       child: ListTile(
         contentPadding: EdgeInsets.zero,
         leading: CountryPickerUtils.getDefaultFlagImage(country),
-        title: Text("${country.name}"),
+        title: Text(country.name),
         // visualDensity: VisualDensity.compact, //TODO: Re-enable after Flutter 1.17
-        trailing: Text("+${country.phoneCode}"),
+        trailing: Text('+${country.phoneCode}'),
       ),
     );
   }
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_range_slider.dart b/lib/src/fields/form_builder_range_slider.dart
@@ -126,9 +126,9 @@ class _FormBuilderRangeSliderState extends State<FormBuilderRangeSlider> {
                 Row(
                   mainAxisAlignment: MainAxisAlignment.spaceBetween,
                   children: <Widget>[
-                    Text("${widget.min}"),
-                    Text("${field.value.start}   -   ${field.value.end}"),
-                    Text("${widget.max}"),
+                    Text('${widget.min}'),
+                    Text('${field.value.start}   -   ${field.value.end}'),
+                    Text('${widget.max}'),
                   ],
                 ),
               ],
diff --git a/lib/src/fields/form_builder_segmented_control.dart b/lib/src/fields/form_builder_segmented_control.dart
@@ -123,7 +123,7 @@ class _FormBuilderSegmentedControlState
                   // ignore: deprecated_member_use_from_same_package
                   child: widget.textStyle != null
                       ? Text(
-                          "${option.label ?? option.value}",
+                          '${option.label ?? option.value}',
                           // ignore: deprecated_member_use_from_same_package
                           style: widget.textStyle,
                         )
diff --git a/lib/src/fields/form_builder_signature_pad.dart b/lib/src/fields/form_builder_signature_pad.dart
@@ -16,14 +16,14 @@ class FormBuilderSignaturePad extends StatefulWidget {
   final ValueChanged onChanged;
   final FormFieldSetter onSaved;
 
-  @Deprecated("Set points within SignatureController")
+  @Deprecated('Set points within SignatureController')
   final List<Point> points;
   final double width;
   final double height;
   final Color backgroundColor;
-  @Deprecated("Set penColor within SignatureController")
+  @Deprecated('Set penColor within SignatureController')
   final Color penColor;
-  @Deprecated("Set penStrokeWidth within SignatureController")
+  @Deprecated('Set penStrokeWidth within SignatureController')
   final double penStrokeWidth;
   final String clearButtonText;
   final SignatureController controller;
@@ -37,7 +37,7 @@ class FormBuilderSignaturePad extends StatefulWidget {
     this.backgroundColor = Colors.white,
     this.penColor = Colors.black,
     this.penStrokeWidth = 3.0,
-    this.clearButtonText = "Clear",
+    this.clearButtonText = 'Clear',
     this.initialValue,
     this.points,
     this.width,
@@ -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_slider.dart b/lib/src/fields/form_builder_slider.dart
@@ -65,7 +65,7 @@ class _FormBuilderSliderState extends State<FormBuilderSlider> {
         (_formState.initialValue.containsKey(widget.attribute)
             ? _formState.initialValue[widget.attribute]
             : null);
-    _numberFormat = widget.numberFormat ?? NumberFormat("##0.0");
+    _numberFormat = widget.numberFormat ?? NumberFormat('##0.0');
     super.initState();
   }
 
@@ -130,9 +130,9 @@ class _FormBuilderSliderState extends State<FormBuilderSlider> {
                 Row(
                   mainAxisAlignment: MainAxisAlignment.spaceBetween,
                   children: <Widget>[
-                    Text("${_numberFormat.format(widget.min)}"),
-                    Text("${_numberFormat.format(field.value)}"),
-                    Text("${_numberFormat.format(widget.max)}"),
+                    Text(_numberFormat.format(widget.min)),
+                    Text(_numberFormat.format(field.value)),
+                    Text(_numberFormat.format(widget.max)),
                   ],
                 ),
               ],
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_field_option.dart b/lib/src/form_builder_field_option.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 
 class FormBuilderFieldOption extends StatelessWidget {
-  @Deprecated("Use `child` instead. Will be removed in the next major version.")
+  @Deprecated('Use `child` instead. Will be removed in the next major version.')
   final String label;
   final Widget child;
   final dynamic value;
@@ -20,7 +20,7 @@ class FormBuilderFieldOption extends StatelessWidget {
       return child;
     } else {
       // ignore: deprecated_member_use_from_same_package
-      return Text("${label ?? value.toString()}");
+      return Text(label ?? value.toString());
     }
   }
 }
diff --git a/lib/src/form_builder_validators.dart b/lib/src/form_builder_validators.dart
diff --git a/pubspec.lock b/pubspec.lock
diff --git a/pubspec.yaml b/pubspec.yaml
diff --git a/test/flutter_form_builder_test.dart b/test/flutter_form_builder_test.dart
