From 90658ba0addf42f8acc258d541b6efff23a7cbb9 Mon Sep 17 00:00:00 2001 From: Ellet Date: Tue, 12 Dec 2023 13:09:17 +0300 Subject: [PATCH] Remove the controller option for each button --- CHANGELOG.md | 2 +- .../lib/flutter_quill_extensions.dart | 6 +- .../models/config/toolbar/buttons/camera.dart | 1 - .../models/config/toolbar/buttons/image.dart | 1 - .../config/toolbar/buttons/media_button.dart | 1 - .../models/config/toolbar/buttons/video.dart | 1 - ...s.dart => base_button_configurations.dart} | 16 +-- .../buttons/clear_format_configurations.dart | 1 - .../toolbar/buttons/color_configurations.dart | 3 +- .../buttons/custom_button_configurations.dart | 3 +- .../buttons/font_family_configurations.dart | 4 - .../buttons/font_size_configurations.dart | 3 - .../buttons/history_configurations.dart | 1 - .../buttons/indent_configurations.dart | 3 +- .../buttons/link_style2_configurations.dart | 3 +- .../buttons/link_style_configurations.dart | 1 - .../buttons/search_configurations.dart | 1 - .../select_alignment_configurations.dart | 3 +- .../select_header_style_configurations.dart | 1 - .../toggle_check_list_configurations.dart | 1 - .../buttons/toggle_style_configurations.dart | 3 +- .../simple_toolbar_configurations.dart | 4 +- lib/src/widgets/toolbar/base_toolbar.dart | 2 +- .../toolbar/buttons/clear_format_button.dart | 1 - .../toolbar/buttons/custom_button_button.dart | 1 - .../toolbar/buttons/font_size_button.dart | 1 - .../toolbar/buttons/history_button.dart | 1 - .../toolbar/buttons/link_style_button.dart | 1 - .../toolbar/buttons/search/search_button.dart | 1 - .../buttons/toggle_check_list_button.dart | 3 +- .../toolbar/buttons/toggle_style_button.dart | 1 - lib/src/widgets/toolbar/simple_toolbar.dart | 107 +++++------------- 32 files changed, 46 insertions(+), 136 deletions(-) rename lib/src/models/config/toolbar/{buttons/base_configurations.dart => base_button_configurations.dart} (82%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5af421ed..cb8ee2c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ All notable changes to this project will be documented in this file. ## 9.0.2-dev -* **Breaking change** Remove the spacer widget +* **Breaking change** Remove the spacer widget, removed the controller option for each button ## 9.0.1 * Fix default icon size diff --git a/flutter_quill_extensions/lib/flutter_quill_extensions.dart b/flutter_quill_extensions/lib/flutter_quill_extensions.dart index d7492043..fc4297d2 100644 --- a/flutter_quill_extensions/lib/flutter_quill_extensions.dart +++ b/flutter_quill_extensions/lib/flutter_quill_extensions.dart @@ -180,19 +180,19 @@ class FlutterQuillEmbeds { if (imageButtonOptions != null) (controller, toolbarIconSize, iconTheme, dialogTheme) => QuillToolbarImageButton( - controller: imageButtonOptions.controller ?? controller, + controller: controller, options: imageButtonOptions, ), if (videoButtonOptions != null) (controller, toolbarIconSize, iconTheme, dialogTheme) => QuillToolbarVideoButton( - controller: videoButtonOptions.controller ?? controller, + controller: controller, options: videoButtonOptions, ), if (cameraButtonOptions != null) (controller, toolbarIconSize, iconTheme, dialogTheme) => QuillToolbarCameraButton( - controller: cameraButtonOptions.controller ?? controller, + controller: controller, options: cameraButtonOptions, ), // TODO: We will return the support for this later diff --git a/flutter_quill_extensions/lib/models/config/toolbar/buttons/camera.dart b/flutter_quill_extensions/lib/models/config/toolbar/buttons/camera.dart index 32e2f754..97e9accf 100644 --- a/flutter_quill_extensions/lib/models/config/toolbar/buttons/camera.dart +++ b/flutter_quill_extensions/lib/models/config/toolbar/buttons/camera.dart @@ -24,7 +24,6 @@ class QuillToolbarCameraButtonOptions extends QuillToolbarBaseButtonOptions< super.tooltip, super.iconTheme, super.childBuilder, - super.controller, }); final double? iconSize; diff --git a/flutter_quill_extensions/lib/models/config/toolbar/buttons/image.dart b/flutter_quill_extensions/lib/models/config/toolbar/buttons/image.dart index 61e8901a..79ff1034 100644 --- a/flutter_quill_extensions/lib/models/config/toolbar/buttons/image.dart +++ b/flutter_quill_extensions/lib/models/config/toolbar/buttons/image.dart @@ -18,7 +18,6 @@ class QuillToolbarImageButtonOptions extends QuillToolbarBaseButtonOptions< QuillToolbarImageButtonOptions, QuillToolbarImageButtonExtraOptions> { const QuillToolbarImageButtonOptions({ super.iconData, - super.controller, this.iconSize, this.iconButtonFactor, diff --git a/flutter_quill_extensions/lib/models/config/toolbar/buttons/media_button.dart b/flutter_quill_extensions/lib/models/config/toolbar/buttons/media_button.dart index d55f20f1..c263ee0c 100644 --- a/flutter_quill_extensions/lib/models/config/toolbar/buttons/media_button.dart +++ b/flutter_quill_extensions/lib/models/config/toolbar/buttons/media_button.dart @@ -38,7 +38,6 @@ class QuillToolbarMediaButtonOptions extends QuillToolbarBaseButtonOptions< super.tooltip, super.iconTheme, super.childBuilder, - super.controller, }); final double? iconSize; diff --git a/flutter_quill_extensions/lib/models/config/toolbar/buttons/video.dart b/flutter_quill_extensions/lib/models/config/toolbar/buttons/video.dart index e1f86a76..f7d5c7a7 100644 --- a/flutter_quill_extensions/lib/models/config/toolbar/buttons/video.dart +++ b/flutter_quill_extensions/lib/models/config/toolbar/buttons/video.dart @@ -25,7 +25,6 @@ class QuillToolbarVideoButtonOptions extends QuillToolbarBaseButtonOptions< super.tooltip, super.iconTheme, super.childBuilder, - super.controller, this.videoConfigurations = const QuillToolbarVideoConfigurations(), }); diff --git a/lib/src/models/config/toolbar/buttons/base_configurations.dart b/lib/src/models/config/toolbar/base_button_configurations.dart similarity index 82% rename from lib/src/models/config/toolbar/buttons/base_configurations.dart rename to lib/src/models/config/toolbar/base_button_configurations.dart index 91058591..c4edf36c 100644 --- a/lib/src/models/config/toolbar/buttons/base_configurations.dart +++ b/lib/src/models/config/toolbar/base_button_configurations.dart @@ -2,10 +2,9 @@ import 'package:equatable/equatable.dart'; import 'package:flutter/foundation.dart' show VoidCallback, immutable; import 'package:flutter/widgets.dart' show BuildContext, IconData, Widget; -import '../../../../../flutter_quill.dart' show QuillController; -import '../../../themes/quill_icon_theme.dart' show QuillIconTheme; -import '../../quill_configurations.dart' - show kDefaultIconSize, kIconButtonFactor; +import '../../../../flutter_quill.dart' show QuillController; +import '../../themes/quill_icon_theme.dart' show QuillIconTheme; +import '../quill_configurations.dart' show kDefaultIconSize, kIconButtonFactor; class QuillToolbarBaseButtonExtraOptionsIsToggled extends Equatable { const QuillToolbarBaseButtonExtraOptionsIsToggled(this.isToggled); @@ -52,7 +51,6 @@ class QuillToolbarBaseButtonOptions extends Equatable { this.tooltip, this.iconTheme, this.childBuilder, - this.controller, }); /// By default it will use a Icon data from Icons which comes from material @@ -81,13 +79,6 @@ class QuillToolbarBaseButtonOptions extends Equatable { /// If you want to dispaly a differnet widget based using a builder final QuillToolbarButtonOptionsChildBuilder childBuilder; - /// By default it will be from the one in [QuillEditor] or [QuillToolbar] - /// To override it you must pass not null controller - /// if you wish to use the controller in the [childBuilder], please use the - /// one from the extraOptions since it will be not null and will be the one - /// which will be used from the quill toolbar - final QuillController? controller; - @override List get props => [ iconData, @@ -96,7 +87,6 @@ class QuillToolbarBaseButtonOptions extends Equatable { tooltip, iconTheme, childBuilder, - controller, ]; } diff --git a/lib/src/models/config/toolbar/buttons/clear_format_configurations.dart b/lib/src/models/config/toolbar/buttons/clear_format_configurations.dart index d34eef84..04bb8b05 100644 --- a/lib/src/models/config/toolbar/buttons/clear_format_configurations.dart +++ b/lib/src/models/config/toolbar/buttons/clear_format_configurations.dart @@ -16,7 +16,6 @@ class QuillToolbarClearFormatButtonOptions super.iconData, super.afterButtonPressed, super.childBuilder, - super.controller, super.iconTheme, super.tooltip, this.iconSize, diff --git a/lib/src/models/config/toolbar/buttons/color_configurations.dart b/lib/src/models/config/toolbar/buttons/color_configurations.dart index b3c08c25..5a00e0e5 100644 --- a/lib/src/models/config/toolbar/buttons/color_configurations.dart +++ b/lib/src/models/config/toolbar/buttons/color_configurations.dart @@ -2,7 +2,7 @@ import 'package:flutter/widgets.dart' show Color; import '../../../../widgets/quill/quill_controller.dart'; import '../../quill_shared_configurations.dart' show QuillSharedConfigurations; -import 'base_configurations.dart'; +import '../base_button_configurations.dart'; class QuillToolbarColorButtonExtraOptions extends QuillToolbarBaseButtonExtraOptions { @@ -31,7 +31,6 @@ class QuillToolbarColorButtonOptions extends QuillToolbarBaseButtonOptions< super.iconData, super.afterButtonPressed, super.childBuilder, - super.controller, super.iconTheme, super.tooltip, this.customOnPressedCallback, diff --git a/lib/src/models/config/toolbar/buttons/custom_button_configurations.dart b/lib/src/models/config/toolbar/buttons/custom_button_configurations.dart index 3c6f3d7b..44fc79fb 100644 --- a/lib/src/models/config/toolbar/buttons/custom_button_configurations.dart +++ b/lib/src/models/config/toolbar/buttons/custom_button_configurations.dart @@ -1,6 +1,6 @@ import 'package:flutter/widgets.dart' show VoidCallback, Widget; -import 'base_configurations.dart'; +import '../base_button_configurations.dart'; class QuillToolbarCustomButtonExtraOptions extends QuillToolbarBaseButtonExtraOptions { @@ -21,7 +21,6 @@ class QuillToolbarCustomButtonOptions extends QuillToolbarBaseButtonOptions< super.tooltip, super.iconTheme, super.childBuilder, - super.controller, this.onPressed, }); diff --git a/lib/src/models/config/toolbar/buttons/font_family_configurations.dart b/lib/src/models/config/toolbar/buttons/font_family_configurations.dart index 74b9f35b..8d7daf9e 100644 --- a/lib/src/models/config/toolbar/buttons/font_family_configurations.dart +++ b/lib/src/models/config/toolbar/buttons/font_family_configurations.dart @@ -33,7 +33,6 @@ class QuillToolbarFontFamilyButtonOptions extends QuillToolbarBaseButtonOptions< const QuillToolbarFontFamilyButtonOptions({ this.attribute = Attribute.font, this.rawItemsMap, - super.controller, super.iconData, super.afterButtonPressed, super.tooltip, @@ -92,8 +91,6 @@ class QuillToolbarFontFamilyButtonOptions extends QuillToolbarBaseButtonOptions< Color? defaultItemColor, double? iconSize, double? iconButtonFactor, - // Add properties to override inherited properties - QuillController? controller, IconData? iconData, VoidCallback? afterButtonPressed, String? tooltip, @@ -102,7 +99,6 @@ class QuillToolbarFontFamilyButtonOptions extends QuillToolbarBaseButtonOptions< return QuillToolbarFontFamilyButtonOptions( attribute: attribute ?? this.attribute, rawItemsMap: rawItemsMap ?? this.rawItemsMap, - controller: controller ?? this.controller, iconData: iconData ?? this.iconData, afterButtonPressed: afterButtonPressed ?? this.afterButtonPressed, tooltip: tooltip ?? this.tooltip, diff --git a/lib/src/models/config/toolbar/buttons/font_size_configurations.dart b/lib/src/models/config/toolbar/buttons/font_size_configurations.dart index 37ba61f1..90718a92 100644 --- a/lib/src/models/config/toolbar/buttons/font_size_configurations.dart +++ b/lib/src/models/config/toolbar/buttons/font_size_configurations.dart @@ -39,7 +39,6 @@ class QuillToolbarFontSizeButtonOptions extends QuillToolbarBaseButtonOptions< this.rawItemsMap, this.onSelected, this.attribute = Attribute.size, - super.controller, super.afterButtonPressed, super.tooltip, this.padding, @@ -93,7 +92,6 @@ class QuillToolbarFontSizeButtonOptions extends QuillToolbarBaseButtonOptions< Color? defaultItemColor, VoidCallback? afterButtonPressed, String? tooltip, - QuillController? controller, OutlinedBorder? shape, }) { return QuillToolbarFontSizeButtonOptions( @@ -112,7 +110,6 @@ class QuillToolbarFontSizeButtonOptions extends QuillToolbarBaseButtonOptions< defaultItemColor: defaultItemColor ?? this.defaultItemColor, tooltip: tooltip ?? super.tooltip, afterButtonPressed: afterButtonPressed ?? super.afterButtonPressed, - controller: controller ?? super.controller, ); } } diff --git a/lib/src/models/config/toolbar/buttons/history_configurations.dart b/lib/src/models/config/toolbar/buttons/history_configurations.dart index 5766c380..1a146679 100644 --- a/lib/src/models/config/toolbar/buttons/history_configurations.dart +++ b/lib/src/models/config/toolbar/buttons/history_configurations.dart @@ -21,7 +21,6 @@ class QuillToolbarHistoryButtonOptions extends QuillToolbarBaseButtonOptions< QuillToolbarHistoryButtonOptions, QuillToolbarHistoryButtonExtraOptions> { const QuillToolbarHistoryButtonOptions({ super.iconData, - super.controller, super.iconTheme, super.afterButtonPressed, super.tooltip, diff --git a/lib/src/models/config/toolbar/buttons/indent_configurations.dart b/lib/src/models/config/toolbar/buttons/indent_configurations.dart index 559217e7..d5e3ee99 100644 --- a/lib/src/models/config/toolbar/buttons/indent_configurations.dart +++ b/lib/src/models/config/toolbar/buttons/indent_configurations.dart @@ -1,6 +1,6 @@ import 'package:flutter/foundation.dart'; -import 'base_configurations.dart'; +import '../base_button_configurations.dart'; class QuillToolbarIndentButtonExtraOptions extends QuillToolbarBaseButtonExtraOptions { @@ -18,7 +18,6 @@ class QuillToolbarIndentButtonOptions extends QuillToolbarBaseButtonOptions< super.iconData, super.afterButtonPressed, super.childBuilder, - super.controller, super.iconTheme, super.tooltip, this.iconSize, diff --git a/lib/src/models/config/toolbar/buttons/link_style2_configurations.dart b/lib/src/models/config/toolbar/buttons/link_style2_configurations.dart index 6c977f64..170369f0 100644 --- a/lib/src/models/config/toolbar/buttons/link_style2_configurations.dart +++ b/lib/src/models/config/toolbar/buttons/link_style2_configurations.dart @@ -1,7 +1,7 @@ import 'package:flutter/widgets.dart'; import '../../../themes/quill_dialog_theme.dart'; -import 'base_configurations.dart'; +import '../base_button_configurations.dart'; class QuillToolbarLinkStyleButton2ExtraOptions extends QuillToolbarBaseButtonExtraOptions { @@ -33,7 +33,6 @@ class QuillToolbarLinkStyleButton2Options extends QuillToolbarBaseButtonOptions< super.tooltip, super.iconTheme, super.childBuilder, - super.controller, }); final double? iconSize; diff --git a/lib/src/models/config/toolbar/buttons/link_style_configurations.dart b/lib/src/models/config/toolbar/buttons/link_style_configurations.dart index e82d750e..4d5a2d39 100644 --- a/lib/src/models/config/toolbar/buttons/link_style_configurations.dart +++ b/lib/src/models/config/toolbar/buttons/link_style_configurations.dart @@ -29,7 +29,6 @@ class QuillToolbarLinkStyleButtonOptions extends QuillToolbarBaseButtonOptions< super.tooltip, super.iconTheme, super.childBuilder, - super.controller, }); final double? iconSize; diff --git a/lib/src/models/config/toolbar/buttons/search_configurations.dart b/lib/src/models/config/toolbar/buttons/search_configurations.dart index 6d18fad2..45c0ecc9 100644 --- a/lib/src/models/config/toolbar/buttons/search_configurations.dart +++ b/lib/src/models/config/toolbar/buttons/search_configurations.dart @@ -14,7 +14,6 @@ class QuillToolbarSearchButtonExtraOptions class QuillToolbarSearchButtonOptions extends QuillToolbarBaseButtonOptions { const QuillToolbarSearchButtonOptions({ super.iconData, - super.controller, super.childBuilder, super.tooltip, super.afterButtonPressed, diff --git a/lib/src/models/config/toolbar/buttons/select_alignment_configurations.dart b/lib/src/models/config/toolbar/buttons/select_alignment_configurations.dart index 7870e9a1..b3919470 100644 --- a/lib/src/models/config/toolbar/buttons/select_alignment_configurations.dart +++ b/lib/src/models/config/toolbar/buttons/select_alignment_configurations.dart @@ -1,5 +1,5 @@ import 'package:flutter/widgets.dart' show IconData, immutable; -import 'base_configurations.dart'; +import '../base_button_configurations.dart'; class QuillToolbarSelectAlignmentButtonExtraOptions extends QuillToolbarBaseButtonExtraOptions { @@ -23,7 +23,6 @@ class QuillToolbarSelectAlignmentButtonOptions /// This will called on every select alignment button super.childBuilder, - super.controller, super.iconTheme, }); final double? iconSize; diff --git a/lib/src/models/config/toolbar/buttons/select_header_style_configurations.dart b/lib/src/models/config/toolbar/buttons/select_header_style_configurations.dart index 975b4770..3d5860c9 100644 --- a/lib/src/models/config/toolbar/buttons/select_header_style_configurations.dart +++ b/lib/src/models/config/toolbar/buttons/select_header_style_configurations.dart @@ -19,7 +19,6 @@ class QuillToolbarSelectHeaderStyleButtonsOptions const QuillToolbarSelectHeaderStyleButtonsOptions({ super.afterButtonPressed, super.childBuilder, - super.controller, super.iconTheme, super.tooltip, this.axis, diff --git a/lib/src/models/config/toolbar/buttons/toggle_check_list_configurations.dart b/lib/src/models/config/toolbar/buttons/toggle_check_list_configurations.dart index 54d456b9..de9dfe65 100644 --- a/lib/src/models/config/toolbar/buttons/toggle_check_list_configurations.dart +++ b/lib/src/models/config/toolbar/buttons/toggle_check_list_configurations.dart @@ -26,7 +26,6 @@ class QuillToolbarToggleCheckListButtonOptions this.fillColor, this.attribute = Attribute.unchecked, this.isShouldRequestKeyboard = false, - super.controller, super.iconTheme, super.tooltip, super.iconData, diff --git a/lib/src/models/config/toolbar/buttons/toggle_style_configurations.dart b/lib/src/models/config/toolbar/buttons/toggle_style_configurations.dart index 4ea2ea0f..d8d0e3e2 100644 --- a/lib/src/models/config/toolbar/buttons/toggle_style_configurations.dart +++ b/lib/src/models/config/toolbar/buttons/toggle_style_configurations.dart @@ -2,7 +2,7 @@ import 'package:flutter/foundation.dart' show immutable; import 'package:flutter/widgets.dart' show Color; -import 'base_configurations.dart'; +import '../base_button_configurations.dart'; class QuillToolbarToggleStyleButtonExtraOptions extends QuillToolbarBaseButtonExtraOptions @@ -31,7 +31,6 @@ class QuillToolbarToggleStyleButtonOptions super.afterButtonPressed, super.iconTheme, super.childBuilder, - super.controller, }); final double? iconSize; diff --git a/lib/src/models/config/toolbar/simple_toolbar_configurations.dart b/lib/src/models/config/toolbar/simple_toolbar_configurations.dart index 1179b559..a5fa4636 100644 --- a/lib/src/models/config/toolbar/simple_toolbar_configurations.dart +++ b/lib/src/models/config/toolbar/simple_toolbar_configurations.dart @@ -8,7 +8,7 @@ import '../../../widgets/quill/embeds.dart'; import '../../../widgets/quill/quill_controller.dart'; import '../../themes/quill_dialog_theme.dart'; import '../../themes/quill_icon_theme.dart'; -import 'buttons/base_configurations.dart'; +import 'base_button_configurations.dart'; import 'buttons/clear_format_configurations.dart'; import 'buttons/color_configurations.dart'; import 'buttons/custom_button_configurations.dart'; @@ -26,7 +26,7 @@ import 'buttons/toggle_style_configurations.dart'; import 'toolbar_shared_configurations.dart'; export './../../../widgets/toolbar/buttons/search/search_dialog.dart'; -export 'buttons/base_configurations.dart'; +export 'base_button_configurations.dart'; export 'buttons/clear_format_configurations.dart'; export 'buttons/color_configurations.dart'; export 'buttons/custom_button_configurations.dart'; diff --git a/lib/src/widgets/toolbar/base_toolbar.dart b/lib/src/widgets/toolbar/base_toolbar.dart index bd051cc9..03e31d78 100644 --- a/lib/src/widgets/toolbar/base_toolbar.dart +++ b/lib/src/widgets/toolbar/base_toolbar.dart @@ -7,7 +7,7 @@ import '../../models/config/toolbar/simple_toolbar_configurations.dart'; import '../../models/config/toolbar/toolbar_configurations.dart'; import 'simple_toolbar.dart'; -export '../../models/config/toolbar/buttons/base_configurations.dart'; +export '../../models/config/toolbar/base_button_configurations.dart'; export '../../models/config/toolbar/simple_toolbar_configurations.dart'; export 'buttons/clear_format_button.dart'; export 'buttons/color/color_button.dart'; diff --git a/lib/src/widgets/toolbar/buttons/clear_format_button.dart b/lib/src/widgets/toolbar/buttons/clear_format_button.dart index 75147411..88e9a459 100644 --- a/lib/src/widgets/toolbar/buttons/clear_format_button.dart +++ b/lib/src/widgets/toolbar/buttons/clear_format_button.dart @@ -87,7 +87,6 @@ class QuillToolbarClearFormatButton extends StatelessWidget { return childBuilder( QuillToolbarClearFormatButtonOptions( afterButtonPressed: afterButtonPressed, - controller: controller, iconData: iconData, iconSize: iconSize, iconButtonFactor: iconButtonFactor, diff --git a/lib/src/widgets/toolbar/buttons/custom_button_button.dart b/lib/src/widgets/toolbar/buttons/custom_button_button.dart index 825b3d2f..f77b4a1e 100644 --- a/lib/src/widgets/toolbar/buttons/custom_button_button.dart +++ b/lib/src/widgets/toolbar/buttons/custom_button_button.dart @@ -67,7 +67,6 @@ class QuillToolbarCustomButton extends StatelessWidget { iconButtonFactor: iconButtonFactor, iconSize: iconSize, afterButtonPressed: afterButtonPressed, - controller: controller, iconTheme: iconTheme, tooltip: tooltip, icon: options.icon, diff --git a/lib/src/widgets/toolbar/buttons/font_size_button.dart b/lib/src/widgets/toolbar/buttons/font_size_button.dart index 54a14b6b..aa2c94ad 100644 --- a/lib/src/widgets/toolbar/buttons/font_size_button.dart +++ b/lib/src/widgets/toolbar/buttons/font_size_button.dart @@ -127,7 +127,6 @@ class QuillToolbarFontSizeButtonState iconSize: iconSize, iconButtonFactor: iconButtonFactor, afterButtonPressed: afterButtonPressed, - controller: controller, ), QuillToolbarFontSizeButtonExtraOptions( controller: controller, diff --git a/lib/src/widgets/toolbar/buttons/history_button.dart b/lib/src/widgets/toolbar/buttons/history_button.dart index 5436e74c..1c778f11 100644 --- a/lib/src/widgets/toolbar/buttons/history_button.dart +++ b/lib/src/widgets/toolbar/buttons/history_button.dart @@ -77,7 +77,6 @@ class QuillToolbarHistoryButtonState extends State { return childBuilder( QuillToolbarHistoryButtonOptions( afterButtonPressed: afterButtonPressed, - controller: controller, iconData: iconData, iconSize: iconSize, iconButtonFactor: iconButtonFactor, diff --git a/lib/src/widgets/toolbar/buttons/link_style_button.dart b/lib/src/widgets/toolbar/buttons/link_style_button.dart index 33ae60e9..2fa6047a 100644 --- a/lib/src/widgets/toolbar/buttons/link_style_button.dart +++ b/lib/src/widgets/toolbar/buttons/link_style_button.dart @@ -117,7 +117,6 @@ class QuillToolbarLinkStyleButtonState return childBuilder( QuillToolbarLinkStyleButtonOptions( afterButtonPressed: afterButtonPressed, - controller: controller, dialogBarrierColor: dialogBarrierColor, dialogTheme: options.dialogTheme, iconData: iconData, diff --git a/lib/src/widgets/toolbar/buttons/search/search_button.dart b/lib/src/widgets/toolbar/buttons/search/search_button.dart index 78936d35..572d4885 100644 --- a/lib/src/widgets/toolbar/buttons/search/search_button.dart +++ b/lib/src/widgets/toolbar/buttons/search/search_button.dart @@ -87,7 +87,6 @@ class QuillToolbarSearchButton extends StatelessWidget { return childBuilder( QuillToolbarSearchButtonOptions( afterButtonPressed: afterButtonPressed, - controller: controller, dialogBarrierColor: _dialogBarrierColor(context), dialogTheme: _dialogTheme(context), fillColor: options.fillColor, diff --git a/lib/src/widgets/toolbar/buttons/toggle_check_list_button.dart b/lib/src/widgets/toolbar/buttons/toggle_check_list_button.dart index 7c2ba94f..32527165 100644 --- a/lib/src/widgets/toolbar/buttons/toggle_check_list_button.dart +++ b/lib/src/widgets/toolbar/buttons/toggle_check_list_button.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import '../../../extensions/quill_configurations_ext.dart'; import '../../../l10n/extensions/localizations.dart'; -import '../../../models/config/toolbar/buttons/base_configurations.dart'; +import '../../../models/config/toolbar/base_button_configurations.dart'; import '../../../models/config/toolbar/buttons/toggle_check_list_configurations.dart'; import '../../../models/documents/attribute.dart'; import '../../../models/documents/style.dart'; @@ -133,7 +133,6 @@ class QuillToolbarToggleCheckListButtonState QuillToolbarToggleCheckListButtonOptions( afterButtonPressed: afterButtonPressed, iconTheme: iconTheme, - controller: controller, iconSize: iconSize, iconButtonFactor: iconButtonFactor, tooltip: tooltip, diff --git a/lib/src/widgets/toolbar/buttons/toggle_style_button.dart b/lib/src/widgets/toolbar/buttons/toggle_style_button.dart index fd558ebb..1202c611 100644 --- a/lib/src/widgets/toolbar/buttons/toggle_style_button.dart +++ b/lib/src/widgets/toolbar/buttons/toggle_style_button.dart @@ -155,7 +155,6 @@ class QuillToolbarToggleStyleButtonState return childBuilder( QuillToolbarToggleStyleButtonOptions( afterButtonPressed: options.afterButtonPressed, - controller: controller, fillColor: options.fillColor, iconButtonFactor: options.iconButtonFactor, iconData: iconData, diff --git a/lib/src/widgets/toolbar/simple_toolbar.dart b/lib/src/widgets/toolbar/simple_toolbar.dart index f21c798d..fafac046 100644 --- a/lib/src/widgets/toolbar/simple_toolbar.dart +++ b/lib/src/widgets/toolbar/simple_toolbar.dart @@ -66,114 +66,89 @@ class QuillSimpleToolbar extends StatelessWidget QuillToolbarHistoryButton( isUndo: true, options: toolbarConfigurations.buttonOptions.undoHistory, - controller: - toolbarConfigurations.buttonOptions.undoHistory.controller ?? - globalController, + controller: globalController, ), if (configurations.showRedo) QuillToolbarHistoryButton( isUndo: false, options: toolbarConfigurations.buttonOptions.redoHistory, - controller: - toolbarConfigurations.buttonOptions.redoHistory.controller ?? - globalController, + controller: globalController, ), if (configurations.showFontFamily) QuillToolbarFontFamilyButton( options: toolbarConfigurations.buttonOptions.fontFamily, - controller: - toolbarConfigurations.buttonOptions.fontFamily.controller ?? - globalController, + controller: globalController, defaultDispalyText: context.loc.font, ), if (configurations.showFontSize) QuillToolbarFontSizeButton( options: toolbarConfigurations.buttonOptions.fontSize, - controller: - toolbarConfigurations.buttonOptions.fontFamily.controller ?? - globalController, + controller: globalController, defaultDisplayText: context.loc.fontSize, ), if (configurations.showBoldButton) QuillToolbarToggleStyleButton( attribute: Attribute.bold, options: toolbarConfigurations.buttonOptions.bold, - controller: toolbarConfigurations.buttonOptions.bold.controller ?? - globalController, + controller: globalController, ), if (configurations.showItalicButton) QuillToolbarToggleStyleButton( attribute: Attribute.italic, options: toolbarConfigurations.buttonOptions.italic, - controller: toolbarConfigurations.buttonOptions.italic.controller ?? - globalController, + controller: globalController, ), if (configurations.showUnderLineButton) QuillToolbarToggleStyleButton( attribute: Attribute.underline, options: toolbarConfigurations.buttonOptions.underLine, - controller: - toolbarConfigurations.buttonOptions.underLine.controller ?? - globalController, + controller: globalController, ), if (configurations.showStrikeThrough) QuillToolbarToggleStyleButton( attribute: Attribute.strikeThrough, options: toolbarConfigurations.buttonOptions.strikeThrough, - controller: - toolbarConfigurations.buttonOptions.strikeThrough.controller ?? - globalController, + controller: globalController, ), if (configurations.showInlineCode) QuillToolbarToggleStyleButton( attribute: Attribute.inlineCode, options: toolbarConfigurations.buttonOptions.inlineCode, - controller: - toolbarConfigurations.buttonOptions.inlineCode.controller ?? - globalController, + controller: globalController, ), if (configurations.showSubscript) QuillToolbarToggleStyleButton( attribute: Attribute.subscript, options: toolbarConfigurations.buttonOptions.subscript, - controller: - toolbarConfigurations.buttonOptions.subscript.controller ?? - globalController, + controller: globalController, ), if (configurations.showSuperscript) QuillToolbarToggleStyleButton( attribute: Attribute.superscript, options: toolbarConfigurations.buttonOptions.superscript, - controller: - toolbarConfigurations.buttonOptions.superscript.controller ?? - globalController, + controller: globalController, ), if (configurations.showSmallButton) QuillToolbarToggleStyleButton( attribute: Attribute.small, options: toolbarConfigurations.buttonOptions.small, - controller: toolbarConfigurations.buttonOptions.small.controller ?? - globalController, + controller: globalController, ), if (configurations.showColorButton) QuillToolbarColorButton( - controller: toolbarConfigurations.buttonOptions.color.controller ?? - globalController, + controller: globalController, isBackground: false, options: toolbarConfigurations.buttonOptions.color, ), if (configurations.showBackgroundColorButton) QuillToolbarColorButton( options: toolbarConfigurations.buttonOptions.backgroundColor, - controller: toolbarConfigurations.buttonOptions.color.controller ?? - globalController, + controller: globalController, isBackground: true, ), if (configurations.showClearFormat) QuillToolbarClearFormatButton( - controller: - toolbarConfigurations.buttonOptions.clearFormat.controller ?? - globalController, + controller: globalController, options: toolbarConfigurations.buttonOptions.clearFormat, ), if (theEmbedButtons != null) @@ -197,9 +172,7 @@ class QuillSimpleToolbar extends StatelessWidget ), if (configurations.showAlignmentButtons) QuillToolbarSelectAlignmentButtons( - controller: toolbarConfigurations - .buttonOptions.selectAlignmentButtons.controller ?? - globalController, + controller: globalController, options: toolbarConfigurations.buttonOptions.selectAlignmentButtons, showLeftAlignment: configurations.showLeftAlignment, showCenterAlignment: configurations.showCenterAlignment, @@ -210,9 +183,7 @@ class QuillSimpleToolbar extends StatelessWidget QuillToolbarToggleStyleButton( attribute: Attribute.rtl, options: toolbarConfigurations.buttonOptions.direction, - controller: - toolbarConfigurations.buttonOptions.direction.controller ?? - globalController, + controller: globalController, ), if (configurations.showDividers && isButtonGroupShown[1] && @@ -227,9 +198,7 @@ class QuillSimpleToolbar extends StatelessWidget ), if (configurations.showHeaderStyle) QuillToolbarSelectHeaderStyleButton( - controller: toolbarConfigurations - .buttonOptions.selectHeaderStyleButtons.controller ?? - globalController, + controller: globalController, options: toolbarConfigurations.buttonOptions.selectHeaderStyleButtons, ), @@ -248,32 +217,24 @@ class QuillSimpleToolbar extends StatelessWidget QuillToolbarToggleStyleButton( attribute: Attribute.ol, options: toolbarConfigurations.buttonOptions.listNumbers, - controller: - toolbarConfigurations.buttonOptions.listNumbers.controller ?? - globalController, + controller: globalController, ), if (configurations.showListBullets) QuillToolbarToggleStyleButton( attribute: Attribute.ul, options: toolbarConfigurations.buttonOptions.listBullets, - controller: - toolbarConfigurations.buttonOptions.listBullets.controller ?? - globalController, + controller: globalController, ), if (configurations.showListCheck) QuillToolbarToggleCheckListButton( options: toolbarConfigurations.buttonOptions.toggleCheckList, - controller: toolbarConfigurations - .buttonOptions.toggleCheckList.controller ?? - globalController, + controller: globalController, ), if (configurations.showCodeBlock) QuillToolbarToggleStyleButton( attribute: Attribute.codeBlock, options: toolbarConfigurations.buttonOptions.codeBlock, - controller: - toolbarConfigurations.buttonOptions.codeBlock.controller ?? - globalController, + controller: globalController, ), if (configurations.showDividers && isButtonGroupShown[3] && @@ -287,23 +248,18 @@ class QuillSimpleToolbar extends StatelessWidget if (configurations.showQuote) QuillToolbarToggleStyleButton( options: toolbarConfigurations.buttonOptions.quote, - controller: toolbarConfigurations.buttonOptions.quote.controller ?? - globalController, + controller: globalController, attribute: Attribute.blockQuote, ), if (configurations.showIndent) QuillToolbarIndentButton( - controller: - toolbarConfigurations.buttonOptions.indentIncrease.controller ?? - globalController, + controller: globalController, isIncrease: true, options: toolbarConfigurations.buttonOptions.indentIncrease, ), if (configurations.showIndent) QuillToolbarIndentButton( - controller: - toolbarConfigurations.buttonOptions.indentDecrease.controller ?? - globalController, + controller: globalController, isIncrease: false, options: toolbarConfigurations.buttonOptions.indentDecrease, ), @@ -318,21 +274,16 @@ class QuillSimpleToolbar extends StatelessWidget if (configurations.showLink) toolbarConfigurations.linkStyleType.isOriginal ? QuillToolbarLinkStyleButton( - controller: toolbarConfigurations - .buttonOptions.linkStyle.controller ?? - globalController, + controller: globalController, options: toolbarConfigurations.buttonOptions.linkStyle, ) : QuillToolbarLinkStyleButton2( - controller: toolbarConfigurations - .buttonOptions.linkStyle2.controller ?? - globalController, + controller: globalController, options: toolbarConfigurations.buttonOptions.linkStyle2, ), if (configurations.showSearchButton) QuillToolbarSearchButton( - controller: toolbarConfigurations.buttonOptions.search.controller ?? - globalController, + controller: globalController, options: toolbarConfigurations.buttonOptions.search, ), if (configurations.customButtons.isNotEmpty) ...[ @@ -345,7 +296,7 @@ class QuillSimpleToolbar extends StatelessWidget for (final customButton in configurations.customButtons) QuillToolbarCustomButton( options: customButton, - controller: customButton.controller ?? globalController, + controller: globalController, ), // if (customButton.child != null) ...[ // InkWell(