fix: more null-safety fixes

Author: danvick

CHANGELOG.md

@@ -1,3 +1,6 @@
+## [1.2.0-nullsafety.2] - 21-Jun-2021.
+* more null-safety fixes
+
 ## [1.2.0-nullsafety.1] - 21-Jun-2021.
 * Upgraded packages - fix null-safety issues
 

example/.flutter-plugins-dependencies

@@ -1 +1 @@
-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"file_picker","path":"/Users/danvick/flutter/.pub-cache/hosted/pub.dartlang.org/file_picker-3.0.2+2/","dependencies":[]},{"name":"permission_handler","path":"/Users/danvick/flutter/.pub-cache/hosted/pub.dartlang.org/permission_handler-8.1.1/","dependencies":[]}],"android":[{"name":"file_picker","path":"/Users/danvick/flutter/.pub-cache/hosted/pub.dartlang.org/file_picker-3.0.2+2/","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"flutter_plugin_android_lifecycle","path":"/Users/danvick/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_plugin_android_lifecycle-2.0.0/","dependencies":[]},{"name":"permission_handler","path":"/Users/danvick/flutter/.pub-cache/hosted/pub.dartlang.org/permission_handler-8.1.1/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[{"name":"file_picker","path":"/Users/danvick/flutter/.pub-cache/hosted/pub.dartlang.org/file_picker-3.0.2+2/","dependencies":[]}]},"dependencyGraph":[{"name":"file_picker","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"permission_handler","dependencies":[]}],"date_created":"2021-06-21 22:29:59.738698","version":"2.2.0"}
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"file_picker","path":"/Users/danvick/flutter/.pub-cache/hosted/pub.dartlang.org/file_picker-3.0.2+2/","dependencies":[]},{"name":"permission_handler","path":"/Users/danvick/flutter/.pub-cache/hosted/pub.dartlang.org/permission_handler-8.1.1/","dependencies":[]}],"android":[{"name":"file_picker","path":"/Users/danvick/flutter/.pub-cache/hosted/pub.dartlang.org/file_picker-3.0.2+2/","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"flutter_plugin_android_lifecycle","path":"/Users/danvick/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_plugin_android_lifecycle-2.0.0/","dependencies":[]},{"name":"permission_handler","path":"/Users/danvick/flutter/.pub-cache/hosted/pub.dartlang.org/permission_handler-8.1.1/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[{"name":"file_picker","path":"/Users/danvick/flutter/.pub-cache/hosted/pub.dartlang.org/file_picker-3.0.2+2/","dependencies":[]}]},"dependencyGraph":[{"name":"file_picker","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"permission_handler","dependencies":[]}],"date_created":"2021-06-21 22:45:29.749265","version":"2.2.0"}

example/pubspec.lock

@@ -104,7 +104,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.2.0-nullsafety.0"
+    version: "1.2.0-nullsafety.1"
   intl:
     dependency: transitive
     description:

lib/src/form_builder_file_picker.dart

@@ -10,7 +10,7 @@ import 'package:flutter_form_builder/flutter_form_builder.dart';
 import 'package:permission_handler/permission_handler.dart';
 
 /// Field for image(s) from user device storage
-class FormBuilderFilePicker extends FormBuilderField<List<PlatformFile>> {
+class FormBuilderFilePicker extends FormBuilderField<List<PlatformFile>?> {
   /// Maximum number of files needed for this field
   final int? maxFiles;
 
@@ -95,7 +95,7 @@ class FormBuilderFilePicker extends FormBuilderField<List<PlatformFile>> {
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     children: <Widget>[
                       if (maxFiles != null)
-                        Text('${state._files!.length} / $maxFiles'),
+                        Text('${state._files.length} / $maxFiles'),
                       InkWell(
                         onTap: state.enabled &&
                                 (null == state._remainingItemCount ||
@@ -139,10 +139,10 @@ class _FormBuilderFilePickerState
     'wbmp',
   ];
 
-  List<PlatformFile>? _files;
+  List<PlatformFile> _files = [];
 
   int? get _remainingItemCount =>
-      widget.maxFiles == null ? null : widget.maxFiles! - _files!.length;
+      widget.maxFiles == null ? null : widget.maxFiles! - _files.length;
 
   @override
   void initState() {
@@ -176,7 +176,7 @@ class _FormBuilderFilePickerState
     if (!mounted) return;
 
     if (resultList != null) {
-      setState(() => _files!.addAll(resultList!.files));
+      setState(() => _files.addAll(resultList!.files));
       // TODO: Pick only remaining number
       field.didChange(_files);
       widget.onChanged?.call(_files);
@@ -185,7 +185,7 @@ class _FormBuilderFilePickerState
 
   void removeFileAtIndex(int index, FormFieldState<List<PlatformFile>?> field) {
     setState(() {
-      _files!.removeAt(index);
+      _files.removeAt(index);
     });
     field.didChange(_files);
     widget.onChanged?.call(_files);

pubspec.yaml

@@ -1,6 +1,6 @@
 name: form_builder_file_picker
 description: FilePicker Field for flutter_form_builder package. Used to select files as part of form input.
-version: 1.2.0-nullsafety.1
+version: 1.2.0-nullsafety.2
 homepage: https://github.com/danvick/form_builder_file_picker
 
 environment: