diff --git a/CHANGELOG.md b/CHANGELOG.md index 31db7a5b..e432d811 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,9 +2,6 @@ All notable changes to this project will be documented in this file. -## 9.1.0 -* Because most of the users still uses material 2, we have to revert back to old buttons of `7.0.0`, take a look at [https://github.com/singerdmx/flutter-quill/pull/1621/](https://github.com/singerdmx/flutter-quill/pull/1621/) - ## 9.0.4 * Feature: [#1611](https://github.com/singerdmx/flutter-quill/issues/1611) * Export missing widgets diff --git a/example/lib/presentation/quill/my_quill_toolbar.dart b/example/lib/presentation/quill/my_quill_toolbar.dart index 582d03d6..f85dbe0b 100644 --- a/example/lib/presentation/quill/my_quill_toolbar.dart +++ b/example/lib/presentation/quill/my_quill_toolbar.dart @@ -210,7 +210,7 @@ class MyQuillToolbar extends StatelessWidget { ), selectHeaderStyleDropdownButton: const QuillToolbarSelectHeaderStyleDropdownButtonOptions( - style: TextStyle( + textStyle: TextStyle( fontSize: 20, ), iconTheme: QuillIconTheme( diff --git a/flutter_quill_extensions/CHANGELOG.md b/flutter_quill_extensions/CHANGELOG.md index 0cfa1e3e..2c013026 100644 --- a/flutter_quill_extensions/CHANGELOG.md +++ b/flutter_quill_extensions/CHANGELOG.md @@ -2,9 +2,6 @@ All notable changes to this project will be documented in this file. -## 9.1.0 -* Because most of the users still uses material 2, we have to revert back to old buttons of `7.0.0`, take a look at [https://github.com/singerdmx/flutter-quill/pull/1621/](https://github.com/singerdmx/flutter-quill/pull/1621/) - ## 9.0.4 * Feature: [#1611](https://github.com/singerdmx/flutter-quill/issues/1611) * Export missing widgets diff --git a/flutter_quill_extensions/lib/embeds/formula/toolbar/formula_button.dart b/flutter_quill_extensions/lib/embeds/formula/toolbar/formula_button.dart index e366497e..84dfdb36 100644 --- a/flutter_quill_extensions/lib/embeds/formula/toolbar/formula_button.dart +++ b/flutter_quill_extensions/lib/embeds/formula/toolbar/formula_button.dart @@ -94,6 +94,7 @@ class QuillToolbarFormulaButton extends StatelessWidget { icon: Icon(iconData, size: iconSize * iconButtonFactor, color: iconColor), tooltip: tooltip, onPressed: () => _sharedOnPressed(context), + isFilled: false, ); } diff --git a/flutter_quill_extensions/lib/embeds/image/toolbar/image_button.dart b/flutter_quill_extensions/lib/embeds/image/toolbar/image_button.dart index 45007eb8..f943dabd 100644 --- a/flutter_quill_extensions/lib/embeds/image/toolbar/image_button.dart +++ b/flutter_quill_extensions/lib/embeds/image/toolbar/image_button.dart @@ -109,6 +109,7 @@ class QuillToolbarImageButton extends StatelessWidget { color: iconColor, ), tooltip: tooltip, + isFilled: false, onPressed: () => _sharedOnPressed(context), ); } diff --git a/flutter_quill_extensions/lib/embeds/others/camera_button/camera_button.dart b/flutter_quill_extensions/lib/embeds/others/camera_button/camera_button.dart index d93d8bfd..ef7ad3da 100644 --- a/flutter_quill_extensions/lib/embeds/others/camera_button/camera_button.dart +++ b/flutter_quill_extensions/lib/embeds/others/camera_button/camera_button.dart @@ -108,6 +108,8 @@ class QuillToolbarCameraButton extends StatelessWidget { return QuillToolbarIconButton( icon: Icon(iconData, size: iconButtonFactor * iconSize, color: iconColor), tooltip: tooltip, + isFilled: false, + // isDesktop(supportWeb: false) ? null : onPressed: () => _sharedOnPressed(context), ); } diff --git a/flutter_quill_extensions/lib/embeds/video/toolbar/video_button.dart b/flutter_quill_extensions/lib/embeds/video/toolbar/video_button.dart index 84141a0c..74875978 100644 --- a/flutter_quill_extensions/lib/embeds/video/toolbar/video_button.dart +++ b/flutter_quill_extensions/lib/embeds/video/toolbar/video_button.dart @@ -108,6 +108,7 @@ class QuillToolbarVideoButton extends StatelessWidget { return QuillToolbarIconButton( icon: Icon(iconData, size: iconSize * iconButtonFactor, color: iconColor), tooltip: tooltip, + isFilled: false, onPressed: () => _sharedOnPressed(context), ); } diff --git a/flutter_quill_extensions/pubspec.yaml b/flutter_quill_extensions/pubspec.yaml index bbbab3de..eb68dbb0 100644 --- a/flutter_quill_extensions/pubspec.yaml +++ b/flutter_quill_extensions/pubspec.yaml @@ -1,6 +1,6 @@ name: flutter_quill_extensions description: Embed extensions for flutter_quill including image, video, formula and etc. -version: 9.1.0 +version: 9.0.4 homepage: https://github.com/singerdmx/flutter-quill/tree/master/flutter_quill_extensions/ repository: https://github.com/singerdmx/flutter-quill/tree/master/flutter_quill_extensions/ issue_tracker: https://github.com/singerdmx/flutter-quill/issues/ diff --git a/flutter_quill_test/CHANGELOG.md b/flutter_quill_test/CHANGELOG.md index 0cfa1e3e..2c013026 100644 --- a/flutter_quill_test/CHANGELOG.md +++ b/flutter_quill_test/CHANGELOG.md @@ -2,9 +2,6 @@ All notable changes to this project will be documented in this file. -## 9.1.0 -* Because most of the users still uses material 2, we have to revert back to old buttons of `7.0.0`, take a look at [https://github.com/singerdmx/flutter-quill/pull/1621/](https://github.com/singerdmx/flutter-quill/pull/1621/) - ## 9.0.4 * Feature: [#1611](https://github.com/singerdmx/flutter-quill/issues/1611) * Export missing widgets diff --git a/flutter_quill_test/pubspec.yaml b/flutter_quill_test/pubspec.yaml index 66cce8f0..fe64d2b6 100644 --- a/flutter_quill_test/pubspec.yaml +++ b/flutter_quill_test/pubspec.yaml @@ -1,6 +1,6 @@ name: flutter_quill_test description: Test utilities for flutter_quill which includes methods to simplify interacting with the editor in test cases. -version: 9.1.0 +version: 9.0.4 homepage: https://github.com/singerdmx/flutter-quill/tree/master/flutter_quill_test/ repository: https://github.com/singerdmx/flutter-quill/tree/master/flutter_quill_test/ issue_tracker: https://github.com/singerdmx/flutter-quill/issues/ diff --git a/lib/flutter_quill.dart b/lib/flutter_quill.dart index 5186a444..acfb7f7e 100644 --- a/lib/flutter_quill.dart +++ b/lib/flutter_quill.dart @@ -33,6 +33,7 @@ export 'src/widgets/raw_editor/raw_editor.dart'; export 'src/widgets/raw_editor/raw_editor_state.dart'; export 'src/widgets/style_widgets/style_widgets.dart'; export 'src/widgets/toolbar/base_toolbar.dart'; +export 'src/widgets/toolbar/buttons/alignment/select_alignment_button.dart'; export 'src/widgets/toolbar/buttons/hearder_style/select_header_style_dropdown_button.dart'; export 'src/widgets/toolbar/simple_toolbar.dart'; export 'src/widgets/utils/provider.dart'; 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 6ada035c..8d7daf9e 100644 --- a/lib/src/models/config/toolbar/buttons/font_family_configurations.dart +++ b/lib/src/models/config/toolbar/buttons/font_family_configurations.dart @@ -49,18 +49,11 @@ class QuillToolbarFontFamilyButtonOptions extends QuillToolbarBaseButtonOptions< this.itemPadding, this.defaultItemColor = Colors.red, this.renderFontFamilies = true, - this.highlightElevation = 1, - this.hoverElevation = 1, - this.fillColor, this.iconSize, this.iconButtonFactor, }); - final Color? fillColor; - final double hoverElevation; - final double highlightElevation; - - /// By default it will be [fontFamilyValues] from [QuillToolbarConfigurations] + /// By default it will be [fontFamilyValues] from [QuillSimpleToolbarConfigurations] /// You can override this if you want final Map? rawItemsMap; final ValueChanged? onSelected; @@ -82,9 +75,6 @@ class QuillToolbarFontFamilyButtonOptions extends QuillToolbarBaseButtonOptions< final double? iconButtonFactor; QuillToolbarFontFamilyButtonOptions copyWith({ - Color? fillColor, - double? hoverElevation, - double? highlightElevation, List>? items, Map? rawItemsMap, ValueChanged? onSelected, @@ -101,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, @@ -129,9 +117,6 @@ class QuillToolbarFontFamilyButtonOptions extends QuillToolbarBaseButtonOptions< defaultItemColor: defaultItemColor ?? this.defaultItemColor, iconSize: iconSize ?? this.iconSize, iconButtonFactor: iconButtonFactor ?? this.iconButtonFactor, - fillColor: fillColor ?? this.fillColor, - hoverElevation: hoverElevation ?? this.hoverElevation, - highlightElevation: highlightElevation ?? this.highlightElevation, ); } } 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 2f28c55b..efd31e6e 100644 --- a/lib/src/models/config/toolbar/buttons/font_size_configurations.dart +++ b/lib/src/models/config/toolbar/buttons/font_size_configurations.dart @@ -2,9 +2,15 @@ import 'dart:ui'; import 'package:flutter/foundation.dart' show immutable; import 'package:flutter/material.dart' - show Colors, PopupMenuEntry, ValueChanged; + show ButtonStyle, Colors, PopupMenuEntry, ValueChanged; import 'package:flutter/widgets.dart' - show Color, EdgeInsets, EdgeInsetsGeometry, TextOverflow, TextStyle; + show + Color, + EdgeInsets, + EdgeInsetsGeometry, + OutlinedBorder, + TextOverflow, + TextStyle; import '../../../documents/attribute.dart'; import '../../quill_configurations.dart'; @@ -29,9 +35,6 @@ class QuillToolbarFontSizeButtonOptions extends QuillToolbarBaseButtonOptions< const QuillToolbarFontSizeButtonOptions({ this.iconSize, this.iconButtonFactor, - this.fillColor, - this.hoverElevation = 1, - this.highlightElevation = 1, this.rawItemsMap, this.onSelected, this.attribute = Attribute.size, @@ -46,15 +49,15 @@ class QuillToolbarFontSizeButtonOptions extends QuillToolbarBaseButtonOptions< this.itemPadding, this.defaultItemColor = Colors.red, super.childBuilder, + this.shape, }); final double? iconSize; final double? iconButtonFactor; - final Color? fillColor; - final double hoverElevation; - final double highlightElevation; - /// By default it will be [fontSizesValues] from [QuillToolbarConfigurations] + final ButtonStyle? shape; + + /// By default it will be [fontSizesValues] from [QuillSimpleToolbarConfigurations] /// You can override this if you want final Map? rawItemsMap; final ValueChanged? onSelected; @@ -88,13 +91,11 @@ class QuillToolbarFontSizeButtonOptions extends QuillToolbarBaseButtonOptions< Color? defaultItemColor, VoidCallback? afterButtonPressed, String? tooltip, + OutlinedBorder? shape, }) { return QuillToolbarFontSizeButtonOptions( iconSize: iconSize ?? this.iconSize, iconButtonFactor: iconButtonFactor ?? this.iconButtonFactor, - fillColor: fillColor ?? this.fillColor, - hoverElevation: hoverElevation ?? this.hoverElevation, - highlightElevation: highlightElevation ?? this.highlightElevation, rawItemsMap: rawItemsMap ?? this.rawItemsMap, onSelected: onSelected ?? this.onSelected, attribute: attribute ?? this.attribute, diff --git a/lib/src/models/config/toolbar/buttons/select_header_style_dropdown_button_configurations.dart b/lib/src/models/config/toolbar/buttons/select_header_style_dropdown_button_configurations.dart index c7740d58..8aafcc78 100644 --- a/lib/src/models/config/toolbar/buttons/select_header_style_dropdown_button_configurations.dart +++ b/lib/src/models/config/toolbar/buttons/select_header_style_dropdown_button_configurations.dart @@ -1,9 +1,9 @@ -import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart' + show IconData, TextStyle, ValueChanged, VoidCallback; -import '../../../../widgets/quill/quill_controller.dart'; +import '../../../../widgets/toolbar/base_toolbar.dart'; import '../../../documents/attribute.dart'; import '../../../themes/quill_icon_theme.dart'; -import '../../quill_configurations.dart'; class QuillToolbarSelectHeaderStyleDropdownButtonExtraOptions extends QuillToolbarBaseButtonExtraOptions { @@ -21,68 +21,46 @@ class QuillToolbarSelectHeaderStyleDropdownButtonOptions QuillToolbarSelectHeaderStyleDropdownButtonOptions, QuillToolbarSelectHeaderStyleDropdownButtonExtraOptions> { const QuillToolbarSelectHeaderStyleDropdownButtonOptions({ - super.iconData, super.afterButtonPressed, - super.tooltip, - super.iconTheme, super.childBuilder, + super.iconTheme, + super.tooltip, this.iconSize, this.iconButtonFactor, - this.fillColor, - this.hoverElevation = 0, - this.highlightElevation = 0, - this.onSelected, + this.textStyle, + super.iconData, this.attributes, - this.padding, - this.style, - this.width, - this.labelOverflow = TextOverflow.visible, - this.itemHeight, - this.itemPadding, - this.defaultItemColor, - this.renderItemTextStyle = false, }); + /// By default we will the toolbar axis from [QuillSimpleToolbarConfigurations] final double? iconSize; final double? iconButtonFactor; - final Color? fillColor; - final double hoverElevation; - final double highlightElevation; - final ValueChanged? onSelected; - final List? attributes; - final EdgeInsetsGeometry? padding; - final TextStyle? style; - final double? width; - final TextOverflow labelOverflow; - final double? itemHeight; - final EdgeInsets? itemPadding; - final Color? defaultItemColor; - final bool renderItemTextStyle; + final TextStyle? textStyle; + + /// Header attributes, defaults to: + /// ```dart + /// [ + /// Attribute.h1, + /// Attribute.h2, + /// Attribute.h3, + /// Attribute.h4, + /// Attribute.h5, + /// Attribute.h6, + /// Attribute.header, + /// ] + /// ``` + final List>? attributes; QuillToolbarSelectHeaderStyleDropdownButtonOptions copyWith({ - Color? fillColor, - double? hoverElevation, - double? highlightElevation, - List>? items, ValueChanged? onSelected, - List? attributes, - EdgeInsetsGeometry? padding, + List>? attributes, TextStyle? style, - double? width, - TextOverflow? labelOverflow, - bool? renderFontFamilies, - bool? overrideTooltipByFontFamily, - double? itemHeight, - EdgeInsets? itemPadding, - Color? defaultItemColor, double? iconSize, double? iconButtonFactor, - QuillController? controller, IconData? iconData, VoidCallback? afterButtonPressed, String? tooltip, QuillIconTheme? iconTheme, - bool? renderItemTextStyle, }) { return QuillToolbarSelectHeaderStyleDropdownButtonOptions( attributes: attributes ?? this.attributes, @@ -90,20 +68,8 @@ class QuillToolbarSelectHeaderStyleDropdownButtonOptions afterButtonPressed: afterButtonPressed ?? this.afterButtonPressed, tooltip: tooltip ?? this.tooltip, iconTheme: iconTheme ?? this.iconTheme, - onSelected: onSelected ?? this.onSelected, - padding: padding ?? this.padding, - style: style ?? this.style, - width: width ?? this.width, - labelOverflow: labelOverflow ?? this.labelOverflow, - itemHeight: itemHeight ?? this.itemHeight, - itemPadding: itemPadding ?? this.itemPadding, - defaultItemColor: defaultItemColor ?? this.defaultItemColor, iconSize: iconSize ?? this.iconSize, iconButtonFactor: iconButtonFactor ?? this.iconButtonFactor, - fillColor: fillColor ?? this.fillColor, - hoverElevation: hoverElevation ?? this.hoverElevation, - highlightElevation: highlightElevation ?? this.highlightElevation, - renderItemTextStyle: renderItemTextStyle ?? this.renderItemTextStyle, ); } } diff --git a/lib/src/widgets/toolbar/base_toolbar.dart b/lib/src/widgets/toolbar/base_toolbar.dart index 5caee6b6..ab1b483e 100644 --- a/lib/src/widgets/toolbar/base_toolbar.dart +++ b/lib/src/widgets/toolbar/base_toolbar.dart @@ -9,7 +9,6 @@ import 'simple_toolbar.dart'; export '../../models/config/toolbar/base_button_configurations.dart'; export '../../models/config/toolbar/simple_toolbar_configurations.dart'; -export 'buttons/alignment/select_alignment_button_original.dart'; export 'buttons/clear_format_button.dart'; export 'buttons/color/color_button.dart'; export 'buttons/custom_button_button.dart'; diff --git a/lib/src/widgets/toolbar/buttons/alignment/select_alignment_button_original.dart b/lib/src/widgets/toolbar/buttons/alignment/select_alignment_button_original.dart deleted file mode 100644 index 9edd0f4a..00000000 --- a/lib/src/widgets/toolbar/buttons/alignment/select_alignment_button_original.dart +++ /dev/null @@ -1,281 +0,0 @@ -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; - -import '../../../../../translations.dart'; -import '../../../../extensions/quill_configurations_ext.dart'; -import '../../../../models/config/quill_configurations.dart'; -import '../../../../models/documents/attribute.dart'; -import '../../../../models/documents/style.dart'; -import '../../../../models/themes/quill_icon_theme.dart'; -import '../../../../utils/widgets.dart'; -import '../../../quill/quill_controller.dart'; - -class QuillToolbarSelectAlignmentButton extends StatefulWidget { - const QuillToolbarSelectAlignmentButton({ - required this.controller, - this.options = const QuillToolbarSelectAlignmentButtonOptions(), - this.showLeftAlignment = true, - this.showCenterAlignment = true, - this.showRightAlignment = true, - this.showJustifyAlignment = true, - this.padding, - super.key, - }); - - final QuillController controller; - final QuillToolbarSelectAlignmentButtonOptions options; - - final bool showLeftAlignment; - final bool showCenterAlignment; - final bool showRightAlignment; - final bool showJustifyAlignment; - final EdgeInsetsGeometry? padding; - - @override - QuillToolbarSelectAlignmentButtonState createState() => - QuillToolbarSelectAlignmentButtonState(); -} - -class QuillToolbarSelectAlignmentButtonState - extends State { - Attribute? _value; - - Style get _selectionStyle => controller.getSelectionStyle(); - - @override - void initState() { - super.initState(); - setState(() { - _value = _selectionStyle.attributes[Attribute.align.key] ?? - Attribute.leftAlignment; - }); - controller.addListener(_didChangeEditingValue); - } - - QuillToolbarSelectAlignmentButtonOptions get options { - return widget.options; - } - - QuillController get controller { - return widget.controller; - } - - double get _iconSize { - final baseFontSize = baseButtonExtraOptions.globalIconSize; - final iconSize = options.iconSize; - return iconSize ?? baseFontSize; - } - - double get _iconButtonFactor { - final baseIconFactor = baseButtonExtraOptions.globalIconButtonFactor; - final iconButtonFactor = options.iconButtonFactor; - return iconButtonFactor ?? baseIconFactor; - } - - VoidCallback? get _afterButtonPressed { - return options.afterButtonPressed ?? - baseButtonExtraOptions.afterButtonPressed; - } - - QuillIconTheme? get _iconTheme { - return options.iconTheme ?? baseButtonExtraOptions.iconTheme; - } - - QuillToolbarBaseButtonOptions get baseButtonExtraOptions { - return context.requireQuillToolbarBaseButtonOptions; - } - - QuillSelectAlignmentValues get _iconsData { - final iconsData = options.iconsData; - if (iconsData != null) { - return iconsData; - } - final baseIconData = baseButtonExtraOptions.iconData; - if (baseIconData != null) { - return QuillSelectAlignmentValues( - leftAlignment: baseIconData, - centerAlignment: baseIconData, - rightAlignment: baseIconData, - justifyAlignment: baseIconData, - ); - } - return const QuillSelectAlignmentValues( - leftAlignment: Icons.format_align_left, - centerAlignment: Icons.format_align_center, - rightAlignment: Icons.format_align_right, - justifyAlignment: Icons.format_align_justify, - ); - } - - QuillSelectAlignmentValues get _tooltips { - final tooltips = options.tooltips; - if (tooltips != null) { - return tooltips; - } - final baseToolTip = baseButtonExtraOptions.tooltip; - if (baseToolTip != null) { - return QuillSelectAlignmentValues( - leftAlignment: baseToolTip, - centerAlignment: baseToolTip, - rightAlignment: baseToolTip, - justifyAlignment: baseToolTip, - ); - } - return QuillSelectAlignmentValues( - leftAlignment: context.loc.alignLeft, - centerAlignment: context.loc.alignCenter, - rightAlignment: context.loc.alignRight, - justifyAlignment: context.loc.justifyWinWidth, - ); - } - - void _didChangeEditingValue() { - setState(() { - _value = _selectionStyle.attributes[Attribute.align.key] ?? - Attribute.leftAlignment; - }); - } - - @override - void didUpdateWidget(covariant QuillToolbarSelectAlignmentButton oldWidget) { - super.didUpdateWidget(oldWidget); - if (oldWidget.controller != controller) { - oldWidget.controller.removeListener(_didChangeEditingValue); - controller.addListener(_didChangeEditingValue); - _value = _selectionStyle.attributes[Attribute.align.key] ?? - Attribute.leftAlignment; - } - } - - @override - void dispose() { - controller.removeListener(_didChangeEditingValue); - super.dispose(); - } - - @override - Widget build(BuildContext context) { - final valueToText = { - if (widget.showLeftAlignment) - Attribute.leftAlignment: Attribute.leftAlignment.value!, - if (widget.showCenterAlignment) - Attribute.centerAlignment: Attribute.centerAlignment.value!, - if (widget.showRightAlignment) - Attribute.rightAlignment: Attribute.rightAlignment.value!, - if (widget.showJustifyAlignment) - Attribute.justifyAlignment: Attribute.justifyAlignment.value!, - }; - - final valueAttribute = [ - if (widget.showLeftAlignment) Attribute.leftAlignment, - if (widget.showCenterAlignment) Attribute.centerAlignment, - if (widget.showRightAlignment) Attribute.rightAlignment, - if (widget.showJustifyAlignment) Attribute.justifyAlignment - ]; - final valueString = [ - if (widget.showLeftAlignment) Attribute.leftAlignment.value!, - if (widget.showCenterAlignment) Attribute.centerAlignment.value!, - if (widget.showRightAlignment) Attribute.rightAlignment.value!, - if (widget.showJustifyAlignment) Attribute.justifyAlignment.value!, - ]; - // final _valueToButtons = { - // if (widget.showLeftAlignment!) - // Attribute.leftAlignment: ToolbarButtons.leftAlignment, - // if (widget.showCenterAlignment!) - // Attribute.centerAlignment: ToolbarButtons.centerAlignment, - // if (widget.showRightAlignment!) - // Attribute.rightAlignment: ToolbarButtons.rightAlignment, - // if (widget.showJustifyAlignment!) - // Attribute.justifyAlignment: ToolbarButtons.justifyAlignment, - // }; - - final buttonCount = ((widget.showLeftAlignment) ? 1 : 0) + - ((widget.showCenterAlignment) ? 1 : 0) + - ((widget.showRightAlignment) ? 1 : 0) + - ((widget.showJustifyAlignment) ? 1 : 0); - - final childBuilder = - options.childBuilder ?? baseButtonExtraOptions.childBuilder; - - void sharedOnPressed(int index) { - valueAttribute[index] == Attribute.leftAlignment - ? controller.formatSelection( - Attribute.clone(Attribute.align, null), - ) - : controller.formatSelection(valueAttribute[index]); - _afterButtonPressed?.call(); - } - - return Row( - mainAxisSize: MainAxisSize.min, - children: List.generate(buttonCount, (index) { - if (childBuilder != null) { - return childBuilder( - QuillToolbarSelectAlignmentButtonOptions( - afterButtonPressed: _afterButtonPressed, - iconSize: _iconSize, - iconButtonFactor: _iconButtonFactor, - iconTheme: _iconTheme, - tooltips: _tooltips, - iconsData: _iconsData, - ), - QuillToolbarSelectAlignmentButtonExtraOptions( - context: context, - controller: controller, - onPressed: () => sharedOnPressed(index), - ), - ); - } - final theme = Theme.of(context); - return Padding( - padding: widget.padding ?? - const EdgeInsets.symmetric(horizontal: !kIsWeb ? 1.0 : 5.0), - child: ConstrainedBox( - constraints: BoxConstraints.tightFor( - width: _iconSize * _iconButtonFactor, - height: _iconSize * _iconButtonFactor, - ), - child: UtilityWidgets.maybeTooltip( - message: valueString[index] == Attribute.leftAlignment.value - ? _tooltips.leftAlignment - : valueString[index] == Attribute.centerAlignment.value - ? _tooltips.centerAlignment - : valueString[index] == Attribute.rightAlignment.value - ? _tooltips.rightAlignment - : _tooltips.justifyAlignment, - child: RawMaterialButton( - hoverElevation: 0, - highlightElevation: 0, - elevation: 0, - visualDensity: VisualDensity.compact, - shape: RoundedRectangleBorder( - borderRadius: - BorderRadius.circular(_iconTheme?.borderRadius ?? 2)), - fillColor: valueToText[_value] == valueString[index] - ? (_iconTheme?.iconSelectedFillColor ?? theme.primaryColor) - : (_iconTheme?.iconUnselectedFillColor ?? - theme.canvasColor), - onPressed: () => sharedOnPressed(index), - child: Icon( - valueString[index] == Attribute.leftAlignment.value - ? _iconsData.leftAlignment - : valueString[index] == Attribute.centerAlignment.value - ? _iconsData.centerAlignment - : valueString[index] == Attribute.rightAlignment.value - ? _iconsData.rightAlignment - : _iconsData.justifyAlignment, - size: _iconSize, - color: valueToText[_value] == valueString[index] - ? (_iconTheme?.iconSelectedColor ?? - theme.primaryIconTheme.color) - : (_iconTheme?.iconUnselectedColor ?? - theme.iconTheme.color), - ), - ), - ), - ), - ); - }), - ); - } -} diff --git a/lib/src/widgets/toolbar/buttons/clear_format_button.dart b/lib/src/widgets/toolbar/buttons/clear_format_button.dart index bb8c5d17..88e9a459 100644 --- a/lib/src/widgets/toolbar/buttons/clear_format_button.dart +++ b/lib/src/widgets/toolbar/buttons/clear_format_button.dart @@ -107,17 +107,11 @@ class QuillToolbarClearFormatButton extends StatelessWidget { final theme = Theme.of(context); final iconColor = iconTheme?.iconUnselectedColor ?? theme.iconTheme.color; - final iconFillColor = - iconTheme?.iconUnselectedFillColor ?? theme.canvasColor; return QuillToolbarIconButton( tooltip: tooltip, - highlightElevation: 0, - hoverElevation: 0, - size: iconSize * iconButtonFactor, - icon: Icon(iconData, size: iconSize, color: iconColor), - fillColor: iconFillColor, - borderRadius: iconTheme?.borderRadius ?? 2, + icon: Icon(iconData, size: iconSize * iconButtonFactor, color: iconColor), + isFilled: false, onPressed: _sharedOnPressed, afterPressed: afterButtonPressed, ); diff --git a/lib/src/widgets/toolbar/buttons/color/color_button.dart b/lib/src/widgets/toolbar/buttons/color/color_button.dart index c86ca4ee..b4d03e3f 100644 --- a/lib/src/widgets/toolbar/buttons/color/color_button.dart +++ b/lib/src/widgets/toolbar/buttons/color/color_button.dart @@ -194,18 +194,14 @@ class QuillToolbarColorButtonState extends State { ); } - return QuillToolbarIconButton( + return IconButton( tooltip: tooltip, - highlightElevation: 0, - hoverElevation: 0, - size: iconSize * iconButtonFactor, - icon: Icon(iconData, - size: iconSize, - color: widget.isBackground ? iconColorBackground : iconColor), - fillColor: widget.isBackground ? fillColorBackground : fillColor, - borderRadius: iconTheme?.borderRadius ?? 2, + iconSize: iconSize * iconButtonFactor, + icon: Icon( + iconData, + color: widget.isBackground ? iconColorBackground : iconColor, + ), onPressed: _showColorPicker, - afterPressed: afterButtonPressed, ); } diff --git a/lib/src/widgets/toolbar/buttons/custom_button_button.dart b/lib/src/widgets/toolbar/buttons/custom_button_button.dart index 2eca16e3..f77b4a1e 100644 --- a/lib/src/widgets/toolbar/buttons/custom_button_button.dart +++ b/lib/src/widgets/toolbar/buttons/custom_button_button.dart @@ -81,6 +81,7 @@ class QuillToolbarCustomButton extends StatelessWidget { return QuillToolbarIconButton( icon: options.icon ?? const SizedBox.shrink(), + isFilled: false, tooltip: tooltip, onPressed: () => _onPressed(context), afterPressed: afterButtonPressed, diff --git a/lib/src/widgets/toolbar/buttons/font_family_button.dart b/lib/src/widgets/toolbar/buttons/font_family_button.dart index b67e799a..42c5ca6b 100644 --- a/lib/src/widgets/toolbar/buttons/font_family_button.dart +++ b/lib/src/widgets/toolbar/buttons/font_family_button.dart @@ -188,15 +188,6 @@ class QuillToolbarFontFamilyButtonState final isMaterial3 = Theme.of(context).useMaterial3; if (!isMaterial3) { return RawMaterialButton( - visualDensity: VisualDensity.compact, - shape: RoundedRectangleBorder( - borderRadius: - BorderRadius.circular(iconTheme?.borderRadius ?? 2), - ), - fillColor: options.fillColor, - elevation: 0, - hoverElevation: options.hoverElevation, - highlightElevation: options.hoverElevation, onPressed: _onPressed, child: _buildContent(context), ); @@ -207,8 +198,8 @@ class QuillToolbarFontFamilyButtonState style: IconButton.styleFrom( shape: iconTheme?.borderRadius != null ? RoundedRectangleBorder( - borderRadius: - BorderRadius.circular(iconTheme?.borderRadius ?? 2), + borderRadius: BorderRadius.circular( + iconTheme?.borderRadius ?? -1), ) : null, ), diff --git a/lib/src/widgets/toolbar/buttons/font_size_button.dart b/lib/src/widgets/toolbar/buttons/font_size_button.dart index 145f9840..5dc41c38 100644 --- a/lib/src/widgets/toolbar/buttons/font_size_button.dart +++ b/lib/src/widgets/toolbar/buttons/font_size_button.dart @@ -146,21 +146,9 @@ class QuillToolbarFontSizeButtonState builder: (context) { final isMaterial3 = Theme.of(context).useMaterial3; if (!isMaterial3) { - return Tooltip( - message: tooltip, - child: RawMaterialButton( - visualDensity: VisualDensity.compact, - shape: RoundedRectangleBorder( - borderRadius: - BorderRadius.circular(iconTheme?.borderRadius ?? 2), - ), - fillColor: options.fillColor, - elevation: 0, - hoverElevation: options.hoverElevation, - highlightElevation: options.hoverElevation, - onPressed: _onPressed, - child: _buildContent(context), - ), + return RawMaterialButton( + onPressed: _onPressed, + child: _buildContent(context), ); } return IconButton( @@ -170,7 +158,7 @@ class QuillToolbarFontSizeButtonState shape: iconTheme?.borderRadius != null ? RoundedRectangleBorder( borderRadius: - BorderRadius.circular(iconTheme?.borderRadius ?? 2), + BorderRadius.circular(iconTheme?.borderRadius ?? -1), ) : null, ), diff --git a/lib/src/widgets/toolbar/buttons/hearder_style/select_header_style_dropdown_button.dart b/lib/src/widgets/toolbar/buttons/hearder_style/select_header_style_dropdown_button.dart index ef62e6b4..fdfad12e 100644 --- a/lib/src/widgets/toolbar/buttons/hearder_style/select_header_style_dropdown_button.dart +++ b/lib/src/widgets/toolbar/buttons/hearder_style/select_header_style_dropdown_button.dart @@ -1,15 +1,11 @@ import 'package:flutter/material.dart'; -import '../../../../../extensions.dart'; import '../../../../../translations.dart'; import '../../../../extensions/quill_configurations_ext.dart'; -import '../../../../models/config/toolbar/base_button_configurations.dart'; -import '../../../../models/config/toolbar/buttons/select_header_style_dropdown_button_configurations.dart'; import '../../../../models/documents/attribute.dart'; -import '../../../../models/documents/style.dart'; import '../../../../models/themes/quill_icon_theme.dart'; -import '../../../others/default_styles.dart'; import '../../../quill/quill_controller.dart'; +import '../../base_toolbar.dart'; class QuillToolbarSelectHeaderStyleDropdownButton extends StatefulWidget { const QuillToolbarSelectHeaderStyleDropdownButton({ @@ -18,8 +14,6 @@ class QuillToolbarSelectHeaderStyleDropdownButton extends StatefulWidget { super.key, }); - /// Since we can't get the state from the instace of the widget for comparing - /// in [didUpdateWidget] then we will have to store reference here final QuillController controller; final QuillToolbarSelectHeaderStyleDropdownButtonOptions options; @@ -30,263 +24,190 @@ class QuillToolbarSelectHeaderStyleDropdownButton extends StatefulWidget { class _QuillToolbarSelectHeaderStyleDropdownButtonState extends State { - Attribute? _selectedAttribute; + Attribute _selectedItem = Attribute.header; - Style get _selectionStyle => controller.getSelectionStyle(); + final _menuController = MenuController(); + @override + void initState() { + super.initState(); + widget.controller.addListener(_didChangeEditingValue); + } - late final _valueToText = { - Attribute.h1: context.loc.heading1, - Attribute.h2: context.loc.heading2, - Attribute.h3: context.loc.heading3, - Attribute.h4: context.loc.heading4, - Attribute.h5: context.loc.heading5, - Attribute.h6: context.loc.heading6, - Attribute.header: context.loc.normal, - }; + @override + void dispose() { + widget.controller.removeListener(_didChangeEditingValue); + super.dispose(); + } - Map? _headerTextStyles; + @override + void didUpdateWidget( + covariant QuillToolbarSelectHeaderStyleDropdownButton oldWidget) { + super.didUpdateWidget(oldWidget); + if (oldWidget.controller == widget.controller) { + return; + } + widget.controller + ..removeListener(_didChangeEditingValue) + ..addListener(_didChangeEditingValue); + } - QuillToolbarSelectHeaderStyleDropdownButtonOptions get options { - return widget.options; + void _didChangeEditingValue() { + final newSelectedItem = _getHeaderValue(); + if (newSelectedItem == _selectedItem) { + return; + } + setState(() { + _selectedItem = newSelectedItem; + }); } - QuillController get controller { - return widget.controller; + Attribute _getHeaderValue() { + final attr = widget.controller.toolbarButtonToggler[Attribute.header.key]; + if (attr != null) { + // checkbox tapping causes controller.selection to go to offset 0 + widget.controller.toolbarButtonToggler.remove(Attribute.header.key); + return attr; + } + return widget.controller + .getSelectionStyle() + .attributes[Attribute.header.key] ?? + Attribute.header; + } + + String _label(Attribute value) { + final label = switch (value) { + Attribute.h1 => context.loc.heading1, + Attribute.h2 => context.loc.heading2, + Attribute.h3 => context.loc.heading3, + Attribute.h4 => context.loc.heading4, + Attribute.h5 => context.loc.heading5, + Attribute.h6 => context.loc.heading6, + Attribute.header => context.loc.normal, + Attribute() => throw ArgumentError(), + }; + return label; } double get iconSize { - final baseFontSize = baseButtonExtraOptions.globalIconSize; - final iconSize = options.iconSize; - return iconSize ?? baseFontSize; + final baseFontSize = context.quillToolbarBaseButtonOptions?.globalIconSize; + final iconSize = widget.options.iconSize; + return iconSize ?? baseFontSize ?? kDefaultIconSize; } double get iconButtonFactor { - final baseIconFactor = baseButtonExtraOptions.globalIconButtonFactor; - final iconButtonFactor = options.iconButtonFactor; - return iconButtonFactor ?? baseIconFactor; + final baseIconFactor = + context.quillToolbarBaseButtonOptions?.globalIconButtonFactor; + final iconButtonFactor = widget.options.iconButtonFactor; + return iconButtonFactor ?? baseIconFactor ?? kIconButtonFactor; } - VoidCallback? get afterButtonPressed { - return options.afterButtonPressed ?? - baseButtonExtraOptions.afterButtonPressed; + QuillIconTheme? get iconTheme { + return widget.options.iconTheme ?? + context.quillToolbarBaseButtonOptions?.iconTheme; } - QuillIconTheme? get iconTheme { - return options.iconTheme ?? baseButtonExtraOptions.iconTheme; + List> get headerAttributes { + return widget.options.attributes ?? + [ + Attribute.h1, + Attribute.h2, + Attribute.h3, + Attribute.h4, + Attribute.h5, + Attribute.h6, + Attribute.header, + ]; } QuillToolbarBaseButtonOptions get baseButtonExtraOptions { return context.requireQuillToolbarBaseButtonOptions; } - String get tooltip { - return options.tooltip ?? - baseButtonExtraOptions.tooltip ?? - context.loc.headerStyle; - } - - List get _attrbuites { - return options.attributes ?? _valueToText.keys.toList(); - } - - @override - void dispose() { - controller.removeListener(_didChangeEditingValue); - super.dispose(); - } - - @override - void didUpdateWidget( - covariant QuillToolbarSelectHeaderStyleDropdownButton oldWidget) { - super.didUpdateWidget(oldWidget); - if (oldWidget.controller != controller) { - oldWidget.controller.removeListener(_didChangeEditingValue); - controller.addListener(_didChangeEditingValue); - _selectedAttribute = _getHeaderValue(); - } - } - - @override - void didChangeDependencies() { - super.didChangeDependencies(); - if (_headerTextStyles == null) { - final defaultStyles = DefaultStyles.getInstance(context); - _headerTextStyles = { - Attribute.h1: defaultStyles.h1!.style, - Attribute.h2: defaultStyles.h2!.style, - Attribute.h3: defaultStyles.h3!.style, - Attribute.h4: defaultStyles.h4!.style, - Attribute.h5: defaultStyles.h5!.style, - Attribute.h6: defaultStyles.h6!.style, - Attribute.header: - widget.options.style ?? defaultStyles.paragraph!.style, - }; - } + VoidCallback? get afterButtonPressed { + return widget.options.afterButtonPressed ?? + baseButtonExtraOptions.afterButtonPressed; } - @override - void initState() { - super.initState(); - controller.addListener(_didChangeEditingValue); - _selectedAttribute = _getHeaderValue(); + void _onPressed(Attribute e) { + setState(() => _selectedItem = e); + widget.controller.formatSelection(_selectedItem); } @override Widget build(BuildContext context) { - assert(_attrbuites.every((element) => _valueToText.keys.contains(element))); - final baseButtonConfigurations = context.requireQuillToolbarBaseButtonOptions; final childBuilder = - options.childBuilder ?? baseButtonConfigurations.childBuilder; + widget.options.childBuilder ?? baseButtonConfigurations.childBuilder; if (childBuilder != null) { return childBuilder( - options.copyWith( + widget.options.copyWith( iconSize: iconSize, iconTheme: iconTheme, - tooltip: tooltip, afterButtonPressed: afterButtonPressed, ), QuillToolbarSelectHeaderStyleDropdownButtonExtraOptions( - currentValue: _selectedAttribute!, - controller: controller, + currentValue: _selectedItem, context: context, - onPressed: _onPressed, + controller: widget.controller, + onPressed: () { + throw UnimplementedError('Not implemented yet.'); + }, ), ); } - return ConstrainedBox( - constraints: BoxConstraints.tightFor( - height: iconSize * 1.81, - width: options.width, - ), - child: UtilityWidgets.maybeTooltip( - message: tooltip, - child: RawMaterialButton( - visualDensity: VisualDensity.compact, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(iconTheme?.borderRadius ?? 2), - ), - fillColor: options.fillColor, - elevation: 0, - hoverElevation: options.hoverElevation, - highlightElevation: options.hoverElevation, - onPressed: _onPressed, - child: _buildContent(context), - ), - ), - ); - } - - void _didChangeEditingValue() { - setState(() { - _selectedAttribute = _getHeaderValue(); - }); - } - - Attribute _getHeaderValue() { - final attr = controller.toolbarButtonToggler[Attribute.header.key]; - if (attr != null) { - // checkbox tapping causes controller.selection to go to offset 0 - controller.toolbarButtonToggler.remove(Attribute.header.key); - return attr; - } - return _selectionStyle.attributes[Attribute.header.key] ?? Attribute.header; - } - - Widget _buildContent(BuildContext context) { - final theme = Theme.of(context); - final hasFinalWidth = options.width != null; - return Padding( - padding: options.padding ?? const EdgeInsets.fromLTRB(10, 0, 0, 0), - child: Row( - mainAxisSize: !hasFinalWidth ? MainAxisSize.min : MainAxisSize.max, - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - UtilityWidgets.maybeWidget( - enabled: hasFinalWidth, - wrapper: (child) => Expanded(child: child), - child: Text( - _valueToText[_selectedAttribute]!, - overflow: options.labelOverflow, - style: options.style ?? - TextStyle( - fontSize: iconSize / 1.15, - color: - iconTheme?.iconUnselectedColor ?? theme.iconTheme.color, - ), + return MenuAnchor( + controller: _menuController, + menuChildren: headerAttributes + .map( + (e) => MenuItemButton( + onPressed: () { + _onPressed(e); + }, + child: Text(_label(e)), ), - ), - const SizedBox(width: 3), - Icon( - Icons.arrow_drop_down, - size: iconSize / 1.15, - color: iconTheme?.iconUnselectedColor ?? theme.iconTheme.color, ) - ], + .toList(), + child: Builder( + builder: (context) { + final isMaterial3 = Theme.of(context).useMaterial3; + final child = Row( + mainAxisSize: MainAxisSize.min, + children: [ + Text( + _label(_selectedItem), + style: widget.options.textStyle ?? + TextStyle( + fontSize: iconSize / 1.15, + ), + ), + Icon( + Icons.arrow_drop_down, + size: iconSize * iconButtonFactor, + ), + ], + ); + if (!isMaterial3) { + return RawMaterialButton( + onPressed: _onDropdownButtonPressed, + child: child, + ); + } + return IconButton( + onPressed: _onDropdownButtonPressed, + icon: child, + ); + }, ), ); } - void _onPressed() { - _showMenu(); - options.afterButtonPressed?.call(); - } - - Future _showMenu() async { - final popupMenuTheme = PopupMenuTheme.of(context); - final button = context.findRenderObject() as RenderBox; - final overlay = Overlay.of(context).context.findRenderObject() as RenderBox; - final position = RelativeRect.fromRect( - Rect.fromPoints( - button.localToGlobal(Offset.zero, ancestor: overlay), - button.localToGlobal(button.size.bottomLeft(Offset.zero), - ancestor: overlay), - ), - Offset.zero & overlay.size, - ); - final newValue = await showMenu( - context: context, - elevation: 4, - items: [ - for (final header in _valueToText.entries) - PopupMenuItem( - key: ValueKey(header.value), - value: header.key, - height: options.itemHeight ?? kMinInteractiveDimension, - padding: options.itemPadding, - child: Text( - header.value, - style: TextStyle( - fontSize: options.renderItemTextStyle - ? _headerStyle(header.key).fontSize ?? - DefaultTextStyle.of(context).style.fontSize ?? - 14 - : null, - color: header.key == _selectedAttribute - ? options.defaultItemColor - : null, - ), - ), - ), - ], - position: position, - shape: popupMenuTheme.shape, - color: popupMenuTheme.color, - ); - if (newValue == null) { + void _onDropdownButtonPressed() { + if (_menuController.isOpen) { + _menuController.close(); return; } - - final attribute0 = - _selectedAttribute == newValue ? Attribute.header : newValue; - controller.formatSelection(attribute0); - afterButtonPressed?.call(); - } - - TextStyle _headerStyle(Attribute attribute) { - assert(_headerTextStyles!.containsKey(attribute)); - return _headerTextStyles![attribute]!; + _menuController.open(); } } diff --git a/lib/src/widgets/toolbar/buttons/history_button.dart b/lib/src/widgets/toolbar/buttons/history_button.dart index 0c2fe5a9..1c778f11 100644 --- a/lib/src/widgets/toolbar/buttons/history_button.dart +++ b/lib/src/widgets/toolbar/buttons/history_button.dart @@ -105,6 +105,7 @@ class QuillToolbarHistoryButtonState extends State { ? iconTheme?.iconUnselectedColor ?? theme.iconTheme.color : iconTheme?.disabledIconColor ?? theme.disabledColor, ), + isFilled: false, onPressed: _updateHistory, afterPressed: afterButtonPressed, ); diff --git a/lib/src/widgets/toolbar/buttons/indent_button.dart b/lib/src/widgets/toolbar/buttons/indent_button.dart index 9fe1891c..654b3d47 100644 --- a/lib/src/widgets/toolbar/buttons/indent_button.dart +++ b/lib/src/widgets/toolbar/buttons/indent_button.dart @@ -107,16 +107,10 @@ class QuillToolbarIndentButtonState extends State { final theme = Theme.of(context); final iconColor = iconTheme?.iconUnselectedColor ?? theme.iconTheme.color; - final iconFillColor = - iconTheme?.iconUnselectedFillColor ?? theme.canvasColor; return QuillToolbarIconButton( tooltip: tooltip, - highlightElevation: 0, - hoverElevation: 0, - size: iconSize * iconButtonFactor, - icon: Icon(iconData, size: iconSize, color: iconColor), - fillColor: iconFillColor, - borderRadius: iconTheme?.borderRadius ?? 2, + icon: Icon(iconData, size: iconSize * iconButtonFactor, color: iconColor), + isFilled: false, onPressed: _sharedOnPressed, afterPressed: afterButtonPressed, ); diff --git a/lib/src/widgets/toolbar/buttons/link_style2_button.dart b/lib/src/widgets/toolbar/buttons/link_style2_button.dart index 7ff23085..8fec6c3a 100644 --- a/lib/src/widgets/toolbar/buttons/link_style2_button.dart +++ b/lib/src/widgets/toolbar/buttons/link_style2_button.dart @@ -148,20 +148,14 @@ class _QuillToolbarLinkStyleButton2State final isToggled = _getLinkAttributeValue() != null; return QuillToolbarIconButton( tooltip: tooltip, - highlightElevation: 0, - hoverElevation: 0, - size: iconSize * iconButtonFactor, icon: Icon( iconData, - size: iconSize, + size: iconSize * iconButtonFactor, color: isToggled ? (iconTheme?.iconSelectedColor ?? theme.primaryIconTheme.color) : (iconTheme?.iconUnselectedColor ?? theme.iconTheme.color), ), - fillColor: isToggled - ? (iconTheme?.iconSelectedFillColor ?? theme.primaryColor) - : (iconTheme?.iconUnselectedFillColor ?? theme.canvasColor), - borderRadius: iconTheme?.borderRadius ?? 2, + isFilled: isToggled, onPressed: _openLinkDialog, afterPressed: afterButtonPressed, ); diff --git a/lib/src/widgets/toolbar/buttons/link_style_button.dart b/lib/src/widgets/toolbar/buttons/link_style_button.dart index 7cf35af2..2fa6047a 100644 --- a/lib/src/widgets/toolbar/buttons/link_style_button.dart +++ b/lib/src/widgets/toolbar/buttons/link_style_button.dart @@ -147,6 +147,7 @@ class QuillToolbarLinkStyleButtonState ? (iconTheme?.iconSelectedColor ?? theme.primaryIconTheme.color) : (iconTheme?.iconUnselectedColor ?? theme.iconTheme.color), ), + isFilled: isToggled, onPressed: () => _openLinkDialog(context), afterPressed: afterButtonPressed, ); diff --git a/lib/src/widgets/toolbar/buttons/quill_icon_button.dart b/lib/src/widgets/toolbar/buttons/quill_icon_button.dart index f1e55920..3024133b 100644 --- a/lib/src/widgets/toolbar/buttons/quill_icon_button.dart +++ b/lib/src/widgets/toolbar/buttons/quill_icon_button.dart @@ -1,18 +1,13 @@ import 'package:flutter/material.dart'; -import '../../../utils/widgets.dart'; - class QuillToolbarIconButton extends StatelessWidget { const QuillToolbarIconButton({ required this.onPressed, + required this.icon, + required this.isFilled, this.afterPressed, - this.icon, - this.size = 40, - this.fillColor, - this.hoverElevation = 1, - this.highlightElevation = 1, - this.borderRadius = 2, this.tooltip, + this.padding, super.key, this.iconFilledStyle, this.iconStyle, @@ -20,39 +15,32 @@ class QuillToolbarIconButton extends StatelessWidget { final VoidCallback? onPressed; final VoidCallback? afterPressed; - final Widget? icon; + final Widget icon; - final double size; - final Color? fillColor; - final double hoverElevation; - final double highlightElevation; - final double borderRadius; final String? tooltip; + final EdgeInsets? padding; + final bool isFilled; final ButtonStyle? iconStyle; final ButtonStyle? iconFilledStyle; @override Widget build(BuildContext context) { - return ConstrainedBox( - constraints: BoxConstraints.tightFor(width: size, height: size), - child: UtilityWidgets.maybeTooltip( - message: tooltip, - child: RawMaterialButton( - visualDensity: VisualDensity.compact, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(borderRadius), - ), - fillColor: fillColor, - elevation: 0, - hoverElevation: hoverElevation, - highlightElevation: hoverElevation, - onPressed: () { - onPressed?.call(); - afterPressed?.call(); - }, - child: icon, - ), - ), + if (isFilled) { + return IconButton.filled( + padding: padding, + onPressed: onPressed, + icon: icon, + style: iconStyle, + ); + } + return IconButton( + padding: padding, + onPressed: () { + onPressed?.call(); + afterPressed?.call(); + }, + icon: icon, + style: iconFilledStyle, ); } } diff --git a/lib/src/widgets/toolbar/buttons/search/search_button.dart b/lib/src/widgets/toolbar/buttons/search/search_button.dart index 25b7bbc1..572d4885 100644 --- a/lib/src/widgets/toolbar/buttons/search/search_button.dart +++ b/lib/src/widgets/toolbar/buttons/search/search_button.dart @@ -118,6 +118,7 @@ class QuillToolbarSearchButton extends StatelessWidget { size: iconSize * iconButtonFactor, color: iconColor, ), + isFilled: false, onPressed: () => _sharedOnPressed(context), afterPressed: afterButtonPressed, ); diff --git a/lib/src/widgets/toolbar/buttons/toggle_style_button.dart b/lib/src/widgets/toolbar/buttons/toggle_style_button.dart index 5b64a85a..6f7f4305 100644 --- a/lib/src/widgets/toolbar/buttons/toggle_style_button.dart +++ b/lib/src/widgets/toolbar/buttons/toggle_style_button.dart @@ -252,22 +252,11 @@ Widget defaultToggleStyleButtonBuilder( .primaryIconTheme.color) //You can specify your own icon color : (iconTheme?.iconUnselectedColor ?? theme.iconTheme.color) : (iconTheme?.disabledIconColor ?? theme.disabledColor); - final fill = isEnabled - ? isToggled == true - ? (iconTheme?.iconSelectedFillColor ?? - Theme.of(context).primaryColor) //Selected icon fill color - : (iconTheme?.iconUnselectedFillColor ?? - theme.canvasColor) //Unselected icon fill color : - : (iconTheme?.disabledIconFillColor ?? - (fillColor ?? theme.canvasColor)); //Disabled icon fill color return QuillToolbarIconButton( - highlightElevation: 0, - hoverElevation: 0, - size: iconSize * iconButtonFactor, - icon: Icon(icon, size: iconSize, color: iconColor), - fillColor: fill, + icon: Icon(icon, size: iconSize * iconButtonFactor, color: iconColor), + isFilled: isEnabled ? isToggled == true : false, onPressed: onPressed, afterPressed: afterPressed, - borderRadius: iconTheme?.borderRadius ?? 2, + padding: iconTheme?.padding, ); } diff --git a/pubspec.yaml b/pubspec.yaml index 1acdf599..821d8293 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: flutter_quill description: A rich text editor built for the modern Android, iOS, web and desktop platforms. It is the WYSIWYG editor and a Quill component for Flutter. -version: 9.1.0 +version: 9.0.4 homepage: https://1o24bbs.com/c/bulletjournal/108/ repository: https://github.com/singerdmx/flutter-quill/ issue_tracker: https://github.com/singerdmx/flutter-quill/issues/ diff --git a/quill_html_converter/CHANGELOG.md b/quill_html_converter/CHANGELOG.md index 0cfa1e3e..2c013026 100644 --- a/quill_html_converter/CHANGELOG.md +++ b/quill_html_converter/CHANGELOG.md @@ -2,9 +2,6 @@ All notable changes to this project will be documented in this file. -## 9.1.0 -* Because most of the users still uses material 2, we have to revert back to old buttons of `7.0.0`, take a look at [https://github.com/singerdmx/flutter-quill/pull/1621/](https://github.com/singerdmx/flutter-quill/pull/1621/) - ## 9.0.4 * Feature: [#1611](https://github.com/singerdmx/flutter-quill/issues/1611) * Export missing widgets diff --git a/quill_html_converter/pubspec.yaml b/quill_html_converter/pubspec.yaml index 4f12d9f4..9221a2d1 100644 --- a/quill_html_converter/pubspec.yaml +++ b/quill_html_converter/pubspec.yaml @@ -1,6 +1,6 @@ name: quill_html_converter description: A extension for flutter_quill package to add support for dealing with conversion to/from html -version: 9.1.0 +version: 9.0.4 homepage: https://github.com/singerdmx/flutter-quill/tree/master/quill_html_converter/ repository: https://github.com/singerdmx/flutter-quill/tree/master/quill_html_converter/ issue_tracker: https://github.com/singerdmx/flutter-quill/issues/ diff --git a/version.dart b/version.dart index 53a3092c..c5301916 100644 --- a/version.dart +++ b/version.dart @@ -1 +1 @@ -const version = '9.1.0'; +const version = '9.0.4';