Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.idea/libraries/Flutter_Plugins.xml
#	.idea/workspace.xml

Author: danvick

README.md

@@ -212,6 +212,7 @@ The currently supported fields include:
 email, urls etc by using different configurations and validators
 * `FormBuilderTouchSpin` - Selection of a number by tapping on a plus or minus icon
 * `FormBuilderTypeAhead` - Auto-completes user input from a list of items
+* `FormBuilderImagePicker` - Picker a image from Gallery or Camera and stores it in a List of images, File or String. **Note**: This picker is available for iOS and Android.
 
 In order to create an input field in the form, along with the label, and any applicable validation, there are several attributes that are supported by all types of inputs namely:
 

example/.flutter-plugins-dependencies

@@ -1 +1 @@
-{"_info":"// This is a generated file; do not edit or check into version control.","dependencyGraph":[{"name":"flutter_keyboard_visibility","dependencies":[]}]}
+{"_info":"// This is a generated file; do not edit or check into version control.","dependencyGraph":[{"name":"flutter_keyboard_visibility","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"image_picker","dependencies":["flutter_plugin_android_lifecycle"]}]}

example/lib/main.dart

@@ -511,6 +511,18 @@ class MyHomePageState extends State<MyHomePage> {
                         },
                       ),
                     ),
+                    FormBuilderImagePicker(
+                      attribute: "images",
+                      validators: [
+                        FormBuilderValidators.required(),
+                        (images) {
+                          if (images.length < 2) {
+                            return "Two or more images is required.";
+                          }
+                          return null;
+                        }
+                      ],
+                    ),
                     FormBuilderSignaturePad(
                       decoration: InputDecoration(labelText: "Signature"),
                       attribute: "signature",

flutter_form_builder.iml

@@ -42,7 +42,6 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Dart Packages" level="project" />
     <orderEntry type="library" name="Dart SDK" level="project" />
     <orderEntry type="library" name="Flutter Plugins" level="project" />
   </component>

lib/flutter_form_builder.dart

@@ -24,5 +24,6 @@ export './src/fields/form_builder_text_field.dart';
 export './src/fields/form_builder_touch_spin.dart';
 export './src/fields/form_builder_typeahead.dart';
 export './src/fields/form_builder_signature_pad.dart';
+export './src/fields/form_builder_image_picker.dart';
 
 export 'package:flutter_typeahead/flutter_typeahead.dart';

lib/src/fields/form_builder_image_picker.dart

@@ -0,0 +1,152 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_form_builder/flutter_form_builder.dart';
+import 'package:flutter_form_builder/src/widgets/image_source_sheet.dart';
+
+class FormBuilderImagePicker extends StatefulWidget {
+  final String attribute;
+  final List<FormFieldValidator> validators;
+  final List initialValue;
+  final bool readOnly;
+  final String labelText;
+  final ValueTransformer valueTransformer;
+  final ValueChanged onChanged;
+
+  final double imageWidth;
+  final double imageHeight;
+  final EdgeInsets imageMargin;
+  final FormFieldSetter onSaved;
+
+  const FormBuilderImagePicker({
+    Key key,
+    @required this.attribute,
+    this.initialValue,
+    this.validators = const [],
+    this.valueTransformer,
+    this.labelText,
+    this.onChanged,
+    this.imageWidth = 130,
+    this.imageHeight = 130,
+    this.imageMargin,
+    this.readOnly = false,
+    this.onSaved
+  }) : super(key: key);
+
+  @override
+  _FormBuilderImagePickerState createState() => _FormBuilderImagePickerState();
+}
+
+class _FormBuilderImagePickerState extends State<FormBuilderImagePicker> {
+  bool _readOnly = false;
+  List _initialValue;
+  final GlobalKey<FormFieldState> _fieldKey = GlobalKey<FormFieldState>();
+  FormBuilderState _formState;
+
+  @override
+  void initState() {
+    _formState = FormBuilder.of(context);
+    _formState?.registerFieldKey(widget.attribute, _fieldKey);
+    _initialValue = List.of(widget.initialValue ??
+        (_formState.initialValue.containsKey(widget.attribute)
+            ? _formState.initialValue[widget.attribute]
+            : []));
+    super.initState();
+  }
+
+  @override
+  void dispose() {
+    _formState?.unregisterFieldKey(widget.attribute);
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    _readOnly = (_formState?.readOnly == true) ? true : widget.readOnly;
+
+    return FormField<List>(
+      key: _fieldKey,
+      enabled: !_readOnly,
+      initialValue: _initialValue,
+      validator: (val) {
+        for (int i = 0; i < widget.validators.length; i++) {
+          if (widget.validators[i](val) != null)
+            return widget.validators[i](val);
+        }
+        return null;
+      },
+      onSaved: (val) {
+        var transformed;
+        if (widget.valueTransformer != null) {
+          transformed = widget.valueTransformer(val);
+          _formState?.setAttributeValue(widget.attribute, transformed);
+        } else
+          _formState?.setAttributeValue(widget.attribute, val);
+        if (widget.onSaved != null) {
+          widget.onSaved(transformed ?? val);
+        }
+      },
+      builder: (state) => Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: <Widget>[
+          Text(
+            widget.labelText != null ? widget.labelText : 'Images',
+            style: TextStyle(
+                color: _readOnly ? Theme.of(context).disabledColor : Theme.of(context).primaryColor
+            ),
+          ),
+          SizedBox(
+            height: 8,
+          ),
+          Container(
+            height: widget.imageHeight,
+            child: ListView(
+                scrollDirection: Axis.horizontal,
+                children: state.value.map<Widget>((item) {
+                  return Container(
+                    width: widget.imageWidth,
+                    height: widget.imageHeight,
+                    margin: widget.imageMargin,
+                    child: GestureDetector(
+                      child: item is String ?
+                      Image.network(item, fit: BoxFit.cover) :
+                      Image.file(item, fit: BoxFit.cover),
+                      onLongPress: _readOnly ? null : () {
+                        state.didChange(state.value..remove(item));
+                      },
+                    ),
+                  );
+                }).toList()
+                  ..add(
+                      GestureDetector(
+                        child: Container(
+                          width: widget.imageWidth,
+                          height: widget.imageHeight,
+                          child: Icon(
+                            Icons.camera_enhance,
+                              color: _readOnly ? Theme.of(context).disabledColor : Theme.of(context).primaryColor
+                          ),
+                            color: (_readOnly ? Theme.of(context).disabledColor : Theme.of(context).primaryColor).withAlpha(50)
+                        ),
+                        onTap: _readOnly ? null : () {
+                          showModalBottomSheet(context: context, builder: (_) {
+                            return ImageSourceSheet(
+                              onImageSelected: (image) {
+                                state.didChange(state.value..add(image));
+                                Navigator.of(context).pop();
+                              },
+                            );
+                          });
+                        },
+                      )
+                  )
+            ),
+          ),
+          state.hasError
+              ? Text(
+            state.errorText,
+            style: TextStyle(color: Theme.of(context).errorColor, fontSize: 12),
+          ) : Container()
+        ],
+      ),
+    );
+  }
+}

lib/src/widgets/image_source_sheet.dart

@@ -0,0 +1,43 @@
+import 'dart:io';
+
+import 'package:flutter/material.dart';
+import 'package:image_picker/image_picker.dart';
+
+class ImageSourceSheet extends StatelessWidget {
+
+  final Function(File) onImageSelected;
+
+  ImageSourceSheet({ @required this.onImageSelected });
+
+  void imageSelected(File image) async {
+    if (image != null) {
+      onImageSelected(image);
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      child: Wrap(
+        children: <Widget>[
+          ListTile(
+            leading: Icon(Icons.camera_enhance),
+            title: Text('Camera'),
+            onTap: () async {
+              File image = await ImagePicker.pickImage(source: ImageSource.camera);
+              imageSelected(image);
+            },
+          ),
+          ListTile(
+            leading: Icon(Icons.image),
+            title: Text('Gallery'),
+            onTap: () async {
+              File image = await ImagePicker.pickImage(source: ImageSource.gallery);
+              imageSelected(image);
+            },
+          )
+        ],
+      ),
+    );
+  }
+}

pubspec.yaml

@@ -21,6 +21,7 @@ dependencies:
   validators: ^2.0.0+1
   date_range_picker: ^1.0.6
   flutter_touch_spin: ^1.0.1
+  image_picker: ^0.6.4
 
 dev_dependencies:
   flutter_test: