Redesign filter dialog

3 files changed, 86 insertions, 58 deletions

diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml
index b89a819f1..998b086c6 100644
--- a/core/src/main/res/values/attrs.xml
+++ b/core/src/main/res/values/attrs.xml
@@ -1,69 +1,73 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <attr name="action_about" format="reference"/>
-    <attr name="action_search" format="reference"/>
-    <attr name="action_stream" format="reference"/>
-    <attr name="av_download" format="reference"/>
-    <attr name="av_fast_forward" format="reference"/>
-    <attr name="av_pause" format="reference"/>
-    <attr name="av_play" format="reference"/>
-    <attr name="av_skip" format="reference"/>
-    <attr name="av_rewind" format="reference"/>
-    <attr name="ic_delete" format="reference"/>
-    <attr name="content_new" format="reference"/>
-    <attr name="content_remove_from_queue" format="reference"/>
-    <attr name="storage" format="reference"/>
-    <attr name="statistics" format="reference"/>
-    <attr name="feed" format="reference"/>
-    <attr name="location_web_site" format="reference"/>
-    <attr name="navigation_accept" format="reference"/>
-    <attr name="navigation_cancel" format="reference"/>
-    <attr name="ic_load_more" format="reference"/>
-    <attr name="navigation_refresh" format="reference"/>
-    <attr name="navigation_up" format="reference"/>
-    <attr name="stat_playlist" format="reference"/>
-    <attr name="ic_folder" format="reference"/>
-    <attr name="type_video" format="reference"/>
-    <attr name="dragview_background" format="reference"/>
-    <attr name="ic_history" format="reference"/>
-    <attr name="ic_sliders" format="reference"/>
-    <attr name="ic_settings_playback" format="reference"/>
-    <attr name="ic_settings" format="reference"/>
-    <attr name="ic_lock_open" format="reference"/>
-    <attr name="ic_lock_closed" format="reference"/>
-    <attr name="ic_filter" format="reference"/>
-    <attr name="progressBarTheme" format="reference"/>
-    <attr name="ic_fav" format="reference"/>
-    <attr name="ic_unfav" format="reference"/>
-    <attr name="ic_sleep" format="reference"/>
-    <attr name="ic_sleep_off" format="reference"/>
-    <attr name="checkbox_multiple" format="reference"/>
-    <attr name="ic_select_all" format="reference"/>
-    <attr name="ic_select_none" format="reference"/>
-    <attr name="ic_sort" format="reference"/>
-    <attr name="ic_key" format="reference"/>
-    <attr name="ic_volume_adaption" format="reference"/>
-    <attr name="ic_network" format="reference"/>
-    <attr name="ic_appearance" 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" />
+    <attr name="action_search" format="reference" />
+    <attr name="action_stream" format="reference" />
+    <attr name="av_download" format="reference" />
+    <attr name="av_fast_forward" format="reference" />
+    <attr name="av_pause" format="reference" />
+    <attr name="av_play" format="reference" />
+    <attr name="av_skip" format="reference" />
+    <attr name="av_rewind" format="reference" />
+    <attr name="ic_delete" format="reference" />
+    <attr name="content_new" format="reference" />
+    <attr name="content_remove_from_queue" format="reference" />
+    <attr name="storage" format="reference" />
+    <attr name="statistics" format="reference" />
+    <attr name="feed" format="reference" />
+    <attr name="location_web_site" format="reference" />
+    <attr name="navigation_accept" format="reference" />
+    <attr name="navigation_cancel" format="reference" />
+    <attr name="ic_load_more" format="reference" />
+    <attr name="navigation_refresh" format="reference" />
+    <attr name="navigation_up" format="reference" />
+    <attr name="stat_playlist" format="reference" />
+    <attr name="ic_folder" format="reference" />
+    <attr name="type_video" format="reference" />
+    <attr name="dragview_background" format="reference" />
+    <attr name="ic_history" format="reference" />
+    <attr name="ic_sliders" format="reference" />
+    <attr name="ic_settings_playback" format="reference" />
+    <attr name="ic_settings" format="reference" />
+    <attr name="ic_lock_open" format="reference" />
+    <attr name="ic_lock_closed" format="reference" />
+    <attr name="ic_filter" format="reference" />
+    <attr name="progressBarTheme" format="reference" />
+    <attr name="ic_fav" format="reference" />
+    <attr name="ic_unfav" format="reference" />
+    <attr name="ic_sleep" format="reference" />
+    <attr name="ic_sleep_off" format="reference" />
+    <attr name="checkbox_multiple" format="reference" />
+    <attr name="ic_select_all" format="reference" />
+    <attr name="ic_select_none" format="reference" />
+    <attr name="ic_sort" format="reference" />
+    <attr name="ic_key" format="reference" />
+    <attr name="ic_volume_adaption" format="reference" />
+    <attr name="ic_network" format="reference" />
+    <attr name="ic_appearance" format="reference" />
     <attr name="ic_questionmark" format="reference" />
