Redesign filter dialog

3 files changed, 19 insertions, 10 deletions

diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml
index 998b086c6..5b80840ac 100644
--- a/core/src/main/res/values/attrs.xml
+++ b/core/src/main/res/values/attrs.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <attr name="filter_dialog_close" format="reference" />
+    <attr name="filter_dialog_text_active" format="reference" />
+    <attr name="filter_dialog_text_inactive" format="reference" />
     <attr name="filter_dialog_button_background" format="reference" />
-    <attr name="filter_dialog_button_clear" format="reference" />
     <attr name="filter_dialog_clear_active" format="reference" />
     <attr name="filter_dialog_clear_inactive" format="reference" />
     <attr name="action_about" format="reference" />
diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml
index 148919db7..bd542a05c 100644
--- a/core/src/main/res/values/colors.xml
+++ b/core/src/main/res/values/colors.xml
@@ -40,4 +40,7 @@
     <color name="dialog_filter_clear_inactive_light">#757575</color>
     <color name="dialog_filter_clear_inactive_dark">#46C6C6C6</color>
 
+    <color name="dialog_filter_text_active">#FFFFFF</color>
+    <color name="dialog_filter_text_inactive">#000000</color>
+
 </resources>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index 1aaa67e2d..adeb7573a 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -9,9 +9,6 @@
         <item name="filter_dialog_button_background">
             @drawable/filter_dialog_button_background_light
         </item>
-        <item name="filter_dialog_button_clear">@drawable/filter_dialog_button_clear</item>
-        <item name="filter_dialog_clear_active">@color/dialog_filter_clear_active_light</item>
-        <item name="filter_dialog_clear_inactive">@color/dialog_filter_clear_inactive_light</item>
         <item name="colorPrimary">@color/accent_light</item>
         <item name="colorAccent">@color/accent_light</item>
         <item name="colorSecondary">@color/accent_light</item>
@@ -79,6 +76,12 @@
         <item name="ic_key">@drawable/ic_key_black</item>
         <item name="ic_volume_adaption">@drawable/ic_volume_adaption_black</item>
         <item name="scrollbar_thumb">@drawable/scrollbar_thumb_light</item>
+
+        <item name="filter_dialog_text_active">@color/dialog_filter_text_active</item>
+        <item name="filter_dialog_text_inactive">@color/dialog_filter_text_inactive</item>
+        <item name="filter_dialog_clear_active">@color/dialog_filter_clear_active_light</item>
+        <item name="filter_dialog_clear_inactive">@color/dialog_filter_clear_inactive_light</item>
+        <item name="filter_dialog_close">@color/filter_dialog_close</item>
     </style>
 
     <style name="Theme.AntennaPod.Dark" parent="Theme.Base.AntennaPod.Dark">
@@ -86,12 +89,6 @@
     </style>
 
     <style name="Theme.Base.AntennaPod.Dark" parent="Theme.MaterialComponents">
-        <item name="filter_dialog_button_background">
-            @drawable/filter_dialog_button_background_dark
-        </item>
-        <item name="filter_dialog_button_clear">@drawable/filter_dialog_button_clear</item>
-        <item name="filter_dialog_clear_active">@color/dialog_filter_clear_active_dark</item>
-        <item name="filter_dialog_clear_inactive">@color/dialog_filter_clear_inactive_dark</item>
         <item name="colorAccent">@color/accent_dark</item>
         <item name="colorSecondary">@color/accent_dark</item>
         <item name="colorOnSecondary">@color/black</item>
@@ -160,6 +157,13 @@
         <item name="ic_key">@drawable/ic_key_white</item>
         <item name="ic_volume_adaption">@drawable/ic_volume_adaption_white</item>
         <item name="scrollbar_thumb">@drawable/scrollbar_thumb_dark</item>
+
+        <item name="filter_dialog_button_background">
+            @drawable/filter_dialog_button_background_dark
+        </item>
+        <item name="filter_dialog_clear_active">@color/dialog_filter_clear_active_dark</item>
+        <item name="filter_dialog_clear_inactive">@color/dialog_filter_clear_inactive_dark</item>
+        <item name="filter_dialog_close">@color/filter_dialog_close</item>
     </style>
 
     <style name="Theme.AntennaPod.TrueBlack" parent="Theme.Base.AntennaPod.TrueBlack">