diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2016-01-07 14:01:48 -0800 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2016-01-07 14:01:48 -0800 |
| commit | 3a046f4d90b1705ecca24877461367052c778dfd (patch) | |
| tree | c0cdbddb51e1705d9d9c7a97d4b8211da79c66eb /app/src | |
| parent | 7c37b3f893b0dda5f887dbd7af2787bcb904b168 (diff) | |
| parent | 5b05b0334ab836abf40fab6bddf7b149fd320224 (diff) | |
| download | dsub-3a046f4d90b1705ecca24877461367052c778dfd.tar.gz dsub-3a046f4d90b1705ecca24877461367052c778dfd.tar.bz2 dsub-3a046f4d90b1705ecca24877461367052c778dfd.zip | |
Merge branch 'Kakadua-master'
Diffstat (limited to 'app/src')
| -rw-r--r-- | app/src/main/res/drawable/drawer_header_dark.png | bin | 0 -> 115054 bytes | |||
| -rw-r--r-- | app/src/main/res/drawable/drawer_header_holo.png | bin | 0 -> 149240 bytes | |||
| -rw-r--r-- | app/src/main/res/drawable/drawer_header_light.png | bin | 0 -> 131371 bytes | |||
| -rw-r--r-- | app/src/main/res/layout/drawer_header.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/values/attrs.xml | 1 | ||||
| -rw-r--r-- | app/src/main/res/values/themes.xml | 3 |
6 files changed, 5 insertions, 1 deletions
diff --git a/app/src/main/res/drawable/drawer_header_dark.png b/app/src/main/res/drawable/drawer_header_dark.png Binary files differnew file mode 100644 index 00000000..a6d2c1fb --- /dev/null +++ b/app/src/main/res/drawable/drawer_header_dark.png diff --git a/app/src/main/res/drawable/drawer_header_holo.png b/app/src/main/res/drawable/drawer_header_holo.png Binary files differnew file mode 100644 index 00000000..3caa320b --- /dev/null +++ b/app/src/main/res/drawable/drawer_header_holo.png diff --git a/app/src/main/res/drawable/drawer_header_light.png b/app/src/main/res/drawable/drawer_header_light.png Binary files differnew file mode 100644 index 00000000..8f041092 --- /dev/null +++ b/app/src/main/res/drawable/drawer_header_light.png diff --git a/app/src/main/res/layout/drawer_header.xml b/app/src/main/res/layout/drawer_header.xml index 86222f43..3a9a2d49 100644 --- a/app/src/main/res/layout/drawer_header.xml +++ b/app/src/main/res/layout/drawer_header.xml @@ -4,7 +4,7 @@ android:layout_height="178dp" android:orientation="vertical" android:weightSum="1" - android:background="@drawable/drawer_header"> + android:background="?attr/drawerHeaderBackground"> <LinearLayout android:layout_width="match_parent" diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 4206d9f0..d97a3b21 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -56,6 +56,7 @@ <attr name="drawerTitleStyle" format="reference"/> <attr name="drawerSubtitleStyle" format="reference"/> <attr name="cardBackgroundDrawable" format="reference"/> + <attr name="drawerHeaderBackground" format="reference"/> <declare-styleable name="SeekBarPreference"> <attr name="min" format="integer"/> diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index c125c18a..12784b94 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -63,6 +63,7 @@ <item name="windowActionModeOverlay">true</item> <item name="actionModeBackground">?attr/colorPrimary</item> <item name="cardBackgroundDrawable">@drawable/card_rounded_corners_light</item> + <item name="drawerHeaderBackground">@drawable/drawer_header_light</item> </style> <style name="Theme.DSub.Dark.Base" parent="@style/Theme.AppCompat"> <item name="offline_icon">@drawable/main_offline_dark</item> @@ -126,6 +127,7 @@ <item name="windowActionModeOverlay">true</item> <item name="actionModeBackground">?attr/colorPrimary</item> <item name="cardBackgroundDrawable">@drawable/card_rounded_corners_black</item> + <item name="drawerHeaderBackground">@drawable/drawer_header_dark</item> </style> <style name="Theme.DSub.Light" parent="Theme.DSub.Light.Base"> </style> @@ -141,6 +143,7 @@ <item name="colorPrimaryDark">@color/holoPrimaryDark</item> <item name="colorAccent">@color/holoAccent</item> <item name="actionbarBackgroundColor">@color/holoPrimary</item> + <item name="drawerHeaderBackground">@drawable/drawer_header_holo</item> </style> <style name="Theme.DSub.Light.No_Actionbar" parent="Theme.DSub.Light"> |
