From 991b9e22e81e563819e949adc3f4a8d8ccd791e6 Mon Sep 17 00:00:00 2001 From: dab246 Date: Thu, 12 Jun 2025 19:22:19 +0700 Subject: [PATCH] TF-3764 Fix left padding `All folders` in destination picker Signed-off-by: dab246 --- core/lib/presentation/utils/theme_utils.dart | 9 --- .../presentation/destination_picker_view.dart | 56 ++++++++++--------- .../widgets/empty_emails_widget.dart | 8 ++- 3 files changed, 38 insertions(+), 35 deletions(-) diff --git a/core/lib/presentation/utils/theme_utils.dart b/core/lib/presentation/utils/theme_utils.dart index c4f1f35a6..7a886f4a9 100644 --- a/core/lib/presentation/utils/theme_utils.dart +++ b/core/lib/presentation/utils/theme_utils.dart @@ -279,15 +279,6 @@ class ThemeUtils { color: AppColor.gray424244.withOpacity(0.9), ); - static TextStyle textStyleInter400() => TextStyle( - fontFamily: ConstantsUI.fontApp, - fontWeight: FontWeight.w400, - letterSpacing: -0.15, - fontSize: 16, - height: 21.01 / 16, - color: AppColor.gray424244.withOpacity(0.64), - ); - static TextSelectionThemeData get _textSelectionTheme { return const TextSelectionThemeData( cursorColor: AppColor.primaryColor, diff --git a/lib/features/destination_picker/presentation/destination_picker_view.dart b/lib/features/destination_picker/presentation/destination_picker_view.dart index 4b17acabc..320f8baf6 100644 --- a/lib/features/destination_picker/presentation/destination_picker_view.dart +++ b/lib/features/destination_picker/presentation/destination_picker_view.dart @@ -1,6 +1,7 @@ import 'package:core/presentation/extensions/color_extension.dart'; import 'package:core/presentation/state/success.dart'; import 'package:core/presentation/utils/style_utils.dart'; +import 'package:core/presentation/utils/theme_utils.dart'; import 'package:core/presentation/views/button/icon_button_web.dart'; import 'package:core/presentation/views/list/tree_view.dart'; import 'package:core/presentation/views/search/search_bar_view.dart'; @@ -27,6 +28,8 @@ import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_action import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_categories.dart'; import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_displayed.dart'; import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_node.dart'; +import 'package:tmail_ui_user/features/mailbox/presentation/styles/mailbox_icon_widget_styles.dart'; +import 'package:tmail_ui_user/features/mailbox/presentation/styles/mailbox_item_widget_styles.dart'; import 'package:tmail_ui_user/features/mailbox/presentation/widgets/mailbox_category_widget.dart'; import 'package:tmail_ui_user/features/mailbox/presentation/widgets/mailbox_item_widget.dart'; import 'package:tmail_ui_user/features/mailbox_creator/presentation/widgets/create_mailbox_name_input_decoration_builder.dart'; @@ -499,51 +502,54 @@ class DestinationPickerView extends GetWidget controller.dispatchSelectMailboxDestination(context); } }, - customBorder: const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(8))), + customBorder: RoundedRectangleBorder( + borderRadius: BorderRadius.all(Radius.circular( + PlatformInfo.isWeb + ? MailboxItemWidgetStyles.borderRadius + : MailboxItemWidgetStyles.mobileBorderRadius, + )), + ), hoverColor: AppColor.colorMailboxHovered, child: Obx(() => Container( padding: const EdgeInsetsDirectional.symmetric( - horizontal: 8, - vertical: 10, + horizontal: MailboxItemWidgetStyles.itemPadding, ), color: controller.mailboxDestination.value == PresentationMailbox.unifiedMailbox ? AppColor.colorItemSelected : Colors.transparent, + height: PlatformInfo.isWeb + ? MailboxItemWidgetStyles.height + : MailboxItemWidgetStyles.mobileHeight, child: Row(children: [ - const SizedBox(width: 26), SvgPicture.asset( controller.imagePaths.icFolderMailbox, - width: 20, - height: 20, + width: MailboxIconWidgetStyles.iconSize, + height: MailboxIconWidgetStyles.iconSize, fit: BoxFit.fill ), - const SizedBox(width: 10), + const SizedBox( + width: MailboxItemWidgetStyles.labelIconSpace, + ), Expanded(child: Text( AppLocalizations.of(context).allFolders, maxLines: 1, - softWrap: CommonTextStyle.defaultSoftWrap, - overflow: CommonTextStyle.defaultTextOverFlow, - style: const TextStyle( - fontSize: 14, - color: Colors.black, - fontWeight: FontWeight.normal - ), + overflow: TextOverflow.ellipsis, + style: ThemeUtils.textStyleInter500(), )), - const SizedBox(width: 8), + const SizedBox( + width: MailboxItemWidgetStyles.labelIconSpace, + ), if (_validateDisplaySelectedIcon( actions: actions, mailboxIdSelected: mailboxIdSelected )) - Padding( - padding: const EdgeInsetsDirectional.only(end: 30.0), - child: SvgPicture.asset( - actions == MailboxActions.create - ? controller.imagePaths.icSelectedSB - : controller.imagePaths.icFilterSelected, - width: 20, - height: 20, - fit: BoxFit.fill - ), + SvgPicture.asset( + actions == MailboxActions.create + ? controller.imagePaths.icSelectedSB + : controller.imagePaths.icFilterSelected, + width: MailboxIconWidgetStyles.iconSize, + height: MailboxIconWidgetStyles.iconSize, + fit: BoxFit.fill ) ]) )), diff --git a/lib/features/thread/presentation/widgets/empty_emails_widget.dart b/lib/features/thread/presentation/widgets/empty_emails_widget.dart index 372e0a306..ae867a301 100644 --- a/lib/features/thread/presentation/widgets/empty_emails_widget.dart +++ b/lib/features/thread/presentation/widgets/empty_emails_widget.dart @@ -1,3 +1,4 @@ +import 'package:core/presentation/extensions/color_extension.dart'; import 'package:core/presentation/resources/image_paths.dart'; import 'package:core/presentation/utils/responsive_utils.dart'; import 'package:core/presentation/utils/theme_utils.dart'; @@ -51,7 +52,12 @@ class EmptyEmailsWidget extends StatelessWidget { Text( key: const Key('empty_email_sub_message'), AppLocalizations.of(context).startToComposeEmails, - style: ThemeUtils.textStyleInter400(), + style: ThemeUtils.textStyleInter400().copyWith( + letterSpacing: -0.15, + fontSize: 16, + height: 21.01 / 16, + color: AppColor.gray424244.withOpacity(0.64), + ), textAlign: TextAlign.center, ), ],