-    <attr name="ic_chat" format="reference"/>
+    <attr name="ic_chat" format="reference" />
     <attr name="ic_bug" format="reference" />
-    <attr name="master_switch_background" format="color"/>
-    <attr name="currently_playing_background" format="color"/>
-    <attr name="ic_bookmark" format="reference"/>
+    <attr name="master_switch_background" format="color" />
+    <attr name="currently_playing_background" format="color" />
+    <attr name="ic_bookmark" format="reference" />
     <attr name="ic_settings_speed" format="reference" />
     <attr name="ic_settings_skip" format="reference" />
-    <attr name="drawer_activated_color" format="color"/>
-    <attr name="batch_edit_fab_icon" format="reference"/>
-    <attr name="action_icon_color" format="color"/>
-    <attr name="scrollbar_thumb" format="reference"/>
-    <attr name="background_elevated" format="color"/>
+    <attr name="drawer_activated_color" format="color" />
+    <attr name="batch_edit_fab_icon" format="reference" />
+    <attr name="action_icon_color" format="color" />
+    <attr name="scrollbar_thumb" format="reference" />
+    <attr name="background_elevated" format="color" />
 
     <declare-styleable name="SquareImageView">
         <attr name="direction" format="enum">
-            <enum name="width" value="0"/>
-            <enum name="height" value="1"/>
-            <enum name="minimum" value="2"/>
+            <enum name="width" value="0" />
+            <enum name="height" value="1" />
+            <enum name="minimum" value="2" />
         </attr>
     </declare-styleable>
 </resources>
diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml
index a86d61eba..148919db7 100644
--- a/core/src/main/res/values/colors.xml
+++ b/core/src/main/res/values/colors.xml
@@ -28,4 +28,16 @@
     <color name="master_switch_background_light">#DDDDDD</color>
     <color name="master_switch_background_dark">#191919</color>
 
+    <!-- filter dialog -->
+    <color name="dialog_filter_button_inactive_dark">#757575</color>
+    <color name="dialog_filter_button_inactive_light">#DDDDDD</color>
+    <color name="dialog_filter_button_active_dark">#3D8BFF</color>
+    <color name="dialog_filter_button_active_light">#0078C2</color>
+
+    <color name="dialog_filter_clear_active_light">#46C6C6C6</color>
+    <color name="dialog_filter_clear_active_dark">#43707070</color>
+
+    <color name="dialog_filter_clear_inactive_light">#757575</color>
+    <color name="dialog_filter_clear_inactive_dark">#46C6C6C6</color>
+
 </resources>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index ab78eac47..1aaa67e2d 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android">
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
 
     <style name="Theme.AntennaPod.Light" parent="Theme.Base.AntennaPod.Light">
         <!-- Room for API dependent attributes -->
     </style>
 
     <style name="Theme.Base.AntennaPod.Light" parent="Theme.MaterialComponents.Light">
+        <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>
@@ -80,6 +86,12 @@
     </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>