Merge branch 'master' of https://github.com/danvick/flutter_form_builder

Author: danvick

lib/src/fields/form_builder_checkbox_group.dart

@@ -143,7 +143,9 @@ class _FormBuilderCheckboxGroupState<T>
             focusColor: widget.focusColor,
             checkColor: widget.checkColor,
             materialTapTargetSize: widget.materialTapTargetSize,
-            disabled: widget.disabled,
+            disabled: _readOnly
+                ? widget.options.map((e) => e.value).toList()
+                : widget.disabled,
             hoverColor: widget.hoverColor,
             tristate: widget.tristate,
             wrapAlignment: widget.wrapAlignment,

lib/src/fields/form_builder_phone_field.dart

@@ -129,6 +129,7 @@ class FormBuilderPhoneFieldState extends State<FormBuilderPhoneField> {
   final GlobalKey<FormFieldState> _fieldKey = GlobalKey<FormFieldState>();
   String _initialValue;
   Country _selectedDialogCountry;
+  bool phoneNumberValid = true;
 
   String get fullNumber {
     // When there is no phone number text, the field is empty -- the country
@@ -151,30 +152,37 @@ class FormBuilderPhoneFieldState extends State<FormBuilderPhoneField> {
     _effectiveController = widget.controller ?? TextEditingController();
     _selectedDialogCountry = CountryPickerUtils.getCountryByIsoCode(
         widget.defaultSelectedCountryIsoCode);
-    _parsePhone();
+    _validatePhoneNumber(_initialValue, setVal: true);
   }
 
-  Future<void> _parsePhone() async {
-    if (_initialValue != null && _initialValue.isNotEmpty) {
+  void _validatePhoneNumber(String val, {bool setVal = false}) async {
+    if (val != null && val.isNotEmpty) {
       try {
-        var parseResult = await PhoneNumber().parse(_initialValue);
-        print(parseResult);
-        if (parseResult != null) {
+        final result = await PhoneNumber().parse(val);
+        if (result != null) {
           setState(() {
-            _selectedDialogCountry = CountryPickerUtils.getCountryByPhoneCode(
-                parseResult['country_code']);
+            phoneNumberValid = true;
+            if (setVal) {
+              _selectedDialogCountry = CountryPickerUtils.getCountryByPhoneCode(
+                  result['country_code']);
+              _effectiveController.text = result['national_number'];
+            }
           });
-          _effectiveController.text = parseResult['national_number'];
         }
-      } catch (error) {
-        print(error);
-        _effectiveController.text = _initialValue.replaceFirst('+', '');
+      } on PlatformException catch (_) {
+        setState(() {
+          phoneNumberValid = false;
+        });
       }
-      setState(() {});
+    } else {
+      setState(() {
+        phoneNumberValid = true;
+      });
     }
   }
 
   void _invokeChange(FormFieldState field) {
+    _validatePhoneNumber(fullNumber);
     field.didChange(fullNumber);
     widget.onChanged?.call(fullNumber);
   }
@@ -187,8 +195,14 @@ class FormBuilderPhoneFieldState extends State<FormBuilderPhoneField> {
       key: _fieldKey,
       initialValue: _initialValue,
       autovalidate: widget.autovalidate,
-      validator: (val) =>
-          FormBuilderValidators.validateValidators(val, widget.validators),
+      validator: (val) {
+        if (phoneNumberValid) {
+          return FormBuilderValidators.validateValidators(
+              val, widget.validators);
+        } else {
+          return 'This field requires a valid phone number.';
+        }
+      },
       onSaved: (val) {
         var transformed;
         if (widget.valueTransformer != null) {

lib/src/fields/form_builder_signature_pad.dart

@@ -108,9 +108,12 @@ class _FormBuilderSignaturePadState extends State<FormBuilderSignaturePad> {
       key: _fieldKey,
       enabled: !_readOnly,
       initialValue: _initialValue,
-      validator: (val) =>
-          FormBuilderValidators.validateValidators(val, widget.validators),
+      validator: (val) {
+        if (_savedValue != null && val == null) return;
+        FormBuilderValidators.validateValidators(val, widget.validators);
+      },
       onSaved: (val) {
+        if (_savedValue != null && val == null) return;
         var transformed;
         if (widget.valueTransformer != null) {
           transformed = widget.valueTransformer(val);
@@ -141,7 +144,7 @@ class _FormBuilderSignaturePadState extends State<FormBuilderSignaturePad> {
                         elevation: 0,
                         color: widget.backgroundColor,
                         child: Image.memory(
-                          _savedValue,
+                          _savedValue ?? Uint8List(0),
                           height: widget.height,
                           width: widget.width,
                         ),

lib/src/widgets/image_source_sheet.dart

@@ -39,6 +39,8 @@ class ImageSourceBottomSheet extends StatelessWidget {
   final Widget cameraLabel;
   final Widget galleryLabel;
   final EdgeInsets bottomSheetPadding;
+  
+  bool _isPickingImage = false;
 
   ImageSourceBottomSheet({
     Key key,
@@ -57,6 +59,8 @@ class ImageSourceBottomSheet extends StatelessWidget {
         super(key: key);
 
   Future<void> _onPickImage(ImageSource source) async {
+    if(_isPickingImage) return;
+    _isPickingImage = true;
     final imagePicker = ImagePicker();
     final pickedFile = await imagePicker.getImage(
       source: source,
@@ -65,6 +69,7 @@ class ImageSourceBottomSheet extends StatelessWidget {
       imageQuality: imageQuality,
       preferredCameraDevice: preferredCameraDevice,
     );
+    _isPickingImage = false;
     if (null != pickedFile) {
       if (kIsWeb) {
         if (null != onImage) {
@@ -84,22 +89,24 @@ class ImageSourceBottomSheet extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Container(
-      padding: bottomSheetPadding,
-      child: Wrap(
-        children: <Widget>[
-          ListTile(
-            leading: cameraIcon,
-            title: cameraLabel,
-            onTap: () => _onPickImage(ImageSource.camera),
-          ),
-          ListTile(
-            leading: galleryIcon,
-            title: galleryLabel,
-            onTap: () => _onPickImage(ImageSource.gallery),
-          )
-        ],
-      ),
+    return WillPopScope(
+      onWillPop: () async => !_isPickingImage,
+      child: Container(
+        padding: bottomSheetPadding,
+        child: Wrap(
+          children: <Widget>[
+            ListTile(
+              leading: cameraIcon,
+              title: cameraLabel,
+              onTap: () => _onPickImage(ImageSource.camera),
+            ),
+            ListTile(
+              leading: galleryIcon,
+              title: galleryLabel,
+              onTap: () => _onPickImage(ImageSource.gallery),
+            )
+          ],
+        ),
     );
   }
 }