From ca11a9d8f12e560435b0803fcd56f2de4b61d8f1 Mon Sep 17 00:00:00 2001 From: dab246 Date: Fri, 13 Jun 2025 02:59:32 +0700 Subject: [PATCH] TF-3763 Update style for advanced search value input field Signed-off-by: dab246 --- .../styles/advanced_search_input_form_style.dart | 8 ++++---- .../widgets/advanced_search/date_drop_down_button.dart | 7 ++----- .../widgets/advanced_search/sort_by_drop_down_button.dart | 3 ++- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/lib/features/mailbox_dashboard/presentation/styles/advanced_search_input_form_style.dart b/lib/features/mailbox_dashboard/presentation/styles/advanced_search_input_form_style.dart index ea6833647..c1f1da73c 100644 --- a/lib/features/mailbox_dashboard/presentation/styles/advanced_search_input_form_style.dart +++ b/lib/features/mailbox_dashboard/presentation/styles/advanced_search_input_form_style.dart @@ -1,9 +1,9 @@ +import 'package:core/presentation/extensions/color_extension.dart'; +import 'package:core/presentation/utils/theme_utils.dart'; import 'package:flutter/material.dart'; class AdvancedSearchInputFormStyle { - static const TextStyle inputTextStyle = TextStyle( - color: Colors.black, - fontSize: 16, - fontWeight: FontWeight.w400, + static TextStyle inputTextStyle = ThemeUtils.textStyleBodyBody3( + color: AppColor.m3SurfaceBackground, ); } \ No newline at end of file diff --git a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/date_drop_down_button.dart b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/date_drop_down_button.dart index e786dde2b..68a4e2926 100644 --- a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/date_drop_down_button.dart +++ b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/date_drop_down_button.dart @@ -6,6 +6,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:pointer_interceptor/pointer_interceptor.dart'; import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/email_receive_time_type.dart'; +import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/styles/advanced_search_input_form_style.dart'; class DateDropDownButton extends StatelessWidget { @@ -48,11 +49,7 @@ class DateDropDownButton extends StatelessWidget { child: Row(children: [ Expanded(child: Text( receiveTimeSelected?.getTitle(context, startDate: startDate, endDate: endDate) ?? '', - style: const TextStyle( - fontSize: 16, - fontWeight: FontWeight.normal, - color: Colors.black - ), + style: AdvancedSearchInputFormStyle.inputTextStyle, maxLines: 1, softWrap: CommonTextStyle.defaultSoftWrap, overflow: CommonTextStyle.defaultTextOverFlow, diff --git a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/sort_by_drop_down_button.dart b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/sort_by_drop_down_button.dart index ef591f99f..1dbf7c876 100644 --- a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/sort_by_drop_down_button.dart +++ b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/sort_by_drop_down_button.dart @@ -6,6 +6,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:pointer_interceptor/pointer_interceptor.dart'; import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/email_sort_order_type.dart'; +import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/styles/advanced_search_input_form_style.dart'; import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/styles/sort_by_drop_down_style.dart'; typedef OnSortOrderSelected = void Function(EmailSortOrderType?); @@ -76,7 +77,7 @@ class SortByDropDownButton extends StatelessWidget { Expanded( child: Text( sortOrderSelected?.getTitle(context) ?? '', - style: sortOrderSelected?.getTextStyle(isInDropdown: false), + style: AdvancedSearchInputFormStyle.inputTextStyle, maxLines: 1, softWrap: CommonTextStyle.defaultSoftWrap, overflow: CommonTextStyle.defaultTextOverFlow,