From 03f2198ed5e977c37f0413483a10ad421d06d153 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Mon, 13 Jul 2020 12:06:34 +0200
Subject: [PATCH] Fixed colors in dark theme

---
 .../color/filter_dialog_background_dark.xml    |  2 +-
 .../color/filter_dialog_background_light.xml   |  4 ++--
 .../res/color/filter_dialog_clear_dark.xml     |  5 +++++
 .../res/color/filter_dialog_clear_light.xml    |  5 +++++
 .../src/main/res/color/filter_dialog_close.xml |  5 -----
 core/src/main/res/drawable/ic_filter_close.xml |  6 +++---
 core/src/main/res/values/attrs.xml             |  4 +---
 core/src/main/res/values/colors.xml            | 18 ++++--------------
 core/src/main/res/values/styles.xml            | 12 +++---------
 9 files changed, 24 insertions(+), 37 deletions(-)
 create mode 100644 core/src/main/res/color/filter_dialog_clear_dark.xml
 create mode 100644 core/src/main/res/color/filter_dialog_clear_light.xml
 delete mode 100644 core/src/main/res/color/filter_dialog_close.xml

diff --git a/core/src/main/res/color/filter_dialog_background_dark.xml b/core/src/main/res/color/filter_dialog_background_dark.xml
index 846bb37c9..3df2a80dc 100644
--- a/core/src/main/res/color/filter_dialog_background_dark.xml
+++ b/core/src/main/res/color/filter_dialog_background_dark.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="@color/accent_dark" android:state_checked="true"/>
-    <item android:color="@color/highlight_dark" />
+    <item android:color="@color/dialog_filter_inactive_dark" />
 </selector>
\ No newline at end of file
diff --git a/core/src/main/res/color/filter_dialog_background_light.xml b/core/src/main/res/color/filter_dialog_background_light.xml
index be3feb190..930325629 100644
--- a/core/src/main/res/color/filter_dialog_background_light.xml
+++ b/core/src/main/res/color/filter_dialog_background_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:color="@color/accent_light" android:state_checked="true" android:drawable="@color/accent_light"/>
-    <item android:color="@color/highlight_light" android:drawable="@color/highlight_light" />
+    <item android:color="@color/accent_light" android:state_checked="true" />
+    <item android:color="@color/dialog_filter_inactive_light" />
 </selector>
\ No newline at end of file
diff --git a/core/src/main/res/color/filter_dialog_clear_dark.xml b/core/src/main/res/color/filter_dialog_clear_dark.xml
new file mode 100644
index 000000000..88e022d0f
--- /dev/null
+++ b/core/src/main/res/color/filter_dialog_clear_dark.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/dialog_filter_inactive_dark" android:state_checked="true" />
+    <item android:color="@color/dialog_filter_clear_inactive_dark" />
+</selector>
\ No newline at end of file
diff --git a/core/src/main/res/color/filter_dialog_clear_light.xml b/core/src/main/res/color/filter_dialog_clear_light.xml
new file mode 100644
index 000000000..9d513f72a
--- /dev/null
+++ b/core/src/main/res/color/filter_dialog_clear_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:color="@color/dialog_filter_inactive_light" android:state_checked="true" />
+    <item android:color="@color/dialog_filter_clear_inactive_light" />
+</selector>
\ No newline at end of file
diff --git a/core/src/main/res/color/filter_dialog_close.xml b/core/src/main/res/color/filter_dialog_close.xml
deleted file mode 100644
index 1b059c818..000000000
--- a/core/src/main/res/color/filter_dialog_close.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:color="?attr/filter_dialog_clear_active" android:state_checked="true" />
-    <item android:color="?attr/filter_dialog_clear_inactive" />
-</selector>
\ No newline at end of file
diff --git a/core/src/main/res/drawable/ic_filter_close.xml b/core/src/main/res/drawable/ic_filter_close.xml
index 0cfbbf3f5..9e0a26905 100644
--- a/core/src/main/res/drawable/ic_filter_close.xml
+++ b/core/src/main/res/drawable/ic_filter_close.xml
@@ -10,7 +10,7 @@
         <shape android:shape="oval">
             <stroke
                 android:width="4dp"
-                android:color="?attr/filter_dialog_close" />
+                android:color="?attr/filter_dialog_clear" />
         </shape>
     </item>
 
@@ -28,7 +28,7 @@
             <shape android:shape="line">
                 <stroke
                     android:width="4dp"
-                    android:color="?attr/filter_dialog_close" />
+                    android:color="?attr/filter_dialog_clear" />
             </shape>
         </rotate>
     </item>
@@ -46,7 +46,7 @@
             <shape android:shape="line">
                 <stroke
                     android:width="4dp"
-                    android:color="?attr/filter_dialog_close" />
+                    android:color="?attr/filter_dialog_clear" />
             </shape>
 
         </rotate>
diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml
index 07f7d50e6..efb44a783 100644
--- a/core/src/main/res/values/attrs.xml
+++ b/core/src/main/res/values/attrs.xml
@@ -58,10 +58,8 @@
     <attr name="action_icon_color" format="color" />
     <attr name="scrollbar_thumb" format="reference" />
     <attr name="background_elevated" format="color" />
-    <attr name="filter_dialog_close" format="reference" />
+    <attr name="filter_dialog_clear" format="reference" />
     <attr name="filter_dialog_button_background" format="reference" />
-    <attr name="filter_dialog_clear_active" format="reference" />
-    <attr name="filter_dialog_clear_inactive" format="reference" />
 
     <declare-styleable name="SquareImageView">
         <attr name="direction" format="enum">
diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml
index bd542a05c..a55378931 100644
--- a/core/src/main/res/values/colors.xml
+++ b/core/src/main/res/values/colors.xml
@@ -29,18 +29,8 @@
     <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>
-
-    <color name="dialog_filter_text_active">#FFFFFF</color>
-    <color name="dialog_filter_text_inactive">#000000</color>
-
+    <color name="dialog_filter_clear_inactive_light">#666666</color>
+    <color name="dialog_filter_clear_inactive_dark">#bbbbbb</color>
+    <color name="dialog_filter_inactive_light">#eeeeee</color>
+    <color name="dialog_filter_inactive_dark">#555555</color>
 </resources>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index a5543c4dc..972174da5 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -73,10 +73,7 @@
         <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_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>
+        <item name="filter_dialog_clear">@color/filter_dialog_clear_light</item>
         <item name="filter_dialog_button_background">@color/filter_dialog_background_light</item>
     </style>
 
@@ -153,11 +150,8 @@
         <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_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>
-        <item name="filter_dialog_button_background">@color/filter_dialog_background_light</item>
+        <item name="filter_dialog_clear">@color/filter_dialog_clear_dark</item>
+        <item name="filter_dialog_button_background">@color/filter_dialog_background_dark</item>
     </style>
 
     <style name="Theme.AntennaPod.TrueBlack" parent="Theme.Base.AntennaPod.TrueBlack">