Skip to content

Commit f135200

Browse files
committed
Use dart 2.17 super initiliazers to simplify code
1 parent 343229e commit f135200

17 files changed

+161
-326
lines changed

lib/src/fields/form_builder_checkbox.dart

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -68,25 +68,24 @@ class FormBuilderCheckbox extends FormBuilderField<bool> {
6868

6969
/// Creates a single Checkbox field
7070
FormBuilderCheckbox({
71-
//From Super
72-
Key? key,
73-
required String name,
74-
FormFieldValidator<bool>? validator,
75-
bool? initialValue,
76-
InputDecoration decoration = const InputDecoration(
71+
super.key,
72+
required super.name,
73+
super.validator,
74+
super.initialValue,
75+
super.decoration = const InputDecoration(
7776
border: InputBorder.none,
7877
focusedBorder: InputBorder.none,
7978
enabledBorder: InputBorder.none,
8079
errorBorder: InputBorder.none,
8180
disabledBorder: InputBorder.none,
8281
),
83-
ValueChanged<bool?>? onChanged,
84-
ValueTransformer<bool?>? valueTransformer,
85-
bool enabled = true,
86-
FormFieldSetter<bool?>? onSaved,
87-
AutovalidateMode autovalidateMode = AutovalidateMode.disabled,
88-
VoidCallback? onReset,
89-
FocusNode? focusNode,
82+
super.onChanged,
83+
super.valueTransformer,
84+
super.enabled,
85+
super.onSaved,
86+
super.autovalidateMode = AutovalidateMode.disabled,
87+
super.onReset,
88+
super.focusNode,
9089
required this.title,
9190
this.activeColor,
9291
this.autofocus = false,
@@ -99,18 +98,6 @@ class FormBuilderCheckbox extends FormBuilderField<bool> {
9998
this.subtitle,
10099
this.tristate = false,
101100
}) : super(
102-
key: key,
103-
initialValue: initialValue,
104-
name: name,
105-
validator: validator,
106-
valueTransformer: valueTransformer,
107-
onChanged: onChanged,
108-
autovalidateMode: autovalidateMode,
109-
onSaved: onSaved,
110-
enabled: enabled,
111-
onReset: onReset,
112-
decoration: decoration,
113-
focusNode: focusNode,
114101
builder: (FormFieldState<bool?> field) {
115102
final state = field as _FormBuilderCheckboxState;
116103

lib/src/fields/form_builder_checkbox_group.dart

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,18 @@ class FormBuilderCheckboxGroup<T> extends FormBuilderField<List<T>> {
2727

2828
/// Creates a list of Checkboxes for selecting multiple options
2929
FormBuilderCheckboxGroup({
30-
Key? key,
31-
//From Super
32-
required String name,
33-
FormFieldValidator<List<T>>? validator,
34-
List<T>? initialValue,
35-
InputDecoration decoration = const InputDecoration(),
36-
ValueChanged<List<T>?>? onChanged,
37-
ValueTransformer<List<T>?>? valueTransformer,
38-
bool enabled = true,
39-
FormFieldSetter<List<T>>? onSaved,
40-
AutovalidateMode autovalidateMode = AutovalidateMode.disabled,
41-
VoidCallback? onReset,
42-
FocusNode? focusNode,
30+
super.key,
31+
required super.name,
32+
super.validator,
33+
super.initialValue,
34+
super.decoration,
35+
super.onChanged,
36+
super.valueTransformer,
37+
super.enabled,
38+
super.onSaved,
39+
super.autovalidateMode = AutovalidateMode.disabled,
40+
super.onReset,
41+
super.focusNode,
4342
required this.options,
4443
this.activeColor,
4544
this.checkColor,
@@ -61,18 +60,6 @@ class FormBuilderCheckboxGroup<T> extends FormBuilderField<List<T>> {
6160
this.orientation = OptionsOrientation.wrap,
6261
this.shouldRequestFocus = false,
6362
}) : super(
64-
key: key,
65-
initialValue: initialValue,
66-
name: name,
67-
validator: validator,
68-
valueTransformer: valueTransformer,
69-
onChanged: onChanged,
70-
autovalidateMode: autovalidateMode,
71-
onSaved: onSaved,
72-
enabled: enabled,
73-
onReset: onReset,
74-
decoration: decoration,
75-
focusNode: focusNode,
7663
builder: (FormFieldState<List<T>?> field) {
7764
final state = field as _FormBuilderCheckboxGroupState<T>;
7865

lib/src/fields/form_builder_choice_chips.dart

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -256,16 +256,16 @@ class FormBuilderChoiceChip<T> extends FormBuilderField<T> {
256256

257257
/// Creates a list of `Chip`s that acts like radio buttons
258258
FormBuilderChoiceChip({
259-
AutovalidateMode autovalidateMode = AutovalidateMode.disabled,
260-
bool enabled = true,
261-
FocusNode? focusNode,
262-
FormFieldSetter<T>? onSaved,
263-
FormFieldValidator<T>? validator,
264-
InputDecoration decoration = const InputDecoration(),
265-
Key? key,
266-
required String name, //From Super
259+
super.autovalidateMode = AutovalidateMode.disabled,
260+
super.enabled,
261+
super.focusNode,
262+
super.onSaved,
263+
super.validator,
264+
super.decoration,
265+
super.key,
266+
required super.name,
267267
required this.options,
268-
T? initialValue,
268+
super.initialValue,
269269
this.alignment = WrapAlignment.start,
270270
this.avatarBorder = const CircleBorder(),
271271
this.backgroundColor,
@@ -289,22 +289,10 @@ class FormBuilderChoiceChip<T> extends FormBuilderField<T> {
289289
this.textDirection,
290290
this.verticalDirection = VerticalDirection.down,
291291
this.visualDensity,
292-
ValueChanged<T?>? onChanged,
293-
ValueTransformer<T?>? valueTransformer,
294-
VoidCallback? onReset,
292+
super.onChanged,
293+
super.valueTransformer,
294+
super.onReset,
295295
}) : super(
296-
key: key,
297-
initialValue: initialValue,
298-
name: name,
299-
validator: validator,
300-
valueTransformer: valueTransformer,
301-
onChanged: onChanged,
302-
autovalidateMode: autovalidateMode,
303-
onSaved: onSaved,
304-
enabled: enabled,
305-
onReset: onReset,
306-
decoration: decoration,
307-
focusNode: focusNode,
308296
builder: (FormFieldState<T?> field) {
309297
final state = field as _FormBuilderChoiceChipState<T>;
310298

lib/src/fields/form_builder_date_range_picker.dart

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -64,19 +64,18 @@ class FormBuilderDateRangePicker extends FormBuilderField<DateTimeRange> {
6464

6565
/// Creates field for selecting a range of dates
6666
FormBuilderDateRangePicker({
67-
Key? key,
68-
//From Super
69-
required String name,
70-
FormFieldValidator<DateTimeRange>? validator,
71-
DateTimeRange? initialValue,
72-
InputDecoration decoration = const InputDecoration(),
73-
ValueChanged<DateTimeRange?>? onChanged,
74-
ValueTransformer<DateTimeRange?>? valueTransformer,
75-
bool enabled = true,
76-
FormFieldSetter<DateTimeRange>? onSaved,
77-
AutovalidateMode autovalidateMode = AutovalidateMode.disabled,
78-
VoidCallback? onReset,
79-
FocusNode? focusNode,
67+
super.key,
68+
required super.name,
69+
super.validator,
70+
super.initialValue,
71+
super.decoration,
72+
super.onChanged,
73+
super.valueTransformer,
74+
super.enabled,
75+
super.onSaved,
76+
super.autovalidateMode = AutovalidateMode.disabled,
77+
super.onReset,
78+
super.focusNode,
8079
required this.firstDate,
8180
required this.lastDate,
8281
this.format,
@@ -129,18 +128,6 @@ class FormBuilderDateRangePicker extends FormBuilderField<DateTimeRange> {
129128
this.allowClear = false,
130129
this.clearIcon,
131130
}) : super(
132-
key: key,
133-
initialValue: initialValue,
134-
name: name,
135-
validator: validator,
136-
valueTransformer: valueTransformer,
137-
onChanged: onChanged,
138-
autovalidateMode: autovalidateMode,
139-
onSaved: onSaved,
140-
enabled: enabled,
141-
onReset: onReset,
142-
decoration: decoration,
143-
focusNode: focusNode,
144131
builder: (FormFieldState<DateTimeRange?> field) {
145132
final state = field as _FormBuilderDateRangePickerState;
146133

lib/src/fields/form_builder_date_time_picker.dart

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -127,19 +127,18 @@ class FormBuilderDateTimePicker extends FormBuilderField<DateTime> {
127127

128128
/// Creates field for `Date`, `Time` and `DateTime` input
129129
FormBuilderDateTimePicker({
130-
Key? key,
131-
//From Super
132-
required String name,
133-
FormFieldValidator<DateTime>? validator,
134-
DateTime? initialValue,
135-
InputDecoration decoration = const InputDecoration(),
136-
ValueChanged<DateTime?>? onChanged,
137-
ValueTransformer<DateTime?>? valueTransformer,
138-
bool enabled = true,
139-
FormFieldSetter<DateTime>? onSaved,
140-
AutovalidateMode autovalidateMode = AutovalidateMode.disabled,
141-
VoidCallback? onReset,
142-
FocusNode? focusNode,
130+
super.key,
131+
required super.name,
132+
super.validator,
133+
super.initialValue,
134+
super.decoration,
135+
super.onChanged,
136+
super.valueTransformer,
137+
super.enabled,
138+
super.onSaved,
139+
super.autovalidateMode = AutovalidateMode.disabled,
140+
super.onReset,
141+
super.focusNode,
143142
this.inputType = InputType.both,
144143
this.scrollPadding = const EdgeInsets.all(20.0),
145144
this.cursorWidth = 2.0,
@@ -194,18 +193,6 @@ class FormBuilderDateTimePicker extends FormBuilderField<DateTime> {
194193
this.anchorPoint,
195194
this.onEntryModeChanged,
196195
}) : super(
197-
key: key,
198-
initialValue: initialValue,
199-
name: name,
200-
validator: validator,
201-
valueTransformer: valueTransformer,
202-
onChanged: onChanged,
203-
autovalidateMode: autovalidateMode,
204-
onSaved: onSaved,
205-
enabled: enabled,
206-
onReset: onReset,
207-
decoration: decoration,
208-
focusNode: focusNode,
209196
builder: (FormFieldState<DateTime?> field) {
210197
final state = field as _FormBuilderDateTimePickerState;
211198

lib/src/fields/form_builder_filter_chips.dart

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ class FormBuilderFilterChip<T> extends FormBuilderField<List<T>> {
3636

3737
/// Creates field with chips that acts like a list checkboxes.
3838
FormBuilderFilterChip({
39-
AutovalidateMode autovalidateMode = AutovalidateMode.disabled,
40-
bool enabled = true,
41-
FocusNode? focusNode,
42-
FormFieldSetter<List<T>>? onSaved,
43-
FormFieldValidator<List<T>>? validator,
44-
InputDecoration decoration = const InputDecoration(),
45-
Key? key,
46-
List<T>? initialValue,
47-
required String name, // From Super
39+
super.autovalidateMode = AutovalidateMode.disabled,
40+
super.enabled,
41+
super.focusNode,
42+
super.onSaved,
43+
super.validator,
44+
super.decoration,
45+
super.key,
46+
super.initialValue,
47+
required super.name,
4848
required this.options,
4949
this.alignment = WrapAlignment.start,
5050
this.avatarBorder = const CircleBorder(),
@@ -72,23 +72,11 @@ class FormBuilderFilterChip<T> extends FormBuilderField<List<T>> {
7272
this.spacing = 0.0,
7373
this.textDirection,
7474
this.verticalDirection = VerticalDirection.down,
75-
ValueChanged<List<T>?>? onChanged,
76-
ValueTransformer<List<T>?>? valueTransformer,
77-
VoidCallback? onReset,
75+
super.onChanged,
76+
super.valueTransformer,
77+
super.onReset,
7878
}) : assert((maxChips == null) || ((initialValue ?? []).length <= maxChips)),
7979
super(
80-
autovalidateMode: autovalidateMode,
81-
decoration: decoration,
82-
enabled: enabled,
83-
focusNode: focusNode,
84-
initialValue: initialValue,
85-
key: key,
86-
name: name,
87-
onChanged: onChanged,
88-
onReset: onReset,
89-
onSaved: onSaved,
90-
validator: validator,
91-
valueTransformer: valueTransformer,
9280
builder: (FormFieldState<List<T>?> field) {
9381
final state = field as _FormBuilderFilterChipState<T>;
9482
final fieldValue = field.value ?? [];

lib/src/fields/form_builder_radio_group.dart

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@ class FormBuilderRadioGroup<T> extends FormBuilderField<T> {
2525

2626
/// Creates field to select one value from a list of Radio Widgets
2727
FormBuilderRadioGroup({
28-
AutovalidateMode autovalidateMode = AutovalidateMode.disabled,
29-
bool enabled = true,
30-
FocusNode? focusNode,
31-
FormFieldSetter<T>? onSaved,
32-
FormFieldValidator<T>? validator,
33-
InputDecoration decoration = const InputDecoration(),
34-
Key? key,
35-
required String name, //From Super
28+
super.autovalidateMode = AutovalidateMode.disabled,
29+
super.enabled,
30+
super.focusNode,
31+
super.onSaved,
32+
super.validator,
33+
super.decoration,
34+
super.key,
35+
required super.name,
3636
required this.options,
37-
T? initialValue,
37+
super.initialValue,
3838
this.shouldRadioRequestFocus = false,
3939
this.activeColor,
4040
this.controlAffinity = ControlAffinity.leading,
@@ -52,22 +52,10 @@ class FormBuilderRadioGroup<T> extends FormBuilderField<T> {
5252
this.wrapSpacing = 0.0,
5353
this.wrapTextDirection,
5454
this.wrapVerticalDirection = VerticalDirection.down,
55-
ValueChanged<T?>? onChanged,
56-
ValueTransformer<T?>? valueTransformer,
57-
VoidCallback? onReset,
55+
super.onChanged,
56+
super.valueTransformer,
57+
super.onReset,
5858
}) : super(
59-
key: key,
60-
initialValue: initialValue,
61-
name: name,
62-
validator: validator,
63-
valueTransformer: valueTransformer,
64-
onChanged: onChanged,
65-
autovalidateMode: autovalidateMode,
66-
onSaved: onSaved,
67-
enabled: enabled,
68-
onReset: onReset,
69-
focusNode: focusNode,
70-
decoration: decoration,
7159
builder: (FormFieldState<T?> field) {
7260
final state = field as _FormBuilderRadioGroupState<T>;
7361

0 commit comments

Comments
 (0)