From 0f4ae09f2f5a574edbcbca5cf6d5e1293fc8d403 Mon Sep 17 00:00:00 2001
From: HuyNguyen <quanghnguyen@linagora.com>
Date: Wed, 26 Apr 2023 15:25:37 +0700
Subject: [PATCH] TF-1687: Re-align title and unread count

(cherry picked from commit 0b1169d96930ced40cfeb3a7ab198d79f6a0fc43)
---
 .../widgets/mailbox_folder_tile_builder.dart  | 39 +++++++++++--------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/lib/features/mailbox/presentation/widgets/mailbox_folder_tile_builder.dart b/lib/features/mailbox/presentation/widgets/mailbox_folder_tile_builder.dart
index 8376e1dad..6258ed4a3 100644
--- a/lib/features/mailbox/presentation/widgets/mailbox_folder_tile_builder.dart
+++ b/lib/features/mailbox/presentation/widgets/mailbox_folder_tile_builder.dart
@@ -112,9 +112,8 @@ class MailBoxFolderTileBuilder {
                       children: [
                         _buildLeadingMailboxItem(context),
                         const SizedBox(width: 4),
-                        Expanded(child: _buildTitleFolderItem()),
-                        const SizedBox(width: 8),
-                        _buildTrailingItemForMailboxView(context)
+                        Expanded(child: _buildTitleFolderItem(context)),
+
                     ])
                 ),
               );
@@ -145,10 +144,8 @@ class MailBoxFolderTileBuilder {
                       children: [
                         _buildLeadingMailboxItem(context),
                         const SizedBox(width: 8),
-                        Expanded(child: _buildTitleFolderItem()),
+                        Expanded(child: _buildTitleFolderItem(context)),
                         _buildSelectedIcon(),
-                        const SizedBox(width: 8),
-                        _buildTrailingItemForMailboxView(context)
                     ]),
                   ]
               ),
@@ -175,7 +172,7 @@ class MailBoxFolderTileBuilder {
                   child: Row(children: [
                     _buildLeadingMailboxItem(context),
                     const SizedBox(width: 8),
-                    Expanded(child: _buildTitleFolderItem()),
+                    Expanded(child: _buildTitleFolderItem(context)),
                     _buildSelectedIcon()
                   ])
               ),
@@ -295,19 +292,27 @@ class MailBoxFolderTileBuilder {
     }
   }
 
-  Widget _buildTitleFolderItem() {
+  Widget _buildTitleFolderItem(BuildContext context) {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        Text(
-          (_mailboxNode.item.name?.name ?? '').withUnicodeCharacter,
-          maxLines: 1,
-          softWrap: CommonTextStyle.defaultSoftWrap,
-          overflow: CommonTextStyle.defaultTextOverFlow,
-          style: TextStyle(
-              fontSize: _mailboxNode.item.isTeamMailboxes ? 16 : 15,
-              color: _mailboxNode.item.isTeamMailboxes ? Colors.black : AppColor.colorNameEmail,
-              fontWeight: _mailboxNode.item.isTeamMailboxes ? FontWeight.bold : FontWeight.normal),
+        Row(
+          crossAxisAlignment: CrossAxisAlignment.end,
+          children: [
+            Expanded(
+              child: Text(
+                (_mailboxNode.item.name?.name ?? '').withUnicodeCharacter,
+                maxLines: 1,
+                softWrap: CommonTextStyle.defaultSoftWrap,
+                overflow: CommonTextStyle.defaultTextOverFlow,
+                style: TextStyle(
+                    fontSize: _mailboxNode.item.isTeamMailboxes ? 16 : 15,
+                    color: _mailboxNode.item.isTeamMailboxes ? Colors.black : AppColor.colorNameEmail,
+                    fontWeight: _mailboxNode.item.isTeamMailboxes ? FontWeight.bold : FontWeight.normal),
+              ),
+            ),
+            _buildTrailingItemForMailboxView(context)
+          ],
         ),
         if(_mailboxNode.item.isTeamMailboxes)
           Text(