diff options
author | Andrew Dolgov <[email protected]> | 2015-06-15 16:18:59 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2015-06-15 16:19:10 +0300 |
commit | a8da417af774d42811b015584ee725247ffc2b51 (patch) | |
tree | a0a02fdbb5482bd11a48acd9155ec42a041cd4a3 | |
parent | 0b4ab3121f9eeb5ccb7f86c5bd6185fe363a0868 (diff) |
update drawer header image
-rwxr-xr-x | org.fox.ttrss/src/main/AndroidManifest.xml | 4 | ||||
-rw-r--r-- | org.fox.ttrss/src/main/res/drawable-hdpi/drawer_header.png | bin | 2368 -> 21869 bytes | |||
-rw-r--r-- | org.fox.ttrss/src/main/res/drawable-hdpi/drawer_header_dark.png | bin | 0 -> 21531 bytes | |||
-rw-r--r-- | org.fox.ttrss/src/main/res/drawable-xhdpi/drawer_header.png | bin | 4926 -> 0 bytes | |||
-rwxr-xr-x | org.fox.ttrss/src/main/res/layout/drawer_header.xml | 6 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/res/values/attrs.xml | 1 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/res/values/style.xml | 4 |
7 files changed, 9 insertions, 6 deletions
diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml index 2f5131c8..819934de 100755 --- a/org.fox.ttrss/src/main/AndroidManifest.xml +++ b/org.fox.ttrss/src/main/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.fox.ttrss" - android:versionCode="350" - android:versionName="1.123" > + android:versionCode="351" + android:versionName="1.124" > <uses-sdk android:minSdkVersion="15" diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/drawer_header.png b/org.fox.ttrss/src/main/res/drawable-hdpi/drawer_header.png Binary files differindex e4b382fe..8efcfa75 100644 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/drawer_header.png +++ b/org.fox.ttrss/src/main/res/drawable-hdpi/drawer_header.png diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/drawer_header_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/drawer_header_dark.png Binary files differnew file mode 100644 index 00000000..a9e4f17b --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-hdpi/drawer_header_dark.png diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/drawer_header.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/drawer_header.png Binary files differdeleted file mode 100644 index 16f6e10d..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/drawer_header.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/layout/drawer_header.xml b/org.fox.ttrss/src/main/res/layout/drawer_header.xml index ecdce4ef..d9b443b4 100755 --- a/org.fox.ttrss/src/main/res/layout/drawer_header.xml +++ b/org.fox.ttrss/src/main/res/layout/drawer_header.xml @@ -11,10 +11,8 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:id="@+id/imageView" - android:src="@drawable/drawer_header" android:scaleType="fitXY" - android:tint="?colorPrimaryDark" - android:tintMode="multiply" /> + android:src="?drawer_header" /> <FrameLayout android:layout_width="48dp" @@ -25,7 +23,7 @@ android:layout_alignParentRight="true" android:layout_alignParentEnd="true" android:layout_marginRight="16dp" - android:elevation="4dp"> + android:elevation="8dp"> <ImageView android:id="@+id/drawer_header_account" diff --git a/org.fox.ttrss/src/main/res/values/attrs.xml b/org.fox.ttrss/src/main/res/values/attrs.xml index 4de4e098..28211bb4 100755 --- a/org.fox.ttrss/src/main/res/values/attrs.xml +++ b/org.fox.ttrss/src/main/res/values/attrs.xml @@ -47,4 +47,5 @@ <declare-styleable name="ScrimInsetsView"> <attr format="reference|color" name="insetForeground"> </attr></declare-styleable> + <attr name="drawer_header" format="reference" /> </resources>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml index a02ee887..deb42241 100755 --- a/org.fox.ttrss/src/main/res/values/style.xml +++ b/org.fox.ttrss/src/main/res/values/style.xml @@ -57,6 +57,8 @@ <item name="ic_coffee">@drawable/ic_coffee_dark</item> <item name="ic_folder_outline">@drawable/ic_folder_outline_dark</item> <item name="ic_dots_vertical">@drawable/ic_dots_vertical_dark</item> + + <item name="drawer_header">@drawable/drawer_header</item> </style> <style name="DarkTheme.Base" parent="Theme.AppCompat.NoActionBar"> @@ -115,6 +117,8 @@ <item name="ic_coffee">@drawable/ic_coffee</item> <item name="ic_folder_outline">@drawable/ic_folder_outline</item> <item name="ic_dots_vertical">@drawable/ic_dots_vertical</item> + + <item name="drawer_header">@drawable/drawer_header_dark</item> </style> <style name="DarkDialogTheme" parent="android:Theme"></style> |