From 6a154a0d0edf8be3136dc64293ce91bd75e18616 Mon Sep 17 00:00:00 2001 From: dab246 Date: Wed, 12 Mar 2025 14:56:55 +0700 Subject: [PATCH] TF-3410 Fix wrong text style sender & recipient information in EmailView Signed-off-by: dab246 --- .../widgets/email_receiver_widget.dart | 17 ++++++++--------- .../widgets/email_sender_builder.dart | 13 +++++++------ .../widgets/prefix_recipient_widget.dart | 7 ++----- .../widgets/received_time_builder.dart | 7 ++----- 4 files changed, 19 insertions(+), 25 deletions(-) diff --git a/lib/features/email/presentation/widgets/email_receiver_widget.dart b/lib/features/email/presentation/widgets/email_receiver_widget.dart index 64a16535e..ba5d6358c 100644 --- a/lib/features/email/presentation/widgets/email_receiver_widget.dart +++ b/lib/features/email/presentation/widgets/email_receiver_widget.dart @@ -3,6 +3,7 @@ import 'package:collection/collection.dart'; 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'; import 'package:core/presentation/views/button/tmail_button_widget.dart'; import 'package:core/utils/platform_info.dart'; import 'package:flutter/material.dart'; @@ -87,9 +88,8 @@ class _EmailReceiverWidgetState extends State { ), TMailButtonWidget.fromText( text: AppLocalizations.of(context).hide, - textStyle: Theme.of(context).textTheme.labelMedium?.copyWith( - color: AppColor.primaryColor, - fontSize: 15 + textStyle: ThemeUtils.textStyleBodyBody1( + color: AppColor.steelGray400, ), backgroundColor: Colors.transparent, onTapActionCallback: () => setState(() => _isDisplayAll = false), @@ -134,7 +134,10 @@ class _EmailReceiverWidgetState extends State { ), if (widget.emailSelected.countRecipients > 1) TMailButtonWidget.fromIcon( - icon: _imagePaths.icChevronDown, + icon: _imagePaths.icChevronDownOutline, + iconColor: AppColor.steelGray400, + padding: const EdgeInsets.all(3), + iconSize: 20, backgroundColor: Colors.transparent, onTapActionCallback: () => setState(() => _isDisplayAll = true), ) @@ -235,11 +238,7 @@ class _EmailReceiverWidgetState extends State { text: index == listEmailAddress.length - 1 ? emailAddress.asString() : '${emailAddress.asString()},', - textStyle: Theme.of(context).textTheme.labelSmall?.copyWith( - color: AppColor.steelGray400, - fontSize: 16, - fontWeight: FontWeight.w500, - ), + textStyle: ThemeUtils.textStyleBodyBody1(color: AppColor.steelGray400), padding: const EdgeInsetsDirectional.symmetric(vertical: 5, horizontal: 8), backgroundColor: Colors.transparent, onTapActionCallback: () => widget.openEmailAddressDetailAction?.call(context, emailAddress), diff --git a/lib/features/email/presentation/widgets/email_sender_builder.dart b/lib/features/email/presentation/widgets/email_sender_builder.dart index 70a399e73..d2adf7d4f 100644 --- a/lib/features/email/presentation/widgets/email_sender_builder.dart +++ b/lib/features/email/presentation/widgets/email_sender_builder.dart @@ -1,6 +1,7 @@ import 'package:core/presentation/extensions/color_extension.dart'; import 'package:core/presentation/utils/style_utils.dart'; +import 'package:core/presentation/utils/theme_utils.dart'; import 'package:flutter/material.dart'; import 'package:jmap_dart_client/jmap/mail/email/email_address.dart'; import 'package:model/extensions/email_address_extension.dart'; @@ -38,9 +39,9 @@ class EmailSenderBuilder extends StatelessWidget { }, borderRadius: 8, padding: const EdgeInsets.all(3), - labelSize: 20, - labelColor: Colors.black, - labelWeight: FontWeight.bold, + customStyle: ThemeUtils.textStyleHeadingHeadingSmall( + color: Colors.black, + ), overflow: CommonTextStyle.defaultTextOverFlow, softWrap: CommonTextStyle.defaultSoftWrap ), @@ -54,9 +55,9 @@ class EmailSenderBuilder extends StatelessWidget { }, borderRadius: 8, padding: const EdgeInsets.all(3), - labelSize: 16, - labelColor: AppColor.colorEmailAddressFull, - labelWeight: FontWeight.w500, + customStyle: ThemeUtils.textStyleBodyBody1( + color: AppColor.steelGray400, + ), overflow: CommonTextStyle.defaultTextOverFlow, softWrap: CommonTextStyle.defaultSoftWrap ), diff --git a/lib/features/email/presentation/widgets/prefix_recipient_widget.dart b/lib/features/email/presentation/widgets/prefix_recipient_widget.dart index 809ee42a9..a6593dfd7 100644 --- a/lib/features/email/presentation/widgets/prefix_recipient_widget.dart +++ b/lib/features/email/presentation/widgets/prefix_recipient_widget.dart @@ -1,5 +1,6 @@ import 'package:core/presentation/extensions/color_extension.dart'; +import 'package:core/presentation/utils/theme_utils.dart'; import 'package:flutter/material.dart'; import 'package:model/email/prefix_email_address.dart'; import 'package:tmail_ui_user/features/composer/presentation/extensions/prefix_email_address_extension.dart'; @@ -15,11 +16,7 @@ class PrefixRecipientWidget extends StatelessWidget { padding: const EdgeInsets.only(top: 6), child: Text( '${prefixEmailAddress.asName(context)}:', - style: Theme.of(context).textTheme.labelMedium?.copyWith( - fontSize: 16, - fontWeight: FontWeight.w500, - color: AppColor.steelGray400 - ) + style: ThemeUtils.textStyleBodyBody1(color: AppColor.steelGray400), ), ); } diff --git a/lib/features/email/presentation/widgets/received_time_builder.dart b/lib/features/email/presentation/widgets/received_time_builder.dart index 9283e1b83..b38730425 100644 --- a/lib/features/email/presentation/widgets/received_time_builder.dart +++ b/lib/features/email/presentation/widgets/received_time_builder.dart @@ -2,6 +2,7 @@ import 'package:core/domain/extensions/datetime_extension.dart'; import 'package:core/presentation/extensions/color_extension.dart'; import 'package:core/presentation/utils/style_utils.dart'; +import 'package:core/presentation/utils/theme_utils.dart'; import 'package:flutter/material.dart'; import 'package:model/email/presentation_email.dart'; import 'package:model/extensions/presentation_email_extension.dart'; @@ -27,11 +28,7 @@ class ReceivedTimeBuilder extends StatelessWidget { maxLines: 1, overflow: CommonTextStyle.defaultTextOverFlow, softWrap: CommonTextStyle.defaultSoftWrap, - style: const TextStyle( - fontSize: 14, - fontWeight: FontWeight.normal, - color: AppColor.colorEmailAddressFull - ) + style: ThemeUtils.textStyleBodyBody3(color: AppColor.steelGray400) ), ); }