From dfd596011bbdc5811a26a33a1e65518501350ee2 Mon Sep 17 00:00:00 2001 From: dab246 Date: Thu, 9 Jan 2025 03:30:08 +0700 Subject: [PATCH] TF-3410 Sync changes between web and mobile Signed-off-by: dab246 --- .../extensions/color_extension.dart | 1 - core/lib/utils/html/html_utils.dart | 4 +- .../base/widget/compose_floating_button.dart | 2 +- .../web/bottom_bar_composer_widget_style.dart | 2 +- .../widgets/email_view_app_bar_widget.dart | 37 ++++---- .../mailbox/presentation/mailbox_view.dart | 27 +++--- .../mobile_app_bar_thread_widget_style.dart | 7 +- ...ction_web_app_bar_thread_widget_style.dart | 19 ++-- .../thread/presentation/thread_view.dart | 2 + .../app_bar/app_bar_thread_widget.dart | 11 +++ .../default_mobile_app_bar_thread_widget.dart | 15 ++-- .../default_web_app_bar_thread_widget.dart | 17 ++-- .../app_bar/mobile_app_bar_thread_widget.dart | 11 +++ ...election_mobile_app_bar_thread_widget.dart | 17 ++-- .../selection_web_app_bar_thread_widget.dart | 89 ++++++++++--------- .../app_bar/web_app_bar_thread_widget.dart | 10 +++ .../bottom_bar_thread_selection_widget.dart | 22 +++-- 17 files changed, 167 insertions(+), 126 deletions(-) diff --git a/core/lib/presentation/extensions/color_extension.dart b/core/lib/presentation/extensions/color_extension.dart index af6b54cfc..47b037a91 100644 --- a/core/lib/presentation/extensions/color_extension.dart +++ b/core/lib/presentation/extensions/color_extension.dart @@ -206,7 +206,6 @@ extension AppColor on Color { static const colorLineComposer = Color(0xFFF4F4F4); static const colorPrefixButtonComposer = Color(0xFF8B9CAF); static const colorRichButtonComposer = Color(0xFFAEAEC0); - static const colorMobileRichButtonComposer = Color(0xFF8C9CAF); static const colorSelected = Color(0xFFE3F1FF); static const colorAttachmentBorder = Color(0xFFE5ECF3); static const colorProgressLoadingBackground = Color(0xFFE3F1FF); diff --git a/core/lib/utils/html/html_utils.dart b/core/lib/utils/html/html_utils.dart index 92d41b56b..7fed3a0bd 100644 --- a/core/lib/utils/html/html_utils.dart +++ b/core/lib/utils/html/html_utils.dart @@ -125,7 +125,9 @@ class HtmlUtils { - ${useDefaultFont ? '' : ''} + ${useDefaultFont && PlatformInfo.isMobile + ? '' + : ''}