From ad54e6e8631ef8ffa1ddc29ebc90b5a12f7862a7 Mon Sep 17 00:00:00 2001 From: dab246 Date: Fri, 7 Jul 2023 17:01:42 +0700 Subject: [PATCH] TF-1683 Fix height/color divider for correctly (cherry picked from commit 25c772101eb693825413e6587961c3c56d0e5da2) --- .../extensions/color_extension.dart | 4 ++-- lib/features/email/presentation/email_view.dart | 3 +-- .../mailbox/presentation/base_mailbox_view.dart | 4 ++-- .../mailbox/presentation/mailbox_view.dart | 4 ++-- .../mailbox/presentation/mailbox_view_web.dart | 3 ++- .../mixin/mailbox_widget_mixin.dart | 2 +- .../user_information_widget_builder.dart | 2 +- .../widgets/list_email_rules_widget.dart | 8 ++------ .../presentation/forward/forward_view.dart | 2 +- .../menu/manage_account_menu_view.dart | 4 ++-- .../widgets/sending_email_tile_widget.dart | 6 +----- .../thread/presentation/thread_view.dart | 5 +---- .../widgets/email_tile_builder.dart | 5 +---- .../widgets/email_tile_web_builder.dart | 17 ++++------------- 14 files changed, 23 insertions(+), 46 deletions(-) diff --git a/core/lib/presentation/extensions/color_extension.dart b/core/lib/presentation/extensions/color_extension.dart index 84c31c022..bbf5f8fea 100644 --- a/core/lib/presentation/extensions/color_extension.dart +++ b/core/lib/presentation/extensions/color_extension.dart @@ -65,7 +65,7 @@ extension AppColor on Color { static const backgroundCountAttachment = Color(0x681C1C1C); static const bgStatusResultSearch = Color(0xFFF5F5F7); static const bgWordSearch = Color(0x3D007AFF); - static const lineItemListColor = Color(0xFF99A2AD); + static const lineItemListColor = Color(0xFFE7E8EC); static const colorNameEmail = Color(0xFF000000); static const colorContentEmail = Color(0xFF6D7885); static const colorTextButton = Color(0xFF007AFF); @@ -73,7 +73,7 @@ extension AppColor on Color { static const colorBgSearchBar = Color(0x99EBEDF0); static const colorBgIdentityButton = Color(0x00EBEDF0); static const colorShadowBgContentEmail = Color(0x14000000); - static const colorDividerMailbox = Color(0xFF99A2AD); + static const colorDividerMailbox = Color(0x1F000000); static const colorCollapseMailbox = Color(0xFFB8C1CC); static const colorExpandMailbox = Color(0xFF007AFF); static const colorBgMailbox = Color(0xFFF7F7F7); diff --git a/lib/features/email/presentation/email_view.dart b/lib/features/email/presentation/email_view.dart index b8bf4a6a5..c86218365 100644 --- a/lib/features/email/presentation/email_view.dart +++ b/lib/features/email/presentation/email_view.dart @@ -53,8 +53,7 @@ class EmailView extends GetWidget { if (_supportVerticalDivider(context)) const VerticalDivider( color: AppColor.lineItemListColor, - width: 1, - thickness: 0.2), + width: 12), Expanded(child: SafeArea( right: responsiveUtils.isLandscapeMobile(context), left: responsiveUtils.isLandscapeMobile(context), diff --git a/lib/features/mailbox/presentation/base_mailbox_view.dart b/lib/features/mailbox/presentation/base_mailbox_view.dart index ce45e62ac..73bc0e1d1 100644 --- a/lib/features/mailbox/presentation/base_mailbox_view.dart +++ b/lib/features/mailbox/presentation/base_mailbox_view.dart @@ -21,13 +21,13 @@ abstract class BaseMailboxView extends GetWidget final imagePaths = Get.find(); Widget buildUserInformation(BuildContext context) { - return Column(children: [ + return Column(mainAxisSize: MainAxisSize.min, children: [ Obx(() => UserInformationWidgetBuilder( imagePaths, controller.mailboxDashBoardController.userProfile.value, subtitle: AppLocalizations.of(context).manage_account, onSubtitleClick: controller.mailboxDashBoardController.goToSettings)), - const Divider(color: AppColor.colorDividerMailbox, height: 0.5, thickness: 0.2) + const Divider(color: AppColor.colorDividerMailbox, height: 1) ]); } diff --git a/lib/features/mailbox/presentation/mailbox_view.dart b/lib/features/mailbox/presentation/mailbox_view.dart index 0c9b81c6c..1f3dad9d8 100644 --- a/lib/features/mailbox/presentation/mailbox_view.dart +++ b/lib/features/mailbox/presentation/mailbox_view.dart @@ -109,7 +109,7 @@ class MailboxView extends BaseMailboxView { ) ), if (!responsiveUtils.isTabletLarge(context)) - const Divider(color: AppColor.colorDividerMailbox, height: 0.5, thickness: 0.2), + const Divider(color: AppColor.colorDividerMailbox, height: 1), ] ); } @@ -187,7 +187,7 @@ class MailboxView extends BaseMailboxView { } }), const SizedBox(height: 8), - const Divider(color: AppColor.colorDividerMailbox, height: 0.5, thickness: 0.2), + const Divider(color: AppColor.colorDividerMailbox, height: 1), const SizedBox(height: 12), Container( margin: EdgeInsetsDirectional.only( diff --git a/lib/features/mailbox/presentation/mailbox_view_web.dart b/lib/features/mailbox/presentation/mailbox_view_web.dart index 0541f7396..6a5b79054 100644 --- a/lib/features/mailbox/presentation/mailbox_view_web.dart +++ b/lib/features/mailbox/presentation/mailbox_view_web.dart @@ -93,6 +93,7 @@ class MailboxView extends BaseMailboxView { AppConfig.appGridDashboardAvailable && responsiveUtils.isWebNotDesktop(context) ? buildAppGridDashboard(context, responsiveUtils, imagePaths, controller) : const SizedBox.shrink(), + const SizedBox(height: 8), Obx(() { if (controller.defaultMailboxIsNotEmpty) { return _buildMailboxCategory( @@ -105,7 +106,7 @@ class MailboxView extends BaseMailboxView { } }), const SizedBox(height: 8), - const Divider(color: AppColor.colorDividerMailbox, height: 0.5, thickness: 0.2), + const Divider(color: AppColor.colorDividerMailbox, height: 1), const SizedBox(height: 13), Padding( padding: EdgeInsetsDirectional.only( diff --git a/lib/features/mailbox/presentation/mixin/mailbox_widget_mixin.dart b/lib/features/mailbox/presentation/mixin/mailbox_widget_mixin.dart index cdcf0e33b..4438881cf 100644 --- a/lib/features/mailbox/presentation/mixin/mailbox_widget_mixin.dart +++ b/lib/features/mailbox/presentation/mixin/mailbox_widget_mixin.dart @@ -347,7 +347,7 @@ mixin MailboxWidgetMixin { : const Offstage(); }) ), - const Divider(color: AppColor.colorDividerMailbox, height: 0.5, thickness: 0.2), + const Divider(color: AppColor.colorDividerMailbox, height: 1) ]); } diff --git a/lib/features/mailbox/presentation/widgets/user_information_widget_builder.dart b/lib/features/mailbox/presentation/widgets/user_information_widget_builder.dart index d8aeac2b6..41dec792e 100644 --- a/lib/features/mailbox/presentation/widgets/user_information_widget_builder.dart +++ b/lib/features/mailbox/presentation/widgets/user_information_widget_builder.dart @@ -37,7 +37,7 @@ class UserInformationWidgetBuilder extends StatelessWidget { Widget build(BuildContext context) { return Padding( padding: padding ?? const EdgeInsetsDirectional.only(start: 16, end: 4, top: 16, bottom: 16), - child: Row(mainAxisAlignment: MainAxisAlignment.center, children: [ + child: Row(children: [ (AvatarBuilder() ..text(_userProfile != null ? _userProfile!.getAvatarText() : '') ..backgroundColor(Colors.white) diff --git a/lib/features/manage_account/presentation/email_rules/widgets/list_email_rules_widget.dart b/lib/features/manage_account/presentation/email_rules/widgets/list_email_rules_widget.dart index 72cb839b6..e3ec79fdf 100644 --- a/lib/features/manage_account/presentation/email_rules/widgets/list_email_rules_widget.dart +++ b/lib/features/manage_account/presentation/email_rules/widgets/list_email_rules_widget.dart @@ -47,9 +47,7 @@ class ListEmailRulesWidget extends GetWidget { ), const Divider( color: AppColor.lineItemListColor, - height: 1, - thickness: 0.2, - ), + height: 1), Obx(() { log('ListEmailRulesWidget::build(): ${controller.listEmailRule}'); return ListView.separated( @@ -67,9 +65,7 @@ class ListEmailRulesWidget extends GetWidget { if (controller.listEmailRule.isNotEmpty) { return const Divider( color: AppColor.lineItemListColor, - height: 1, - thickness: 0.2, - ); + height: 1); } else { return const SizedBox.shrink(); } diff --git a/lib/features/manage_account/presentation/forward/forward_view.dart b/lib/features/manage_account/presentation/forward/forward_view.dart index b0a07f3b4..4b18f1245 100644 --- a/lib/features/manage_account/presentation/forward/forward_view.dart +++ b/lib/features/manage_account/presentation/forward/forward_view.dart @@ -36,7 +36,7 @@ class ForwardView extends GetWidget with AppLoaderMixin { if (_responsiveUtils.isWebDesktop(context)) ...[ ForwardHeaderWidget(imagePaths: _imagePaths, responsiveUtils: _responsiveUtils), - Container(height: 1, color: AppColor.colorDividerHeaderSetting) + const Divider(height: 1, color: AppColor.colorDividerHeaderSetting) ], Expanded(child: SingleChildScrollView( physics: const ClampingScrollPhysics(), diff --git a/lib/features/manage_account/presentation/menu/manage_account_menu_view.dart b/lib/features/manage_account/presentation/menu/manage_account_menu_view.dart index ce57bf6e2..7858f9071 100644 --- a/lib/features/manage_account/presentation/menu/manage_account_menu_view.dart +++ b/lib/features/manage_account/presentation/menu/manage_account_menu_view.dart @@ -54,7 +54,7 @@ class ManageAccountMenuView extends GetWidget { ]) ), if (!_responsiveUtils.isWebDesktop(context)) - const Divider(color: AppColor.colorDividerMailbox, height: 0.5, thickness: 0.2), + const Divider(color: AppColor.colorDividerMailbox, height: 1), Expanded(child: Container( color: _responsiveUtils.isWebDesktop(context) ? AppColor.colorBgDesktop : Colors.white, child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -112,7 +112,7 @@ class ManageAccountMenuView extends GetWidget { }), const Padding( padding: EdgeInsets.symmetric(vertical: 16), - child: Divider(color: AppColor.lineItemListColor, height: 0.5, thickness: 0.2)), + child: Divider(color: AppColor.lineItemListColor, height: 1)), Padding( padding: const EdgeInsetsDirectional.only(start: 20, end: 10), child: Material( diff --git a/lib/features/sending_queue/presentation/widgets/sending_email_tile_widget.dart b/lib/features/sending_queue/presentation/widgets/sending_email_tile_widget.dart index 33a604772..32e685968 100644 --- a/lib/features/sending_queue/presentation/widgets/sending_email_tile_widget.dart +++ b/lib/features/sending_queue/presentation/widgets/sending_email_tile_widget.dart @@ -155,11 +155,7 @@ class SendingEmailTileWidget extends StatelessWidget { ), Padding( padding: SendingQueueUtils.getPaddingDividerListViewByResponsiveSize(constraints.maxWidth), - child: const Divider( - color: AppColor.lineItemListColor, - height: 1, - thickness: 0.2 - ), + child: const Divider(color: AppColor.lineItemListColor, height: 1), ) ], ), diff --git a/lib/features/thread/presentation/thread_view.dart b/lib/features/thread/presentation/thread_view.dart index 1258b8efe..51a785464 100644 --- a/lib/features/thread/presentation/thread_view.dart +++ b/lib/features/thread/presentation/thread_view.dart @@ -50,10 +50,7 @@ class ThreadView extends GetWidget body: Portal( child: Row(children: [ if (supportVerticalDivider(context)) - const VerticalDivider( - color: AppColor.colorDividerVertical, - width: 1, - thickness: 0.2), + const VerticalDivider(color: AppColor.colorDividerVertical, width: 1), Expanded(child: SafeArea( right: _responsiveUtils.isLandscapeMobile(context), left: _responsiveUtils.isLandscapeMobile(context), diff --git a/lib/features/thread/presentation/widgets/email_tile_builder.dart b/lib/features/thread/presentation/widgets/email_tile_builder.dart index bcf409f02..f7d6b1f10 100644 --- a/lib/features/thread/presentation/widgets/email_tile_builder.dart +++ b/lib/features/thread/presentation/widgets/email_tile_builder.dart @@ -135,10 +135,7 @@ class EmailTileBuilder with BaseEmailItemTile { ), Padding( padding: paddingDivider ?? const EdgeInsetsDirectional.symmetric(horizontal: 16), - child: const Divider( - color: AppColor.lineItemListColor, - height: 1, - thickness: 0.2)), + child: const Divider(color: AppColor.lineItemListColor, height: 1)), ], ), ); diff --git a/lib/features/thread/presentation/widgets/email_tile_web_builder.dart b/lib/features/thread/presentation/widgets/email_tile_web_builder.dart index 8cc59fbb5..f5db5f5f0 100644 --- a/lib/features/thread/presentation/widgets/email_tile_web_builder.dart +++ b/lib/features/thread/presentation/widgets/email_tile_web_builder.dart @@ -202,11 +202,8 @@ class EmailTileBuilder with BaseEmailItemTile { ), if (_selectModeAll == SelectMode.INACTIVE) Transform( - transform: Matrix4.translationValues(0.0, 10.0, 0.0), - child: const Divider( - color: AppColor.lineItemListColor, - height: 1, - thickness: 0.2)), + transform: Matrix4.translationValues(0.0, 10.0, 0.0), + child: const Divider(color: AppColor.lineItemListColor, height: 1)), ], ); } @@ -289,10 +286,7 @@ class EmailTileBuilder with BaseEmailItemTile { if (_selectModeAll == SelectMode.INACTIVE) Transform( transform: Matrix4.translationValues(0.0, 10.0, 0.0), - child: const Divider( - color: AppColor.lineItemListColor, - height: 1, - thickness: 0.2), + child: const Divider(color: AppColor.lineItemListColor, height: 1), ), ], )) @@ -391,10 +385,7 @@ class EmailTileBuilder with BaseEmailItemTile { transform: Matrix4.translationValues(0.0, 10, 0.0), child: const Padding( padding: EdgeInsetsDirectional.only(start: 120), - child: Divider( - color: AppColor.lineItemListColor, - height: 1, - thickness: 0.2)), + child: Divider(color: AppColor.lineItemListColor, height: 1)), ) ]), );