improved the package to be cross platform, and pumped versions

ahmednfwela · ahmednfwela · commit 32b3a59b5376 · 2021-09-25T18:40:22.000+02:00
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -40,16 +40,26 @@ class MyHomePage extends StatelessWidget {
                 FormBuilderImagePicker(
                   name: 'photos',
                   decoration: const InputDecoration(labelText: 'Pick Photos'),
-                  maxImages: 1,
+                  maxImages: 3,
+                  initialValue: [
+                    'https://images.pexels.com/photos/7078045/pexels-photo-7078045.jpeg?auto=compress&cs=tinysrgb&dpr=2&h=750&w=1260'
+                  ],
                 ),
                 const SizedBox(height: 15),
                 ElevatedButton(
-                    child: Text('Submit'),
-                    onPressed: () {
-                      if (_formKey.currentState.saveAndValidate()) {
-                        print(_formKey.currentState.value);
-                      }
-                    })
+                  child: Text('Submit'),
+                  onPressed: () {
+                    if (_formKey.currentState.saveAndValidate()) {
+                      print(_formKey.currentState.value);
+                    }
+                  },
+                ),
+                ElevatedButton(
+                  child: Text('Reset'),
+                  onPressed: () {
+                    _formKey.currentState?.reset();
+                  },
+                )
               ],
             ),
           ),
diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -7,21 +7,14 @@ packages:
       name: archive
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.13"
-  args:
-    dependency: transitive
-    description:
-      name: args
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.6.0"
+    version: "3.1.2"
   async:
     dependency: transitive
     description:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.5.0"
+    version: "2.8.1"
   boolean_selector:
     dependency: transitive
     description:
@@ -42,7 +35,7 @@ packages:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.1"
   clock:
     dependency: transitive
     description:
@@ -57,20 +50,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.15.0"
-  convert:
+  cross_file:
     dependency: transitive
     description:
-      name: convert
+      name: cross_file
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.1"
+    version: "0.3.1+5"
   crypto:
     dependency: transitive
     description:
       name: crypto
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.5"
+    version: "3.0.1"
   fake_async:
     dependency: transitive
     description:
@@ -84,7 +77,7 @@ packages:
       name: file
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.0.0"
+    version: "6.1.2"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -96,17 +89,12 @@ packages:
     source: sdk
     version: "0.0.0"
   flutter_form_builder:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: flutter_form_builder
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.0.0-nullsafety.0"
-  flutter_localizations:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.0"
+    version: "7.0.0-beta.0"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
@@ -156,26 +144,26 @@ packages:
       name: image_picker
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.7.4"
+    version: "0.8.4+2"
   image_picker_for_web:
     dependency: transitive
     description:
       name: image_picker_for_web
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.1.3"
   image_picker_platform_interface:
     dependency: transitive
     description:
       name: image_picker_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.1"
+    version: "2.4.1"
   integration_test:
     dependency: "direct dev"
     description: flutter
     source: sdk
-    version: "0.9.2+2"
+    version: "0.0.0"
   intl:
     dependency: transitive
     description:
@@ -203,7 +191,7 @@ packages:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.7.0"
   path:
     dependency: transitive
     description:
@@ -238,7 +226,7 @@ packages:
       name: process
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.0.0"
+    version: "4.2.3"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -250,7 +238,7 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0"
+    version: "1.8.1"
   stack_trace:
     dependency: transitive
     description:
@@ -278,7 +266,7 @@ packages:
       name: sync_http
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.0"
+    version: "0.3.0"
   term_glyph:
     dependency: transitive
     description:
@@ -292,7 +280,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.19"
+    version: "0.4.2"
   typed_data:
     dependency: transitive
     description:
@@ -313,14 +301,14 @@ packages:
       name: vm_service
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.5.0"
+    version: "7.1.1"
   webdriver:
     dependency: transitive
     description:
       name: webdriver
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.2"
+    version: "3.0.0"
 sdks:
-  dart: ">=2.12.0 <3.0.0"
-  flutter: ">=1.20.0"
+  dart: ">=2.14.0 <3.0.0"
+  flutter: ">=2.5.0"
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -9,8 +9,7 @@ environment:
 
 dependencies:
   flutter:
-    sdk: flutter
-  flutter_form_builder: ^6.0.0-nullsafety.0
+    sdk: flutter  
   form_builder_image_picker:
     path: ../
 
diff --git a/lib/src/form_builder_image_picker.dart b/lib/src/form_builder_image_picker.dart
@@ -1,6 +1,5 @@
-import 'dart:io';
 import 'dart:typed_data';
