Merge branch 'Bdaya-Dev/main'

# Conflicts:
#	example/pubspec.lock
#	lib/src/image_source_sheet.dart
#	pubspec.lock
#	pubspec.yaml

Author: danvick

CHANGELOG.md

@@ -1,4 +1,9 @@
-## [1.0.0-nullsafety.0] - 03-Apr-2020
+## [2.0.0] - 28-Oct-2021
+* Use XFile instead of the old picker
+* Proper null safety
+* Added `displayCustomType` to accept any type for the values
+* Used ListView.builder for lazy loading items
+## [1.0.0-nullsafety.0] - 03-Apr-2021
 * Started working on null-safety
 
 ## [0.1.2] - 31-Dec-2020

example/lib/main.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
+
 import 'package:form_builder_image_picker/form_builder_image_picker.dart';
 
 void main() {
@@ -20,6 +21,15 @@ class MyApp extends StatelessWidget {
   }
 }
 
+class ApiImage {
+  final String imageUrl;
+  final String id;
+  ApiImage({
+    required this.imageUrl,
+    required this.id,
+  });
+}
+
 class MyHomePage extends StatelessWidget {
   final _formKey = GlobalKey<FormBuilderState>();
 
@@ -39,17 +49,35 @@ class MyHomePage extends StatelessWidget {
               children: <Widget>[
                 FormBuilderImagePicker(
                   name: 'photos',
+                  displayCustomType: (obj) =>
+                      obj is ApiImage ? obj.imageUrl : obj,
                   decoration: const InputDecoration(labelText: 'Pick Photos'),
-                  maxImages: 1,
+                  maxImages: 5,
+                  initialValue: [
+                    'https://images.pexels.com/photos/7078045/pexels-photo-7078045.jpeg?auto=compress&cs=tinysrgb&dpr=2&h=750&w=1260',
+                    Text('this is an image\nas a widget !'),
+                    ApiImage(
+                      id: 'whatever',
+                      imageUrl:
+                          'https://images.pexels.com/photos/8311418/pexels-photo-8311418.jpeg?auto=compress&cs=tinysrgb&dpr=3&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() == true) {
+                      print(_formKey.currentState!.value);
+                    }
+                  },
+                ),
+                ElevatedButton(
+                  child: Text('Reset'),
+                  onPressed: () {
+                    _formKey.currentState?.reset();
+                  },
+                )
               ],
             ),
           ),

example/pubspec.lock

@@ -56,7 +56,7 @@ packages:
       name: cross_file
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.1+5"
+    version: "0.3.2"
   crypto:
     dependency: transitive
     description:
@@ -89,24 +89,19 @@ 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.1.0+1"
-  flutter_localizations:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.0"
+    version: "7.0.0"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
       name: flutter_plugin_android_lifecycle
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.4"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -123,7 +118,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.0.0-nullsafety.0"
+    version: "2.0.0"
   fuchsia_remote_debug_protocol:
     dependency: transitive
     description: flutter
@@ -135,7 +130,7 @@ packages:
       name: http
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.13.3"
+    version: "0.13.4"
   http_parser:
     dependency: transitive
     description:
@@ -149,14 +144,14 @@ packages:
       name: image_picker
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.8.4"
+    version: "0.8.4+4"
   image_picker_for_web:
     dependency: transitive
     description:
       name: image_picker_for_web
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.3"
+    version: "2.1.4"
   image_picker_platform_interface:
     dependency: transitive
     description:
@@ -204,13 +199,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.8.0"
-  pedantic:
-    dependency: transitive
-    description:
-      name: pedantic
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.11.0"
   platform:
     dependency: transitive
     description:
@@ -224,7 +212,7 @@ packages:
       name: plugin_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.2"
   process:
     dependency: transitive
     description:
@@ -315,5 +303,5 @@ packages:
     source: hosted
     version: "3.0.0"
 sdks:
-  dart: ">=2.12.0 <3.0.0"
-  flutter: ">=2.0.0"
+  dart: ">=2.14.0 <3.0.0"
+  flutter: ">=2.5.0"

example/pubspec.yaml

@@ -5,12 +5,11 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.7.0 <3.0.0"
+  sdk: ">=2.12.0 <3.0.0"
 
 dependencies:
   flutter:
-    sdk: flutter
-  flutter_form_builder: ^6.0.0-nullsafety.0
+    sdk: flutter  
   form_builder_image_picker:
     path: ../