diff options
author | ByteHamster <info@bytehamster.com> | 2022-08-07 21:36:15 +0200 |
---|---|---|
committer | ByteHamster <info@bytehamster.com> | 2022-09-18 19:12:41 +0200 |
commit | 37b49b1e386be9449f8c093ab0b23c83d4b57ac1 (patch) | |
tree | b69f969940220b925a7f0ac46eb5dba25bf6a444 /core/src | |
parent | 2740816bb85041d4d67fe242bcf0dddb5ad06116 (diff) | |
download | AntennaPod-37b49b1e386be9449f8c093ab0b23c83d4b57ac1.zip |
Use segmented buttons for filter
Diffstat (limited to 'core/src')
-rw-r--r-- | core/src/main/res/color/filter_dialog_button_text.xml | 5 | ||||
-rw-r--r-- | core/src/main/res/color/filter_dialog_clear_dark.xml | 5 | ||||
-rw-r--r-- | core/src/main/res/color/filter_dialog_clear_light.xml | 5 | ||||
-rw-r--r-- | core/src/main/res/drawable-v21/ic_filter_close.xml | 55 | ||||
-rw-r--r-- | core/src/main/res/drawable/filter_dialog_background_dark.xml | 5 | ||||
-rw-r--r-- | core/src/main/res/drawable/filter_dialog_background_light.xml | 5 | ||||
-rw-r--r-- | core/src/main/res/drawable/ic_filter_close.xml | 55 | ||||
-rw-r--r-- | core/src/main/res/values/attrs.xml | 2 | ||||
-rw-r--r-- | core/src/main/res/values/colors.xml | 6 | ||||
-rw-r--r-- | core/src/main/res/values/styles.xml | 9 |
10 files changed, 0 insertions, 152 deletions
diff --git a/core/src/main/res/color/filter_dialog_button_text.xml b/core/src/main/res/color/filter_dialog_button_text.xml deleted file mode 100644 index fea8b3e74..000000000 --- a/core/src/main/res/color/filter_dialog_button_text.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/colorOnSecondary" android:state_checked="true" /> - <item android:color="?android:textColorPrimary" /> -</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 deleted file mode 100644 index 88e022d0f..000000000 --- a/core/src/main/res/color/filter_dialog_clear_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_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 deleted file mode 100644 index 9d513f72a..000000000 --- a/core/src/main/res/color/filter_dialog_clear_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/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/drawable-v21/ic_filter_close.xml b/core/src/main/res/drawable-v21/ic_filter_close.xml deleted file mode 100644 index 9e0a26905..000000000 --- a/core/src/main/res/drawable-v21/ic_filter_close.xml +++ /dev/null @@ -1,55 +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="?attr/filter_dialog_clear" /> - </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="?attr/filter_dialog_clear" /> - </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="?attr/filter_dialog_clear" /> - </shape> - - </rotate> - </item> - -</layer-list>
\ 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 deleted file mode 100644 index 9ea827147..000000000 --- a/core/src/main/res/drawable/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: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 deleted file mode 100644 index 09af585a6..000000000 --- a/core/src/main/res/drawable/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: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/drawable/ic_filter_close.xml b/core/src/main/res/drawable/ic_filter_close.xml deleted file mode 100644 index 4d7eedb30..000000000 --- a/core/src/main/res/drawable/ic_filter_close.xml +++ /dev/null @@ -1,55 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> - <!-- Fall-back for old Android devices that do not support attrs as colors --> - <item - android:bottom="5dp" - android:left="5dp" - android:right="5dp" - android:top="5dp"> - - <shape android:shape="oval"> - <stroke - android:width="4dp" - android:color="#555" /> - </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="#555" /> - </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="#555" /> - </shape> - - </rotate> - </item> - -</layer-list>
\ 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 6f88b6d51..d2207bbfb 100644 --- a/core/src/main/res/values/attrs.xml +++ b/core/src/main/res/values/attrs.xml @@ -10,8 +10,6 @@ <attr name="scrollbar_thumb" format="reference"/> <attr name="background_color" format="color"/> <attr name="background_elevated" format="color"/> - <attr name="filter_dialog_clear" format="color"/> - <attr name="filter_dialog_button_background" format="reference"/> <attr name="seek_background" format="color" /> <attr name="icon_red" format="color" /> <attr name="icon_yellow" format="color" /> diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml index d8a860af6..d948fc2bb 100644 --- a/core/src/main/res/values/colors.xml +++ b/core/src/main/res/values/colors.xml @@ -35,10 +35,4 @@ <color name="master_switch_background_light">#DDDDDD</color> <color name="master_switch_background_dark">#191919</color> - - <!-- filter dialog --> - <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 f8bae33f3..34cd04b1b 100644 --- a/core/src/main/res/values/styles.xml +++ b/core/src/main/res/values/styles.xml @@ -29,8 +29,6 @@ <item name="navigation_up">@drawable/navigation_up</item> <item name="dragview_background">@drawable/ic_drag_lighttheme</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">@drawable/filter_dialog_background_light</item> <item name="icon_red">#CF1800</item> <item name="icon_yellow">#F59F00</item> <item name="icon_green">#008537</item> @@ -74,8 +72,6 @@ <item name="navigation_up">@drawable/navigation_up_dark</item> <item name="dragview_background">@drawable/ic_drag_darktheme</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">@drawable/filter_dialog_background_dark</item> <item name="icon_red">#CF1800</item> <item name="icon_yellow">#F59F00</item> <item name="icon_green">#008537</item> @@ -250,9 +246,4 @@ <item name="android:clickable">true</item> </style> - <style name="NoButtonRadio" parent="Widget.Material3.CompoundButton.RadioButton"> - <item name="buttonCompat">@null</item> <!-- For Android 4.4 --> - <item name="android:button">@null</item> - </style> - </resources> |