Merge branch 'version_4' of https://github.com/danvick/flutter_form_b…

…uilder into version_4 # Conflicts: # lib/src/fields/form_builder_country_picker.dart # lib/src/fields/form_builder_date_time_picker.dart # lib/src/fields/form_builder_dropdown.dart # lib/src/fields/form_builder_range_slider.dart
flutter-form-builder-ecosystem · Oct 2, 2020 · adfe909 · adfe909
2 parents 859a40c + a6fa0e5
commit adfe909
Show file tree

Hide file tree

Showing 29 changed files with 175 additions and 174 deletions.
diff --git a/example/ios/Flutter/flutter_export_environment.sh b/example/ios/Flutter/flutter_export_environment.sh
diff --git a/example/lib/sources/complete_form.dart b/example/lib/sources/complete_form.dart
@@ -229,7 +229,7 @@ class CompleteFormState extends State<CompleteForm> {
                     ]),
                   ),
                   FormBuilderTextField(
-                    autovalidate: true,
+                    autovalidateMode: AutovalidateMode.always,
                     name: 'age',
                     decoration: InputDecoration(
                       labelText: 'Age',

diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -16,6 +16,9 @@ dependencies:
   widget_with_codeview: ^1.0.3
   cupertino_icons: any
 
+dependency_overrides:
+  modal_bottom_sheet: ^0.2.1+1-dev
+
 dev_dependencies:
   flutter_test:
     sdk: flutter

diff --git a/lib/src/fields/form_builder_checkbox.dart b/lib/src/fields/form_builder_checkbox.dart
@@ -76,7 +76,7 @@ class FormBuilderCheckbox extends FormBuilderField<bool> {
     ValueTransformer valueTransformer,
     bool enabled = true,
     FormFieldSetter onSaved,
-    bool autovalidate = false,
+    AutovalidateMode autovalidateMode = AutovalidateMode.disabled,
     VoidCallback onReset,
     FocusNode focusNode,
     @required this.title,
@@ -97,7 +97,7 @@ class FormBuilderCheckbox extends FormBuilderField<bool> {
           valueTransformer: valueTransformer,
           onChanged: onChanged,
           readOnly: readOnly,
-          autovalidate: autovalidate,
+          autovalidateMode: autovalidateMode,
           onSaved: onSaved,
           enabled: enabled,
           onReset: onReset,

diff --git a/lib/src/fields/form_builder_checkbox_group.dart b/lib/src/fields/form_builder_checkbox_group.dart
@@ -36,7 +36,7 @@ class FormBuilderCheckboxGroup<T> extends FormBuilderField<List<T>> {
     ValueTransformer valueTransformer,
     bool enabled = true,
     FormFieldSetter onSaved,
-    bool autovalidate = false,
+    AutovalidateMode autovalidateMode = AutovalidateMode.disabled,
     VoidCallback onReset,
     FocusNode focusNode,
     @required this.options,
@@ -66,7 +66,7 @@ class FormBuilderCheckboxGroup<T> extends FormBuilderField<List<T>> {
           valueTransformer: valueTransformer,
           onChanged: onChanged,
           readOnly: readOnly,
-          autovalidate: autovalidate,
+          autovalidateMode: autovalidateMode,
           onSaved: onSaved,
           enabled: enabled,
           onReset: onReset,

diff --git a/lib/src/fields/form_builder_chips_input.dart b/lib/src/fields/form_builder_chips_input.dart
@@ -35,7 +35,7 @@ class FormBuilderChipsInput<T> extends FormBuilderField<List<T>> {
     ValueTransformer valueTransformer,
     bool enabled = true,
     FormFieldSetter onSaved,
-    bool autovalidate = false,
+    AutovalidateMode autovalidateMode = AutovalidateMode.disabled,
     VoidCallback onReset,
     FocusNode focusNode,
     @required this.chipBuilder,
@@ -62,7 +62,7 @@ class FormBuilderChipsInput<T> extends FormBuilderField<List<T>> {
             valueTransformer: valueTransformer,
             onChanged: onChanged,
             readOnly: readOnly,
-            autovalidate: autovalidate,
+            autovalidateMode: autovalidateMode,
             onSaved: onSaved,
             enabled: enabled,
             onReset: onReset,

diff --git a/lib/src/fields/form_builder_choice_chips.dart b/lib/src/fields/form_builder_choice_chips.dart
@@ -250,7 +250,7 @@ class FormBuilderChoiceChip<T> extends FormBuilderField<T> {
     ValueTransformer valueTransformer,
     bool enabled = true,
     FormFieldSetter onSaved,
-    bool autovalidate = false,
+    AutovalidateMode autovalidateMode = AutovalidateMode.disabled,
     VoidCallback onReset,
     FocusNode focusNode,
     @required this.options,
@@ -283,7 +283,7 @@ class FormBuilderChoiceChip<T> extends FormBuilderField<T> {
             valueTransformer: valueTransformer,
             onChanged: onChanged,
             readOnly: readOnly,
-            autovalidate: autovalidate,
+            autovalidateMode: autovalidateMode,
             onSaved: onSaved,
             enabled: enabled,
             onReset: onReset,

diff --git a/lib/src/fields/form_builder_color_picker.dart b/lib/src/fields/form_builder_color_picker.dart
@@ -54,12 +54,12 @@ class FormBuilderColorPickerField extends FormBuilderField<Color> {
   final VoidCallback onEditingComplete;
   final ValueChanged<String> onFieldSubmitted;
   final List<TextInputFormatter> inputFormatters;
-  final double cursorWidth ;
+  final double cursorWidth;
   final Radius cursorRadius;
   final Color cursorColor;
   final Brightness keyboardAppearance;
-  final EdgeInsets scrollPadding ;
-  final bool enableInteractiveSelection ;
+  final EdgeInsets scrollPadding;
+  final bool enableInteractiveSelection;
   final InputCounterWidgetBuilder buildCounter;
 
   FormBuilderColorPickerField({
@@ -68,7 +68,7 @@ class FormBuilderColorPickerField extends FormBuilderField<Color> {
     Color initialValue,
     FormFieldValidator validator,
     bool enabled = true,
-    bool autovalidate = false,
+    AutovalidateMode autovalidateMode = AutovalidateMode.disabled,
     ValueTransformer valueTransformer,
     ValueChanged onChanged,
     FormFieldSetter<Color> onSaved,
@@ -84,27 +84,27 @@ class FormBuilderColorPickerField extends FormBuilderField<Color> {
     this.textInputAction,
     this.style,
     this.strutStyle,
-    this. textDirection,
-    this. autofocus = false,
-    this. obscureText = false,
-    this. autocorrect = true,
-    this. maxLengthEnforced = true,
-    this. maxLines = 1,
-    this. expands = false,
-    this. showCursor,
-    this. minLines,
-    this. maxLength,
-    this. onEditingComplete,
-    this. onFieldSubmitted,
+    this.textDirection,
+    this.autofocus = false,
+    this.obscureText = false,
+    this.autocorrect = true,
+    this.maxLengthEnforced = true,
+    this.maxLines = 1,
+    this.expands = false,
+    this.showCursor,
+    this.minLines,
+    this.maxLength,
+    this.onEditingComplete,
+    this.onFieldSubmitted,
     // FormFieldValidator<String> validator,
-    this. inputFormatters,
-    this. cursorWidth = 2.0,
-    this. cursorRadius,
-    this. cursorColor,
-    this. keyboardAppearance,
-    this. scrollPadding = const EdgeInsets.all(20.0),
-    this. enableInteractiveSelection = true,
-    this. buildCounter,
+    this.inputFormatters,
+    this.cursorWidth = 2.0,
+    this.cursorRadius,
+    this.cursorColor,
+    this.keyboardAppearance,
+    this.scrollPadding = const EdgeInsets.all(20.0),
+    this.enableInteractiveSelection = true,
+    this.buildCounter,
   }) : super(
           key: key,
           initialValue: initialValue,
@@ -113,7 +113,7 @@ class FormBuilderColorPickerField extends FormBuilderField<Color> {
           valueTransformer: valueTransformer,
           onChanged: onChanged,
           readOnly: readOnly,
-          autovalidate: autovalidate,
+          autovalidateMode: autovalidateMode,
           onSaved: onSaved,
           enabled: enabled,
           onReset: onReset,

diff --git a/lib/src/fields/form_builder_country_picker.dart b/lib/src/fields/form_builder_country_picker.dart
@@ -0,0 +1 @@
+
diff --git a/lib/src/fields/form_builder_date_range_picker.dart b/lib/src/fields/form_builder_date_range_picker.dart
@@ -59,7 +59,7 @@ class FormBuilderDateRangePicker extends FormBuilderField {
     ValueTransformer valueTransformer,
     bool enabled = true,
     FormFieldSetter onSaved,
-    bool autovalidate = false,
+    AutovalidateMode autovalidateMode = AutovalidateMode.disabled,
     VoidCallback onReset,
     FocusNode focusNode,
     @required this.firstDate,
@@ -123,7 +123,7 @@ class FormBuilderDateRangePicker extends FormBuilderField {
           valueTransformer: valueTransformer,
           onChanged: onChanged,
           readOnly: readOnly,
-          autovalidate: autovalidate,
+          autovalidateMode: autovalidateMode,
           onSaved: onSaved,
           enabled: enabled,
           onReset: onReset,
@@ -227,7 +227,7 @@ class FormBuilderDateRangePickerState extends FormBuilderFieldState {
         selectableDayPredicate: widget.selectableDayPredicate,
       );
       if (picked != null) {
-        if(picked.length == 1){
+        if (picked.length == 1) {
           picked.add(picked[0]);
         }
         didChange(picked);

diff --git a/lib/src/fields/form_builder_date_time_picker.dart b/lib/src/fields/form_builder_date_time_picker.dart
@@ -156,7 +156,7 @@ class FormBuilderDateTimePicker extends FormBuilderField {
     ValueTransformer valueTransformer,
     bool enabled = true,
     FormFieldSetter onSaved,
-    bool autovalidate = false,
+    AutovalidateMode autovalidateMode = AutovalidateMode.disabled,
     VoidCallback onReset,
     FocusNode focusNode,
     this.inputType = InputType.both,
@@ -226,7 +226,7 @@ class FormBuilderDateTimePicker extends FormBuilderField {
           valueTransformer: valueTransformer,
           onChanged: onChanged,
           readOnly: readOnly,
-          autovalidate: autovalidate,
+          autovalidateMode: autovalidateMode,
           onSaved: onSaved,
           enabled: enabled,
           onReset: onReset,
@@ -240,7 +240,8 @@ class FormBuilderDateTimePicker extends FormBuilderField {
               format: state.dateFormat,
               validator: validator,
               onShowPicker: state.onShowPicker,
-              autovalidate: autovalidate,
+              autovalidate: autovalidateMode != AutovalidateMode.disabled &&
+                  autovalidateMode != null,
               resetIcon: resetIcon,
               textDirection: textDirection,
               textAlign: textAlign,
@@ -300,12 +301,18 @@ class _FormBuilderDateTimePickerState extends FormBuilderFieldState {
   DateFormat get dateFormat =>
       widget.format ?? _dateTimeFormats[widget.inputType];
 
-  Map _dateTimeFormats;
+  Map _dateTimeFormats = {
+    InputType.both: DateFormat.yMd().add_Hms(),
+    InputType.date: DateFormat.yMd(),
+    InputType.time: DateFormat.Hm(),
+  };
 
   @override
   void initState() {
     super.initState();
     _textFieldController = widget.controller ?? TextEditingController();
+    _textFieldController.text =
+        initialValue == null ? '' : dateFormat.format(initialValue);
     // effectiveFocusNode.addListener(_handleFocus);
   }
 

diff --git a/lib/src/fields/form_builder_dropdown.dart b/lib/src/fields/form_builder_dropdown.dart
@@ -191,7 +191,7 @@ class FormBuilderDropdown<T> extends FormBuilderField<T> {
     ValueTransformer valueTransformer,
     bool enabled = true,
     FormFieldSetter onSaved,
-    bool autovalidate = false,
+    AutovalidateMode autovalidateMode = AutovalidateMode.disabled,
     VoidCallback onReset,
     FocusNode focusNode,
     @required this.items,
@@ -221,7 +221,7 @@ class FormBuilderDropdown<T> extends FormBuilderField<T> {
           valueTransformer: valueTransformer,
           onChanged: onChanged,
           readOnly: readOnly,
-          autovalidate: autovalidate,
+          autovalidateMode: autovalidateMode,
           onSaved: onSaved,
           enabled: enabled,
           onReset: onReset,
@@ -239,6 +239,7 @@ class FormBuilderDropdown<T> extends FormBuilderField<T> {
                     ? decoration.floatingLabelBehavior
                     : FloatingLabelBehavior.always,
               ),
+              isEmpty: state.value == null,
               child: Row(
                 children: <Widget>[
                   Expanded(

diff --git a/lib/src/fields/form_builder_filter_chips.dart b/lib/src/fields/form_builder_filter_chips.dart
@@ -42,7 +42,7 @@ class FormBuilderFilterChip extends FormBuilderField<dynamic> {
     ValueTransformer valueTransformer,
     bool enabled = true,
     FormFieldSetter onSaved,
-    bool autovalidate = false,
+    AutovalidateMode autovalidateMode = AutovalidateMode.disabled,
     VoidCallback onReset,
     FocusNode focusNode,
     @required this.options,
@@ -78,7 +78,7 @@ class FormBuilderFilterChip extends FormBuilderField<dynamic> {
             valueTransformer: valueTransformer,
             onChanged: onChanged,
             readOnly: readOnly,
-            autovalidate: autovalidate,
+            autovalidateMode: autovalidateMode,
             onSaved: onSaved,
             enabled: enabled,
             onReset: onReset,

diff --git a/lib/src/fields/form_builder_image_picker.dart b/lib/src/fields/form_builder_image_picker.dart
@@ -38,7 +38,7 @@ class FormBuilderImagePicker extends FormBuilderField {
   final Widget galleryLabel;
   final EdgeInsets bottomSheetPadding;
 
-  FormBuilderImagePicker( {
+  FormBuilderImagePicker({
     Key key,
     //From Super
     @required String name,
@@ -50,7 +50,7 @@ class FormBuilderImagePicker extends FormBuilderField {
     ValueTransformer valueTransformer,
     bool enabled = true,
     FormFieldSetter onSaved,
-    bool autovalidate = false,
+    AutovalidateMode autovalidateMode = AutovalidateMode.disabled,
     VoidCallback onReset,
     FocusNode focusNode,
     this.previewWidth = 130,
@@ -78,7 +78,7 @@ class FormBuilderImagePicker extends FormBuilderField {
           valueTransformer: valueTransformer,
           onChanged: onChanged,
           readOnly: readOnly,
-          autovalidate: autovalidate,
+          autovalidateMode: autovalidateMode,
           onSaved: onSaved,
           enabled: enabled,
           onReset: onReset,
@@ -143,22 +143,23 @@ class FormBuilderImagePicker extends FormBuilderField {
                       }).toList()),
                     if (!state.readOnly && !state.hasMaxImages)
                       GestureDetector(
-                        child: placeholderImage != null?
-                        Image(
-                          width: previewWidth,
-                          height: previewHeight,
-                          image: placeholderImage,
-                        ) : Container(
-                            width: previewWidth,
-                            height: previewHeight,
-                            child: Icon(Icons.camera_enhance,
-                                color: state.readOnly
-                                    ? disabledColor
-                                    : iconColor ?? primaryColor),
-                            color: (state.readOnly
-                                    ? disabledColor
-                                    : iconColor ?? primaryColor)
-                                .withAlpha(50)),
+                        child: placeholderImage != null
+                            ? Image(
+                                width: previewWidth,
+                                height: previewHeight,
+                                image: placeholderImage,
+                              )
+                            : Container(
+                                width: previewWidth,
+                                height: previewHeight,
+                                child: Icon(Icons.camera_enhance,
+                                    color: state.readOnly
+                                        ? disabledColor
+                                        : iconColor ?? primaryColor),
+                                color: (state.readOnly
+                                        ? disabledColor
+                                        : iconColor ?? primaryColor)
+                                    .withAlpha(50)),
                         onTap: () {
                           showModalBottomSheet(
                             context: state.context,

diff --git a/lib/src/fields/form_builder_location_field.dart b/lib/src/fields/form_builder_location_field.dart
@@ -52,7 +52,7 @@ class FormBuilderLocationField extends FormBuilderField<CameraPosition> {
     ValueTransformer valueTransformer,
     bool enabled = true,
     FormFieldSetter onSaved,
-    bool autovalidate = false,
+    AutovalidateMode autovalidateMode = AutovalidateMode.disabled,
     VoidCallback onReset,
     FocusNode focusNode,
     this.allowClear = true,
@@ -93,7 +93,7 @@ class FormBuilderLocationField extends FormBuilderField<CameraPosition> {
           valueTransformer: valueTransformer,
           onChanged: onChanged,
           readOnly: readOnly,
-          autovalidate: autovalidate,
+          autovalidateMode: autovalidateMode,
           onSaved: onSaved,
           enabled: enabled,
           onReset: onReset,