From b79379633c92385bc68b7c892ef4ae9181dcb5a9 Mon Sep 17 00:00:00 2001 From: Douglas Ward Date: Sun, 21 Apr 2024 16:04:03 -0600 Subject: [PATCH] Fixes for before_push script --- .../lib/screens/quill/my_quill_toolbar.dart | 36 ++++++++-------- .../base_button/base_value_button.dart | 4 +- .../toolbar/buttons/font_family_button.dart | 19 +++++---- .../toolbar/buttons/font_size_button.dart | 7 +++- .../buttons/toggle_check_list_button.dart | 1 - .../toolbar/buttons/toggle_style_button.dart | 41 ++++++------------- 6 files changed, 49 insertions(+), 59 deletions(-) diff --git a/example/lib/screens/quill/my_quill_toolbar.dart b/example/lib/screens/quill/my_quill_toolbar.dart index 6fb382d8..7e177956 100644 --- a/example/lib/screens/quill/my_quill_toolbar.dart +++ b/example/lib/screens/quill/my_quill_toolbar.dart @@ -223,24 +223,24 @@ class MyQuillToolbar extends StatelessWidget { '40': '40.0' }, // headerStyleType: HeaderStyleType.buttons, - buttonOptions: QuillSimpleToolbarButtonOptions( - base: QuillToolbarBaseButtonOptions( - afterButtonPressed: focusNode.requestFocus, - // // iconSize: 20, - // iconTheme: QuillIconTheme( - // iconButtonSelectedData: IconButtonData( - // style: IconButton.styleFrom( - // foregroundColor: Colors.blue, - // ), - // ), - // iconButtonUnselectedData: IconButtonData( - // style: IconButton.styleFrom( - // foregroundColor: Colors.red, - // ), - // ), - // ), - ), - ), + // buttonOptions: QuillSimpleToolbarButtonOptions( + // base: QuillToolbarBaseButtonOptions( + // afterButtonPressed: focusNode.requestFocus, + // // iconSize: 20, + // iconTheme: QuillIconTheme( + // iconButtonSelectedData: IconButtonData( + // style: IconButton.styleFrom( + // foregroundColor: Colors.blue, + // ), + // ), + // iconButtonUnselectedData: IconButtonData( + // style: IconButton.styleFrom( + // foregroundColor: Colors.red, + // ), + // ), + // ), + // ), + //), customButtons: [ QuillToolbarCustomButtonOptions( icon: const Icon(Icons.add_alarm_rounded), diff --git a/lib/src/widgets/toolbar/base_button/base_value_button.dart b/lib/src/widgets/toolbar/base_button/base_value_button.dart index e3b52db2..3c2b8046 100644 --- a/lib/src/widgets/toolbar/base_button/base_value_button.dart +++ b/lib/src/widgets/toolbar/base_button/base_value_button.dart @@ -21,7 +21,7 @@ abstract class QuillToolbarBaseValueButtonState< W extends QuillToolbarBaseValueButton, T extends QuillToolbarBaseButtonOptions, E extends QuillToolbarBaseButtonExtraOptions, - V > extends State { + V> extends State { T get options => widget.options; QuillController get controller => widget.controller; @@ -72,7 +72,7 @@ abstract class QuillToolbarBaseValueButtonState< } double get iconSize { - final baseFontSize = context.quillToolbarBaseButtonOptions?.iconSize; + final baseFontSize = baseButtonExtraOptions?.iconSize; final iconSize = options.iconSize; return iconSize ?? baseFontSize ?? kDefaultIconSize; } diff --git a/lib/src/widgets/toolbar/buttons/font_family_button.dart b/lib/src/widgets/toolbar/buttons/font_family_button.dart index ce593b08..ca112964 100644 --- a/lib/src/widgets/toolbar/buttons/font_family_button.dart +++ b/lib/src/widgets/toolbar/buttons/font_family_button.dart @@ -28,16 +28,19 @@ class QuillToolbarFontFamilyButton extends QuillToolbarBaseValueButton< QuillToolbarFontFamilyButtonState(); } -class QuillToolbarFontFamilyButtonState extends QuillToolbarBaseValueButtonState< - QuillToolbarFontFamilyButton, - QuillToolbarFontFamilyButtonOptions, - QuillToolbarFontFamilyButtonExtraOptions, - String> { - +class QuillToolbarFontFamilyButtonState + extends QuillToolbarBaseValueButtonState< + QuillToolbarFontFamilyButton, + QuillToolbarFontFamilyButtonOptions, + QuillToolbarFontFamilyButtonExtraOptions, + String> { @override String get currentStateValue { - final attribute = controller.getSelectionStyle().attributes[options.attribute.key]; - return attribute == null ? _defaultDisplayText : (_getKeyName(attribute.value) ?? _defaultDisplayText); + final attribute = + controller.getSelectionStyle().attributes[options.attribute.key]; + return attribute == null + ? _defaultDisplayText + : (_getKeyName(attribute.value) ?? _defaultDisplayText); } String get _defaultDisplayText { diff --git a/lib/src/widgets/toolbar/buttons/font_size_button.dart b/lib/src/widgets/toolbar/buttons/font_size_button.dart index a4c74318..0612c82e 100644 --- a/lib/src/widgets/toolbar/buttons/font_size_button.dart +++ b/lib/src/widgets/toolbar/buttons/font_size_button.dart @@ -66,8 +66,11 @@ class QuillToolbarFontSizeButtonState extends QuillToolbarBaseValueButtonState< @override String get currentStateValue { - final attribute = controller.getSelectionStyle().attributes[options.attribute.key]; - return attribute == null ? _defaultDisplayText : (_getKeyName(attribute.value) ?? _defaultDisplayText); + final attribute = + controller.getSelectionStyle().attributes[options.attribute.key]; + return attribute == null + ? _defaultDisplayText + : (_getKeyName(attribute.value) ?? _defaultDisplayText); } String? _getKeyName(dynamic value) { 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 2fa2892b..113642d9 100644 --- a/lib/src/widgets/toolbar/buttons/toggle_check_list_button.dart +++ b/lib/src/widgets/toolbar/buttons/toggle_check_list_button.dart @@ -27,7 +27,6 @@ class QuillToolbarToggleCheckListButtonState QuillToolbarToggleCheckListButtonOptions, QuillToolbarToggleCheckListButtonExtraOptions, bool> { - Style get _selectionStyle => controller.getSelectionStyle(); @override diff --git a/lib/src/widgets/toolbar/buttons/toggle_style_button.dart b/lib/src/widgets/toolbar/buttons/toggle_style_button.dart index cffbce24..76b74b94 100644 --- a/lib/src/widgets/toolbar/buttons/toggle_style_button.dart +++ b/lib/src/widgets/toolbar/buttons/toggle_style_button.dart @@ -21,9 +21,7 @@ typedef ToggleStyleButtonBuilder = Widget Function( QuillIconTheme? iconTheme, ]); -class QuillToolbarToggleStyleButton extends QuillToolbarBaseValueButton< - QuillToolbarToggleStyleButtonOptions, - QuillToolbarToggleStyleButtonExtraOptions> { +class QuillToolbarToggleStyleButton extends QuillToolbarBaseValueButton { const QuillToolbarToggleStyleButton({ required super.controller, required this.attribute, @@ -34,16 +32,11 @@ class QuillToolbarToggleStyleButton extends QuillToolbarBaseValueButton< final Attribute attribute; @override - QuillToolbarToggleStyleButtonState createState() => - QuillToolbarToggleStyleButtonState(); + QuillToolbarToggleStyleButtonState createState() => QuillToolbarToggleStyleButtonState(); } -class QuillToolbarToggleStyleButtonState extends QuillToolbarBaseValueButtonState< - QuillToolbarToggleStyleButton, - QuillToolbarToggleStyleButtonOptions, - QuillToolbarToggleStyleButtonExtraOptions, - bool> { - +class QuillToolbarToggleStyleButtonState + extends QuillToolbarBaseValueButtonState { Style get _selectionStyle => controller.getSelectionStyle(); @override @@ -84,10 +77,7 @@ class QuillToolbarToggleStyleButtonState extends QuillToolbarBaseValueButtonStat 'left' => (context.loc.alignLeft, Icons.format_align_left), 'right' => (context.loc.alignRight, Icons.format_align_right), 'center' => (context.loc.alignCenter, Icons.format_align_center), - 'justify' => ( - context.loc.justifyWinWidth, - Icons.format_align_justify - ), + 'justify' => (context.loc.justifyWinWidth, Icons.format_align_justify), Object() => throw ArgumentError(widget.attribute.value), null => (context.loc.alignCenter, Icons.format_align_center), }; @@ -103,9 +93,7 @@ class QuillToolbarToggleStyleButtonState extends QuillToolbarBaseValueButtonStat String get defaultTooltip => _defaultTooltipAndIconData.$1; IconData get iconData { - return options.iconData ?? - context.quillToolbarBaseButtonOptions?.iconData ?? - _defaultTooltipAndIconData.$2; + return options.iconData ?? context.quillToolbarBaseButtonOptions?.iconData ?? _defaultTooltipAndIconData.$2; } void _onPressed() { @@ -115,8 +103,7 @@ class QuillToolbarToggleStyleButtonState extends QuillToolbarBaseValueButtonStat @override Widget build(BuildContext context) { - final childBuilder = options.childBuilder ?? - context.quillToolbarBaseButtonOptions?.childBuilder; + final childBuilder = options.childBuilder ?? context.quillToolbarBaseButtonOptions?.childBuilder; if (childBuilder != null) { return childBuilder( options, @@ -146,9 +133,7 @@ class QuillToolbarToggleStyleButtonState extends QuillToolbarBaseValueButtonStat } bool _getIsToggled(Map attrs) { - if (widget.attribute.key == Attribute.list.key || - widget.attribute.key == Attribute.script.key || - widget.attribute.key == Attribute.align.key) { + if (widget.attribute.key == Attribute.list.key || widget.attribute.key == Attribute.script.key || widget.attribute.key == Attribute.align.key) { final attribute = attrs[widget.attribute.key]; if (attribute == null) { return false; @@ -159,11 +144,11 @@ class QuillToolbarToggleStyleButtonState extends QuillToolbarBaseValueButtonStat } void _toggleAttribute() { - controller..formatSelection( - currentValue - ? Attribute.clone(widget.attribute, null) - : widget.attribute, - ) + controller + ..skipRequestKeyboard = !widget.attribute.isInline + ..formatSelection( + currentValue ? Attribute.clone(widget.attribute, null) : widget.attribute, + ) ..selectStyle(widget.attribute, currentValue); } }