Skip to content

Commit d1f0341

Browse files
danvickdanvick
committed
Bumped up pedantic static analysis package
1 parent 62d7874 commit d1f0341

29 files changed

+297
-128
lines changed

‎lib/src/fields/form_builder_checkbox.dart

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,19 @@ import 'package:flutter/widgets.dart';
33
import 'package:flutter_form_builder/flutter_form_builder.dart';
44

55
class FormBuilderCheckbox extends FormBuilderField<bool> {
6+
@override
67
final String attribute;
8+
@override
79
final FormFieldValidator validator;
10+
@override
811
final bool initialValue;
12+
@override
913
final bool readOnly;
14+
@override
1015
final InputDecoration decoration;
16+
@override
1117
final ValueChanged onChanged;
18+
@override
1219
final ValueTransformer valueTransformer;
1320
final Widget title;
1421
final Widget subtitle;
@@ -18,7 +25,7 @@ class FormBuilderCheckbox extends FormBuilderField<bool> {
1825
final ListTileControlAffinity controlAffinity;
1926
final EdgeInsets contentPadding;
2027

21-
FormBuilderCheckbox( {
28+
FormBuilderCheckbox({
2229
Key key,
2330
@required this.attribute,
2431
@required this.title,
@@ -72,7 +79,6 @@ class FormBuilderCheckbox extends FormBuilderField<bool> {
7279

7380
@override
7481
_FormBuilderCheckboxState createState() => _FormBuilderCheckboxState();
75-
7682
}
7783

7884
class _FormBuilderCheckboxState extends FormBuilderFieldState<bool> {

‎lib/src/fields/form_builder_checkbox_list.dart

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,26 @@ import 'package:flutter/widgets.dart';
33
import 'package:flutter_form_builder/flutter_form_builder.dart';
44

55
class FormBuilderCheckboxList<T> extends FormBuilderField<List<T>> {
6+
@override
67
final String attribute;
8+
@override
79
final FormFieldValidator validator;
10+
@override
811
final List<T> initialValue;
12+
@override
913
final bool readOnly;
14+
@override
1015
final InputDecoration decoration;
16+
@override
1117
final ValueChanged onChanged;
18+
@override
1219
final ValueTransformer valueTransformer;
1320

1421
final List<FormBuilderFieldOption> options;
1522
final ListTileControlAffinity controlAffinity;
1623
final Color activeColor;
1724
final Color checkColor;
25+
1826
// final Widget secondary;
1927

2028
FormBuilderCheckboxList({
@@ -41,9 +49,9 @@ class FormBuilderCheckboxList<T> extends FormBuilderField<List<T>> {
4149
readOnly: readOnly,
4250
builder: (FormFieldState field) {
4351
final _FormBuilderCheckboxListState<T> state = field;
52+
var checkboxList = [];
4453

45-
List<Widget> checkboxList = [];
46-
for (int i = 0; i < options.length; i++) {
54+
for (var i = 0; i < options.length; i++) {
4755
checkboxList.addAll([
4856
CheckboxListTile(
4957
value: state.value.contains(options[i].value),
@@ -90,5 +98,6 @@ class FormBuilderCheckboxList<T> extends FormBuilderField<List<T>> {
9098
}
9199

92100
class _FormBuilderCheckboxListState<T> extends FormBuilderFieldState<List<T>> {
101+
@override
93102
FormBuilderCheckboxList<T> get widget => super.widget;
94103
}

‎lib/src/fields/form_builder_chips_input.dart

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,19 @@ import 'package:flutter_chips_input/flutter_chips_input.dart';
33
import 'package:flutter_form_builder/flutter_form_builder.dart';
44

55
class FormBuilderChipsInput<T> extends FormBuilderField {
6+
@override
67
final String attribute;
8+
@override
79
final FormFieldValidator validator;
10+
@override
811
final List<T> initialValue;
12+
@override
913
final bool readOnly;
14+
@override
1015
final InputDecoration decoration;
16+
@override
1117
final ValueChanged onChanged;
18+
@override
1219
final ValueTransformer valueTransformer;
1320

1421
final ChipsInputSuggestions findSuggestions;
@@ -32,7 +39,7 @@ class FormBuilderChipsInput<T> extends FormBuilderField {
3239
final bool autofocus;
3340
final TextOverflow textOverflow;
3441

35-
FormBuilderChipsInput( {
42+
FormBuilderChipsInput({
3643
Key key,
3744
@required this.attribute,
3845
@required this.chipBuilder,
@@ -106,5 +113,6 @@ class FormBuilderChipsInput<T> extends FormBuilderField {
106113
}
107114

108115
class _FormBuilderChipsInputState extends FormBuilderFieldState {
116+
@override
109117
FormBuilderChipsInput get widget => super.widget;
110118
}

‎lib/src/fields/form_builder_choice_chips.dart

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,21 @@ import 'package:flutter_form_builder/flutter_form_builder.dart';
44

55
class FormBuilderChoiceChip extends FormBuilderField<dynamic> {
66
// FormBuilder Settings
7+
@override
78
final String attribute;
9+
@override
810
final FormFieldValidator validator;
11+
@override
912
final dynamic initialValue;
13+
@override
1014
final bool readOnly;
15+
@override
1116
final InputDecoration decoration;
17+
@override
1218
final ValueChanged onChanged;
19+
@override
1320
final FormFieldSetter onSaved;
21+
@override
1422
final ValueTransformer valueTransformer;
1523
final List<FormBuilderFieldOption> options;
1624

‎lib/src/fields/form_builder_color_picker.dart

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ class FormBuilderColorPickerField extends FormBuilderField<Color> {
141141

142142
final TextEditingController controller;
143143
final FocusNode focusNode;
144+
@override
144145
final bool readOnly;
145146
final ColorPickerType colorPickerType;
146147

@@ -172,11 +173,11 @@ class _FormBuilderColorPickerFieldState extends FormBuilderFieldState<Color> {
172173
_effectiveFocusNode.addListener(_handleFocus);
173174
}
174175

175-
_handleFocus() async {
176+
Future<void> _handleFocus() async {
176177
if (effectiveFocusNode.hasFocus && !readOnly) {
177178
await Future.microtask(
178179
() => FocusScope.of(context).requestFocus(FocusNode()));
179-
bool selected = await showDialog(
180+
var selected = await showDialog(
180181
context: context,
181182
builder: (BuildContext context) {
182183
return AlertDialog(
@@ -235,15 +236,15 @@ class _FormBuilderColorPickerFieldState extends FormBuilderFieldState<Color> {
235236
layoutBuilder: ,*/
236237
);
237238
default:
238-
throw "Unknown ColorPickerType";
239+
throw 'Unknown ColorPickerType';
239240
}
240241
}
241242

242-
_colorChanged(Color color) {
243+
void _colorChanged(Color color) {
243244
_selectedColor = color;
244245
}
245246

246-
_setTextFieldString() {
247+
void _setTextFieldString() {
247248
_effectiveController.text = valueString ?? '';
248249
}
249250

‎lib/src/fields/form_builder_country_picker.dart

Lines changed: 49 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,31 @@ import 'package:flutter/cupertino.dart';
44
import 'package:flutter/material.dart';
55
import 'package:flutter/widgets.dart';
66
import 'package:flutter_form_builder/flutter_form_builder.dart';
7-
import 'package:flutter_form_builder/src/country_picker_util.dart';
87

98
class FormBuilderCountryPicker extends FormBuilderField {
9+
@override
1010
final String attribute;
11+
@override
1112
final FormFieldValidator validator;
13+
@override
1214
final bool readOnly;
15+
@override
1316
final InputDecoration decoration;
17+
@override
1418
final ValueChanged onChanged;
19+
@override
1520
final ValueTransformer valueTransformer;
1621

1722
final TextStyle style;
23+
@override
1824
final FormFieldSetter onSaved;
1925

2026
// For country dialog
2127
final String searchText;
2228
final EdgeInsets titlePadding;
2329
final bool isSearchable;
2430
final Text dialogTitle;
31+
@override
2532
final String initialValue;
2633
final String defaultSelectedCountryIsoCode;
2734
final List<String> priorityListByIsoCode;
@@ -34,7 +41,7 @@ class FormBuilderCountryPicker extends FormBuilderField {
3441
FormBuilderCountryPicker({
3542
Key key,
3643
@required this.attribute,
37-
this.defaultSelectedCountryIsoCode = "US",
44+
this.defaultSelectedCountryIsoCode = 'US',
3845
this.initialValue,
3946
this.validator,
4047
this.readOnly = false,
@@ -100,8 +107,9 @@ class FormBuilderCountryPicker extends FormBuilderField {
100107
);
101108
},
102109
);
103-
104-
static void _openCupertinoCountryPicker(_FormBuilderCountryPickerState field) =>
110+
111+
static void _openCupertinoCountryPicker(
112+
_FormBuilderCountryPickerState field) =>
105113
showCupertinoModalPopup<void>(
106114
context: field.context,
107115
builder: (BuildContext context) {
@@ -113,47 +121,49 @@ class FormBuilderCountryPicker extends FormBuilderField {
113121
: null,
114122
priorityList: field.widget.priorityListByIsoCode != null
115123
? List.generate(
116-
field.widget.priorityListByIsoCode.length,
124+
field.widget.priorityListByIsoCode.length,
117125
(index) => CountryPickerUtils.getCountryByIsoCode(
118126
field.widget.priorityListByIsoCode[index]))
119127
: null,
120128
);
121129
},
122130
);
123131

124-
static void _openCountryPickerDialog(_FormBuilderCountryPickerState field) => showDialog(
125-
context: field.context,
126-
builder: (context) => Theme(
127-
data: Theme.of(context).copyWith(
128-
cursorColor: Theme.of(context).primaryColor,
129-
primaryColor: field.widget.cursorColor ?? Theme.of(context).primaryColor,
130-
),
131-
child: CountryPickerDialog(
132-
titlePadding: field.widget.titlePadding ?? EdgeInsets.all(8.0),
133-
searchCursorColor:
134-
field.widget.cursorColor ?? Theme.of(context).cursorColor,
135-
searchInputDecoration:
136-
InputDecoration(hintText: field.widget.searchText ?? 'Search...'),
137-
isSearchable: field.widget.isSearchable ?? true,
138-
title: field.widget.dialogTitle ??
139-
Text(
140-
'Select Your Country',
141-
style: field.widget.dialogTextStyle ?? field.widget.style,
142-
),
143-
onValuePicked: (Country value) => field.didChange(value),
144-
itemFilter: field.widget.countryFilterByIsoCode != null
145-
? (c) => field.widget.countryFilterByIsoCode.contains(c.isoCode)
146-
: null,
147-
priorityList: field.widget.priorityListByIsoCode != null
148-
? List.generate(
149-
field.widget.priorityListByIsoCode.length,
150-
(index) => CountryPickerUtils.getCountryByIsoCode(
151-
field.widget.priorityListByIsoCode[index]))
152-
: null,
153-
itemBuilder: _buildDialogItem,
154-
),
155-
),
156-
);
132+
static void _openCountryPickerDialog(_FormBuilderCountryPickerState field) =>
133+
showDialog(
134+
context: field.context,
135+
builder: (context) => Theme(
136+
data: Theme.of(context).copyWith(
137+
cursorColor: Theme.of(context).primaryColor,
138+
primaryColor:
139+
field.widget.cursorColor ?? Theme.of(context).primaryColor,
140+
),
141+
child: CountryPickerDialog(
142+
titlePadding: field.widget.titlePadding ?? EdgeInsets.all(8.0),
143+
searchCursorColor:
144+
field.widget.cursorColor ?? Theme.of(context).cursorColor,
145+
searchInputDecoration: InputDecoration(
146+
hintText: field.widget.searchText ?? 'Search...'),
147+
isSearchable: field.widget.isSearchable ?? true,
148+
title: field.widget.dialogTitle ??
149+
Text(
150+
'Select Your Country',
151+
style: field.widget.dialogTextStyle ?? field.widget.style,
152+
),
153+
onValuePicked: (Country value) => field.didChange(value),
154+
itemFilter: field.widget.countryFilterByIsoCode != null
155+
? (c) => field.widget.countryFilterByIsoCode.contains(c.isoCode)
156+
: null,
157+
priorityList: field.widget.priorityListByIsoCode != null
158+
? List.generate(
159+
field.widget.priorityListByIsoCode.length,
160+
(index) => CountryPickerUtils.getCountryByIsoCode(
161+
field.widget.priorityListByIsoCode[index]))
162+
: null,
163+
itemBuilder: _buildDialogItem,
164+
),
165+
),
166+
);
157167

158168
static Widget _buildDialogItem(Country country) {
159169
return Container(
@@ -173,7 +183,7 @@ class FormBuilderCountryPicker extends FormBuilderField {
173183
class _FormBuilderCountryPickerState extends FormBuilderFieldState/*<String>*/ {
174184
FormBuilderCountryPicker get widget => super.widget;
175185

176-
/*@override
186+
/*@override
177187
void initState() {
178188
var _initialValue =
179189
CountryPickerUtil.getCountryByCodeOrName(widget.initialValue) ??

‎lib/src/fields/form_builder_date_range_picker.dart

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,22 @@ import 'package:flutter_form_builder/src/always_disabled_focus_node.dart';
1010
import 'package:intl/intl.dart' as intl;
1111

1212
class FormBuilderDateRangePicker extends FormBuilderField {
13+
@override
1314
final String attribute;
15+
@override
1416
final FormFieldValidator validator;
17+
@override
1518
final List<DateTime> initialValue;
19+
@override
1620
final bool readOnly;
21+
@override
1722
final InputDecoration decoration;
23+
@override
1824
final ValueChanged onChanged;
25+
@override
1926
final ValueTransformer valueTransformer;
2027

28+
@override
2129
final bool autovalidate;
2230
final int maxLines;
2331
final TextInputType keyboardType;
@@ -37,6 +45,7 @@ class FormBuilderDateRangePicker extends FormBuilderField {
3745
final VoidCallback onEditingComplete;
3846
final ValueChanged<String> onFieldSubmitted;
3947
final List<TextInputFormatter> inputFormatters;
48+
@override
4049
final bool enabled;
4150
final double cursorWidth;
4251
final Radius cursorRadius;
@@ -56,6 +65,7 @@ class FormBuilderDateRangePicker extends FormBuilderField {
5665
final Locale locale;
5766
final date_range_picker.SelectableDayPredicate selectableDayPredicate;
5867
final intl.DateFormat format;
68+
@override
5969
final FormFieldSetter onSaved;
6070

6171
FormBuilderDateRangePicker({

0 commit comments

Comments
 (0)