Merge branch 'drawing-pad' into access_fields_by_key

# Conflicts:
#	example/lib/main.dart

Author: danvick

.idea/libraries/Dart_Packages.xml

@@ -310,16 +310,17 @@ class MyHomePageState extends State<MyHomePage> {
             Expanded(
               child: FormBuilder(
                 context,
-                // key: _fbKey,
+                key: _fbKey,
                 autovalidate: autoValidate,
                 readonly: readOnly,
-                // showResetButton: true,
-                // resetButtonContent: Text("Clear Form"),
+                onChanged: (formValue) {
+                  print(formValue);
+                },
                 controls: [
                   FormBuilderInput.typeAhead(
                     label: 'Country',
                     attribute: 'country',
-                    require: true,
+                    // require: true,
                     itemBuilder: (context, country) {
                       return ListTile(
                         title: Text(country),
@@ -344,7 +345,7 @@ class MyHomePageState extends State<MyHomePage> {
                   FormBuilderInput.chipsInput(
                     label: 'Chips',
                     attribute: 'chips_test',
-                    require: true,
+                    // require: true,
                     value: [
                       Contact('Andrew', '[email protected]',
                           'https://d2gg9evh47fn9z.cloudfront.net/800px_COLOURBOX4057996.jpg'),
@@ -398,6 +399,8 @@ class MyHomePageState extends State<MyHomePage> {
                     attribute: "name",
                     label: "Name",
                     value: "John Doe",
+                    // require: true,
+                    // readonly: true,
                     require: true,
                     // readonly: true,
                     min: 3,
@@ -409,7 +412,7 @@ class MyHomePageState extends State<MyHomePage> {
                   ),
                   FormBuilderInput.dropdown(
                     attribute: "dropdown",
-                    require: true,
+                    // require: true,
                     label: "Dropdown",
                     hint: "Select Option",
                     options: [
@@ -421,8 +424,8 @@ class MyHomePageState extends State<MyHomePage> {
                   FormBuilderInput.number(
                     attribute: "age",
                     label: "Age",
-                    require: true,
-                    min: 18,
+                    // require: true,
+                    // min: 18,
                   ),
                   FormBuilderInput.textField(
                     type: FormBuilderInput.TYPE_MULTILINE_TEXT,
@@ -535,6 +538,12 @@ class MyHomePageState extends State<MyHomePage> {
                     step: 1,
                     hint: "Hint",
                   ),
+                  FormBuilderInput.signaturePad(
+                    label: "Signature",
+                    attribute: "signature",
+                    hint: "Hint",
+                    require: true,
+                  ),
                   FormBuilderInput.rate(
                     label: "Rate",
                     attribute: "rate",
@@ -553,16 +562,14 @@ class MyHomePageState extends State<MyHomePage> {
                         .toList(),
                   ),
                 ],
-                onChanged: (formValue) {
-                  print(formValue);
-                },
               ),
             ),
             MaterialButton(
               child: Text('External submit'),
               onPressed: () {
                 _fbKey.currentState.save();
                 if (_fbKey.currentState.validate()) {
+                  print('validationSucceded');
                   print(_fbKey.currentState.value);
                 } else {
                   print("External FormValidation failed");

.idea/libraries/Flutter_Plugins.xml

@@ -1,9 +1,14 @@
+import 'dart:typed_data';
+import 'dart:ui' as ui;
+
 import 'package:datetime_picker_formfield/datetime_picker_formfield.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_chips_input/flutter_chips_input.dart';
+import 'package:flutter_form_builder/src/form_builder_input.dart';
 import 'package:flutter_typeahead/flutter_typeahead.dart';
 import 'package:intl/intl.dart';
+import 'package:signature/signature.dart';
 import 'package:sy_flutter_widgets/sy_flutter_widgets.dart';
 
 import './form_builder_input.dart';
@@ -193,8 +198,8 @@ class FormBuilderState extends State<FormBuilder> {
                         val.isNotEmpty) {
                       Pattern pattern =
                           r"(https?|ftp)://([-A-Z0-9.]+)(/[-A-Z0-9+&@#/%=~_|!:,.;]*)?(\?[A-Z0-9+&@#/%=~_|!:‌​,.;]*)?";
-                      if (!RegExp(pattern, caseSensitive: false)
-                          .hasMatch(val)) return '$val is not a valid URL';
+                      if (!RegExp(pattern, caseSensitive: false).hasMatch(val))
+                        return '$val is not a valid URL';
                     }
 
                     if (formControl.validator != null)
@@ -317,8 +322,7 @@ class FormBuilderState extends State<FormBuilder> {
                       return formControl.validator(val);
                   },
                   onSaved: (val) => value[formControl.attribute] = val,
-                  getImmediateSuggestions:
-                      formControl.getImmediateSuggestions,
+                  getImmediateSuggestions: formControl.getImmediateSuggestions,
                   errorBuilder: formControl.errorBuilder,
                   noItemsFoundBuilder: formControl.noItemsFoundBuilder,
                   loadingBuilder: formControl.loadingBuilder,
@@ -851,6 +855,72 @@ class FormBuilderState extends State<FormBuilder> {
                   ),
                 );
                 break;
+
+              case FormBuilderInput.TYPE_SIGNATURE_PAD:
+                var _signatureCanvas = Signature(
+                  points: formControl.points,
+                  width: formControl.width,
+                  height: formControl.height,
+                  backgroundColor: formControl.backgroundColor,
+                  penColor: formControl.penColor,
+                  penStrokeWidth: formControl.penStrokeWidth,
+                );
+                
+                return FormField<Image>(
+                  key: Key(formControl.attribute),
+                  enabled: !(widget.readonly || formControl.readonly),
+                  initialValue: formControl.value,
+                  onSaved: (val) async {
+                    Uint8List signature = await _signatureCanvas.exportBytes();
+                    var image = Image.memory(signature).image;
+                    print(image);
+                    value[formControl.attribute] = image;
+                  },
+                  validator: (value) {
+                    if (formControl.require && _signatureCanvas.isEmpty)
+                      return "${formControl.label} is required";
+                    if (formControl.validator != null)
+                      return formControl.validator(value);
+                  },
+                  builder: (FormFieldState<dynamic> field) {
+
+                    return InputDecorator(
+                      decoration: InputDecoration(
+                        // icon: const Icon(Icons.person),
+                        enabled: !(widget.readonly || formControl.readonly),
+                        hintText: formControl.hint,
+                        labelText: formControl.label,
+                        errorText: field.errorText,
+                      ),
+                      child: Column(
+                        children: <Widget>[
+                          Container(
+                            decoration: BoxDecoration(
+                              border: Border.all(color: Colors.grey),
+                            ),
+                            child: GestureDetector(
+                              onVerticalDragUpdate: (_) {},
+                              child: _signatureCanvas,
+                            ),
+                          ),
+                          Row(
+                            children: <Widget>[
+                              Expanded(child: SizedBox()),
+                              FlatButton(
+                                  onPressed: () {
+                                    _signatureCanvas.clear();
+                                    field.didChange(null);
+                                  },
+                                  child: Text('Clear')),
+                            ],
+                          ),
+                        ],
+                      ),
+                    );
+                  },
+                );
+
+                break;
             }
           }).toList(),
         ),

.idea/workspace.xml

@@ -1,6 +1,9 @@
+import 'dart:ui';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_chips_input/flutter_chips_input.dart';
 import 'package:flutter_typeahead/flutter_typeahead.dart';
+import 'package:signature/signature.dart';
 
 import './form_builder_input_option.dart';
 
@@ -31,6 +34,7 @@ class FormBuilderInput {
   static const String TYPE_RATE = "Rate";
   static const String TYPE_SEGMENTED_CONTROL = "SegmentedControl";
   static const String TYPE_CHIPS_INPUT = "ChipsInput";
+  static const String TYPE_SIGNATURE_PAD = "DrawingPad";
 
   String label;
   String attribute;
@@ -42,6 +46,12 @@ class FormBuilderInput {
   dynamic min;
   dynamic max;
   int divisions;
+  Color penColor;
+  Color backgroundColor;
+  double penStrokeWidth;
+  double height;
+  double width;
+  List<Point> points;
   num step;
   String format;
   IconData icon;
@@ -138,6 +148,24 @@ class FormBuilderInput {
     type = FormBuilderInput.TYPE_TYPE_AHEAD;
   }
 
+  FormBuilderInput.signaturePad({
+    @required this.label,
+    @required this.attribute,
+    this.readonly = false,
+    this.penColor = Colors.black,
+    this.penStrokeWidth = 3,
+    this.width,
+    this.points,
+    this.height = 250,
+    this.backgroundColor = Colors.white70,
+    this.hint,
+    this.value,
+    this.require = false,
+    this.validator,
+  }) {
+    type = FormBuilderInput.TYPE_SIGNATURE_PAD;
+  }
+
   FormBuilderInput.number({
     @required this.label,
     @required this.attribute,

example/lib/main.dart

@@ -48,6 +48,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.0"
+  flutter_signature_pad:
+    dependency: "direct main"
+    description:
+      name: flutter_signature_pad
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.0"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -109,6 +116,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.1"
+  signature:
+    dependency: "direct main"
+    description:
+      name: signature
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.0"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -179,4 +193,4 @@ packages:
     version: "2.0.8"
 sdks:
   dart: ">=2.1.0 <3.0.0"
-  flutter: ">=0.1.4 <2.0.0"
+  flutter: ">=0.6.0 <2.0.0"

lib/src/form_builder.dart

@@ -1,6 +1,6 @@
 name: flutter_form_builder
 description: Package to build Material Form with components such as TextField (With number, url, email validation), DropDown, TypeAhead, Radios, Checkboxes
-version: 1.5.1
+version: 1.4.0
 author: Danvick Miller <[email protected]>
 homepage: https://github.com/danvick/flutter_form_builder
 
@@ -16,6 +16,7 @@ dependencies:
   sy_flutter_widgets: ^0.1.4
   flutter_chips_input: ^1.1.0
   datetime_picker_formfield: ^0.1.8
+  signature: ^2.0.0
 
 dev_dependencies:
   flutter_test: