Skip to content

Commit 65034bf

Browse files
danvickdanvick
committed
Static analysis fixes and flutter format
1 parent 70ce0af commit 65034bf

27 files changed

+142
-79
lines changed

‎example/lib/data.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ class Contact {
88
@override
99
bool operator ==(Object other) =>
1010
identical(this, other) ||
11-
other is Contact &&
12-
runtimeType == other.runtimeType &&
13-
name == other.name;
11+
other is Contact &&
12+
runtimeType == other.runtimeType &&
13+
name == other.name;
1414

1515
@override
1616
int get hashCode => name.hashCode;

‎lib/src/fields/form_builder_checkbox.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,9 @@ class _FormBuilderCheckboxState extends State<FormBuilderCheckbox> {
102102
initialValue: _initialValue,
103103
validator: (val) {
104104
for (int i = 0; i < widget.validators.length; i++) {
105-
if (widget.validators[i](val) != null)
105+
if (widget.validators[i](val) != null) {
106106
return widget.validators[i](val);
107+
}
107108
}
108109
return null;
109110
},
@@ -112,8 +113,9 @@ class _FormBuilderCheckboxState extends State<FormBuilderCheckbox> {
112113
if (widget.valueTransformer != null) {
113114
transformed = widget.valueTransformer(val);
114115
_formState?.setAttributeValue(widget.attribute, transformed);
115-
} else
116+
} else {
116117
_formState?.setAttributeValue(widget.attribute, val);
118+
}
117119
if (widget.onSaved != null) {
118120
widget.onSaved(transformed ?? val);
119121
}

‎lib/src/fields/form_builder_checkbox_list.dart

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,11 @@ class _FormBuilderCheckboxListState extends State<FormBuilderCheckboxList> {
7777
: (bool value) {
7878
FocusScope.of(context).requestFocus(FocusNode());
7979
var currValue = [...field.value];
80-
if (value)
80+
if (value) {
8181
currValue.add(widget.options[i].value);
82-
else
82+
} else {
8383
currValue.remove(widget.options[i].value);
84+
}
8485
field.didChange(currValue);
8586
if (widget.onChanged != null) widget.onChanged(currValue);
8687
},
@@ -107,8 +108,9 @@ class _FormBuilderCheckboxListState extends State<FormBuilderCheckboxList> {
107108
initialValue: _initialValue ?? [],
108109
validator: (val) {
109110
for (int i = 0; i < widget.validators.length; i++) {
110-
if (widget.validators[i](val) != null)
111+
if (widget.validators[i](val) != null) {
111112
return widget.validators[i](val);
113+
}
112114
}
113115
return null;
114116
},
@@ -117,8 +119,9 @@ class _FormBuilderCheckboxListState extends State<FormBuilderCheckboxList> {
117119
if (widget.valueTransformer != null) {
118120
transformed = widget.valueTransformer(val);
119121
_formState?.setAttributeValue(widget.attribute, transformed);
120-
} else
122+
} else {
121123
_formState?.setAttributeValue(widget.attribute, val);
124+
}
122125
if (widget.onSaved != null) {
123126
widget.onSaved(transformed ?? val);
124127
}
@@ -138,13 +141,15 @@ class _FormBuilderCheckboxListState extends State<FormBuilderCheckboxList> {
138141
? null
139142
: () {
140143
var currentValue = [...field.value];
141-
if (!currentValue.contains(widget.options[i].value))
144+
if (!currentValue.contains(widget.options[i].value)) {
142145
currentValue.add(widget.options[i].value);
143-
else
146+
} else {
144147
currentValue.remove(widget.options[i].value);
148+
}
145149
field.didChange(currentValue);
146-
if (widget.onChanged != null)
150+
if (widget.onChanged != null) {
147151
widget.onChanged(currentValue);
152+
}
148153
},
149154
),
150155
Divider(height: 0.0),

‎lib/src/fields/form_builder_chips_choice.dart

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,9 @@ class _FormBuilderChoiceChipState extends State<FormBuilderChoiceChip> {
100100
initialValue: _initialValue,
101101
validator: (val) {
102102
for (int i = 0; i < widget.validators.length; i++) {
103-
if (widget.validators[i](val) != null)
103+
if (widget.validators[i](val) != null) {
104104
return widget.validators[i](val);
105+
}
105106
}
106107
return null;
107108
},
@@ -110,8 +111,9 @@ class _FormBuilderChoiceChipState extends State<FormBuilderChoiceChip> {
110111
if (widget.valueTransformer != null) {
111112
transformed = widget.valueTransformer(val);
112113
_formState?.setAttributeValue(widget.attribute, transformed);
113-
} else
114+
} else {
114115
_formState?.setAttributeValue(widget.attribute, val);
116+
}
115117
if (widget.onSaved != null) {
116118
widget.onSaved(transformed ?? val);
117119
}
@@ -152,8 +154,9 @@ class _FormBuilderChoiceChipState extends State<FormBuilderChoiceChip> {
152154
FocusScope.of(context).requestFocus(FocusNode());
153155
var choice = selected ? option.value : null;
154156
field.didChange(choice);
155-
if (widget.onChanged != null)
157+
if (widget.onChanged != null) {
156158
widget.onChanged(choice);
159+
}
157160
});
158161
},
159162
)

‎lib/src/fields/form_builder_chips_filter.dart

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,9 @@ class _FormBuilderFilterChipState extends State<FormBuilderFilterChip> {
114114
initialValue: _initialValue ?? [],
115115
validator: (val) {
116116
for (int i = 0; i < widget.validators.length; i++) {
117-
if (widget.validators[i](val) != null)
117+
if (widget.validators[i](val) != null) {
118118
return widget.validators[i](val);
119+
}
119120
}
120121
return null;
121122
},
@@ -124,8 +125,9 @@ class _FormBuilderFilterChipState extends State<FormBuilderFilterChip> {
124125
if (widget.valueTransformer != null) {
125126
transformed = widget.valueTransformer(val);
126127
_formState?.setAttributeValue(widget.attribute, transformed);
127-
} else
128+
} else {
128129
_formState?.setAttributeValue(widget.attribute, val);
130+
}
129131
if (widget.onSaved != null) {
130132
widget.onSaved(transformed ?? val);
131133
}
@@ -158,14 +160,16 @@ class _FormBuilderFilterChipState extends State<FormBuilderFilterChip> {
158160
FocusScope.of(context).requestFocus(FocusNode());
159161
var currentValue = [...field.value];
160162

161-
if (selected)
163+
if (selected) {
162164
currentValue.add(option.value);
163-
else
165+
} else {
164166
currentValue.remove(option.value);
167+
}
165168

166169
field.didChange(currentValue);
167-
if (widget.onChanged != null)
170+
if (widget.onChanged != null) {
168171
widget.onChanged(currentValue);
172+
}
169173
},
170174
);
171175
},

‎lib/src/fields/form_builder_chips_input.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,9 @@ class _FormBuilderChipsInputState extends State<FormBuilderChipsInput> {
9191
initialValue: _initialValue ?? [],
9292
validator: (val) {
9393
for (int i = 0; i < widget.validators.length; i++) {
94-
if (widget.validators[i](val) != null)
94+
if (widget.validators[i](val) != null) {
9595
return widget.validators[i](val);
96+
}
9697
}
9798
return null;
9899
},
@@ -101,8 +102,9 @@ class _FormBuilderChipsInputState extends State<FormBuilderChipsInput> {
101102
if (widget.valueTransformer != null) {
102103
transformed = widget.valueTransformer(val);
103104
_formState?.setAttributeValue(widget.attribute, transformed);
104-
} else
105+
} else {
105106
_formState?.setAttributeValue(widget.attribute, val);
107+
}
106108
if (widget.onSaved != null) {
107109
widget.onSaved(transformed ?? val);
108110
}

‎lib/src/fields/form_builder_color_picker.dart

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,9 @@ class _FormBuilderColorPickerState extends State<FormBuilderColorPicker> {
146146
initialValue: _initialValue,
147147
validator: (val) {
148148
for (int i = 0; i < widget.validators.length; i++) {
149-
if (widget.validators[i](val) != null)
149+
if (widget.validators[i](val) != null) {
150150
return widget.validators[i](val);
151+
}
151152
}
152153
return null;
153154
},
@@ -156,8 +157,9 @@ class _FormBuilderColorPickerState extends State<FormBuilderColorPicker> {
156157
if (widget.valueTransformer != null) {
157158
transformed = widget.valueTransformer(val);
158159
_formState?.setAttributeValue(widget.attribute, transformed);
159-
} else
160+
} else {
160161
_formState?.setAttributeValue(widget.attribute, val);
162+
}
161163
if (widget.onSaved != null) {
162164
widget.onSaved(transformed ?? val);
163165
}
@@ -232,7 +234,8 @@ class _FormBuilderColorPickerState extends State<FormBuilderColorPicker> {
232234

233235
_handleFocus() async {
234236
if (effectiveFocusNode.hasFocus && !_readOnly) {
235-
Future.microtask(() => FocusScope.of(context).requestFocus(FocusNode()));
237+
await Future.microtask(
238+
() => FocusScope.of(context).requestFocus(FocusNode()));
236239
await showDialog(
237240
context: context,
238241
builder: (BuildContext context) {

‎lib/src/fields/form_builder_date_range_picker.dart

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'dart:async';
22
import 'dart:core';
33

4-
import 'package:date_range_picker/date_range_picker.dart' as DateRangePicker;
4+
import 'package:date_range_picker/date_range_picker.dart' as date_range_picker;
55
import 'package:flutter/material.dart';
66
import 'package:flutter/services.dart';
77
import 'package:flutter/widgets.dart';
@@ -52,9 +52,9 @@ class FormBuilderDateRangePicker extends StatefulWidget {
5252
final DateTime initialLastDate;
5353
final DateTime firstDate;
5454
final DateTime lastDate;
55-
final DateRangePicker.DatePickerMode initialDatePickerMode;
55+
final date_range_picker.DatePickerMode initialDatePickerMode;
5656
final Locale locale;
57-
final DateRangePicker.SelectableDayPredicate selectableDayPredicate;
57+
final date_range_picker.SelectableDayPredicate selectableDayPredicate;
5858
final intl.DateFormat format;
5959
final FormFieldSetter onSaved;
6060

@@ -102,7 +102,7 @@ class FormBuilderDateRangePicker extends StatefulWidget {
102102
this.showCursor,
103103
this.initialFirstDate,
104104
this.initialLastDate,
105-
this.initialDatePickerMode = DateRangePicker.DatePickerMode.day,
105+
this.initialDatePickerMode = date_range_picker.DatePickerMode.day,
106106
this.locale,
107107
this.selectableDayPredicate,
108108
this.onSaved,
@@ -171,8 +171,9 @@ class FormBuilderDateRangePickerState
171171
initialValue: _initialValue,
172172
validator: (val) {
173173
for (int i = 0; i < widget.validators.length; i++) {
174-
if (widget.validators[i](val) != null)
174+
if (widget.validators[i](val) != null) {
175175
return widget.validators[i](val);
176+
}
176177
}
177178
return null;
178179
},
@@ -181,8 +182,9 @@ class FormBuilderDateRangePickerState
181182
if (widget.valueTransformer != null) {
182183
transformed = widget.valueTransformer(val);
183184
_formState?.setAttributeValue(widget.attribute, transformed);
184-
} else
185+
} else {
185186
_formState?.setAttributeValue(widget.attribute, val);
187+
}
186188
if (widget.onSaved != null) {
187189
widget.onSaved(transformed ?? val);
188190
}
@@ -239,7 +241,7 @@ class FormBuilderDateRangePickerState
239241
var initialLastDate = value.isEmpty
240242
? (widget.initialLastDate ?? initialFirstDate)
241243
: (value.length < 2 ? initialFirstDate : value[1]);
242-
final List<DateTime> picked = await DateRangePicker.showDatePicker(
244+
final List<DateTime> picked = await date_range_picker.showDatePicker(
243245
context: context,
244246
initialFirstDate: initialFirstDate,
245247
initialLastDate: initialLastDate,

‎lib/src/fields/form_builder_date_time_picker.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,16 +267,18 @@ class _FormBuilderDateTimePickerState extends State<FormBuilderDateTimePicker> {
267267
if (widget.valueTransformer != null) {
268268
transformed = widget.valueTransformer(val);
269269
_formState?.setAttributeValue(widget.attribute, transformed);
270-
} else
270+
} else {
271271
_formState?.setAttributeValue(widget.attribute, value);
272+
}
272273
if (widget.onSaved != null) {
273274
widget.onSaved(transformed ?? value);
274275
}
275276
},
276277
validator: (val) {
277278
for (int i = 0; i < widget.validators.length; i++) {
278-
if (widget.validators[i](val) != null)
279+
if (widget.validators[i](val) != null) {
279280
return widget.validators[i](val);
281+
}
280282
}
281283
return null;
282284
},

‎lib/src/fields/form_builder_dropdown.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,9 @@ class _FormBuilderDropdownState extends State<FormBuilderDropdown> {
9090
initialValue: _initialValue,
9191
validator: (val) {
9292
for (int i = 0; i < widget.validators.length; i++) {
93-
if (widget.validators[i](val) != null)
93+
if (widget.validators[i](val) != null) {
9494
return widget.validators[i](val);
95+
}
9596
}
9697
return null;
9798
},
@@ -100,8 +101,9 @@ class _FormBuilderDropdownState extends State<FormBuilderDropdown> {
100101
if (widget.valueTransformer != null) {
101102
transformed = widget.valueTransformer(val);
102103
_formState?.setAttributeValue(widget.attribute, transformed);
103-
} else
104+
} else {
104105
_formState?.setAttributeValue(widget.attribute, val);
106+
}
105107
if (widget.onSaved != null) {
106108
widget.onSaved(transformed ?? val);
107109
}

0 commit comments

Comments
 (0)