From 9f6608d0177349f9792a8163ff45c309b3a04f8a Mon Sep 17 00:00:00 2001
From: dab246 <tdvu@linagora.com>
Date: Wed, 17 Jul 2024 15:23:30 +0700
Subject: [PATCH] TF-2973 Adjust remove button in email rule for each action or
 condition

---
 assets/images/ic_remove_rule.svg              |  4 ++++
 .../presentation/resources/image_paths.dart   |  1 +
 ...ilter_condition_remove_button_builder.dart | 21 +++++++------------
 .../rule_filter_condition_row_builder.dart    |  2 +-
 .../rules_filter_input_field_builder.dart     |  2 +-
 5 files changed, 14 insertions(+), 16 deletions(-)
 create mode 100644 assets/images/ic_remove_rule.svg

diff --git a/assets/images/ic_remove_rule.svg b/assets/images/ic_remove_rule.svg
new file mode 100644
index 000000000..1d76f5a71
--- /dev/null
+++ b/assets/images/ic_remove_rule.svg
@@ -0,0 +1,4 @@
+<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="44" height="44" rx="22" fill="#001C3D" fill-opacity="0.05"/>
+<path d="M31 21H23H13C12.4477 21 12 21.4477 12 22C12 22.5523 12.4477 23 13 23H23H31C31.5523 23 32 22.5523 32 22C32 21.4477 31.5523 21 31 21Z" fill="#E64646"/>
+</svg>
diff --git a/core/lib/presentation/resources/image_paths.dart b/core/lib/presentation/resources/image_paths.dart
index 9b1462015..86e6c3c4a 100644
--- a/core/lib/presentation/resources/image_paths.dart
+++ b/core/lib/presentation/resources/image_paths.dart
@@ -212,6 +212,7 @@ class ImagePaths {
   String get icPrinter => _getImagePath('ic_printer.svg');
   String get icAlwaysReadReceipt => _getImagePath('ic_always_read_receipt.svg');
   String get icNotification => _getImagePath('ic_notification.svg');
+  String get icRemoveRule => _getImagePath('ic_remove_rule.svg');
 
   String _getImagePath(String imageName) {
     return AssetsPaths.images + imageName;
diff --git a/lib/features/rules_filter_creator/presentation/widgets/rule_filter_condition_remove_button_builder.dart b/lib/features/rules_filter_creator/presentation/widgets/rule_filter_condition_remove_button_builder.dart
index 24220254b..bdae64bba 100644
--- a/lib/features/rules_filter_creator/presentation/widgets/rule_filter_condition_remove_button_builder.dart
+++ b/lib/features/rules_filter_creator/presentation/widgets/rule_filter_condition_remove_button_builder.dart
@@ -1,7 +1,6 @@
-import 'package:core/presentation/extensions/color_extension.dart';
 import 'package:core/presentation/resources/image_paths.dart';
+import 'package:core/presentation/views/button/tmail_button_widget.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_svg/flutter_svg.dart';
 
 class RuleFilterConditionRemoveButton extends StatelessWidget {
   final Function()? tapRemoveRuleFilterConditionCallback;
@@ -15,17 +14,11 @@ class RuleFilterConditionRemoveButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return InkWell(
-    onTap: tapRemoveRuleFilterConditionCallback,
-    child: CircleAvatar(
-      backgroundColor: AppColor.colorRemoveRuleFilterConditionButton,
-      radius: 22,
-      child: SvgPicture.asset(
-        imagePath!.icMinimize,
-        fit: BoxFit.fill,
-        colorFilter: AppColor.colorDeletePermanentlyButton.asFilter(),
-      ),
-    )
-  );
+    return TMailButtonWidget.fromIcon(
+      icon: imagePath!.icRemoveRule,
+      backgroundColor: Colors.transparent,
+      padding: EdgeInsets.zero,
+      onTapActionCallback: tapRemoveRuleFilterConditionCallback,
+    );
   }
 }
\ No newline at end of file
diff --git a/lib/features/rules_filter_creator/presentation/widgets/rule_filter_condition_row_builder.dart b/lib/features/rules_filter_creator/presentation/widgets/rule_filter_condition_row_builder.dart
index a26cd3811..549c4feac 100644
--- a/lib/features/rules_filter_creator/presentation/widgets/rule_filter_condition_row_builder.dart
+++ b/lib/features/rules_filter_creator/presentation/widgets/rule_filter_condition_row_builder.dart
@@ -107,7 +107,7 @@ class RuleFilterConditionRow extends StatelessWidget {
                 )
             ),
             Container(
-              padding: const EdgeInsets.only(left: 12),
+              padding: const EdgeInsetsDirectional.only(start: 12),
               alignment: Alignment.center,
               child: RuleFilterConditionRemoveButton(
                 tapRemoveRuleFilterConditionCallback: tapRemoveRuleFilterConditionCallback,
diff --git a/lib/features/rules_filter_creator/presentation/widgets/rules_filter_input_field_builder.dart b/lib/features/rules_filter_creator/presentation/widgets/rules_filter_input_field_builder.dart
index 175abe76f..4906070d9 100644
--- a/lib/features/rules_filter_creator/presentation/widgets/rules_filter_input_field_builder.dart
+++ b/lib/features/rules_filter_creator/presentation/widgets/rules_filter_input_field_builder.dart
@@ -36,7 +36,7 @@ class RulesFilterInputField extends StatelessWidget {
       focusNode: focusNode,
       maxLines: 1,
       decoration: (RulesFilterInputDecorationBuilder()
-        ..setContentPadding(const EdgeInsets.symmetric(vertical: PlatformInfo.isWeb ? 16 : 12, horizontal: 12))
+        ..setContentPadding(const EdgeInsets.symmetric(vertical: PlatformInfo.isWeb ? 14 : 12, horizontal: 12))
         ..setHintText(hintText)
         ..setErrorText(errorText))
       .build(),