-
+import 'package:async/async.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
@@ -52,12 +51,13 @@ class FormBuilderImagePicker extends FormBuilderField<List<dynamic>> {
     List<dynamic>? initialValue,
     InputDecoration decoration = const InputDecoration(),
     ValueChanged<List<dynamic>?>? onChanged,
-    ValueTransformer<List<dynamic>>? valueTransformer,
+    ValueTransformer<List<dynamic>?>? valueTransformer,
     bool enabled = true,
     FormFieldSetter<List<dynamic>>? onSaved,
     AutovalidateMode autovalidateMode = AutovalidateMode.disabled,
     VoidCallback? onReset,
     FocusNode? focusNode,
+    WidgetBuilder? loadingWidget,
     this.previewWidth = 130,
     this.previewHeight = 130,
     this.previewMargin,
@@ -103,7 +103,7 @@ class FormBuilderImagePicker extends FormBuilderField<List<dynamic>> {
                   children: [
                     if (field.value != null)
                       ...field.value!.map<Widget>((dynamic item) {
-                        assert(item is File ||
+                        assert(item is XFile ||
                             item is String ||
                             item is Uint8List);
                         return Stack(
@@ -117,8 +117,11 @@ class FormBuilderImagePicker extends FormBuilderField<List<dynamic>> {
                                   ? Image.memory(item, fit: BoxFit.cover)
                                   : item is String
                                       ? Image.network(item, fit: BoxFit.cover)
-                                      : Image.file(item as File,
-                                          fit: BoxFit.cover),
+                                      : XFileImage(
+                                          file: item,
+                                          fit: BoxFit.cover,
+                                          loadingWidget: loadingWidget,
+                                        ),
                             ),
                             if (state.enabled)
                               InkWell(
@@ -187,12 +190,6 @@ class FormBuilderImagePicker extends FormBuilderField<List<dynamic>> {
                                       <dynamic>[...?field.value, image]);
                                   Navigator.pop(state.context);
                                 },
-                                onImage: (image) {
-                                  field.didChange(
-                                      <dynamic>[...?field.value, image]);
-                                  onChanged?.call(field.value);
-                                  Navigator.pop(state.context);
-                                },
                               );
                             },
                           );
@@ -216,3 +213,38 @@ class _FormBuilderImagePickerState
       value != null &&
       value!.length >= widget.maxImages!;
 }
+
+class XFileImage extends StatefulWidget {
+  const XFileImage({
+    Key? key,
+    required this.file,
+    this.fit,
+    this.loadingWidget,
+  }) : super(key: key);
+  final XFile file;
+  final BoxFit? fit;
+  final WidgetBuilder? loadingWidget;
+  @override
+  State<XFileImage> createState() => _XFileImageState();
+}
+
+class _XFileImageState extends State<XFileImage> {
+  final _memoizer = AsyncMemoizer<Uint8List>();
+
+  @override
+  Widget build(BuildContext context) {
+    return FutureBuilder<Uint8List>(
+      future: _memoizer.runOnce(widget.file.readAsBytes),
+      builder: (context, snapshot) {
+        final data = snapshot.data;
+        if (data == null) {
+          return widget.loadingWidget?.call(context) ??
+              Center(
+                child: CircularProgressIndicator(),
+              );
+        }
+        return Image.memory(data, fit: widget.fit);
+      },
+    );
+  }
+}
diff --git a/lib/src/image_source_sheet.dart b/lib/src/image_source_sheet.dart
@@ -1,6 +1,3 @@
-import 'dart:io';
-import 'dart:typed_data' show Uint8List;
-
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:image_picker/image_picker.dart';
@@ -24,15 +21,7 @@ class ImageSourceBottomSheet extends StatefulWidget {
   final CameraDevice preferredCameraDevice;
 
   /// Callback when an image is selected.
-  ///
-  /// **Note**: This will work on web platform whereas [onImageSelected] will not.
-  final void Function(Uint8List)? onImage;
-
-  /// Callback when an image is selected.
-  ///
-  /// **Warning**: This will _NOT_ work on web platform because [File] is not
-  /// available.
-  final void Function(File)? onImageSelected;
+  final void Function(XFile)? onImageSelected;
 
   final Widget? cameraIcon;
   final Widget? galleryIcon;
@@ -46,14 +35,13 @@ class ImageSourceBottomSheet extends StatefulWidget {
     this.maxWidth,
     this.imageQuality,
     this.preferredCameraDevice = CameraDevice.rear,
-    this.onImage,
     this.onImageSelected,
     this.cameraIcon,
     this.galleryIcon,
     this.cameraLabel,
     this.galleryLabel,
     this.bottomSheetPadding,
-  })  : assert(null != onImage || null != onImageSelected),
+  })  : assert(null != onImageSelected),
         super(key: key);
 
   @override
@@ -67,28 +55,16 @@ class _ImageSourceBottomSheetState extends State<ImageSourceBottomSheet> {
     if (_isPickingImage) return;
     _isPickingImage = true;
     final imagePicker = ImagePicker();
-    final pickedFile = await imagePicker.getImage(
+    final pickedFile = await imagePicker.pickImage(
       source: source,
       maxHeight: widget.maxHeight,
       maxWidth: widget.maxWidth,
       imageQuality: widget.imageQuality,
       preferredCameraDevice: widget.preferredCameraDevice,
     );
     _isPickingImage = false;
-    if (null != pickedFile) {
-      if (kIsWeb) {
-        if (null != widget.onImage) {
-          widget.onImage!(await pickedFile.readAsBytes());
-        }
-      } else {
-        if (null != widget.onImageSelected) {
-          // Warning:  this will not work on the web platform because pickedFile
-          // will instead point to a network resource.
-          final imageFile = File(pickedFile.path);
-          // assert(null != imageFile);
-          widget.onImageSelected!(imageFile);
-        }
-      }
+    if (pickedFile != null) {
+      widget.onImageSelected?.call(pickedFile);
     }
   }
 
diff --git a/pubspec.lock b/pubspec.lock
diff --git a/pubspec.yaml b/pubspec.yaml
