diff options
Diffstat (limited to 'core/src/main/res')
| -rw-r--r-- | core/src/main/res/color/filter_dialog_button_background_light.xml | 5 | ||||
| -rw-r--r-- | core/src/main/res/color/filter_dialog_button_clear.xml | 5 | ||||
| -rw-r--r-- | core/src/main/res/color/filter_dialog_button_text_light.xml | 5 | ||||
| -rw-r--r-- | core/src/main/res/drawable/filter_dialog_x_off.xml | 56 | ||||
| -rw-r--r-- | core/src/main/res/drawable/ic_filter_close_light.xml (renamed from core/src/main/res/drawable/filter_dialog_x_on.xml) | 8 | ||||
| -rw-r--r-- | core/src/main/res/values/arrays.xml | 12 |
6 files changed, 18 insertions, 73 deletions
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 new file mode 100644 index 000000000..c6dd0d6cb --- /dev/null +++ b/core/src/main/res/color/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: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 new file mode 100644 index 000000000..1ef3e3e57 --- /dev/null +++ b/core/src/main/res/color/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:state_checked="true" android:color="@color/grey" /> + <item android:color="@color/master_switch_background_light" /> +</selector> diff --git a/core/src/main/res/color/filter_dialog_button_text_light.xml b/core/src/main/res/color/filter_dialog_button_text_light.xml new file mode 100644 index 000000000..0a5388eb9 --- /dev/null +++ b/core/src/main/res/color/filter_dialog_button_text_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:state_checked="true" android:color="@color/white" /> + <item android:color="@color/black" /> +</selector> diff --git a/core/src/main/res/drawable/filter_dialog_x_off.xml b/core/src/main/res/drawable/filter_dialog_x_off.xml deleted file mode 100644 index 8368ffa51..000000000 --- a/core/src/main/res/drawable/filter_dialog_x_off.xml +++ /dev/null @@ -1,56 +0,0 @@ -<?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/master_switch_background_light" /> - </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/master_switch_background_light" /> - </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/master_switch_background_light" /> - </shape> - - </rotate> - </item> - -</layer-list>
\ No newline at end of file diff --git a/core/src/main/res/drawable/filter_dialog_x_on.xml b/core/src/main/res/drawable/ic_filter_close_light.xml index b25b42df3..1d695cd0f 100644 --- a/core/src/main/res/drawable/filter_dialog_x_on.xml +++ b/core/src/main/res/drawable/ic_filter_close_light.xml @@ -10,9 +10,8 @@ <shape android:shape="oval"> <stroke android:width="4dp" - android:color="@color/grey" /> + android:color="@color/filter_dialog_button_clear" /> </shape> - </item> <!-- x --> @@ -29,7 +28,7 @@ <shape android:shape="line"> <stroke android:width="4dp" - android:color="@color/grey" /> + android:color="@color/filter_dialog_button_clear" /> </shape> </rotate> </item> @@ -47,9 +46,8 @@ <shape android:shape="line"> <stroke android:width="4dp" - android:color="@color/grey" /> + android:color="@color/filter_dialog_button_clear" /> </shape> - </rotate> </item> diff --git a/core/src/main/res/values/arrays.xml b/core/src/main/res/values/arrays.xml index 8e8d70525..13ff092b0 100644 --- a/core/src/main/res/values/arrays.xml +++ b/core/src/main/res/values/arrays.xml @@ -245,18 +245,6 @@ <item>exoplayer</item> </string-array> - <string-array name="episode_filter_options"> - <item>@string/hide_unplayed_episodes_label</item> - <item>@string/hide_paused_episodes_label</item> - <item>@string/hide_played_episodes_label</item> - <item>@string/hide_queued_episodes_label</item> - <item>@string/hide_not_queued_episodes_label</item> - <item>@string/hide_downloaded_episodes_label</item> - <item>@string/hide_not_downloaded_episodes_label</item> - <item>@string/hide_has_media_label</item> - <item>@string/hide_is_favorite_label</item> - </string-array> - <!-- sort for podcast screen, not for queue --> <string-array name="feed_episodes_sort_options"> <item>@string/sort_date_new_old</item> |