Redesign filter dialog

8 files changed, 75 insertions, 18 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItemFilterGroup.java b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItemFilterGroup.java
index 7a0eac2e3..45f22ef00 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItemFilterGroup.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItemFilterGroup.java
@@ -6,10 +6,10 @@ public enum FeedItemFilterGroup {
     PLAYED(new ItemProperties(R.string.hide_played_episodes_label, "played"),
             new ItemProperties(R.string.not_played, "unplayed")),
     PAUSED(new ItemProperties(R.string.hide_paused_episodes_label, "paused"),
-            new ItemProperties(R.string.not_paused, "")),
+            new ItemProperties(R.string.not_paused, "_no_id_not_paused")),
     FAVORITE(new ItemProperties(R.string.hide_is_favorite_label, "is_favorite"),
-            new ItemProperties(R.string.not_favorite, "")),
-    MEDIA(new ItemProperties(R.string.has_media, ""),
+            new ItemProperties(R.string.not_favorite, "_no_id_not_favorite")),
+    MEDIA(new ItemProperties(R.string.has_media, "_no_id_no_media"),
             new ItemProperties(R.string.no_media, "no_media")),
     QUEUED(new ItemProperties(R.string.queued_label, "queued"),
             new ItemProperties(R.string.not_queued_label, "not_queued")),
diff --git a/core/src/main/res/color/filter_dialog_button_background_light.xml b/core/src/main/res/color/filter_dialog_button_background_light.xml
deleted file mode 100644
index c6dd0d6cb..000000000
--- a/core/src/main/res/color/filter_dialog_button_background_light.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="true" android:color="@color/accent_light" />
-    <item android:color="@color/master_switch_background_light" />
-</selector>
diff --git a/core/src/main/res/color/filter_dialog_button_clear.xml b/core/src/main/res/color/filter_dialog_button_clear.xml
deleted file mode 100644
index 1ef3e3e57..000000000
--- a/core/src/main/res/color/filter_dialog_button_clear.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="true" android:color="@color/grey" />
-    <item android:color="@color/master_switch_background_light" />
-</selector>
diff --git a/core/src/main/res/drawable/filter_dialog_button_background_light.xml b/core/src/main/res/drawable/filter_dialog_button_background_light.xml
new file mode 100644
index 000000000..c3a1b385e
--- /dev/null
+++ b/core/src/main/res/drawable/filter_dialog_button_background_light.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/accent_light" android:state_checked="true" />
+    <item android:drawable="@color/master_switch_background_light" />
+</selector>
\ No newline at end of file
diff --git a/core/src/main/res/drawable/filter_dialog_button_clear.xml b/core/src/main/res/drawable/filter_dialog_button_clear.xml
new file mode 100644
index 000000000..33e3888b9
--- /dev/null
+++ b/core/src/main/res/drawable/filter_dialog_button_clear.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_filter_close_dark" android:state_checked="true" />
+    <item android:drawable="@drawable/ic_filter_close_light" />
+</selector>
\ No newline at end of file
diff --git a/core/src/main/res/color/filter_dialog_button_text_light.xml b/core/src/main/res/drawable/filter_dialog_button_text_light.xml
index 0a5388eb9..4d75670b7 100644
--- a/core/src/main/res/color/filter_dialog_button_text_light.xml
+++ b/core/src/main/res/drawable/filter_dialog_button_text_light.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="true" android:color="@color/white" />
+    <item android:color="@color/white" android:state_checked="true" />
     <item android:color="@color/black" />
-</selector>
+</selector>
\ No newline at end of file
diff --git a/core/src/main/res/drawable/ic_filter_close_dark.xml b/core/src/main/res/drawable/ic_filter_close_dark.xml
new file mode 100644
index 000000000..b25b42df3
--- /dev/null
+++ b/core/src/main/res/drawable/ic_filter_close_dark.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:bottom="5dp"
+        android:left="5dp"
+        android:right="5dp"
+        android:top="5dp">
+
+        <shape android:shape="oval">
+            <stroke
+                android:width="4dp"
+                android:color="@color/grey" />
+        </shape>
+
+    </item>
+
+    <!-- x -->
+    <item
+        android:bottom="12dp"
+        android:left="12dp"
+        android:right="12dp"
+        android:top="12dp">
+        <rotate
+            android:fromDegrees="135"
+            android:pivotX="50%"
+            android:pivotY="50%"
+            android:toDegrees="135">
+            <shape android:shape="line">
+                <stroke
+                    android:width="4dp"
+                    android:color="@color/grey" />
+            </shape>
+        </rotate>
+    </item>
+
+    <item
+        android:bottom="12dp"
+        android:left="12dp"
+        android:right="12dp"
+        android:top="12dp">
+        <rotate
+            android:fromDegrees="45"
+            android:pivotX="50%"
+            android:pivotY="50%"
+            android:toDegrees="45">
+            <shape android:shape="line">
+                <stroke
+                    android:width="4dp"
+                    android:color="@color/grey" />
+            </shape>
+
+        </rotate>
+    </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/core/src/main/res/drawable/ic_filter_close_light.xml b/core/src/main/res/drawable/ic_filter_close_light.xml
index 1d695cd0f..003b82834 100644
--- a/core/src/main/res/drawable/ic_filter_close_light.xml
+++ b/core/src/main/res/drawable/ic_filter_close_light.xml
@@ -10,7 +10,7 @@
         <shape android:shape="oval">
             <stroke
                 android:width="4dp"
-                android:color="@color/filter_dialog_button_clear" />
+                android:color="@color/master_switch_background_light" />
         </shape>
     </item>
 
@@ -28,7 +28,7 @@
             <shape android:shape="line">
                 <stroke
                     android:width="4dp"
-                    android:color="@color/filter_dialog_button_clear" />
+                    android:color="@color/master_switch_background_light" />
             </shape>
         </rotate>
     </item>
@@ -46,8 +46,9 @@
             <shape android:shape="line">
                 <stroke
                     android:width="4dp"
-                    android:color="@color/filter_dialog_button_clear" />
+                    android:color="@color/master_switch_background_light" />
             </shape>
+
         </rotate>
     </item>