From fb5f96f316287ecc61e5aa2df5feecfbb3a283e9 Mon Sep 17 00:00:00 2001
From: dab246 <tdvu@linagora.com>
Date: Thu, 6 Jul 2023 18:00:34 +0700
Subject: [PATCH] TF-1960 Fix padding, alignment widget in IdentityCreatorView

(cherry picked from commit bde38aff78d77056a7b07628acb812e74b43abdb)
---
 .../presentation/identity_creator_view.dart        | 14 ++++----------
 .../widgets/identity_drop_list_field_builder.dart  |  2 +-
 .../widgets/identity_input_field_builder.dart      |  4 +++-
 .../set_default_identity_checkbox_builder.dart     |  6 +-----
 4 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/lib/features/identity_creator/presentation/identity_creator_view.dart b/lib/features/identity_creator/presentation/identity_creator_view.dart
index 2fd22280e..5996ddcae 100644
--- a/lib/features/identity_creator/presentation/identity_creator_view.dart
+++ b/lib/features/identity_creator/presentation/identity_creator_view.dart
@@ -387,22 +387,16 @@ class IdentityCreatorView extends GetWidget<IdentityCreatorController> {
         _buildCheckboxIdentityDefault(context),
         Expanded(
           child: Padding(
-            padding: EdgeInsets.only(
+            padding: const EdgeInsetsDirectional.only(
               top: 24.0,
               bottom: 40.0,
-              left: AppUtils.isDirectionRTL(context) ? 0 : 12,
-              right: AppUtils.isDirectionRTL(context) ? 12 : 0
+              start: 12,
             ),
             child: Row(
               mainAxisAlignment: MainAxisAlignment.end,
               children: [
-                Padding(
-                  padding: EdgeInsets.only(
-                    right: AppUtils.isDirectionRTL(context) ? 0 : 12,
-                    left: AppUtils.isDirectionRTL(context) ? 12 : 0
-                  ),
-                  child: _buildCancelButton(context, width: 156),
-                ),
+                _buildCancelButton(context, width: 156),
+                const SizedBox(width: 12),
                 _buildSaveButton(context, width: 156),
               ],
             ),
diff --git a/lib/features/identity_creator/presentation/widgets/identity_drop_list_field_builder.dart b/lib/features/identity_creator/presentation/widgets/identity_drop_list_field_builder.dart
index eecc334b9..7ca9b41e1 100644
--- a/lib/features/identity_creator/presentation/widgets/identity_drop_list_field_builder.dart
+++ b/lib/features/identity_creator/presentation/widgets/identity_drop_list_field_builder.dart
@@ -65,7 +65,7 @@ class IdentityDropListFieldBuilder extends StatelessWidget {
           onChanged: onSelectItemDropList,
           buttonStyleData: ButtonStyleData(
             height: 44,
-            padding: const EdgeInsets.only(right: 8),
+            padding: const EdgeInsetsDirectional.only(end: 8),
             decoration: BoxDecoration(
               borderRadius: BorderRadius.circular(10),
               border: Border.all(color: AppColor.colorInputBorderCreateMailbox, width: 0.5),
diff --git a/lib/features/identity_creator/presentation/widgets/identity_input_field_builder.dart b/lib/features/identity_creator/presentation/widgets/identity_input_field_builder.dart
index 001dbe724..edf550a2d 100644
--- a/lib/features/identity_creator/presentation/widgets/identity_input_field_builder.dart
+++ b/lib/features/identity_creator/presentation/widgets/identity_input_field_builder.dart
@@ -53,7 +53,9 @@ class IdentityInputFieldBuilder extends StatelessWidget {
         textStyle: const TextStyle(color: Colors.black, fontSize: 16),
         keyboardType: inputType ?? TextInputType.text,
         decoration: (IdentityInputDecorationBuilder()
-          ..setContentPadding(const EdgeInsets.symmetric(vertical: PlatformInfo.isWeb ? 16 : 12,horizontal: 12))
+          ..setContentPadding(const EdgeInsets.symmetric(
+              vertical: PlatformInfo.isWeb ? 16 : 12,
+              horizontal: 12))
           ..setErrorText(_error))
         .build(),
       )
diff --git a/lib/features/identity_creator/presentation/widgets/set_default_identity_checkbox_builder.dart b/lib/features/identity_creator/presentation/widgets/set_default_identity_checkbox_builder.dart
index 799ea974d..18b9460b4 100644
--- a/lib/features/identity_creator/presentation/widgets/set_default_identity_checkbox_builder.dart
+++ b/lib/features/identity_creator/presentation/widgets/set_default_identity_checkbox_builder.dart
@@ -3,7 +3,6 @@ import 'package:core/presentation/resources/image_paths.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
-import 'package:tmail_ui_user/main/utils/app_utils.dart';
 
 typedef OnCheckboxChanged = void Function();
 
@@ -44,10 +43,7 @@ class SetDefaultIdentityCheckboxBuilder extends StatelessWidget {
           ),
         ),
         Padding(
-          padding: EdgeInsets.only(
-            left: AppUtils.isDirectionRTL(context) ? 0 : 8,
-            right: AppUtils.isDirectionRTL(context) ? 8 : 0,
-          ),
+          padding: const EdgeInsetsDirectional.only(start: 8),
           child: Text(
             AppLocalizations.of(context).setDefaultIdentity,
             style: const TextStyle(