feat: started working with flutter_form_builder 7.*

Author: danvick

CHANGELOG.md

@@ -1,4 +1,7 @@
-## [1.2.0-nullsafety.3] - 21-Jun-2021.
+## [2.0.0-alpha.0] - 21-Jun-2021.
+* Started integration with FormBuilder 7.*
+
+## [1.2.0-nullsafety.3] - 18-Sep-2021.
 * Fixed null safety issue on file-viewer
 
 ## [1.2.0-nullsafety.2] - 21-Jun-2021.

analysis_options.yaml

@@ -1 +1 @@
-include: package:pedantic/analysis_options.yaml
+include: package:flutter_lints/flutter.yaml

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-4.0.3/","dependencies":[]},{"name":"permission_handler","path":"/Users/danvick/flutter/.pub-cache/hosted/pub.dartlang.org/permission_handler-8.1.6/","dependencies":[]}],"android":[{"name":"file_picker","path":"/Users/danvick/flutter/.pub-cache/hosted/pub.dartlang.org/file_picker-4.0.3/","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.3/","dependencies":[]},{"name":"permission_handler","path":"/Users/danvick/flutter/.pub-cache/hosted/pub.dartlang.org/permission_handler-8.1.6/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[{"name":"file_picker","path":"/Users/danvick/flutter/.pub-cache/hosted/pub.dartlang.org/file_picker-4.0.3/","dependencies":[]}]},"dependencyGraph":[{"name":"file_picker","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"permission_handler","dependencies":[]}],"date_created":"2021-09-18 20:37:20.695677","version":"2.5.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-4.1.0/","dependencies":[]},{"name":"permission_handler","path":"/Users/danvick/flutter/.pub-cache/hosted/pub.dartlang.org/permission_handler-8.1.6/","dependencies":[]}],"android":[{"name":"file_picker","path":"/Users/danvick/flutter/.pub-cache/hosted/pub.dartlang.org/file_picker-4.1.0/","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.3/","dependencies":[]},{"name":"permission_handler","path":"/Users/danvick/flutter/.pub-cache/hosted/pub.dartlang.org/permission_handler-8.1.6/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[{"name":"file_picker","path":"/Users/danvick/flutter/.pub-cache/hosted/pub.dartlang.org/file_picker-4.1.0/","dependencies":[]}]},"dependencyGraph":[{"name":"file_picker","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"permission_handler","dependencies":[]}],"date_created":"2021-09-21 11:30:36.491175","version":"2.5.0"}

example/lib/main.dart

@@ -2,22 +2,24 @@ import 'package:flutter/material.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
 import 'package:form_builder_file_picker/form_builder_file_picker.dart';
 
-void main() => runApp(MyApp());
+void main() => runApp(const MyApp());
 
 class MyApp extends StatelessWidget {
+  const MyApp({Key? key}) : super(key: key);
+
   @override
   Widget build(BuildContext context) {
     return MaterialApp(
       title: 'Flutter Demo',
-      theme: ThemeData(
-        primarySwatch: Colors.blue,
-      ),
-      home: MyHomePage(),
+      theme: ThemeData(primarySwatch: Colors.blue),
+      home: const MyHomePage(),
     );
   }
 }
 
 class MyHomePage extends StatefulWidget {
+  const MyHomePage({Key? key}) : super(key: key);
+
   @override
   _MyHomePageState createState() => _MyHomePageState();
 }
@@ -29,37 +31,37 @@ class _MyHomePageState extends State<MyHomePage> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title: Text('FormBuilder FilePicker Example'),
+        title: const Text('FormBuilder FilePicker Example'),
       ),
       body: Padding(
-        padding: EdgeInsets.all(10),
+        padding: const EdgeInsets.all(10),
         child: FormBuilder(
           key: _formKey,
           child: Column(
             children: <Widget>[
               FormBuilderFilePicker(
                 name: 'images',
-                decoration: InputDecoration(labelText: 'Attachments'),
+                decoration: const InputDecoration(labelText: 'Attachments'),
                 maxFiles: null,
                 allowMultiple: true,
                 previewImages: true,
-                onChanged: (val) => print(val),
+                onChanged: (val) => debugPrint(val.toString()),
                 selector: Row(
-                  children: <Widget>[
+                  children: const <Widget>[
                     Icon(Icons.file_upload),
                     Text('Upload'),
                   ],
                 ),
                 onFileLoading: (val) {
-                  print(val);
+                  debugPrint(val.toString());
                 },
               ),
-              SizedBox(height: 20),
+              const SizedBox(height: 20),
               ElevatedButton(
-                child: Text('Submit'),
+                child: const Text('Submit'),
                 onPressed: () {
                   _formKey.currentState!.save();
-                  print(_formKey.currentState!.value);
+                  debugPrint(_formKey.currentState!.value.toString());
                 },
               ),
             ],

example/pubspec.lock

@@ -70,7 +70,7 @@ packages:
       name: file_picker
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.0.3"
+    version: "4.1.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -82,12 +82,14 @@ packages:
       name: flutter_form_builder
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.0.1"
-  flutter_localizations:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.0"
+    version: "7.0.0-beta.0"
+  flutter_lints:
+    dependency: "direct dev"
+    description:
+      name: flutter_lints
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.4"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
@@ -111,7 +113,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.2.0-nullsafety.3"
+    version: "2.0.0-alpha.0"
   intl:
     dependency: transitive
     description:
@@ -126,6 +128,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.6.3"
+  lints:
+    dependency: transitive
+    description:
+      name: lints
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.1"
   matcher:
     dependency: transitive
     description:

example/pubspec.yaml

@@ -10,11 +10,12 @@ dependencies:
   flutter:
     sdk: flutter
 
-  flutter_form_builder: ^6.0.0
+  flutter_form_builder: ^7.0.0-beta.0
   form_builder_file_picker:
     path: ../
 
 dev_dependencies:
+  flutter_lints: ^1.0.4
   flutter_test:
     sdk: flutter
 

example/test/widget_test.dart

@@ -13,7 +13,7 @@ import 'package:example/main.dart';
 void main() {
   testWidgets('Counter increments smoke test', (WidgetTester tester) async {
     // Build our app and trigger a frame.
-    await tester.pumpWidget(MyApp());
+    await tester.pumpWidget(const MyApp());
 
     // Verify that our counter starts at 0.
     expect(find.text('0'), findsOneWidget);

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;
 
@@ -52,7 +52,7 @@ class FormBuilderFilePicker extends FormBuilderField<List<PlatformFile>?> {
     Key? key,
     required String name,
     FormFieldValidator<List<PlatformFile>>? validator,
-    List<PlatformFile>? initialValue,
+    List<PlatformFile> initialValue = const [],
     InputDecoration decoration = const InputDecoration(),
     ValueChanged<List<PlatformFile>?>? onChanged,
     ValueTransformer<List<PlatformFile>?>? valueTransformer,
@@ -88,7 +88,7 @@ class FormBuilderFilePicker extends FormBuilderField<List<PlatformFile>?> {
             final state = field as _FormBuilderFilePickerState;
 
             return InputDecorator(
-              decoration: state.decoration(),
+              decoration: state.decoration,
               child: Column(
                 children: <Widget>[
                   Row(
@@ -176,17 +176,15 @@ class _FormBuilderFilePickerState
     if (!mounted) return;
 
     if (resultList != null) {
-      setState(() => _files.addAll(resultList!.files));
+      setState(() => _files = [..._files, ...resultList!.files]);
       // TODO: Pick only remaining number
       field.didChange(_files);
       widget.onChanged?.call(_files);
     }
   }
 
   void removeFileAtIndex(int index, FormFieldState<List<PlatformFile>?> field) {
-    setState(() {
-      _files.removeAt(index);
-    });
+    setState(() => _files.removeAt(index));
     field.didChange(_files);
     widget.onChanged?.call(_files);
   }
@@ -239,7 +237,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

@@ -70,7 +70,7 @@ packages:
       name: file_picker
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.0.3"
+    version: "4.1.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -82,12 +82,14 @@ packages:
       name: flutter_form_builder
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.0.1"
-  flutter_localizations:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.0"
+    version: "7.0.0-beta.0"
+  flutter_lints:
+    dependency: "direct dev"
+    description:
+      name: flutter_lints
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.4"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
@@ -119,6 +121,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.6.3"
+  lints:
+    dependency: transitive
+    description:
+      name: lints
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.1"
   matcher:
     dependency: transitive
     description:
@@ -140,13 +149,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.8.0"
-  pedantic:
-    dependency: "direct dev"
-    description:
-      name: pedantic
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.11.1"
   permission_handler:
     dependency: "direct main"
     description:

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.3
+version: 2.0.0-alpha.0
 homepage: https://github.com/danvick/form_builder_file_picker
 
 environment:
@@ -10,13 +10,13 @@ dependencies:
   flutter:
     sdk: flutter
 
-  flutter_form_builder: ^6.0.1
-  file_picker: ^4.0.3
+  flutter_form_builder: ^7.0.0-beta.0
+  file_picker: ^4.1.0
   permission_handler: ^8.1.6
   community_material_icon: ^5.9.55
 
 dev_dependencies:
+  flutter_lints: ^1.0.4
   flutter_test:
     sdk: flutter
-  pedantic: ^1.11.1
 flutter: