tf-2083 add swipe to remove condition on mobile

(cherry picked from commit cbb5aeaef04be7efbb0d68ea2f258f70a4ab8a11)

lib/features/rules_filter_creator/presentation/model/rules_filter_input_field_arguments.dart

@@ -0,0 +1,22 @@
+// ignore_for_file: public_member_api_docs, sort_constructors_first
+import 'package:equatable/equatable.dart';
+import 'package:flutter/material.dart';
+
+class RulesFilterInputFieldArguments with EquatableMixin {
+  final FocusNode inputRuleConditionValueFocusNode;
+  final String errorRuleConditionValue;
+  final TextEditingController inputRuleConditionValueController;
+
+  RulesFilterInputFieldArguments({
+    required this.inputRuleConditionValueFocusNode,
+    required this.errorRuleConditionValue,
+    required this.inputRuleConditionValueController,
+  });
+  
+  @override
+  List<Object?> get props => [
+    inputRuleConditionValueFocusNode,
+    errorRuleConditionValue,
+    inputRuleConditionValueController,
+  ];
+}

lib/features/rules_filter_creator/presentation/rules_filter_creator_controller.dart

@@ -41,6 +41,8 @@ import 'package:tmail_ui_user/main/routes/app_routes.dart';
 import 'package:tmail_ui_user/main/routes/dialog_router.dart';
 import 'package:tmail_ui_user/main/routes/route_navigation.dart';
 
