From 1378d40596f1d8aee7eebe0acf53d37b586c760a Mon Sep 17 00:00:00 2001 From: dab246 Date: Mon, 16 Jun 2025 14:38:59 +0700 Subject: [PATCH] TF-3763 Set default height advanced search fields are 40px Signed-off-by: dab246 --- .../widgets/draggable_recipient_tag_widget.dart | 6 ++++-- .../styles/advanced_search_input_form_style.dart | 1 + .../styles/autocomplete_tag_item_web_style.dart | 4 ++-- ...t_field_autocomplete_email_address_web_style.dart | 11 +++++++++-- .../advanced_search/advanced_search_input_form.dart | 12 +++++++++--- .../autocomplete_tag_item_widget_web.dart | 10 ++++++++-- .../advanced_search/date_drop_down_button.dart | 4 ++-- .../advanced_search/sort_by_drop_down_button.dart | 4 ++-- .../text_field_autocomplete_email_address_web.dart | 4 ++++ 9 files changed, 41 insertions(+), 15 deletions(-) diff --git a/lib/features/composer/presentation/widgets/draggable_recipient_tag_widget.dart b/lib/features/composer/presentation/widgets/draggable_recipient_tag_widget.dart index 158edfe24..ef33de386 100644 --- a/lib/features/composer/presentation/widgets/draggable_recipient_tag_widget.dart +++ b/lib/features/composer/presentation/widgets/draggable_recipient_tag_widget.dart @@ -12,12 +12,14 @@ import 'package:tmail_ui_user/features/composer/presentation/styles/draggable_re class DraggableRecipientTagWidget extends StatelessWidget { final EmailAddress emailAddress; + final EdgeInsetsGeometry? padding; final _imagePaths = Get.find(); DraggableRecipientTagWidget({ super.key, - required this.emailAddress + required this.emailAddress, + this.padding, }); @override @@ -31,7 +33,7 @@ class DraggableRecipientTagWidget extends StatelessWidget { ), color: DraggableRecipientTagWidgetStyle.backgroundColor ), - padding: DraggableRecipientTagWidgetStyle.padding, + padding: padding ?? DraggableRecipientTagWidgetStyle.padding, child: Row( mainAxisSize: MainAxisSize.min, children: [ 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 c875a04cc..b0d338148 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 @@ -9,6 +9,7 @@ class AdvancedSearchInputFormStyle { static const double inputFieldBorderRadius = 10; static const double inputFieldBorderWidth = 1; + static const double inputFieldHeight = 40; static const Color inputFieldBorderColor = AppColor.m3Neutral90; static const Color inputFieldBackgroundColor = Colors.white; diff --git a/lib/features/mailbox_dashboard/presentation/styles/autocomplete_tag_item_web_style.dart b/lib/features/mailbox_dashboard/presentation/styles/autocomplete_tag_item_web_style.dart index 4658c4ded..271f03926 100644 --- a/lib/features/mailbox_dashboard/presentation/styles/autocomplete_tag_item_web_style.dart +++ b/lib/features/mailbox_dashboard/presentation/styles/autocomplete_tag_item_web_style.dart @@ -2,12 +2,12 @@ import 'package:core/presentation/extensions/color_extension.dart'; import 'package:flutter/material.dart'; class AutoCompleteTagItemWebStyle { - static const double paddingTop = 8; + static const double paddingTop = 3.0; static const double paddingEnd = 40.0; static const double labelPaddingHorizontal = 4.0; static const EdgeInsetsGeometry collapsedPadding = EdgeInsetsDirectional.symmetric(vertical: 4, horizontal: 8); - static const EdgeInsetsGeometry marginCollapsed = EdgeInsets.only(top: 8); + static const EdgeInsetsGeometry marginCollapsed = EdgeInsets.only(top: 3); static const BorderRadius shapeBorderRadius = BorderRadius.all(Radius.circular(10.0)); diff --git a/lib/features/mailbox_dashboard/presentation/styles/text_field_autocomplete_email_address_web_style.dart b/lib/features/mailbox_dashboard/presentation/styles/text_field_autocomplete_email_address_web_style.dart index 6c1ef2d4d..dc680cfb2 100644 --- a/lib/features/mailbox_dashboard/presentation/styles/text_field_autocomplete_email_address_web_style.dart +++ b/lib/features/mailbox_dashboard/presentation/styles/text_field_autocomplete_email_address_web_style.dart @@ -5,8 +5,15 @@ import 'package:tmail_ui_user/features/composer/presentation/styles/composer_sty import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/styles/advanced_search_input_form_style.dart'; class TextFieldAutoCompleteEmailAddressWebStyles { - static const EdgeInsetsGeometry textInputContentPadding = EdgeInsetsDirectional.only(top: 16, bottom: 16, start: 12, end: 8); - static const EdgeInsetsGeometry textInputContentPaddingWithSomeTag = EdgeInsetsDirectional.symmetric(vertical: 16); + static const EdgeInsetsGeometry textInputContentPadding = + EdgeInsetsDirectional.only( + top: 14, + bottom: 14, + start: 12, + end: 8, + ); + static const EdgeInsetsGeometry textInputContentPaddingWithSomeTag = + EdgeInsetsDirectional.symmetric(vertical: 14); static const EdgeInsets tagEditorPadding = EdgeInsets.symmetric(horizontal: 12); static const double suggestionBoxRadius = 20.0; diff --git a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/advanced_search_input_form.dart b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/advanced_search_input_form.dart index 1fae40509..9ca91fba9 100644 --- a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/advanced_search_input_form.dart +++ b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/advanced_search_input_form.dart @@ -136,8 +136,8 @@ class AdvancedSearchInputForm extends GetWidget ), ), ), - height: 44, - width: 44, + height: AdvancedSearchInputFormStyle.inputFieldHeight, + width: AdvancedSearchInputFormStyle.inputFieldHeight, child: TMailButtonWidget.fromIcon( icon: controller.imagePaths.icCalendarSB, iconSize: 22, @@ -257,7 +257,10 @@ class AdvancedSearchInputForm extends GetWidget mainAxisSize: MainAxisSize.min, children: child, ) - : SizedBox(height: 44, child: Row(children: child)); + : SizedBox( + height: AdvancedSearchInputFormStyle.inputFieldHeight, + child: Row(children: child), + ); } bool _isVerticalArrange(BuildContext context) => @@ -342,6 +345,9 @@ class AdvancedSearchInputForm extends GetWidget }, onTextChange: onTextChange, decoration: InputDecoration( + constraints: const BoxConstraints( + maxHeight: AdvancedSearchInputFormStyle.inputFieldHeight, + ), filled: true, fillColor: AdvancedSearchInputFormStyle.inputFieldBackgroundColor, contentPadding: const EdgeInsetsDirectional.only(start: 12, end: 8), diff --git a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/autocomplete_tag_item_widget_web.dart b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/autocomplete_tag_item_widget_web.dart index 16cc1fe48..9fba96de2 100644 --- a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/autocomplete_tag_item_widget_web.dart +++ b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/autocomplete_tag_item_widget_web.dart @@ -55,8 +55,14 @@ class AutoCompleteTagItemWidgetWeb extends StatelessWidget { emailAddress: currentEmailAddress, prefix: field.getPrefixEmailAddress() ), - feedback: DraggableRecipientTagWidget(emailAddress: currentEmailAddress), - childWhenDragging: DraggableRecipientTagWidget(emailAddress: currentEmailAddress), + feedback: DraggableRecipientTagWidget( + emailAddress: currentEmailAddress, + padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 4), + ), + childWhenDragging: DraggableRecipientTagWidget( + emailAddress: currentEmailAddress, + padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 4), + ), child: TextFieldTapRegion( child: InkWell( onTap: () => isCollapsed 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 a0495a91f..b469df63d 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 @@ -35,7 +35,7 @@ class DateDropDownButton extends StatelessWidget { .toList(), value: receiveTimeSelected, customButton: Container( - height: 44, + height: AdvancedSearchInputFormStyle.inputFieldHeight, decoration: BoxDecoration( borderRadius: const BorderRadius.all( Radius.circular(AdvancedSearchInputFormStyle.inputFieldBorderRadius), @@ -64,7 +64,7 @@ class DateDropDownButton extends StatelessWidget { } }, buttonStyleData: ButtonStyleData( - height: 44, + height: AdvancedSearchInputFormStyle.inputFieldHeight, padding: const EdgeInsetsDirectional.only(start: 12, end: 8), decoration: BoxDecoration( borderRadius: const BorderRadius.all( 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 e12e45765..2ecdc904f 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 @@ -61,7 +61,7 @@ class SortByDropDownButton extends StatelessWidget { )).toList(), value: sortOrderSelected, customButton: Container( - height: SortByDropdownStyle.height, + height: AdvancedSearchInputFormStyle.inputFieldHeight, decoration: BoxDecoration( borderRadius: const BorderRadius.all( Radius.circular(AdvancedSearchInputFormStyle.inputFieldBorderRadius), @@ -90,7 +90,7 @@ class SortByDropDownButton extends StatelessWidget { ), onChanged: onSortOrderSelected, buttonStyleData: ButtonStyleData( - height: SortByDropdownStyle.height, + height: AdvancedSearchInputFormStyle.inputFieldHeight, padding: SortByDropdownStyle.buttonPadding, decoration: BoxDecoration( borderRadius: const BorderRadius.all( diff --git a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/text_field_autocomplete_email_address_web.dart b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/text_field_autocomplete_email_address_web.dart index ee7f88e8b..b2d7d5f60 100644 --- a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/text_field_autocomplete_email_address_web.dart +++ b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/text_field_autocomplete_email_address_web.dart @@ -141,6 +141,10 @@ class _TextFieldAutocompleteEmailAddressWebState extends State