Remove choose new criteria button

app/src/main/java/org/tasks/activities/FilterSettingsActivity.java

@@ -19,8 +19,6 @@ import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.FrameLayout;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
 import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -149,7 +147,7 @@ public class FilterSettingsActivity extends BaseListSettingsActivity {
     MaterialButtonToggleGroup group = view.findViewById(R.id.button_toggle);
     int selected = getSelected(criterionInstance);
     group.check(selected);
-    AlertDialog d = dialogBuilder
+    dialogBuilder
         .newDialog(criterionInstance.getTitleFromCriterion())
         .setView(view)
         .setNegativeButton(android.R.string.cancel, null)
@@ -160,10 +158,6 @@ public class FilterSettingsActivity extends BaseListSettingsActivity {
               updateList();
             })
         .show();
-    view.findViewById(R.id.reconfigure).setOnClickListener(v -> {
-      d.dismiss();
-      addCriteria(criterionInstance);
-    });
   }
 
   private int getSelected(CriterionInstance instance) {
@@ -194,12 +188,8 @@ public class FilterSettingsActivity extends BaseListSettingsActivity {
 
   @OnClick(R.id.fab)
   void addCriteria() {
-    addCriteria(null);
-    fab.shrink();
-  }
-
-  private void addCriteria(@Nullable CriterionInstance replace) {
     AndroidUtilities.hideKeyboard(this);
+    fab.shrink();
 
     List<CustomFilterCriterion> all = filterCriteriaProvider.getAll();
     List<String> names = transform(all, CustomFilterCriterion::getName);
@@ -208,11 +198,7 @@ public class FilterSettingsActivity extends BaseListSettingsActivity {
           CriterionInstance instance = new CriterionInstance();
           instance.criterion = all.get(which);
           showOptionsFor(instance, () -> {
-            if (replace == null) {
-              criteria.add(instance);
-            } else {
-              criteria.set(criteria.indexOf(replace), instance);
-            }
+            criteria.add(instance);
             updateList();
           });
           dialog.dismiss();

app/src/main/res/layout/dialog_custom_filter_row_edit.xml

@@ -38,11 +38,4 @@
 
     </com.google.android.material.button.MaterialButtonToggleGroup>
 
-    <TextView
-      android:id="@+id/reconfigure"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      style="@style/TagSettingsRow"
-      android:text="@string/choose_new_criteria" />
-
 </LinearLayout>

app/src/main/res/values-de/strings.xml

@@ -600,5 +600,4 @@
     <string name="custom_filter_not">NICHT</string>
     <string name="custom_filter_or">ODER</string>
     <string name="custom_filter_criteria">Filterkriterien</string>
-    <string name="choose_new_criteria">Neue Kriterien auswählen</string>
 </resources>

app/src/main/res/values-es/strings.xml

@@ -605,5 +605,4 @@
     <string name="custom_filter_or">O</string>
     <string name="custom_filter_and">Y</string>
     <string name="custom_filter_criteria">Criterios de filtro</string>
-    <string name="choose_new_criteria">Elija los nuevos criterios</string>
 </resources>

app/src/main/res/values-fr/strings.xml

@@ -600,5 +600,4 @@
     <string name="custom_filter_not">NON</string>
     <string name="custom_filter_or">OU</string>
     <string name="custom_filter_and">ET</string>
-    <string name="choose_new_criteria">Choisir de nouveaux critères</string>
 </resources>

app/src/main/res/values-hu/strings.xml

@@ -603,5 +603,4 @@
     <string name="custom_filter_or">VAGY</string>
     <string name="custom_filter_and">ÉS</string>
     <string name="custom_filter_criteria">Szűrő feltétel</string>
-    <string name="choose_new_criteria">Új feltétel kiválasztása</string>
 </resources>

app/src/main/res/values-it/strings.xml

@@ -577,7 +577,6 @@
     <string name="custom_filter_not">NON</string>
     <string name="custom_filter_or">O</string>
     <string name="custom_filter_and">E</string>
-    <string name="choose_new_criteria">Scegli nuovi criteri</string>
     <string name="widget_show_menu">Mostra il menu</string>
     <string name="widget_hide_background">Nascondi lo sfondo</string>
 </resources>

app/src/main/res/values-nl/strings.xml

@@ -600,5 +600,4 @@
     <string name="custom_filter_or">OF</string>
     <string name="custom_filter_and">EN</string>
     <string name="custom_filter_criteria">Filter criteria</string>
-    <string name="choose_new_criteria">Kies nieuwe criteria</string>
 </resources>

app/src/main/res/values-zh-rCN/strings.xml

@@ -596,5 +596,4 @@
     <string name="custom_filter_or">或</string>
     <string name="custom_filter_and">和</string>
     <string name="custom_filter_criteria">过滤条件</string>
-    <string name="choose_new_criteria">选择新条件</string>
 </resources>