diff --git a/app/src/main/java/org/tasks/activities/FilterSettingsActivity.java b/app/src/main/java/org/tasks/activities/FilterSettingsActivity.java index ff1982293..b4c8ec2b6 100644 --- a/app/src/main/java/org/tasks/activities/FilterSettingsActivity.java +++ b/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 all = filterCriteriaProvider.getAll(); List 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(); diff --git a/app/src/main/res/layout/dialog_custom_filter_row_edit.xml b/app/src/main/res/layout/dialog_custom_filter_row_edit.xml index 9b38e6e01..db8052dcf 100644 --- a/app/src/main/res/layout/dialog_custom_filter_row_edit.xml +++ b/app/src/main/res/layout/dialog_custom_filter_row_edit.xml @@ -38,11 +38,4 @@ - - \ No newline at end of file diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 1eccf651c..d053f2534 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -600,5 +600,4 @@ NICHT ODER Filterkriterien - Neue Kriterien auswählen \ No newline at end of file diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 88b9c9f08..e5952c21d 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -605,5 +605,4 @@ O Y Criterios de filtro - Elija los nuevos criterios \ No newline at end of file diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 5d419be8e..449faa48d 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -600,5 +600,4 @@ NON OU ET - Choisir de nouveaux critères \ No newline at end of file diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index c407b1626..4141f4fed 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -603,5 +603,4 @@ VAGY ÉS Szűrő feltétel - Új feltétel kiválasztása \ No newline at end of file diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 9e20dd0c1..4b3b852ab 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -577,7 +577,6 @@ NON O E - Scegli nuovi criteri Mostra il menu Nascondi lo sfondo \ No newline at end of file diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index dfcabb78c..01b36cc57 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -600,5 +600,4 @@ OF EN Filter criteria - Kies nieuwe criteria \ No newline at end of file diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 5682ce399..1ddcba0d0 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -596,5 +596,4 @@ 过滤条件 - 选择新条件 \ No newline at end of file