From ec3fcc785288565439061b51078f4898a4e46079 Mon Sep 17 00:00:00 2001
From: dab246 <tdvu@linagora.com>
Date: Thu, 6 Jul 2023 17:16:10 +0700
Subject: [PATCH] TF-1958 Fix "To" and "Cc" fields are not displayed in the
 single line on RTL mode

(cherry picked from commit c48dff29e37a0d9562b1ba7ce744d57cdae5ebaf)
---
 .../widgets/email_receiver_builder.dart       | 76 ++++++++++---------
 .../change_language_button_widget.dart        |  2 +-
 2 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/lib/features/email/presentation/widgets/email_receiver_builder.dart b/lib/features/email/presentation/widgets/email_receiver_builder.dart
index ec33f8a80..e5f026611 100644
--- a/lib/features/email/presentation/widgets/email_receiver_builder.dart
+++ b/lib/features/email/presentation/widgets/email_receiver_builder.dart
@@ -3,6 +3,7 @@ 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/style_utils.dart';
+import 'package:core/utils/direction_utils.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:get/get.dart';
@@ -41,16 +42,25 @@ class EmailReceiverBuilder extends StatelessWidget {
     return Obx(() => Row(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        Expanded(child: _buildEmailAddressOfReceiver(
-          context,
-          emailSelected,
-          controller.isDisplayFullEmailAddress,
-          maxWidth
+        Expanded(child: Padding(
+          padding: EdgeInsets.only(top: controller.isDisplayFullEmailAddress
+            ? DirectionUtils.isDirectionRTLByLanguage(context) ? 3 : 5.5
+            : 0),
+          child: _buildEmailAddressOfReceiver(
+            context,
+            emailSelected,
+            controller.isDisplayFullEmailAddress,
+            maxWidth
+          ),
         )),
         if (controller.isDisplayFullEmailAddress)
           Padding(
-            padding: const EdgeInsets.only(top: 8),
+            padding: EdgeInsets.symmetric(
+              vertical: DirectionUtils.isDirectionRTLByLanguage(context) ? 0 : 6),
             child: MaterialTextButton(
+              padding: DirectionUtils.isDirectionRTLByLanguage(context)
+                ? const EdgeInsets.symmetric(horizontal: 8, vertical: 4)
+                : null,
               onTap: controller.collapseEmailAddress,
               label: AppLocalizations.of(context).hide,
             )
@@ -142,37 +152,29 @@ class EmailReceiverBuilder extends StatelessWidget {
     PrefixEmailAddress prefixEmailAddress,
     bool isDisplayFull
   ) {
-    return Padding(
-      padding: const EdgeInsets.only(top: 4),
-      child: Row(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          Padding(
-            padding: const EdgeInsets.only(top: 5),
-            child: Text(
-              '${prefixEmailAddress.asName(context)}:',
-              style: const TextStyle(
-                fontSize: 16,
-                fontWeight: FontWeight.w500,
-                color: AppColor.colorEmailAddressFull
-              )
-            ),
-          ),
-          if (!isDisplayFull && presentationEmail.numberOfAllEmailAddress() > 1)
-            _buildListEmailAddressWidget(
-              context,
-              prefixEmailAddress.listEmailAddress(presentationEmail),
-              isDisplayFull
-            )
-          else
-            Expanded(child: _buildListEmailAddressWidget(
-              context,
-              prefixEmailAddress.listEmailAddress(presentationEmail),
-              isDisplayFull
-            ))
-        ]
-      ),
+    return Row(
+      children: [
+        Text(
+          '${prefixEmailAddress.asName(context)}:',
+          style: const TextStyle(
+            fontSize: 16,
+            fontWeight: FontWeight.w500,
+            color: AppColor.colorEmailAddressFull
+          )
+        ),
+        if (!isDisplayFull && presentationEmail.numberOfAllEmailAddress() > 1)
+          _buildListEmailAddressWidget(
+            context,
+            prefixEmailAddress.listEmailAddress(presentationEmail),
+            isDisplayFull
+          )
+        else
+          Expanded(child: _buildListEmailAddressWidget(
+            context,
+            prefixEmailAddress.listEmailAddress(presentationEmail),
+            isDisplayFull
+          ))
+      ]
     );
   }
 
diff --git a/lib/features/manage_account/presentation/language_and_region/widgets/change_language_button_widget.dart b/lib/features/manage_account/presentation/language_and_region/widgets/change_language_button_widget.dart
index a27bc7fdd..3f29c3abc 100644
--- a/lib/features/manage_account/presentation/language_and_region/widgets/change_language_button_widget.dart
+++ b/lib/features/manage_account/presentation/language_and_region/widgets/change_language_button_widget.dart
@@ -109,7 +109,7 @@ class ChangeLanguageButtonWidget extends StatelessWidget {
             ),
             color: AppColor.colorItemSelected,
           ),
-          padding: const EdgeInsets.only(left: 12, right: 10),
+          padding: const EdgeInsetsDirectional.only(start: 12, end: 10),
           child: Row(children: [
             Expanded(child: Text(
               _controller.languageSelected.value.getLanguageNameByCurrentLocale(context),