From 52ef2db30060f12a80f8b633996dcb2ed77bdfdf Mon Sep 17 00:00:00 2001 From: dab246 Date: Fri, 9 May 2025 11:30:32 +0700 Subject: [PATCH] TF-3704 Fix style label mailbox item Signed-off-by: dab246 --- core/lib/presentation/utils/theme_utils.dart | 5 +++-- .../label_mailbox_item_widget_styles.dart | 2 -- .../widgets/label_mailbox_item_widget.dart | 17 ++++------------- 3 files changed, 7 insertions(+), 17 deletions(-) diff --git a/core/lib/presentation/utils/theme_utils.dart b/core/lib/presentation/utils/theme_utils.dart index 320cf236b..4d9a5d2a6 100644 --- a/core/lib/presentation/utils/theme_utils.dart +++ b/core/lib/presentation/utils/theme_utils.dart @@ -204,12 +204,13 @@ class ThemeUtils { static TextStyle textStyleInter700({ Color? color, + double? fontSize, }) => TextStyle( fontFamily: ConstantsUI.fontApp, fontWeight: FontWeight.w700, letterSpacing: 0.0, - fontSize: 15, - height: 20 / 15, + fontSize: fontSize ?? 15, + height: 20 / (fontSize ?? 15), color: color, ); diff --git a/lib/features/mailbox/presentation/styles/label_mailbox_item_widget_styles.dart b/lib/features/mailbox/presentation/styles/label_mailbox_item_widget_styles.dart index 96dcc1b8d..8fe6ac2eb 100644 --- a/lib/features/mailbox/presentation/styles/label_mailbox_item_widget_styles.dart +++ b/lib/features/mailbox/presentation/styles/label_mailbox_item_widget_styles.dart @@ -5,9 +5,7 @@ import 'package:flutter/material.dart'; class LabelMailboxItemWidgetStyles { static const double labelFolderTextSize = 14; - static const Color labelFolderTextColor = Colors.black; static const Color teamMailboxEmailTextColor = AppColor.steelGray400; static const FontWeight labelFolderTextFontWeight = FontWeight.w400; - static const FontWeight labelFolderSelectedFontWeight = FontWeight.bold; } \ No newline at end of file diff --git a/lib/features/mailbox/presentation/widgets/label_mailbox_item_widget.dart b/lib/features/mailbox/presentation/widgets/label_mailbox_item_widget.dart index 7ed7751f7..e2785ab9c 100644 --- a/lib/features/mailbox/presentation/widgets/label_mailbox_item_widget.dart +++ b/lib/features/mailbox/presentation/widgets/label_mailbox_item_widget.dart @@ -1,5 +1,6 @@ import 'package:core/presentation/resources/image_paths.dart'; import 'package:core/presentation/utils/responsive_utils.dart'; +import 'package:core/presentation/utils/theme_utils.dart'; import 'package:core/presentation/views/text/text_overflow_builder.dart'; import 'package:flutter/material.dart'; import 'package:model/extensions/presentation_mailbox_extension.dart'; @@ -42,11 +43,9 @@ class LabelMailboxItemWidget extends StatelessWidget { Widget build(BuildContext context) { final displayNameWidget = TextOverflowBuilder( mailboxNode.item.getDisplayName(context), - style: Theme.of(context).textTheme.bodyMedium?.copyWith( - fontSize: LabelMailboxItemWidgetStyles.labelFolderTextSize, - color: LabelMailboxItemWidgetStyles.labelFolderTextColor, - fontWeight: _mailboxNameTextFontWeight, - ), + style: isSelected + ? ThemeUtils.textStyleInter700(color: Colors.black, fontSize: 14) + : ThemeUtils.textStyleBodyBody3(color: Colors.black), ); final nameWithExpandIcon = Row( @@ -134,12 +133,4 @@ class LabelMailboxItemWidget extends StatelessWidget { return childWidget; } } - - FontWeight get _mailboxNameTextFontWeight { - if (isSelected || mailboxNode.item.isTeamMailboxes) { - return LabelMailboxItemWidgetStyles.labelFolderSelectedFontWeight; - } else { - return LabelMailboxItemWidgetStyles.labelFolderTextFontWeight; - } - } } \ No newline at end of file