Skip to content

Commit a694d0c

Browse files
danvickdanvick
committed
Merge branch 'version_4' of https://github.com/danvick/flutter_form_builder into version_4
2 parents 91203ba + 2c6d6c5 commit a694d0c

28 files changed

+279
-212
lines changed

‎example/lib/generated_plugin_registrant.dart

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,16 @@
55
// ignore: unused_import
66
import 'dart:ui';
77

8+
import 'package:file_picker/src/file_picker_web.dart';
89
import 'package:image_picker_for_web/image_picker_for_web.dart';
10+
import 'package:url_launcher_web/url_launcher_web.dart';
911

1012
import 'package:flutter_web_plugins/flutter_web_plugins.dart';
1113

1214
// ignore: public_member_api_docs
1315
void registerPlugins(PluginRegistry registry) {
16+
FilePickerWeb.registerWith(registry.registrarFor(FilePickerWeb));
1417
ImagePickerPlugin.registerWith(registry.registrarFor(ImagePickerPlugin));
18+
UrlLauncherPlugin.registerWith(registry.registrarFor(UrlLauncherPlugin));
1519
registry.registerMessageHandler();
1620
}

‎lib/src/fields/form_builder_checkbox.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,14 @@ class FormBuilderCheckbox extends FormBuilderField<bool> {
6868
//From Super
6969
Key key,
7070
@required String name,
71-
FormFieldValidator validator,
71+
FormFieldValidator<bool> validator,
7272
bool initialValue,
7373
bool readOnly = false,
7474
InputDecoration decoration = const InputDecoration(),
75-
ValueChanged onChanged,
76-
ValueTransformer valueTransformer,
75+
ValueChanged<bool> onChanged,
76+
ValueTransformer<bool> valueTransformer,
7777
bool enabled = true,
78-
FormFieldSetter onSaved,
78+
FormFieldSetter<bool> onSaved,
7979
AutovalidateMode autovalidateMode = AutovalidateMode.disabled,
8080
VoidCallback onReset,
8181
FocusNode focusNode,
@@ -103,7 +103,7 @@ class FormBuilderCheckbox extends FormBuilderField<bool> {
103103
onReset: onReset,
104104
decoration: decoration,
105105
focusNode: focusNode,
106-
builder: (FormFieldState field) {
106+
builder: (FormFieldState<bool> field) {
107107
final _FormBuilderCheckboxState state = field;
108108

109109
return InputDecorator(

‎lib/src/fields/form_builder_checkbox_group.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ class FormBuilderCheckboxGroup<T> extends FormBuilderField<List<T>> {
3232
List<T> initialValue,
3333
bool readOnly = false,
3434
InputDecoration decoration = const InputDecoration(),
35-
ValueChanged onChanged,
36-
ValueTransformer valueTransformer,
35+
ValueChanged<List<T>> onChanged,
36+
ValueTransformer<List<T>> valueTransformer,
3737
bool enabled = true,
38-
FormFieldSetter onSaved,
38+
FormFieldSetter<List<T>> onSaved,
3939
AutovalidateMode autovalidateMode = AutovalidateMode.disabled,
4040
VoidCallback onReset,
4141
FocusNode focusNode,
@@ -72,7 +72,7 @@ class FormBuilderCheckboxGroup<T> extends FormBuilderField<List<T>> {
7272
onReset: onReset,
7373
decoration: decoration,
7474
focusNode: focusNode,
75-
builder: (FormFieldState field) {
75+
builder: (FormFieldState<List<T>> field) {
7676
final _FormBuilderCheckboxGroupState<T> state = field;
7777

7878
return InputDecorator(

‎lib/src/fields/form_builder_chips_input.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ class FormBuilderChipsInput<T> extends FormBuilderField<List<T>> {
2727
Key key,
2828
//From Super
2929
@required String name,
30-
FormFieldValidator validator,
30+
FormFieldValidator<List<T>> validator,
3131
List<T> initialValue = const [],
3232
bool readOnly = false,
3333
InputDecoration decoration = const InputDecoration(),
34-
ValueChanged onChanged,
35-
ValueTransformer valueTransformer,
34+
ValueChanged<List<T>> onChanged,
35+
ValueTransformer<List<T>> valueTransformer,
3636
bool enabled = true,
37-
FormFieldSetter onSaved,
37+
FormFieldSetter<List<T>> onSaved,
3838
AutovalidateMode autovalidateMode = AutovalidateMode.disabled,
3939
VoidCallback onReset,
4040
FocusNode focusNode,

‎lib/src/fields/form_builder_choice_chips.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -242,14 +242,14 @@ class FormBuilderChoiceChip<T> extends FormBuilderField<T> {
242242
Key key,
243243
//From Super
244244
@required String name,
245-
FormFieldValidator validator,
245+
FormFieldValidator<T> validator,
246246
T initialValue,
247247
bool readOnly = false,
248248
InputDecoration decoration = const InputDecoration(),
249-
ValueChanged onChanged,
250-
ValueTransformer valueTransformer,
249+
ValueChanged<T> onChanged,
250+
ValueTransformer<T> valueTransformer,
251251
bool enabled = true,
252-
FormFieldSetter onSaved,
252+
FormFieldSetter<T> onSaved,
253253
AutovalidateMode autovalidateMode = AutovalidateMode.disabled,
254254
VoidCallback onReset,
255255
FocusNode focusNode,

‎lib/src/fields/form_builder_color_picker.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class FormBuilderColorPickerField extends FormBuilderField<Color> {
5252
final int minLines;
5353
final int maxLength;
5454
final VoidCallback onEditingComplete;
55-
final ValueChanged<String> onFieldSubmitted;
55+
final ValueChanged<Color> onFieldSubmitted;
5656
final List<TextInputFormatter> inputFormatters;
5757
final double cursorWidth;
5858
final Radius cursorRadius;
@@ -66,11 +66,11 @@ class FormBuilderColorPickerField extends FormBuilderField<Color> {
6666
Key key,
6767
@required String name,
6868
Color initialValue,
69-
FormFieldValidator validator,
69+
FormFieldValidator<Color> validator,
7070
bool enabled = true,
7171
AutovalidateMode autovalidateMode = AutovalidateMode.disabled,
72-
ValueTransformer valueTransformer,
73-
ValueChanged onChanged,
72+
ValueTransformer<Color> valueTransformer,
73+
ValueChanged<Color> onChanged,
7474
FormFieldSetter<Color> onSaved,
7575
VoidCallback onReset,
7676
this.controller,

‎lib/src/fields/form_builder_date_range_picker.dart

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import 'package:flutter_form_builder/flutter_form_builder.dart';
99
import 'package:flutter_form_builder/src/always_disabled_focus_node.dart';
1010
import 'package:intl/intl.dart' as intl;
1111

12-
class FormBuilderDateRangePicker extends FormBuilderField {
12+
class FormBuilderDateRangePicker extends FormBuilderField<List<DateTime>> {
1313
//TODO: Add documentation
1414
final int maxLines;
1515
final TextInputType keyboardType;
@@ -51,14 +51,14 @@ class FormBuilderDateRangePicker extends FormBuilderField {
5151
Key key,
5252
//From Super
5353
@required String name,
54-
FormFieldValidator validator,
54+
FormFieldValidator<List<DateTime>> validator,
5555
List<DateTime> initialValue,
5656
bool readOnly = false,
5757
InputDecoration decoration = const InputDecoration(),
58-
ValueChanged onChanged,
59-
ValueTransformer valueTransformer,
58+
ValueChanged<List<DateTime>> onChanged,
59+
ValueTransformer<List<DateTime>> valueTransformer,
6060
bool enabled = true,
61-
FormFieldSetter onSaved,
61+
FormFieldSetter<List<DateTime>> onSaved,
6262
AutovalidateMode autovalidateMode = AutovalidateMode.disabled,
6363
VoidCallback onReset,
6464
FocusNode focusNode,
@@ -129,7 +129,7 @@ class FormBuilderDateRangePicker extends FormBuilderField {
129129
onReset: onReset,
130130
decoration: decoration,
131131
focusNode: focusNode,
132-
builder: (FormFieldState field) {
132+
builder: (FormFieldState<List<DateTime>> field) {
133133
final FormBuilderDateRangePickerState state = field;
134134

135135
return TextField(
@@ -189,7 +189,8 @@ class FormBuilderDateRangePicker extends FormBuilderField {
189189
}
190190
}
191191

192-
class FormBuilderDateRangePickerState extends FormBuilderFieldState {
192+
class FormBuilderDateRangePickerState
193+
extends FormBuilderFieldState<List<DateTime>> {
193194
@override
194195
FormBuilderDateRangePicker get widget =>
195196
super.widget as FormBuilderDateRangePicker;

‎lib/src/fields/form_builder_date_time_picker.dart

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ import 'package:flutter_form_builder/src/utils.dart';
1010
import 'package:intl/intl.dart';
1111

1212
enum InputType { date, time, both }
13+
1314
enum PickerType { material, cupertino }
1415

15-
class FormBuilderDateTimePicker extends FormBuilderField {
16+
class FormBuilderDateTimePicker extends FormBuilderField<DateTime> {
1617
/// The date/time picker dialogs to show.
1718
final InputType inputType;
1819

@@ -148,14 +149,14 @@ class FormBuilderDateTimePicker extends FormBuilderField {
148149
Key key,
149150
//From Super
150151
@required String name,
151-
FormFieldValidator validator,
152+
FormFieldValidator<DateTime> validator,
152153
DateTime initialValue,
153154
bool readOnly = false,
154155
InputDecoration decoration = const InputDecoration(),
155-
ValueChanged onChanged,
156-
ValueTransformer valueTransformer,
156+
ValueChanged<DateTime> onChanged,
157+
ValueTransformer<DateTime> valueTransformer,
157158
bool enabled = true,
158-
FormFieldSetter onSaved,
159+
FormFieldSetter<DateTime> onSaved,
159160
AutovalidateMode autovalidateMode = AutovalidateMode.disabled,
160161
VoidCallback onReset,
161162
FocusNode focusNode,
@@ -232,7 +233,7 @@ class FormBuilderDateTimePicker extends FormBuilderField {
232233
onReset: onReset,
233234
decoration: decoration,
234235
focusNode: focusNode,
235-
builder: (FormFieldState field) {
236+
builder: (FormFieldState<DateTime> field) {
236237
final _FormBuilderDateTimePickerState state = field;
237238

238239
return DateTimeField(
@@ -288,7 +289,7 @@ class FormBuilderDateTimePicker extends FormBuilderField {
288289
_FormBuilderDateTimePickerState();
289290
}
290291

291-
class _FormBuilderDateTimePickerState extends FormBuilderFieldState {
292+
class _FormBuilderDateTimePickerState extends FormBuilderFieldState<DateTime> {
292293
@override
293294
FormBuilderDateTimePicker get widget =>
294295
super.widget as FormBuilderDateTimePicker;

‎lib/src/fields/form_builder_dropdown.dart

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -183,14 +183,14 @@ class FormBuilderDropdown<T> extends FormBuilderField<T> {
183183
Key key,
184184
//From Super
185185
@required String name,
186-
FormFieldValidator validator,
186+
FormFieldValidator<T> validator,
187187
T initialValue,
188188
bool readOnly = false,
189189
InputDecoration decoration = const InputDecoration(),
190-
ValueChanged onChanged,
191-
ValueTransformer valueTransformer,
190+
ValueChanged<T> onChanged,
191+
ValueTransformer<T> valueTransformer,
192192
bool enabled = true,
193-
FormFieldSetter onSaved,
193+
FormFieldSetter<T> onSaved,
194194
AutovalidateMode autovalidateMode = AutovalidateMode.disabled,
195195
VoidCallback onReset,
196196
FocusNode focusNode,
@@ -226,8 +226,8 @@ class FormBuilderDropdown<T> extends FormBuilderField<T> {
226226
enabled: enabled,
227227
onReset: onReset,
228228
decoration: decoration,
229-
builder: (FormFieldState field) {
230-
final _FormBuilderDropdownState state = field;
229+
builder: (FormFieldState<T> field) {
230+
final _FormBuilderDropdownState<T> state = field;
231231
// DropdownButtonFormField
232232
// TextFormField
233233

@@ -267,7 +267,7 @@ class FormBuilderDropdown<T> extends FormBuilderField<T> {
267267
onChanged: (state.readOnly || !enabled)
268268
? null
269269
: (value) {
270-
_changeValue(field, value);
270+
_changeValue<T>(field, value);
271271
},
272272
onTap: onTap,
273273
focusNode: state.effectiveFocusNode,
@@ -294,7 +294,7 @@ class FormBuilderDropdown<T> extends FormBuilderField<T> {
294294
},
295295
);
296296

297-
static void _changeValue(_FormBuilderDropdownState state, value) {
297+
static void _changeValue<T>(_FormBuilderDropdownState<T> state, value) {
298298
state.requestFocus();
299299
state.didChange(value);
300300
}

‎lib/src/fields/form_builder_file_picker.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@ class FormBuilderFilePicker extends FormBuilderField<List<PlatformFile>> {
4545
//From Super
4646
Key key,
4747
@required String name,
48-
FormFieldValidator validator,
48+
FormFieldValidator<List<PlatformFile>> validator,
4949
List<PlatformFile> initialValue,
5050
bool readOnly = false,
5151
InputDecoration decoration = const InputDecoration(),
52-
ValueChanged onChanged,
53-
ValueTransformer valueTransformer,
52+
ValueChanged<List<PlatformFile>> onChanged,
53+
ValueTransformer<List<PlatformFile>> valueTransformer,
5454
bool enabled = true,
55-
FormFieldSetter onSaved,
55+
FormFieldSetter<List<PlatformFile>> onSaved,
5656
AutovalidateMode autovalidateMode = AutovalidateMode.disabled,
5757
VoidCallback onReset,
5858
FocusNode focusNode,
@@ -79,7 +79,7 @@ class FormBuilderFilePicker extends FormBuilderField<List<PlatformFile>> {
7979
onReset: onReset,
8080
decoration: decoration,
8181
focusNode: focusNode,
82-
builder: (FormFieldState field) {
82+
builder: (FormFieldState<List<PlatformFile>> field) {
8383
final _FormBuilderFilePickerState state = field;
8484

8585
return InputDecorator(

0 commit comments

Comments
 (0)