From 4798a3f8df77b7ace34967b0116e6aab61489453 Mon Sep 17 00:00:00 2001 From: Ellet Date: Sat, 30 Dec 2023 16:21:56 +0300 Subject: [PATCH] Fix #1632 --- example/android/build.gradle | 2 +- .../models/config/shared_configurations.dart | 1 - .../models/config/quill_configurations.dart | 29 ------------ .../toolbar/base_button_configurations.dart | 2 - .../toolbar/buttons/color/color_button.dart | 13 ++++-- .../toolbar/buttons/color/color_dialog.dart | 46 ++++++++++++------- 6 files changed, 40 insertions(+), 53 deletions(-) diff --git a/example/android/build.gradle b/example/android/build.gradle index f86105d7..76a4bae8 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -24,7 +24,7 @@ rootProject.buildDir = '../build' subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" - // For mode details visit https://gist.github.com/freshtechtips/93fefb39e48c40592bda3931e05fd35c + // For mode details visit https://gist.github.com/ellet0/93fefb39e48c40592bda3931e05fd35c afterEvaluate { // check if android block is available diff --git a/flutter_quill_extensions/lib/models/config/shared_configurations.dart b/flutter_quill_extensions/lib/models/config/shared_configurations.dart index 402260b8..fe34b54d 100644 --- a/flutter_quill_extensions/lib/models/config/shared_configurations.dart +++ b/flutter_quill_extensions/lib/models/config/shared_configurations.dart @@ -36,7 +36,6 @@ class QuillSharedExtensionsConfigurations { /// The key to be used in the `extraConfigurations` property /// which can be found in the [QuillSharedConfigurations] - /// which lives in the [QuillConfigurations] /// /// which exists in the [QuillEditorConfigurations] static const String key = 'QuillSharedExtensionsConfigurations'; diff --git a/lib/src/models/config/quill_configurations.dart b/lib/src/models/config/quill_configurations.dart index b673ba39..853136b7 100644 --- a/lib/src/models/config/quill_configurations.dart +++ b/lib/src/models/config/quill_configurations.dart @@ -1,32 +1,3 @@ -import 'package:equatable/equatable.dart'; -import 'package:flutter/foundation.dart' show immutable; - -import '../../../flutter_quill.dart'; - export 'editor/editor_configurations.dart'; export 'quill_shared_configurations.dart'; export 'toolbar/simple_toolbar_configurations.dart'; - -@immutable -class QuillConfigurations extends Equatable { - const QuillConfigurations({ - this.sharedConfigurations = const QuillSharedConfigurations(), - }); - - // /// Controller object which establishes a link between a rich text document - // /// and this editor. - // /// - // /// The controller is shared between [QuillEditorConfigurations] and - // /// [QuillToolbarConfigurations] but to simplify things we will defined it - // /// here, it should not be null - // final QuillController controller; - - /// The shared configurations between [QuillEditorConfigurations] and - /// [QuillSimpleToolbarConfigurations] so we don't duplicate things - final QuillSharedConfigurations sharedConfigurations; - - @override - List get props => [ - sharedConfigurations, - ]; -} diff --git a/lib/src/models/config/toolbar/base_button_configurations.dart b/lib/src/models/config/toolbar/base_button_configurations.dart index c4edf36c..05b43cef 100644 --- a/lib/src/models/config/toolbar/base_button_configurations.dart +++ b/lib/src/models/config/toolbar/base_button_configurations.dart @@ -23,8 +23,6 @@ class QuillToolbarBaseButtonExtraOptions extends Equatable { required this.onPressed, }); - /// if you need the not null controller for some usage in the [childBuilder] - /// then please use this instead of the one in the [options] final QuillController controller; /// if the child builder you must use this when the widget tapped or pressed diff --git a/lib/src/widgets/toolbar/buttons/color/color_button.dart b/lib/src/widgets/toolbar/buttons/color/color_button.dart index 587b4a33..eefcc8c8 100644 --- a/lib/src/widgets/toolbar/buttons/color/color_button.dart +++ b/lib/src/widgets/toolbar/buttons/color/color_button.dart @@ -32,7 +32,6 @@ class QuillToolbarColorButton extends StatefulWidget { QuillToolbarColorButtonState createState() => QuillToolbarColorButtonState(); } -// TODO: This button shouldn't require anything to use it class QuillToolbarColorButtonState extends State { late bool _isToggledColor; late bool _isToggledBackground; @@ -165,8 +164,6 @@ class QuillToolbarColorButtonState extends State { final childBuilder = options.childBuilder ?? baseButtonExtraOptions?.childBuilder; if (childBuilder != null) { - // if the caller using Cupertino app he might need to wrap the builder - // with Material() widget return childBuilder( QuillToolbarColorButtonOptions( afterButtonPressed: afterButtonPressed, @@ -206,7 +203,15 @@ class QuillToolbarColorButtonState extends State { ); } - void _changeColor(BuildContext context, Color color) { + void _changeColor(BuildContext context, Color? color) { + if (color == null) { + widget.controller.formatSelection( + widget.isBackground + ? const BackgroundAttribute(null) + : const ColorAttribute(null), + ); + return; + } var hex = colorToHex(color); hex = '#$hex'; widget.controller.formatSelection( diff --git a/lib/src/widgets/toolbar/buttons/color/color_dialog.dart b/lib/src/widgets/toolbar/buttons/color/color_dialog.dart index 3ce6bf81..c8343061 100644 --- a/lib/src/widgets/toolbar/buttons/color/color_dialog.dart +++ b/lib/src/widgets/toolbar/buttons/color/color_dialog.dart @@ -6,6 +6,11 @@ import '../../../../../translations.dart'; import '../../../../models/documents/style.dart'; import 'color_button.dart' show hexToColor; +enum _PickerType { + material, + color, +} + class ColorPickerDialog extends StatefulWidget { const ColorPickerDialog({ required this.isBackground, @@ -17,7 +22,7 @@ class ColorPickerDialog extends StatefulWidget { final bool isBackground; final bool isToggledColor; - final Function(BuildContext context, Color color) onRequestChangeColor; + final Function(BuildContext context, Color? color) onRequestChangeColor; final Style selectionStyle; @override @@ -25,7 +30,7 @@ class ColorPickerDialog extends StatefulWidget { } class ColorPickerDialogState extends State { - var pickerType = 'material'; + var pickerType = _PickerType.material; var selectedColor = Colors.black; late final TextEditingController hexController; @@ -61,24 +66,33 @@ class ColorPickerDialogState extends State { Row( children: [ TextButton( - onPressed: () { - setState(() { - pickerType = 'material'; - }); - }, - child: Text(context.loc.material)), + onPressed: () { + setState(() { + pickerType = _PickerType.material; + }); + }, + child: Text(context.loc.material), + ), TextButton( - onPressed: () { - setState(() { - pickerType = 'color'; - }); - }, - child: Text(context.loc.color)), + onPressed: () { + setState(() { + pickerType = _PickerType.color; + }); + }, + child: Text(context.loc.color), + ), + TextButton( + onPressed: () { + widget.onRequestChangeColor(context, null); + Navigator.of(context).pop(); + }, + child: Text(context.loc.clear), + ), ], ), Column( children: [ - if (pickerType == 'material') + if (pickerType == _PickerType.material) MaterialPicker( pickerColor: selectedColor, onColorChanged: (color) { @@ -86,7 +100,7 @@ class ColorPickerDialogState extends State { Navigator.of(context).pop(); }, ), - if (pickerType == 'color') + if (pickerType == _PickerType.color) ColorPicker( pickerColor: selectedColor, onColorChanged: (color) {