diff options
Diffstat (limited to 'core')
7 files changed, 16 insertions, 22 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 new file mode 100644 index 000000000..846bb37c9 --- /dev/null +++ b/core/src/main/res/color/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:color="@color/accent_dark" android:state_checked="true"/> + <item android:color="@color/highlight_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 new file mode 100644 index 000000000..be3feb190 --- /dev/null +++ b/core/src/main/res/color/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:color="@color/accent_light" android:state_checked="true" android:drawable="@color/accent_light"/> + <item android:color="@color/highlight_light" android:drawable="@color/highlight_light" /> +</selector>
\ No newline at end of file diff --git a/core/src/main/res/drawable/filter_dialog_button_background_dark.xml b/core/src/main/res/drawable/filter_dialog_button_background_dark.xml deleted file mode 100644 index b8bc1216f..000000000 --- a/core/src/main/res/drawable/filter_dialog_button_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/dialog_filter_button_active_dark" android:state_checked="true" /> - <item android:color="@color/dialog_filter_button_inactive_dark" /> -</selector>
\ No newline at end of file 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 deleted file mode 100644 index 5e58d3a26..000000000 --- a/core/src/main/res/drawable/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:drawable="@color/dialog_filter_button_active_light" android:state_checked="true" /> - <item android:drawable="@color/dialog_filter_button_inactive_light" /> -</selector>
\ No newline at end of file diff --git a/core/src/main/res/drawable/filter_dialog_button_text_light.xml b/core/src/main/res/drawable/filter_dialog_button_text_light.xml deleted file mode 100644 index 4d75670b7..000000000 --- a/core/src/main/res/drawable/filter_dialog_button_text_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/white" android:state_checked="true" /> - <item android:color="@color/black" /> -</selector>
\ No newline at end of file diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml index c7c794451..07f7d50e6 100644 --- a/core/src/main/res/values/attrs.xml +++ b/core/src/main/res/values/attrs.xml @@ -1,9 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <attr name="filter_dialog_close" 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" /> <attr name="action_about" format="reference" /> <attr name="action_search" format="reference" /> <attr name="action_stream" format="reference" /> @@ -62,6 +58,10 @@ <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_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/styles.xml b/core/src/main/res/values/styles.xml index 48a10bcdb..a5543c4dc 100644 --- a/core/src/main/res/values/styles.xml +++ b/core/src/main/res/values/styles.xml @@ -77,7 +77,7 @@ <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_button_background">@drawable/filter_dialog_button_background_light</item> + <item name="filter_dialog_button_background">@color/filter_dialog_background_light</item> </style> <style name="Theme.AntennaPod.Dark" parent="Theme.Base.AntennaPod.Dark"> @@ -154,11 +154,10 @@ <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">@drawable/filter_dialog_button_background_dark</item> + <item name="filter_dialog_button_background">@color/filter_dialog_background_light</item> </style> <style name="Theme.AntennaPod.TrueBlack" parent="Theme.Base.AntennaPod.TrueBlack"> |