diff options
| author | Martin Fietz <Martin.Fietz@gmail.com> | 2019-01-27 11:35:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-27 11:35:46 +0100 |
| commit | bcfc951f1bcb42ef51415ca9a7a963d00ac6f947 (patch) | |
| tree | 16f44fe3b2555b4476fcc6dd26d9f6e7019de861 /core/src/main/res/values | |
| parent | 62711d9a1109d488d917ca83903245f4218d952b (diff) | |
| parent | 0474717ba1c0cf5e72738390fb24392def351692 (diff) | |
| download | AntennaPod-bcfc951f1bcb42ef51415ca9a7a963d00ac6f947.zip | |
Merge branch 'develop' into android_gradle_330_upgrade
Diffstat (limited to 'core/src/main/res/values')
| -rw-r--r-- | core/src/main/res/values/attrs.xml | 1 | ||||
| -rw-r--r-- | core/src/main/res/values/colors.xml | 3 | ||||
| -rw-r--r-- | core/src/main/res/values/styles.xml | 10 |
3 files changed, 11 insertions, 3 deletions
diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml index 16a6d9185..48e55768e 100644 --- a/core/src/main/res/values/attrs.xml +++ b/core/src/main/res/values/attrs.xml @@ -67,6 +67,7 @@ <attr name="overlay_background" format="color"/> <attr name="nav_drawer_background" format="color"/> + <attr name="drawer_activated_color" format="color"/> <attr name="about_screen_background" format="color"/> <attr name="about_screen_card_background" format="color"/> diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml index eec4f76ce..5d820f3cf 100644 --- a/core/src/main/res/values/colors.xml +++ b/core/src/main/res/values/colors.xml @@ -29,7 +29,8 @@ <!-- Theme colors --> <color name="primary_light">#FFFFFF</color> <color name="primary_darktheme">#212121</color> - + <color name="nav_drawer_background_dark">#3B3B3B</color> + <color name="nav_drawer_highlighted_dark">#212121</color> <color name="highlight_light">#DDDDDD</color> <color name="highlight_dark">#414141</color> <color name="highlight_trueblack">#414141</color> diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml index 79773619f..363a69a63 100644 --- a/core/src/main/res/values/styles.xml +++ b/core/src/main/res/values/styles.xml @@ -43,6 +43,7 @@ <item type="attr" name="dragview_background">@drawable/ic_drag_vertical_grey600_48dp</item> <item type="attr" name="dragview_float_background">@color/white</item> <item type="attr" name="nav_drawer_background">@color/white</item> + <item type="attr" name="drawer_activated_color">@color/highlight_light</item> <item type="attr" name="ic_new">@drawable/ic_new_releases_grey600_24dp</item> <item type="attr" name="ic_history">@drawable/ic_history_grey600_24dp</item> <item type="attr" name="ic_folder">@drawable/ic_folder_grey600_24dp</item> @@ -125,7 +126,8 @@ <item type="attr" name="overlay_drawable">@drawable/overlay_drawable_dark</item> <item type="attr" name="dragview_background">@drawable/ic_drag_vertical_white_48dp</item> <item type="attr" name="dragview_float_background">@color/black</item> - <item type="attr" name="nav_drawer_background">#3B3B3B</item> + <item type="attr" name="nav_drawer_background">@color/nav_drawer_background_dark</item> + <item type="attr" name="drawer_activated_color">@color/nav_drawer_highlighted_dark</item> <item type="attr" name="ic_new">@drawable/ic_new_releases_white_24dp</item> <item type="attr" name="ic_history">@drawable/ic_history_white_24dp</item> <item type="attr" name="ic_folder">@drawable/ic_folder_white_24dp</item> @@ -175,6 +177,7 @@ <item type="attr" name="dragview_background">@drawable/ic_drag_vertical_white_48dp</item> <item type="attr" name="dragview_float_background">@color/black</item> <item type="attr" name="nav_drawer_background">@color/black</item> + <item type="attr" name="drawer_activated_color">@color/highlight_trueblack</item> <item name="android:textColorPrimary">@color/white</item> <item name="android:color">@color/white</item> <item name="android:colorBackground">@color/black</item> @@ -228,6 +231,7 @@ <item type="attr" name="dragview_background">@drawable/ic_drag_vertical_grey600_48dp</item> <item type="attr" name="dragview_float_background">@color/white</item> <item type="attr" name="nav_drawer_background">@color/white</item> + <item type="attr" name="drawer_activated_color">@color/highlight_light</item> <item type="attr" name="ic_new">@drawable/ic_new_releases_grey600_24dp</item> <item type="attr" name="ic_history">@drawable/ic_history_grey600_24dp</item> <item type="attr" name="ic_folder">@drawable/ic_folder_grey600_24dp</item> @@ -309,7 +313,8 @@ <item type="attr" name="overlay_drawable">@drawable/overlay_drawable_dark</item> <item type="attr" name="dragview_background">@drawable/ic_drag_vertical_white_48dp</item> <item type="attr" name="dragview_float_background">@color/black</item> - <item type="attr" name="nav_drawer_background">#3B3B3B</item> + <item type="attr" name="nav_drawer_background">@color/nav_drawer_background_dark</item> + <item type="attr" name="drawer_activated_color">@color/nav_drawer_highlighted_dark</item> <item type="attr" name="ic_new">@drawable/ic_new_releases_white_24dp</item> <item type="attr" name="ic_history">@drawable/ic_history_white_24dp</item> <item type="attr" name="ic_folder">@drawable/ic_folder_white_24dp</item> @@ -359,6 +364,7 @@ <item type="attr" name="dragview_background">@drawable/ic_drag_vertical_white_48dp</item> <item type="attr" name="dragview_float_background">@color/black</item> <item type="attr" name="nav_drawer_background">@color/black</item> + <item type="attr" name="drawer_activated_color">@color/highlight_trueblack</item> <item type="attr" name="currently_playing_background">@color/highlight_trueblack</item> <item name="android:textColorPrimary">@color/white</item> <item name="android:color">@color/white</item> |