From 2ce23f6868a1205996955f7cbbbb004246ebf9b1 Mon Sep 17 00:00:00 2001
From: bws9000 <armorsoft@gmail.com>
Date: Tue, 7 Jul 2020 10:55:56 -0400
Subject: Redesign filter dialog

---
 app/src/main/java/de/danoeh/antennapod/dialog/FilterDialog.java | 7 ++++---
 app/src/main/res/layout/filter_dialog_row.xml                   | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'app')

diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/FilterDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/FilterDialog.java
index 82bdfaafe..a5d024545 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/FilterDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/FilterDialog.java
@@ -50,9 +50,7 @@ public abstract class FilterDialog {
 
         for (String filterId : filterValues) {
             if (!TextUtils.isEmpty(filterId)) {
-                if (layout.findViewWithTag(filterId) != null) {
-                    ((RadioButton) layout.findViewWithTag(filterId)).setChecked(true);
-                }
+                ((RadioButton) layout.findViewWithTag(filterId)).setChecked(true);
             }
         }
 
@@ -67,6 +65,9 @@ public abstract class FilterDialog {
                     filterValues.add((String) group.getCheckedButton().getTag());
                 }
             }
+            if (filterValues.contains(null)) {
+                filterValues.clear();
+            }
             updateFilter(filterValues);
         });
 
diff --git a/app/src/main/res/layout/filter_dialog_row.xml b/app/src/main/res/layout/filter_dialog_row.xml
index 5a92ae8d9..ff26a58cb 100644
--- a/app/src/main/res/layout/filter_dialog_row.xml
+++ b/app/src/main/res/layout/filter_dialog_row.xml
@@ -30,7 +30,7 @@
                 android:button="@android:color/transparent"
                 android:checked="false"
                 android:gravity="center"
-                android:textColor="@drawable/filter_dialog_button_text_light" />
+                android:textColor="@color/filter_dialog_button_text" />
 
             <RadioButton
                 android:id="@+id/filter_dialog_radioButton2"
@@ -41,7 +41,7 @@
                 android:button="@android:color/transparent"
                 android:checked="false"
                 android:gravity="center"
-                android:textColor="@drawable/filter_dialog_button_text_light" />
+                android:textColor="@color/filter_dialog_button_text" />
         </LinearLayout>
     </androidx.cardview.widget.CardView>
 
@@ -49,7 +49,7 @@
         android:id="@+id/filter_dialog_clear"
         android:layout_width="48dp"
         android:layout_height="48dp"
-        android:background="?attr/filter_dialog_button_clear"
+        android:background="@drawable/ic_filter_close"
         android:button="@android:color/transparent"
         android:checked="true" />
 
-- 
cgit v1.2.3