diff options
Diffstat (limited to 'app/src/main')
| -rw-r--r-- | app/src/main/java/de/danoeh/antennapod/dialog/FilterDialog.java | 13 | ||||
| -rw-r--r-- | app/src/main/res/layout/filter_dialog_row.xml | 27 |
2 files changed, 19 insertions, 21 deletions
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 2448742ca..82bdfaafe 100644 --- a/app/src/main/java/de/danoeh/antennapod/dialog/FilterDialog.java +++ b/app/src/main/java/de/danoeh/antennapod/dialog/FilterDialog.java @@ -5,14 +5,17 @@ import android.text.TextUtils; import android.view.LayoutInflater; import android.widget.LinearLayout; import android.widget.RadioButton; + import androidx.appcompat.app.AlertDialog; + +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + import de.danoeh.antennapod.R; import de.danoeh.antennapod.core.feed.FeedItemFilter; import de.danoeh.antennapod.core.feed.FeedItemFilterGroup; import de.danoeh.antennapod.view.RecursiveRadioGroup; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; public abstract class FilterDialog { @@ -47,7 +50,9 @@ public abstract class FilterDialog { for (String filterId : filterValues) { if (!TextUtils.isEmpty(filterId)) { - ((RadioButton) layout.findViewWithTag(filterId)).setChecked(true); + if (layout.findViewWithTag(filterId) != null) { + ((RadioButton) layout.findViewWithTag(filterId)).setChecked(true); + } } } diff --git a/app/src/main/res/layout/filter_dialog_row.xml b/app/src/main/res/layout/filter_dialog_row.xml index ef0ceb9a4..5a92ae8d9 100644 --- a/app/src/main/res/layout/filter_dialog_row.xml +++ b/app/src/main/res/layout/filter_dialog_row.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<de.danoeh.antennapod.view.RecursiveRadioGroup - xmlns:android="http://schemas.android.com/apk/res/android" +<de.danoeh.antennapod.view.RecursiveRadioGroup xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" @@ -24,29 +23,25 @@ android:id="@+id/filter_dialog_radioButton1" android:layout_width="0dp" android:layout_height="match_parent" + android:layout_marginEnd="2dp" + android:layout_marginRight="2dp" android:layout_weight="1" - android:background="@drawable/filter_dialog_button_background_light" - android:textColor="@drawable/filter_dialog_button_text_light" + android:background="?attr/filter_dialog_button_background" android:button="@android:color/transparent" - android:layout_marginRight="2dp" - android:layout_marginEnd="2dp" android:checked="false" - android:foreground="?attr/selectableItemBackground" - android:tag="" - android:gravity="center" /> + android:gravity="center" + android:textColor="@drawable/filter_dialog_button_text_light" /> <RadioButton android:id="@+id/filter_dialog_radioButton2" android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" - android:background="@drawable/filter_dialog_button_background_light" - android:textColor="@drawable/filter_dialog_button_text_light" + android:background="?attr/filter_dialog_button_background" android:button="@android:color/transparent" android:checked="false" - android:foreground="?attr/selectableItemBackground" - android:tag="" - android:gravity="center" /> + android:gravity="center" + android:textColor="@drawable/filter_dialog_button_text_light" /> </LinearLayout> </androidx.cardview.widget.CardView> @@ -54,10 +49,8 @@ android:id="@+id/filter_dialog_clear" android:layout_width="48dp" android:layout_height="48dp" - android:background="@drawable/filter_dialog_button_clear" + android:background="?attr/filter_dialog_button_clear" android:button="@android:color/transparent" - android:foreground="?attr/selectableItemBackground" - android:tag="" android:checked="true" /> </de.danoeh.antennapod.view.RecursiveRadioGroup> |