From e8c0c484a498865973328a4a22253e45e8a356ef Mon Sep 17 00:00:00 2001
From: Xin Yao <singerdmx@gmail.com>
Date: Fri, 18 Jun 2021 09:58:51 -0700
Subject: [PATCH] Upgrade version to 1.4.0

---
 CHANGELOG.md                              |  3 +++
 example/lib/pages/home_page.dart          | 28 ++++++++++-------------
 example/lib/widgets/demo_scaffold.dart    | 15 ++++++------
 lib/src/widgets/toolbar.dart              |  2 +-
 lib/src/widgets/toolbar/image_button.dart |  6 ++---
 pubspec.yaml                              |  2 +-
 6 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a17d4d7f..cb4229be 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## [1.4.0]
+* Remove path_provider dependency.
+
 ## [1.3.4]
 * Add option to paintCursorAboveText.
 
diff --git a/example/lib/pages/home_page.dart b/example/lib/pages/home_page.dart
index 0f0650ef..57eab392 100644
--- a/example/lib/pages/home_page.dart
+++ b/example/lib/pages/home_page.dart
@@ -138,6 +138,16 @@ class _HomePageState extends State<HomePage> {
           ),
           embedBuilder: defaultEmbedBuilderWeb);
     }
+    var toolbar = QuillToolbar.basic(
+        controller: _controller!, onImagePickCallback: _onImagePickCallback);
+    const isDesktop = !kIsWeb && !Platform.isAndroid && !Platform.isIOS;
+    if (isDesktop) {
+      toolbar = QuillToolbar.basic(
+          controller: _controller!,
+          onImagePickCallback: _onImagePickCallback,
+          applicationPath: getApplicationDirectoryForDesktop());
+    }
+
     return SafeArea(
       child: Column(
         mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -155,23 +165,9 @@ class _HomePageState extends State<HomePage> {
                   child: Container(
                   padding:
                       const EdgeInsets.symmetric(vertical: 16, horizontal: 8),
-                  child: QuillToolbar.basic(
-                      controller: _controller!,
-                      onImagePickCallback: _onImagePickCallback,
-                      applicationPath:
-                      !(kIsWeb || Platform.isAndroid || Platform.isIOS)
-                          ? null
-                          : getApplicationDirectoryForDesktop()),
+                  child: toolbar,
                 ))
-              : Container(
-                  child: QuillToolbar.basic(
-                      controller: _controller!,
-                      onImagePickCallback: _onImagePickCallback,
-                      applicationPath:
-                          !(kIsWeb || Platform.isAndroid || Platform.isIOS)
-                              ? null
-                              : getApplicationDirectoryForDesktop()),
-                ),
+              : Container(child: toolbar)
         ],
       ),
     );
diff --git a/example/lib/widgets/demo_scaffold.dart b/example/lib/widgets/demo_scaffold.dart
index 3aec94b4..fe89dbb1 100644
--- a/example/lib/widgets/demo_scaffold.dart
+++ b/example/lib/widgets/demo_scaffold.dart
@@ -80,6 +80,13 @@ class _DemoScaffoldState extends State<DemoScaffold> {
   @override
   Widget build(BuildContext context) {
     final actions = widget.actions ?? <Widget>[];
+    var toolbar = QuillToolbar.basic(controller: _controller!);
+    const isDesktop = !kIsWeb && !Platform.isAndroid && !Platform.isIOS;
+    if (isDesktop) {
+      toolbar = QuillToolbar.basic(
+          controller: _controller!,
+          applicationPath: getApplicationDirectoryForDesktop());
+    }
     return Scaffold(
       key: _scaffoldKey,
       appBar: AppBar(
@@ -95,13 +102,7 @@ class _DemoScaffoldState extends State<DemoScaffold> {
           ),
           onPressed: () => Navigator.pop(context),
         ),
-        title: _loading || widget.showToolbar == false
-            ? null
-            : QuillToolbar.basic(controller: _controller!,
-            applicationPath:
-            !(kIsWeb || Platform.isAndroid || Platform.isIOS)
-                ? null
-                : getApplicationDirectoryForDesktop()),
+        title: _loading || widget.showToolbar == false ? null : toolbar,
         actions: actions,
       ),
       floatingActionButton: widget.floatingActionButton,
diff --git a/lib/src/widgets/toolbar.dart b/lib/src/widgets/toolbar.dart
index 27558c8d..d9644d19 100644
--- a/lib/src/widgets/toolbar.dart
+++ b/lib/src/widgets/toolbar.dart
@@ -283,7 +283,7 @@ class QuillToolbar extends StatelessWidget implements PreferredSizeWidget {
   /// is given.
   final Color? color;
 
-  final Directory? applicationPath;
+  final Future<Directory>? applicationPath;
 
   @override
   Size get preferredSize => Size.fromHeight(toolBarHeight);
diff --git a/lib/src/widgets/toolbar/image_button.dart b/lib/src/widgets/toolbar/image_button.dart
index 9b20e34f..7cb86d51 100644
--- a/lib/src/widgets/toolbar/image_button.dart
+++ b/lib/src/widgets/toolbar/image_button.dart
@@ -68,7 +68,7 @@ class ImageButton extends StatelessWidget {
         imageUrl = await _pickImage(imageSource);
       } else {
         assert(applicationPath != null,
-        'Desktop must provide application document directory');
+            'Desktop must provide application document directory');
         imageUrl = await _pickImageDesktop(context, applicationPath!);
       }
     }
@@ -100,8 +100,8 @@ class ImageButton extends StatelessWidget {
     return onImagePickCallback!(File(pickedFile.path));
   }
 
-  Future<String?> _pickImageDesktop(BuildContext context,
-      Future<Directory> applicationPath) async {
+  Future<String?> _pickImageDesktop(
+      BuildContext context, Future<Directory> applicationPath) async {
     final filePath = await FilesystemPicker.open(
       context: context,
       rootDirectory: await applicationPath,
diff --git a/pubspec.yaml b/pubspec.yaml
index 6b181bd6..6ab72fdd 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flutter_quill
 description: A rich text editor supporting mobile and web (Demo App @ bulletjournal.us)
-version: 1.3.4
+version: 1.4.0
 #author: bulletjournal
 homepage: https://bulletjournal.us/home/index.html
 repository: https://github.com/singerdmx/flutter-quill