Merge branch 'master' into #15_custom-file-viewer-widget

Author: danvick

example/.flutter-plugins-dependencies

@@ -1 +1,2 @@
-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"file_picker","path":"/usr/local/Caskroom/flutter/2.0.1/flutter/.pub-cache/hosted/pub.dartlang.org/file_picker-3.0.0/","dependencies":[]},{"name":"permission_handler","path":"/usr/local/Caskroom/flutter/2.0.1/flutter/.pub-cache/hosted/pub.dartlang.org/permission_handler-6.1.1/","dependencies":[]}],"android":[{"name":"file_picker","path":"/usr/local/Caskroom/flutter/2.0.1/flutter/.pub-cache/hosted/pub.dartlang.org/file_picker-3.0.0/","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"flutter_plugin_android_lifecycle","path":"/usr/local/Caskroom/flutter/2.0.1/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_plugin_android_lifecycle-2.0.0/","dependencies":[]},{"name":"permission_handler","path":"/usr/local/Caskroom/flutter/2.0.1/flutter/.pub-cache/hosted/pub.dartlang.org/permission_handler-6.1.1/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[{"name":"file_picker","path":"/usr/local/Caskroom/flutter/2.0.1/flutter/.pub-cache/hosted/pub.dartlang.org/file_picker-3.0.0/","dependencies":[]}]},"dependencyGraph":[{"name":"file_picker","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"permission_handler","dependencies":[]}],"date_created":"2021-08-10 22:47:53.534563","version":"2.2.3"}
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"file_picker","path":"/usr/local/Caskroom/flutter/2.0.1/flutter/.pub-cache/hosted/pub.dartlang.org/file_picker-3.0.0/","dependencies":[]},{"name":"permission_handler","path":"/usr/local/Caskroom/flutter/2.0.1/flutter/.pub-cache/hosted/pub.dartlang.org/permission_handler-6.1.1/","dependencies":[]}],"android":[{"name":"file_picker","path":"/usr/local/Caskroom/flutter/2.0.1/flutter/.pub-cache/hosted/pub.dartlang.org/file_picker-3.0.0/","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"flutter_plugin_android_lifecycle","path":"/usr/local/Caskroom/flutter/2.0.1/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_plugin_android_lifecycle-2.0.0/","dependencies":[]},{"name":"permission_handler","path":"/usr/local/Caskroom/flutter/2.0.1/flutter/.pub-cache/hosted/pub.dartlang.org/permission_handler-6.1.1/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[{"name":"file_picker","path":"/usr/local/Caskroom/flutter/2.0.1/flutter/.pub-cache/hosted/pub.dartlang.org/file_picker-3.0.0/","dependencies":[]}]},"dependencyGraph":[{"name":"file_picker","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"permission_handler","dependencies":[]}],"date_created":"2021-08-10 22:47:53.534563","version":"2.2.3"}
+

example/pubspec.lock

@@ -7,7 +7,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.6.1"
+    version: "2.8.1"
   boolean_selector:
     dependency: transitive
     description:
@@ -28,7 +28,7 @@ packages:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.1"
   clock:
     dependency: transitive
     description:
@@ -57,13 +57,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.0"
+  ffi:
+    dependency: transitive
+    description:
+      name: ffi
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.2"
   file_picker:
     dependency: transitive
     description:
       name: file_picker
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.0"
+    version: "4.2.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -87,7 +94,7 @@ packages:
       name: flutter_plugin_android_lifecycle
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.4"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -132,7 +139,7 @@ packages:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.7.0"
   path:
     dependency: transitive
     description:
@@ -146,14 +153,14 @@ packages:
       name: permission_handler
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.1.1"
+    version: "8.2.5"
   permission_handler_platform_interface:
     dependency: transitive
     description:
       name: permission_handler_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.1.1"
+    version: "3.7.0"
   plugin_platform_interface:
     dependency: transitive
     description:
@@ -207,7 +214,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.0"
+    version: "0.4.2"
   typed_data:
     dependency: transitive
     description:
@@ -223,5 +230,5 @@ packages:
     source: hosted
     version: "2.1.0"
 sdks:
-  dart: ">=2.12.0 <3.0.0"
-  flutter: ">=1.22.0"
+  dart: ">=2.14.0 <3.0.0"
+  flutter: ">=2.5.0"

lib/src/form_builder_file_picker.dart

@@ -106,7 +106,7 @@ class FormBuilderFilePicker extends FormBuilderField<List<PlatformFile>> {
             final state = field as _FormBuilderFilePickerState;
 
             return InputDecorator(
-              decoration: state.decoration(),
+              decoration: decoration,
               child: Column(
                 children: <Widget>[
                   Row(
@@ -179,7 +179,7 @@ class _FormBuilderFilePickerState
         resultList = await FilePicker.platform.pickFiles(
           type: widget.type,
           allowedExtensions: widget.allowedExtensions,
-          allowCompression: widget.allowCompression,
+          allowCompression: widget.allowCompression ?? true,
           onFileLoading: widget.onFileLoading,
           allowMultiple: widget.allowMultiple,
           withData: widget.withData,
@@ -200,7 +200,6 @@ class _FormBuilderFilePickerState
       setState(() => _files!.addAll(resultList!.files));
       // TODO: Pick only remaining number
       field.didChange(_files);
-      widget.onChanged?.call(_files);
     }
   }
 
@@ -218,7 +217,6 @@ class _FormBuilderFilePickerState
       _files!.removeAt(index);
     });
     field.didChange(_files);
-    widget.onChanged?.call(_files);
   }
 
   Widget defaultFileViewer(
@@ -269,7 +267,7 @@ class _FormBuilderFilePickerState
                       width: double.infinity,
                       color: Colors.white.withOpacity(.8),
                       child: Text(
-                        files[index].name!,
+                        files[index].name,
                         style: theme.textTheme.caption,
                         maxLines: 2,
                         overflow: TextOverflow.clip,

pubspec.lock

@@ -7,7 +7,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.6.1"
+    version: "2.8.1"
   boolean_selector:
     dependency: transitive
     description:
@@ -28,7 +28,7 @@ packages:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.1"
   clock:
     dependency: transitive
     description:
@@ -57,13 +57,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.0"
+  ffi:
+    dependency: transitive
+    description:
+      name: ffi
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.2"
   file_picker:
     dependency: "direct main"
     description:
       name: file_picker
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.0"
+    version: "4.2.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -87,7 +94,7 @@ packages:
       name: flutter_plugin_android_lifecycle
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.4"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -125,7 +132,7 @@ packages:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.7.0"
   path:
     dependency: transitive
     description:
@@ -146,14 +153,14 @@ packages:
       name: permission_handler
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.1.1"
+    version: "8.2.5"
   permission_handler_platform_interface:
     dependency: transitive
     description:
       name: permission_handler_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.1.1"
+    version: "3.7.0"
   plugin_platform_interface:
     dependency: transitive
     description:
@@ -207,7 +214,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.0"
+    version: "0.4.2"
   typed_data:
     dependency: transitive
     description:
@@ -223,5 +230,5 @@ packages:
     source: hosted
     version: "2.1.0"
 sdks:
-  dart: ">=2.12.0 <3.0.0"
-  flutter: ">=1.22.0"
+  dart: ">=2.14.0 <3.0.0"
+  flutter: ">=2.5.0"

pubspec.yaml

@@ -10,9 +10,9 @@ dependencies:
   flutter:
     sdk: flutter
 
-  flutter_form_builder: ^6.0.0
-  file_picker: ^3.0.0
-  permission_handler: ^6.1.1
+  flutter_form_builder: ^6.0.1
+  file_picker: ^4.2.0
+  permission_handler: ^8.2.5
   community_material_icon: ^5.9.55
 
 dev_dependencies: