From 562f4c99e920da2d8c5200e869c0ad52c129ce20 Mon Sep 17 00:00:00 2001
From: Ellet <73608287+freshtechtips@users.noreply.github.com>
Date: Thu, 9 Nov 2023 20:22:11 +0300
Subject: [PATCH] Fix test failures + New adjustments

---
 .../models/themes/quill_custom_button.dart    | 43 -------------------
 lib/src/widgets/toolbar/toolbar.dart          | 17 --------
 test/bug_fix_test.dart                        |  1 +
 3 files changed, 1 insertion(+), 60 deletions(-)
 delete mode 100644 lib/src/models/themes/quill_custom_button.dart

diff --git a/lib/src/models/themes/quill_custom_button.dart b/lib/src/models/themes/quill_custom_button.dart
deleted file mode 100644
index eaac9d7b..00000000
--- a/lib/src/models/themes/quill_custom_button.dart
+++ /dev/null
@@ -1,43 +0,0 @@
-// import 'package:flutter/material.dart';
-
-// import '../../widgets/toolbar/base_toolbar.dart';
-
-<<<<<<< HEAD
-// class QuillCustomButton extends QuillToolbarBaseButtonOptions {
-//   const QuillCustomButton({
-//     this.icon,
-//     this.onTap,
-//     super.tooltip,
-//     this.child,
-//     super.iconTheme,
-//   });
-
-//   /// The icon widget
-//   final Widget? icon;
-
-//   /// The function when the icon is tapped
-//   final VoidCallback? onTap;
-
-//   /// The customButton placeholder
-//   final Widget? child;
-// }
-=======
-class QuillCustomButton extends QuillToolbarBaseButtonOptions {
-  const QuillCustomButton({
-    this.icon,
-    this.onTap,
-    super.tooltip,
-    this.child,
-    super.iconTheme,
-  });
-
-  /// The icon widget
-  final Widget? icon;
-
-  /// The function when the icon is tapped
-  final VoidCallback? onTap;
-
-  /// The customButton placeholder
-  final Widget? child;
-}
->>>>>>> ad642da (Update QuillCustomButton)
diff --git a/lib/src/widgets/toolbar/toolbar.dart b/lib/src/widgets/toolbar/toolbar.dart
index 6415969d..1361e550 100644
--- a/lib/src/widgets/toolbar/toolbar.dart
+++ b/lib/src/widgets/toolbar/toolbar.dart
@@ -411,7 +411,6 @@ class QuillToolbar extends StatelessWidget {
                     space: configurations.sectionDividerSpace,
                   ),
                 for (final customButton in configurations.customButtons)
-<<<<<<< HEAD
                   QuillToolbarCustomButton(
                     options: customButton,
                     controller: customButton.controller ?? globalController,
@@ -430,22 +429,6 @@ class QuillToolbar extends StatelessWidget {
                 //         globalController,
                 //   ),
                 // ],
-=======
-                  if (customButton.child != null) ...[
-                    InkWell(
-                      onTap: customButton.onTap,
-                      child: customButton.child,
-                    ),
-                  ] else ...[
-                    QuillToolbarCustomButton(
-                      options:
-                          toolbarConfigurations.buttonOptions.customButtons,
-                      controller: toolbarConfigurations
-                              .buttonOptions.customButtons.controller ??
-                          globalController,
-                    ),
-                  ],
->>>>>>> ad642da (Update QuillCustomButton)
                 spacerWidget,
               ],
             ];
diff --git a/test/bug_fix_test.dart b/test/bug_fix_test.dart
index 81849459..635b8dcc 100644
--- a/test/bug_fix_test.dart
+++ b/test/bug_fix_test.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_quill/flutter_quill.dart';
+import 'package:flutter_quill/src/models/config/toolbar/buttons/custom_button.dart';
 import 'package:flutter_quill_test/flutter_quill_test.dart';
 import 'package:flutter_test/flutter_test.dart';