+import 'model/rules_filter_input_field_arguments.dart';
+
 class RulesFilterCreatorController extends BaseMailboxController {
 
   final _appToast = Get.find<AppToast>();
@@ -50,7 +52,6 @@ class RulesFilterCreatorController extends BaseMailboxController {
   GetAllRulesInteractor? _getAllRulesInteractor;
 
   final errorRuleName = Rxn<String>();
-  final listErrorRuleConditionValue = RxList<String>();
   final errorRuleActionValue = Rxn<String>();
   final emailRuleFilterActionSelected = Rxn<EmailRuleFilterAction>();
   final mailboxSelected = Rxn<PresentationMailbox>();
@@ -58,9 +59,8 @@ class RulesFilterCreatorController extends BaseMailboxController {
   final listRuleCondition = RxList<RuleCondition>();
 
   final TextEditingController inputRuleNameController = TextEditingController();
-  final List<TextEditingController> listInputConditionValueController = [];
   final FocusNode inputRuleNameFocusNode = FocusNode();
-  final List<FocusNode> listInputRuleConditionFocusNode = [];
+  final listRuleConditionValueArguments = RxList<RulesFilterInputFieldArguments>();
 
   String? _newRuleName;
 
@@ -111,12 +111,10 @@ class RulesFilterCreatorController extends BaseMailboxController {
   void onClose() {
     log('RulesFilterCreatorController::onClose():');
     inputRuleNameFocusNode.dispose();
-    for (var inputRuleConditionFocusNode in listInputRuleConditionFocusNode) {
-      inputRuleConditionFocusNode.dispose();
-    }
     inputRuleNameController.dispose();
-    for (var inputConditionValueController in listInputConditionValueController) {
+    for (var ruleConditionValueArguments in listRuleConditionValueArguments) {
-      inputConditionValueController.dispose();
+      ruleConditionValueArguments.inputRuleConditionValueFocusNode.dispose();
+      ruleConditionValueArguments.inputRuleConditionValueController.dispose();
     }
     super.onClose();
   }
@@ -153,9 +151,12 @@ class RulesFilterCreatorController extends BaseMailboxController {
           value: ''
         );
         listRuleCondition.add(newRuleCondition);
-        listInputConditionValueController.add(TextEditingController());
+        RulesFilterInputFieldArguments newRuleConditionValueArguments = RulesFilterInputFieldArguments(
-        listInputRuleConditionFocusNode.add(FocusNode());
+          inputRuleConditionValueFocusNode: FocusNode(),
-        listErrorRuleConditionValue.add('');
+          errorRuleConditionValue: '',
+          inputRuleConditionValueController: TextEditingController(),
+        );
+        listRuleConditionValueArguments.add(newRuleConditionValueArguments);
         emailRuleFilterActionSelected.value = EmailRuleFilterAction.moveMessage;
         if (_emailAddress != null) {
           RuleCondition firstRuleCondition = RuleCondition(
@@ -165,7 +166,10 @@ class RulesFilterCreatorController extends BaseMailboxController {
           );
           listRuleCondition[0] = firstRuleCondition;
           listRuleCondition.refresh();
-          _setValueInputField(listInputConditionValueController[0], listRuleCondition[0].value.obs.value);
+          _setValueInputField(
+            listRuleConditionValueArguments[0].inputRuleConditionValueController,
+            listRuleCondition[0].value
+          );
         }
         if (_mailboxDestination != null) {
           mailboxSelected.value = _mailboxDestination;
@@ -179,11 +183,17 @@ class RulesFilterCreatorController extends BaseMailboxController {
             value: _currentTMailRule!.condition.value
           );
           listRuleCondition.add(currentRule);
-          listInputConditionValueController.add(TextEditingController());
+          RulesFilterInputFieldArguments newRuleConditionValueArguments = RulesFilterInputFieldArguments(
-          listInputRuleConditionFocusNode.add(FocusNode());
+          inputRuleConditionValueFocusNode: FocusNode(),
-          listErrorRuleConditionValue.add('');
+          errorRuleConditionValue: '',
+          inputRuleConditionValueController: TextEditingController(),
+        );
+        listRuleConditionValueArguments.add(newRuleConditionValueArguments);
           emailRuleFilterActionSelected.value = EmailRuleFilterAction.moveMessage;
-          _setValueInputField(listInputConditionValueController[0], listRuleCondition[0].value.obs.value);
+          _setValueInputField(
+            listRuleConditionValueArguments[0].inputRuleConditionValueController,
+            listRuleCondition[0].value
+          );
           _newRuleName = _currentTMailRule!.name;
           _setValueInputField(inputRuleNameController, _newRuleName ?? '');
           _getAllMailboxAction();
@@ -220,19 +230,24 @@ class RulesFilterCreatorController extends BaseMailboxController {
 
   void updateConditionValue(BuildContext context, String? value, int ruleConditionIndex) {
     RuleCondition newRuleCondition = RuleCondition(
-      field: listRuleCondition[ruleConditionIndex].field.obs.value,
+      field: listRuleCondition[ruleConditionIndex].field,
-      comparator: listRuleCondition[ruleConditionIndex].comparator.obs.value,
+      comparator: listRuleCondition[ruleConditionIndex].comparator,
       value: value!,
     );
     listRuleCondition[ruleConditionIndex] = newRuleCondition;
     listRuleCondition.refresh();
-    String? errorString = _getErrorStringByInputValue(context, listRuleCondition[ruleConditionIndex].value.obs.value);
+    String? errorString = _getErrorStringByInputValue(context, listRuleCondition[ruleConditionIndex].value);
-    if (listErrorRuleConditionValue.length > ruleConditionIndex) {
+    RulesFilterInputFieldArguments newRuleConditionValueArguments = RulesFilterInputFieldArguments(
-        listErrorRuleConditionValue[ruleConditionIndex] = errorString ?? '';
+      inputRuleConditionValueFocusNode: listRuleConditionValueArguments[ruleConditionIndex].inputRuleConditionValueFocusNode,
+      errorRuleConditionValue: errorString ?? '',
+      inputRuleConditionValueController: listRuleConditionValueArguments[ruleConditionIndex].inputRuleConditionValueController,
+    );
+    if (listRuleConditionValueArguments.length > ruleConditionIndex) {
+      listRuleConditionValueArguments[ruleConditionIndex] = newRuleConditionValueArguments;
     } else {
-      listErrorRuleConditionValue.add(errorString ?? '');
+      listRuleConditionValueArguments.add(newRuleConditionValueArguments);
     }
-    listErrorRuleConditionValue.refresh();
+    listRuleConditionValueArguments.refresh();
   }
 
   String? _getErrorStringByInputValue(BuildContext context, String? inputValue) {
@@ -249,23 +264,27 @@ class RulesFilterCreatorController extends BaseMailboxController {
   }
 
   void selectRuleConditionField(rule_condition.Field? newField, int? ruleConditionIndex) {
-    RuleCondition newRuleCondition = RuleCondition(
+    if (newField != null && ruleConditionIndex != null) {
-      field: newField!,
+      RuleCondition newRuleCondition = RuleCondition(
-      comparator: listRuleCondition[ruleConditionIndex!].comparator.obs.value,
+        field: newField,
-      value: listRuleCondition[ruleConditionIndex].value.obs.value,
+        comparator: listRuleCondition[ruleConditionIndex].comparator,
-    );
+        value: listRuleCondition[ruleConditionIndex].value,
-    listRuleCondition[ruleConditionIndex] = newRuleCondition;
+      );
-    listRuleCondition.refresh();
+      listRuleCondition[ruleConditionIndex] = newRuleCondition;
+      listRuleCondition.refresh();
+    }
   }
 
   void selectRuleConditionComparator(rule_condition.Comparator? newComparator, int? ruleConditionIndex) {
-    RuleCondition newRuleCondition = RuleCondition(
+    if (newComparator != null && ruleConditionIndex != null) {
-      field: listRuleCondition[ruleConditionIndex!].field.obs.value,
+      RuleCondition newRuleCondition = RuleCondition(
-      comparator: newComparator!,
+        field: listRuleCondition[ruleConditionIndex].field,
-      value: listRuleCondition[ruleConditionIndex].value.obs.value,
+        comparator: newComparator,
-    );
+        value: listRuleCondition[ruleConditionIndex].value,
-    listRuleCondition[ruleConditionIndex] = newRuleCondition;
+      );
-    listRuleCondition.refresh();
+      listRuleCondition[ruleConditionIndex] = newRuleCondition;
+      listRuleCondition.refresh();
+    }
   }
 
   void selectEmailRuleFilterAction(EmailRuleFilterAction? newAction) {
@@ -302,16 +321,19 @@ class RulesFilterCreatorController extends BaseMailboxController {
       return;
     }
 
-    List<String> errorCondition = [];
+    if (listRuleCondition.isNotEmpty) {
-    for (var ruleCondition in listRuleCondition) {
+      for (var ruleCondition in listRuleCondition) {
-      if (_getErrorStringByInputValue(context, ruleCondition.value) != null) {
+        String? errorString = _getErrorStringByInputValue(context, ruleCondition.value);
-        errorCondition.add(_getErrorStringByInputValue(context, ruleCondition.value)!);
+        if (errorString != null) {
-      }
+          int ruleConditionIndex = listRuleCondition.indexOf(ruleCondition);
-    }
+          RulesFilterInputFieldArguments newRuleConditionValueArguments = RulesFilterInputFieldArguments(
-    if (errorCondition.isNotEmpty) {
+            inputRuleConditionValueFocusNode: listRuleConditionValueArguments[ruleConditionIndex].inputRuleConditionValueFocusNode,
-      listErrorRuleConditionValue.value = errorCondition;
+            errorRuleConditionValue: errorString,
-      for (var inputRuleConditionFocusNode in listInputRuleConditionFocusNode) {
+            inputRuleConditionValueController: listRuleConditionValueArguments[ruleConditionIndex].inputRuleConditionValueController,
-        inputRuleConditionFocusNode.requestFocus();
+          );
+          listRuleConditionValueArguments[ruleConditionIndex] = newRuleConditionValueArguments;
+          listRuleConditionValueArguments[listRuleCondition.indexOf(ruleCondition)].inputRuleConditionValueFocusNode.requestFocus();
+        }
       }
       return;
     }
@@ -386,15 +408,15 @@ class RulesFilterCreatorController extends BaseMailboxController {
       value: ''
     );
     listRuleCondition.add(newRuleCondition);
-    listInputConditionValueController.add(TextEditingController());
+    listRuleConditionValueArguments.add(RulesFilterInputFieldArguments(
-    listInputRuleConditionFocusNode.add(FocusNode());
+      inputRuleConditionValueFocusNode: FocusNode(),
-    listErrorRuleConditionValue.add('');
+      errorRuleConditionValue: '',
+      inputRuleConditionValueController: TextEditingController(),
+    ));
   }
 
   void tapRemoveCondition(int ruleConditionIndex) {
     listRuleCondition.removeAt(ruleConditionIndex);
-    listInputConditionValueController.removeAt(ruleConditionIndex);
+    listRuleConditionValueArguments.removeAt(ruleConditionIndex);
-    listInputRuleConditionFocusNode.removeAt(ruleConditionIndex);
-    listErrorRuleConditionValue.removeAt(ruleConditionIndex);
   }
 }

lib/features/rules_filter_creator/presentation/rules_filter_creator_view.dart

@@ -146,32 +146,7 @@ class RuleFilterCreatorView extends GetWidget<RulesFilterCreatorController> {
                        fontSize: 16,
                        color: Colors.black)),
                   const SizedBox(height: 24),
-                  Obx(() {
+                  _buildListRuleFilterConditionList(context, RuleFilterConditionScreenType.desktop),
-                    return ListView.separated(
-                      shrinkWrap: true,
-                      itemCount: controller.listRuleCondition.length,
-                      itemBuilder: (context, index) {
-                        return RuleFilterConditionWidget(
-                          ruleFilterConditionScreenType: RuleFilterConditionScreenType.desktop,
-                          ruleCondition: controller.listRuleCondition[index],
-                          imagePaths: _imagePaths,
-                          conditionValueErrorText: controller.listErrorRuleConditionValue[index],
-                          conditionValueFocusNode: controller.listInputRuleConditionFocusNode[index],
-                          conditionValueEditingController: controller.listInputConditionValueController[index],
-                          tapRuleConditionFieldCallback: (value) =>
-                            controller.selectRuleConditionField(value, index),
-                          tapRuleConditionComparatorCallback: (value) =>
-                            controller.selectRuleConditionComparator(value, index),
-                          conditionValueOnChangeAction: (value) =>
-                            controller.updateConditionValue(context, value, index),
-                          tapRemoveRuleFilterConditionCallback: () => controller.tapRemoveCondition(index),
-                        );
-                      },
-                      separatorBuilder: (context, index) {
-                        return const SizedBox(height: 12,);
-                      },
-                    );
-                  }),
                   Container(
                     padding: const EdgeInsets.only(top: 8),
                     child: InkWell(
@@ -322,32 +297,7 @@ class RuleFilterCreatorView extends GetWidget<RulesFilterCreatorController> {
                               fontSize: 16,
                               color: Colors.black)),
                       const SizedBox(height: 24),
-                      Obx(() {
+                      _buildListRuleFilterConditionList(context, RuleFilterConditionScreenType.tablet),
-                        return ListView.separated(
-                          shrinkWrap: true,
-                          itemCount: controller.listRuleCondition.length,
-                          itemBuilder: (context, index) {
-                            return RuleFilterConditionWidget(
-                              ruleFilterConditionScreenType: RuleFilterConditionScreenType.tablet,
-                              ruleCondition: controller.listRuleCondition[index],
-                              imagePaths: _imagePaths,
-                              conditionValueErrorText: controller.listErrorRuleConditionValue.elementAtOrNull(index),
-                              conditionValueFocusNode: controller.listInputRuleConditionFocusNode[index],
-                              conditionValueEditingController: controller.listInputConditionValueController[index],
-                              tapRuleConditionFieldCallback: (value) =>
-                                controller.selectRuleConditionField(value, index),
-                              tapRuleConditionComparatorCallback: (value) =>
-                                controller.selectRuleConditionComparator(value, index),
-                              conditionValueOnChangeAction: (value) =>
-                                controller.updateConditionValue(context, value, index),
-                              tapRemoveRuleFilterConditionCallback: () => controller.tapRemoveCondition(index),
-                            );
-                          },
-                          separatorBuilder: (context, index) {
-                            return const SizedBox(height: 12,);
-                          },
-                        );
-                      }),
                       Container(
                         padding: const EdgeInsets.only(top: 8),
                         child: InkWell(
@@ -504,44 +454,7 @@ class RuleFilterCreatorView extends GetWidget<RulesFilterCreatorController> {
                               fontSize: 16,
                               color: Colors.black)),
                       const SizedBox(height: 24),
-                      Obx(() {
+                      _buildListRuleFilterConditionList(context, RuleFilterConditionScreenType.mobile),
-                        return ListView.separated(
-                          shrinkWrap: true,
-                          itemCount: controller.listRuleCondition.length,
-                          itemBuilder: (context, index) {
-                            return RuleFilterConditionWidget(
-                              ruleFilterConditionScreenType: RuleFilterConditionScreenType.mobile,
-                              ruleCondition: controller.listRuleCondition[index],
-                              imagePaths: _imagePaths,
-                              conditionValueErrorText: controller.listErrorRuleConditionValue.elementAtOrNull(index),
-                              conditionValueFocusNode: controller.listInputRuleConditionFocusNode[index],
-                              conditionValueEditingController: controller.listInputConditionValueController[index],
-                              tapRuleConditionFieldCallback: (value) => controller.openContextMenuAction(
-                                context,
-                                _bottomSheetRuleConditionFieldActionTiles(
-                                  context,
-                                  controller.listRuleCondition[index].field.obs.value,
-                                  index,
-                                )
-                              ),
-                              tapRuleConditionComparatorCallback: (value) => controller.openContextMenuAction(
-                                context,
-                                _bottomSheetRuleConditionComparatorActionTiles(
-                                  context,
-                                  controller.listRuleCondition[index].comparator.obs.value,
-                                  index,
-                                )
-                              ),
-                              conditionValueOnChangeAction: (value) =>
-                                controller.updateConditionValue(context, value, index),
-                              tapRemoveRuleFilterConditionCallback: () => controller.tapRemoveCondition(index),
-                            );
-                          },
-                          separatorBuilder: (context, index) {
-                            return const SizedBox(height: 12,);
-                          },
-                        );
-                      }),
                       Container(
                         padding: const EdgeInsets.only(top: 12),
                         child: InkWell(
@@ -668,6 +581,63 @@ class RuleFilterCreatorView extends GetWidget<RulesFilterCreatorController> {
     );
   }
 
+  Widget _buildListRuleFilterConditionList(
+    BuildContext context,
+    RuleFilterConditionScreenType ruleFilterConditionScreenType
+  ) {
+    return Obx(() {
+      return ListView.separated(
+        shrinkWrap: true,
+        itemCount: controller.listRuleCondition.length,
+        itemBuilder: (context, index) {
+          return RuleFilterConditionWidget(
+            key: ValueKey(controller.listRuleConditionValueArguments[index].inputRuleConditionValueFocusNode),
+            ruleFilterConditionScreenType: ruleFilterConditionScreenType,
+            ruleCondition: controller.listRuleCondition[index],
+            imagePaths: _imagePaths,
+            conditionValueErrorText: controller.listRuleConditionValueArguments[index].errorRuleConditionValue,
+            conditionValueFocusNode: controller.listRuleConditionValueArguments[index].inputRuleConditionValueFocusNode,
+            conditionValueEditingController: controller.listRuleConditionValueArguments[index].inputRuleConditionValueController,
+            tapRuleConditionFieldCallback: (value) => {
+              if (ruleFilterConditionScreenType == RuleFilterConditionScreenType.mobile) {
+                controller.openContextMenuAction(
+                  context,
+                  _bottomSheetRuleConditionFieldActionTiles(
+                    context,
+                    controller.listRuleCondition[index].field,
+                    index,
+                  )
+                ),
+              } else {
+                controller.selectRuleConditionField(value, index)
+              }
+            },
+            tapRuleConditionComparatorCallback: (value) => {
+              if (ruleFilterConditionScreenType == RuleFilterConditionScreenType.mobile) {
+                controller.openContextMenuAction(
+                  context,
+                  _bottomSheetRuleConditionComparatorActionTiles(
+                    context,
+                    controller.listRuleCondition[index].comparator,
+                    index,
+                  )
+                ),
+              } else {
+                controller.selectRuleConditionComparator(value, index),
+              }
+            },
+            conditionValueOnChangeAction: (value) =>
+              controller.updateConditionValue(context, value, index),
+            tapRemoveRuleFilterConditionCallback: () => controller.tapRemoveCondition(index),
+          );
+        },
+        separatorBuilder: (context, index) {
+          return const SizedBox(height: 12,);
+        },
+      );
+    });
+  }
+
   List<Widget> _bottomSheetRuleConditionFieldActionTiles(
       BuildContext context,
       rule_condition.Field? fieldSelected,

lib/features/rules_filter_creator/presentation/widgets/rule_filter_condition_widget.dart

@@ -1,6 +1,7 @@
 import 'package:core/presentation/extensions/color_extension.dart';
 import 'package:core/presentation/utils/keyboard_utils.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_slidable/flutter_slidable.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:tmail_ui_user/features/base/widget/drop_down_button_widget.dart';
 import 'package:tmail_ui_user/features/rules_filter_creator/presentation/model/rule_filter_condition_type.dart';
@@ -39,25 +40,63 @@ class RuleFilterConditionWidget extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Container(
+    return Slidable(
-      padding: const EdgeInsets.all(12),
+      enabled: ruleFilterConditionScreenType == RuleFilterConditionScreenType.mobile ? true : false,
-      decoration: BoxDecoration(
+      endActionPane: ActionPane(
-        color: AppColor.colorBackgroundFieldConditionRulesFilter,
+      extentRatio: 0.1,
-        borderRadius: BorderRadius.circular(12),
+        motion: const BehindMotion(),
+        children: [
+          CustomSlidableAction(
+            padding: const EdgeInsets.only(right: 12),
+            borderRadius: const BorderRadius.only(topRight: Radius.circular(12), bottomRight: Radius.circular(12)),
+            onPressed: (_) => tapRemoveRuleFilterConditionCallback!(),
+            backgroundColor: AppColor.colorBackgroundFieldConditionRulesFilter,
+            child: CircleAvatar(
+              backgroundColor: AppColor.colorRemoveRuleFilterConditionButton,
+              radius: 110,
+              child: SvgPicture.asset(
+                imagePaths!.icMinimize,
+                fit: BoxFit.fill,
+                colorFilter: AppColor.colorDeletePermanentlyButton.asFilter(),
+              ),
+            )
+          )
+        ]
       ),
-      child: _buildRuleFilterCondition(
+      child: Builder(builder: (context) {
-        context,
+        SlidableController? slideController = Slidable.of(context);
-        ruleFilterConditionScreenType,
+        return ValueListenableBuilder<int>(
-        ruleCondition,
+          valueListenable: slideController?.direction ?? ValueNotifier<int>(0),
-        tapRuleConditionFieldCallback,
+          builder: (context, value, _) {
-        tapRuleConditionComparatorCallback,
+            var borderRadius = value != -1 ? 
-        conditionValueErrorText,
+              BorderRadius.circular(12) : 
-        conditionValueEditingController,
+              const BorderRadius.only(
-        conditionValueFocusNode,
+                bottomLeft: Radius.circular(12),
-        conditionValueOnChangeAction,
+                topLeft: Radius.circular(12)
-        tapRemoveRuleFilterConditionCallback,
+              );
-        imagePaths,
+            return Container(
-      )
+              padding: const EdgeInsets.all(12),
+              decoration: BoxDecoration(
+                color: AppColor.colorBackgroundFieldConditionRulesFilter,
+                borderRadius: borderRadius,
+              ),
+              child: _buildRuleFilterCondition(
+                context,
+                ruleFilterConditionScreenType,
+                ruleCondition,
+                tapRuleConditionFieldCallback,
+                tapRuleConditionComparatorCallback,
+                conditionValueErrorText,
+                conditionValueEditingController,
+                conditionValueFocusNode,
+                conditionValueOnChangeAction,
+                tapRemoveRuleFilterConditionCallback,
+                imagePaths,
+              )
+            );
+          }
+        );
+      })
     );
     
   }
@@ -144,7 +183,11 @@ Widget _buildRuleFilterCondition(
                 editingController: conditionValueEditingController,
                 )
             ),
-            _buildRemoveRuleFilterConditionButton(tapRemoveRuleFilterConditionCallback, imagePaths),
+            Container(
+              padding: const EdgeInsets.only(left: 12),
+              alignment: Alignment.center,
+              child: _buildRemoveRuleFilterConditionButton(tapRemoveRuleFilterConditionCallback, imagePaths)
+            ),
           ],
         );
       default:
@@ -156,20 +199,16 @@ Widget _buildRemoveRuleFilterConditionButton (
   Function()? tapRemoveRuleFilterConditionCallback,
   ImagePaths? imagePath,
 ) {
-  return Container(
+  return InkWell(
-    padding: const EdgeInsets.only(left: 12),
+    onTap: tapRemoveRuleFilterConditionCallback,
-    alignment: Alignment.center,
+    child: CircleAvatar(
-    child: InkWell(
+      backgroundColor: AppColor.colorRemoveRuleFilterConditionButton,
-      onTap: tapRemoveRuleFilterConditionCallback,
+      radius: 22,
-      child: CircleAvatar(
+      child: SvgPicture.asset(
-        backgroundColor: AppColor.colorRemoveRuleFilterConditionButton,
+        imagePath!.icMinimize,
-        radius: 22,
+        fit: BoxFit.fill,
-        child: SvgPicture.asset(
+        colorFilter: AppColor.colorDeletePermanentlyButton.asFilter(),
-          imagePath!.icMinimize,
+      ),
-          fit: BoxFit.fill,
+    )
-          colorFilter: AppColor.colorDeletePermanentlyButton.asFilter(),
-        ),
-      )
-    ),
   );
 }

pubspec.lock

@@ -788,6 +788,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.3"
+  flutter_slidable:
+    dependency: "direct main"
+    description:
+      name: flutter_slidable
+      sha256: cc4231579e3eae41ae166660df717f4bad1359c87f4a4322ad8ba1befeb3d2be
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.0"
   flutter_staggered_grid_view:
     dependency: "direct main"
     description:

pubspec.yaml

@@ -204,6 +204,8 @@ dependencies:
 
   super_tag_editor: 0.2.0
 
+  flutter_slidable: 3.0.0
+
 dev_dependencies:
   flutter_test:
     sdk: flutter