From 2a0fdd214d9cd74ca4df15a4a9f67c1ff07bc39b Mon Sep 17 00:00:00 2001
From: dab246 <tdvu@linagora.com>
Date: Mon, 22 Aug 2022 16:37:51 +0700
Subject: [PATCH] TF-855 Fix bottom padding of CreateNewRule dialog

---
 .../rules_filter_creator_view.dart            | 69 +++++++------------
 1 file changed, 25 insertions(+), 44 deletions(-)

diff --git a/lib/features/rules_filter_creator/presentation/rules_filter_creator_view.dart b/lib/features/rules_filter_creator/presentation/rules_filter_creator_view.dart
index 04d621bdb..4c807d76b 100644
--- a/lib/features/rules_filter_creator/presentation/rules_filter_creator_view.dart
+++ b/lib/features/rules_filter_creator/presentation/rules_filter_creator_view.dart
@@ -32,31 +32,21 @@ class RuleFilterCreatorView extends GetWidget<RulesFilterCreatorController> {
             body: GestureDetector(
               onTap: () => FocusScope.of(context).unfocus(),
               child: SafeArea(
-                child: Align(
-                  alignment: Alignment.bottomCenter, 
-                  child: Card(
-                    color: Colors.transparent,
-                    shape: const RoundedRectangleBorder(
-                        borderRadius: BorderRadius.only(
+                bottom: false,
+                left: false,
+                right: false,
+                child: Container(
+                  decoration: const BoxDecoration(
+                    borderRadius: BorderRadius.only(
+                      topLeft: Radius.circular(16),
+                      topRight: Radius.circular(16)),
+                    color: Colors.white),
+                  margin: const EdgeInsets.only(top: BuildUtils.isWeb ? 70 : 0),
+                  child: ClipRRect(
+                      borderRadius: const  BorderRadius.only(
                           topLeft: Radius.circular(16),
-                          topRight: Radius.circular(16),
-                        )),
-                    child: Container(
-                        decoration: const BoxDecoration(
-                            color: Colors.white,
-                            borderRadius: BorderRadius.only(
-                              topLeft: Radius.circular(16),
-                              topRight: Radius.circular(16),
-                            )),
-                        width: double.infinity,
-                        height: _responsiveUtils.getSizeScreenHeight(context) - 70,
-                        child: ClipRRect(
-                            borderRadius: const BorderRadius.only(
-                                topLeft: Radius.circular(16),
-                                topRight: Radius.circular(16)),
-                            child: _buildRulesFilterFormOnMobile(context)
-                        )
-                    )
+                          topRight: Radius.circular(16)),
+                      child: SafeArea(child: _buildRulesFilterFormOnMobile(context))
                   )
                 ),
               ),
@@ -66,28 +56,20 @@ class RuleFilterCreatorView extends GetWidget<RulesFilterCreatorController> {
             backgroundColor: Colors.black38,
             body: GestureDetector(
               onTap: () => FocusScope.of(context).unfocus(),
-              child: Align(alignment: Alignment.bottomCenter, child: Card(
-                  color: Colors.transparent,
-                  shape: const RoundedRectangleBorder(
+              child: Align(alignment: Alignment.bottomCenter, child: Container(
+                  decoration: const BoxDecoration(
+                      color: Colors.white,
                       borderRadius: BorderRadius.only(
                         topLeft: Radius.circular(16),
                         topRight: Radius.circular(16),
                       )),
-                  child: Container(
-                      decoration: const BoxDecoration(
-                          color: Colors.white,
-                          borderRadius: BorderRadius.only(
-                            topLeft: Radius.circular(16),
-                            topRight: Radius.circular(16),
-                          )),
-                      width: double.infinity,
-                      height: _responsiveUtils.getSizeScreenHeight(context) * 0.7,
-                      child: ClipRRect(
-                          borderRadius: const BorderRadius.only(
-                            topLeft: Radius.circular(16),
-                            topRight: Radius.circular(16)),
-                          child: _buildRulesFilterFormOnTablet(context)
-                      )
+                  width: double.infinity,
+                  height: _responsiveUtils.getSizeScreenHeight(context) * 0.7,
+                  child: ClipRRect(
+                      borderRadius: const BorderRadius.only(
+                        topLeft: Radius.circular(16),
+                        topRight: Radius.circular(16)),
+                      child: _buildRulesFilterFormOnTablet(context)
                   )
               )),
             )
@@ -111,8 +93,7 @@ class RuleFilterCreatorView extends GetWidget<RulesFilterCreatorController> {
                           child: _buildRulesFilterFormOnDesktop(context)
                       )
                   )
-              )
-              ),
+              )),
             )
         )
     );