From 7c7ab448e3b1fdff706eba7e7273229aba0d55d8 Mon Sep 17 00:00:00 2001
From: Cheryl <xinyuezhang0402@gmail.com>
Date: Wed, 17 Nov 2021 19:18:56 -0800
Subject: [PATCH] Upgrade to 2.0.18

---
 CHANGELOG.md                 |  3 +++
 lib/src/widgets/toolbar.dart | 13 +++++++++----
 pubspec.yaml                 |  2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ece66e4..ea83e903 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## [2.0.18]
+* Make toolbar dividers optional.
+
 ## [2.0.17]
 * Allow alignment of the toolbar icons to match WrapAlignment.
 
diff --git a/lib/src/widgets/toolbar.dart b/lib/src/widgets/toolbar.dart
index 32e4987e..7115ff2c 100644
--- a/lib/src/widgets/toolbar.dart
+++ b/lib/src/widgets/toolbar.dart
@@ -281,7 +281,8 @@ class QuillToolbar extends StatelessWidget implements PreferredSizeWidget {
             webVideoPickImpl: webVideoPickImpl,
             iconTheme: iconTheme,
           ),
-        if (showDividers && isButtonGroupShown[0] &&
+        if (showDividers &&
+            isButtonGroupShown[0] &&
             (isButtonGroupShown[1] ||
                 isButtonGroupShown[2] ||
                 isButtonGroupShown[3] ||
@@ -302,7 +303,8 @@ class QuillToolbar extends StatelessWidget implements PreferredSizeWidget {
             showRightAlignment: showRightAlignment,
             showJustifyAlignment: showJustifyAlignment,
           ),
-        if (showDividers && isButtonGroupShown[1] &&
+        if (showDividers &&
+            isButtonGroupShown[1] &&
             (isButtonGroupShown[2] ||
                 isButtonGroupShown[3] ||
                 isButtonGroupShown[4] ||
@@ -318,7 +320,9 @@ class QuillToolbar extends StatelessWidget implements PreferredSizeWidget {
             iconSize: toolbarIconSize,
             iconTheme: iconTheme,
           ),
-        if (showDividers && showHeaderStyle && isButtonGroupShown[2] &&
+        if (showDividers &&
+            showHeaderStyle &&
+            isButtonGroupShown[2] &&
             (isButtonGroupShown[3] ||
                 isButtonGroupShown[4] ||
                 isButtonGroupShown[5]))
@@ -359,7 +363,8 @@ class QuillToolbar extends StatelessWidget implements PreferredSizeWidget {
             iconSize: toolbarIconSize,
             iconTheme: iconTheme,
           ),
-        if (showDividers && isButtonGroupShown[3] &&
+        if (showDividers &&
+            isButtonGroupShown[3] &&
             (isButtonGroupShown[4] || isButtonGroupShown[5]))
           VerticalDivider(
             indent: 12,
diff --git a/pubspec.yaml b/pubspec.yaml
index 5da40094..2c9f219b 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: 2.0.17
+version: 2.0.18
 #author: bulletjournal
 homepage: https://bulletjournal.us/home/index.html
 repository: https://github.com/singerdmx/flutter-quill