diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/res/drawable-v21/drawer_item_background.xml | 20 | ||||
| -rw-r--r-- | core/src/main/res/drawable/drawer_item_background.xml | 16 | ||||
| -rw-r--r-- | core/src/main/res/values/colors.xml | 3 | ||||
| -rw-r--r-- | core/src/main/res/values/styles.xml | 4 |
4 files changed, 40 insertions, 3 deletions
diff --git a/core/src/main/res/drawable-v21/drawer_item_background.xml b/core/src/main/res/drawable-v21/drawer_item_background.xml new file mode 100644 index 000000000..1992158cc --- /dev/null +++ b/core/src/main/res/drawable-v21/drawer_item_background.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="?attr/currently_playing_background"> + <item android:id="@android:id/mask"> + <shape android:shape="rectangle"> + <solid android:color="@color/black"/> + <corners android:radius="32dp"/> + </shape> + </item> + <item> + <selector> + <item android:state_selected="true"> + <shape android:shape="rectangle"> + <solid android:color="?attr/drawer_activated_color"/> + <corners android:radius="32dp"/> + </shape> + </item> + <item android:drawable="@android:color/transparent" /> + </selector> + </item> +</ripple> diff --git a/core/src/main/res/drawable/drawer_item_background.xml b/core/src/main/res/drawable/drawer_item_background.xml new file mode 100644 index 000000000..a0ec893a8 --- /dev/null +++ b/core/src/main/res/drawable/drawer_item_background.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8"?> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="true"> + <shape android:shape="rectangle"> + <solid android:color="?attr/currently_playing_background"/> + <corners android:radius="32dp"/> + </shape> + </item> + <item android:state_selected="true"> + <shape android:shape="rectangle"> + <solid android:color="?attr/drawer_activated_color" /> + <corners android:radius="32dp" /> + </shape> + </item> + <item android:drawable="@android:color/transparent" /> +</selector> diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml index 859b64367..d8a860af6 100644 --- a/core/src/main/res/values/colors.xml +++ b/core/src/main/res/values/colors.xml @@ -25,10 +25,11 @@ <color name="non_square_icon_background">#22777777</color> <color name="seek_background_light">#90000000</color> <color name="seek_background_dark">#905B5B5B</color> - <color name="navigation_bar_divider_light">#1F000000</color> <color name="accent_light">#0078C2</color> + <color name="accent_light_alpha">#250078C2</color> <color name="accent_dark">#3D8BFF</color> + <color name="accent_dark_alpha">#253D8BFF</color> <color name="icon_background_gradient_start">#0ba2ff</color> <color name="icon_background_gradient_end">#0878ff</color> diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml index e3e23c1d2..a1e93aad3 100644 --- a/core/src/main/res/values/styles.xml +++ b/core/src/main/res/values/styles.xml @@ -21,7 +21,7 @@ <item name="master_switch_background">@color/master_switch_background_light</item> <item name="currently_playing_background">@color/highlight_light</item> <item name="action_icon_color">@color/black</item> - <item name="drawer_activated_color">@color/highlight_light</item> + <item name="drawer_activated_color">@color/accent_light_alpha</item> <item name="android:textAllCaps">false</item> <item name="android:textColorHint">@color/grey600</item> <item name="seek_background">@color/seek_background_light</item> @@ -56,7 +56,7 @@ <item name="background_elevated">@color/background_elevated_darktheme</item> <item name="colorControlNormal">@color/white</item> <item name="progressBarTheme">@style/ProgressBarDark</item> - <item name="drawer_activated_color">@color/highlight_dark</item> + <item name="drawer_activated_color">@color/accent_dark_alpha</item> <item name="master_switch_background">@color/master_switch_background_dark</item> <item name="currently_playing_background">@color/highlight_dark</item> <item name="action_icon_color">@color/white</item> |