Revise📖

1. 📖Change iconButton in the toolbar to CustomButton
Cierra-Runis · Jul 5, 2023 · 43e07ce · 43e07ce
1 parent ad6fbbf
commit 43e07ce
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 21 deletions.
diff --git a/lib/widgets/diary/editor/diary_editor_toolbar_date_time_button.dart b/lib/widgets/diary/editor/diary_editor_toolbar_date_time_button.dart
@@ -13,10 +13,10 @@ class DiaryEditorToolbarDateTimeButtonWidget extends QuillCustomButton {
   final ValueChanged<Diary?> handleToolbarChangeDiary;
 
   @override
-  IconData? get icon => Icons.date_range_rounded;
+  IconData get icon => Icons.date_range_rounded;
 
   @override
-  VoidCallback? get onTap => () async {
+  VoidCallback get onTap => () async {
         DateTime? dateTime = await showDatePicker(
           context: context,
           initialEntryMode: DatePickerEntryMode.calendarOnly,

diff --git a/lib/widgets/diary/editor/diary_editor_toolbar_image_button_widget.dart b/lib/widgets/diary/editor/diary_editor_toolbar_image_button_widget.dart
@@ -1,24 +1,19 @@
 import 'package:mercurius/index.dart';
 
-class DiaryEditorToolbarImageButtonWidget extends QuillIconButton {
+class DiaryEditorToolbarImageButtonWidget extends CustomButton {
   DiaryEditorToolbarImageButtonWidget({
     super.key,
+    super.icon = Icons.add_photo_alternate_rounded,
+    super.iconTheme,
     required super.tooltip,
     required this.controller,
     required this.context,
     required String path,
-  }) : super(
-          size: 18 * 1.77,
-          borderRadius: 12,
-          onPressed: () => _onPressed(controller, context, path),
-        );
+  }) : super(onPressed: () => _onPressed(controller, context, path));
 
   final BuildContext context;
   final QuillController controller;
 
-  @override
-  Widget? get icon => const Icon(Icons.add_photo_alternate_rounded);
-
   static void _onPressed(
     QuillController controller,
     BuildContext context,

diff --git a/lib/widgets/diary/editor/diary_editor_toolbar_mood_button_widget.dart b/lib/widgets/diary/editor/diary_editor_toolbar_mood_button_widget.dart
@@ -13,10 +13,10 @@ class DiaryEditorToolbarMoodButtonWidget extends QuillCustomButton {
   final ValueChanged<Diary?> handleToolbarChangeDiary;
 
   @override
-  IconData? get icon => Icons.mood_rounded;
+  IconData get icon => Icons.mood_rounded;
 
   @override
-  VoidCallback? get onTap => () async {
+  VoidCallback get onTap => () async {
         Diary? newDiary = await showDialog<Diary>(
           context: context,
           builder: (context) => DiaryMoodSelectorWidget(

diff --git a/lib/widgets/diary/editor/diary_editor_toolbar_tag_button_widget.dart b/lib/widgets/diary/editor/diary_editor_toolbar_tag_button_widget.dart
@@ -1,23 +1,20 @@
 import 'package:mercurius/index.dart';
 
-class DiaryEditorToolbarTagButtonWidget extends QuillIconButton {
+class DiaryEditorToolbarTagButtonWidget extends CustomButton {
   DiaryEditorToolbarTagButtonWidget({
     super.key,
+    super.icon = Icons.new_label_rounded,
+    super.iconTheme,
     required super.tooltip,
     required this.controller,
     required this.context,
   }) : super(
-          size: 18 * 1.77,
-          borderRadius: 12,
           onPressed: () => _onPressed(controller, context),
         );
 
   final BuildContext context;
   final QuillController controller;
 
-  @override
-  Widget? get icon => const Icon(Icons.new_label_rounded);
-
   static void _onPressed(
     QuillController controller,
     BuildContext context,

diff --git a/lib/widgets/diary/editor/diary_editor_toolbar_weather_button.dart b/lib/widgets/diary/editor/diary_editor_toolbar_weather_button.dart
@@ -13,10 +13,10 @@ class DiaryEditorToolbarWeatherButtonWidget extends QuillCustomButton {
   final ValueChanged<Diary?> handleToolbarChangeDiary;
 
   @override
-  IconData? get icon => Icons.cloud;
+  IconData get icon => Icons.cloud;
 
   @override
-  VoidCallback? get onTap => () async {
+  VoidCallback get onTap => () async {
         Diary? newDiary = await showDialog<Diary>(
           context: context,
           builder: (context) => DiaryWeatherSelectorDialogWidget(

diff --git a/lib/widgets/diary/editor/diary_editor_toolbar_widget.dart b/lib/widgets/diary/editor/diary_editor_toolbar_widget.dart
@@ -37,6 +37,7 @@ class DiaryEditorToolbarWidget extends ConsumerWidget {
           error: (error, stackTrace) => Container(),
           data: (data) => DiaryEditorToolbarImageButtonWidget(
             tooltip: l10n.insertImage,
+            iconTheme: quillIconTheme,
             controller: controller,
             context: context,
             path: data,
@@ -46,6 +47,7 @@ class DiaryEditorToolbarWidget extends ConsumerWidget {
       (controller, _, __, ___) {
         return DiaryEditorToolbarTagButtonWidget(
           tooltip: l10n.insertTag,
+          iconTheme: quillIconTheme,
           controller: controller,
           context: context,
         );