From ebc5e39a47768abf98f301e6cd1eb44a964ee3f0 Mon Sep 17 00:00:00 2001 From: dab246 Date: Fri, 9 May 2025 11:05:42 +0700 Subject: [PATCH] TF-3704 Fix mailbox item height Signed-off-by: dab246 --- .../styles/leading_mailbox_item_widget_styles.dart | 11 ----------- .../styles/mailbox_item_widget_styles.dart | 1 + .../widgets/leading_mailbox_item_widget.dart | 14 +++++--------- .../presentation/widgets/mailbox_item_widget.dart | 8 ++++---- 4 files changed, 10 insertions(+), 24 deletions(-) delete mode 100644 lib/features/mailbox/presentation/styles/leading_mailbox_item_widget_styles.dart diff --git a/lib/features/mailbox/presentation/styles/leading_mailbox_item_widget_styles.dart b/lib/features/mailbox/presentation/styles/leading_mailbox_item_widget_styles.dart deleted file mode 100644 index fa72b9fee..000000000 --- a/lib/features/mailbox/presentation/styles/leading_mailbox_item_widget_styles.dart +++ /dev/null @@ -1,11 +0,0 @@ - -import 'package:core/utils/direction_utils.dart'; -import 'package:flutter/material.dart'; - -class LeadingMailboxItemWidgetStyles { - static Matrix4 mailboxIconTransform(BuildContext context) => Matrix4.translationValues( - DirectionUtils.isDirectionRTLByLanguage(context) ? 0.0 : -4.0, - 0.0, - 0.0 - ); -} \ No newline at end of file diff --git a/lib/features/mailbox/presentation/styles/mailbox_item_widget_styles.dart b/lib/features/mailbox/presentation/styles/mailbox_item_widget_styles.dart index 280bbf20f..3cab1be44 100644 --- a/lib/features/mailbox/presentation/styles/mailbox_item_widget_styles.dart +++ b/lib/features/mailbox/presentation/styles/mailbox_item_widget_styles.dart @@ -5,4 +5,5 @@ class MailboxItemWidgetStyles { static const double padding = 8; static const double itemPadding = 10; static const double borderRadius = 8; + static const double height = 36; } \ No newline at end of file diff --git a/lib/features/mailbox/presentation/widgets/leading_mailbox_item_widget.dart b/lib/features/mailbox/presentation/widgets/leading_mailbox_item_widget.dart index f7b19ac69..f0c2132b5 100644 --- a/lib/features/mailbox/presentation/widgets/leading_mailbox_item_widget.dart +++ b/lib/features/mailbox/presentation/widgets/leading_mailbox_item_widget.dart @@ -3,7 +3,6 @@ import 'package:core/presentation/resources/image_paths.dart'; import 'package:flutter/material.dart'; import 'package:model/mailbox/select_mode.dart'; import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_node.dart'; -import 'package:tmail_ui_user/features/mailbox/presentation/styles/leading_mailbox_item_widget_styles.dart'; import 'package:tmail_ui_user/features/mailbox/presentation/utils/mailbox_method_action_define.dart'; import 'package:tmail_ui_user/features/mailbox/presentation/widgets/mailbox_icon_widget.dart'; @@ -24,14 +23,11 @@ class LeadingMailboxItemWidget extends StatelessWidget { @override Widget build(BuildContext context) { - return Transform( - transform: LeadingMailboxItemWidgetStyles.mailboxIconTransform(context), - child: MailboxIconWidget( - imagePaths: imagePaths, - mailboxNode: mailboxNode, - selectionMode: selectionMode, - onSelectMailboxFolderClick: onSelectMailboxFolderClick - ) + return MailboxIconWidget( + imagePaths: imagePaths, + mailboxNode: mailboxNode, + selectionMode: selectionMode, + onSelectMailboxFolderClick: onSelectMailboxFolderClick ); } } \ No newline at end of file diff --git a/lib/features/mailbox/presentation/widgets/mailbox_item_widget.dart b/lib/features/mailbox/presentation/widgets/mailbox_item_widget.dart index 2618e44ca..568fdb8f5 100644 --- a/lib/features/mailbox/presentation/widgets/mailbox_item_widget.dart +++ b/lib/features/mailbox/presentation/widgets/mailbox_item_widget.dart @@ -80,8 +80,8 @@ class _MailboxItemWidgetState extends State { ), padding: const EdgeInsetsDirectional.symmetric( horizontal: MailboxItemWidgetStyles.itemPadding, - vertical: MailboxItemWidgetStyles.space, ), + height: MailboxItemWidgetStyles.height, child: Row( mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: widget.mailboxNode.item.isTeamMailboxes @@ -129,8 +129,8 @@ class _MailboxItemWidgetState extends State { ), padding: const EdgeInsetsDirectional.symmetric( horizontal: MailboxItemWidgetStyles.itemPadding, - vertical: MailboxItemWidgetStyles.space, ), + height: MailboxItemWidgetStyles.height, child: Row( children: [ LeadingMailboxItemWidget( @@ -174,8 +174,8 @@ class _MailboxItemWidgetState extends State { ), padding: const EdgeInsetsDirectional.symmetric( horizontal: MailboxItemWidgetStyles.itemPadding, - vertical: MailboxItemWidgetStyles.space, ), + height: MailboxItemWidgetStyles.height, child: Row( children: [ LeadingMailboxItemWidget( @@ -228,8 +228,8 @@ class _MailboxItemWidgetState extends State { child: Container( padding: const EdgeInsetsDirectional.symmetric( horizontal: MailboxItemWidgetStyles.itemPadding, - vertical: MailboxItemWidgetStyles.space, ), + height: MailboxItemWidgetStyles.height, color: widget.mailboxNode.isSelected ? AppColor.colorItemSelected : Colors.transparent,