summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorandrewc1 <andrewc6l@yahoo.com>2020-09-18 22:58:32 -0700
committerByteHamster <info@bytehamster.com>2020-09-20 08:39:44 +0200
commita6dfd27a15228f68ca3bb96c1e585d4e3c803b13 (patch)
tree2896aa41efc61f0ac84a081f560791c14f726e4d /core
parent410ebfe98c3ae441e57c75ceef3ac34c29ada07d (diff)
downloadAntennaPod-a6dfd27a15228f68ca3bb96c1e585d4e3c803b13.zip
Convert color state lists to state list drawables for filter background colors.
This eliminates an incompatibility on earlier Android OS versions (https://stackoverflow.com/questions/3953606/how-to-specify-background-color-in-color-state-list-resources)
Diffstat (limited to 'core')
-rw-r--r--core/src/main/res/color/filter_dialog_background_dark.xml5
-rw-r--r--core/src/main/res/color/filter_dialog_background_light.xml5
-rw-r--r--core/src/main/res/drawable/filter_dialog_background_dark.xml5
-rw-r--r--core/src/main/res/drawable/filter_dialog_background_light.xml5
-rw-r--r--core/src/main/res/values/styles.xml4
5 files changed, 12 insertions, 12 deletions
diff --git a/core/src/main/res/color/filter_dialog_background_dark.xml b/core/src/main/res/color/filter_dialog_background_dark.xml
deleted file mode 100644
index 3df2a80dc..000000000
--- a/core/src/main/res/color/filter_dialog_background_dark.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="@color/accent_dark" android:state_checked="true"/>
- <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
deleted file mode 100644
index 930325629..000000000
--- a/core/src/main/res/color/filter_dialog_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: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/drawable/filter_dialog_background_dark.xml b/core/src/main/res/drawable/filter_dialog_background_dark.xml
new file mode 100644
index 000000000..9ea827147
--- /dev/null
+++ b/core/src/main/res/drawable/filter_dialog_background_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:drawable="@color/accent_dark" android:state_checked="true"/>
+ <item android:drawable="@color/dialog_filter_inactive_dark" />
+</selector> \ No newline at end of file
diff --git a/core/src/main/res/drawable/filter_dialog_background_light.xml b/core/src/main/res/drawable/filter_dialog_background_light.xml
new file mode 100644
index 000000000..e0a80737c
--- /dev/null
+++ b/core/src/main/res/drawable/filter_dialog_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/dialog_filter_inactive_light" />
+</selector> \ No newline at end of file
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index 972174da5..6dff2782f 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -74,7 +74,7 @@
<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">@color/filter_dialog_clear_light</item>
- <item name="filter_dialog_button_background">@color/filter_dialog_background_light</item>
+ <item name="filter_dialog_button_background">@drawable/filter_dialog_background_light</item>
</style>
<style name="Theme.AntennaPod.Dark" parent="Theme.Base.AntennaPod.Dark">
@@ -151,7 +151,7 @@
<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">@color/filter_dialog_clear_dark</item>
- <item name="filter_dialog_button_background">@color/filter_dialog_background_dark</item>
+ <item name="filter_dialog_button_background">@drawable/filter_dialog_background_dark</item>
</style>
<style name="Theme.AntennaPod.TrueBlack" parent="Theme.Base.AntennaPod.TrueBlack">