From e0369a2f14864cc16bb46488cd25df294bec91c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 29 Jan 2015 17:02:01 +0100
Subject: Header image tryout

---
 .../keychain/ui/NavDrawerActivity.java                  |   3 +--
 OpenKeychain/src/main/res/drawable/drawer_header.png    | Bin 0 -> 47409 bytes
 OpenKeychain/src/main/res/values/colors.xml             |   3 +--
 OpenKeychain/src/main/res/values/themes.xml             |   2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/drawable/drawer_header.png

(limited to 'OpenKeychain/src')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NavDrawerActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NavDrawerActivity.java
index 9f96d9ff8..bc9c36a2e 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NavDrawerActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NavDrawerActivity.java
@@ -38,8 +38,7 @@ public abstract class NavDrawerActivity extends MaterialNavigationDrawer {
 
         // set the header image
         // create and set the header
-        View view = LayoutInflater.from(this).inflate(R.layout.drawer_custom_header, null);
-        setDrawerHeaderCustom(view);
+        setDrawerHeaderImage(R.drawable.drawer_header);
 
         // create sections
         addSection(newSection(getString(R.string.title_keys), R.drawable.ic_vpn_key_black_24dp, new KeyListFragment()));
diff --git a/OpenKeychain/src/main/res/drawable/drawer_header.png b/OpenKeychain/src/main/res/drawable/drawer_header.png
new file mode 100644
index 000000000..614098bd7
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable/drawer_header.png differ
diff --git a/OpenKeychain/src/main/res/values/colors.xml b/OpenKeychain/src/main/res/values/colors.xml
index 353e33058..fbbb89ed1 100644
--- a/OpenKeychain/src/main/res/values/colors.xml
+++ b/OpenKeychain/src/main/res/values/colors.xml
@@ -19,13 +19,12 @@
     <color name="primary">#4CAF50</color>
     <color name="primary_dark">#388E3C</color>
     <color name="primary_light">#C8E6C9</color>
-    <color name="accent">#536DFE</color>
+    <color name="accent">#00BCD4</color>
     <color name="primary_text">#212121</color>
     <color name="secondary_text">#727272</color>
     <color name="icons">#FFFFFF</color>
     <color name="divider">#B6B6B6</color>
 
-
     <!-- set to text colors -->
     <color name="emphasis">#212121</color>
     <color name="emphasis_dark">#727272</color>
diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml
index 1b6eebb6a..075f538e6 100644
--- a/OpenKeychain/src/main/res/values/themes.xml
+++ b/OpenKeychain/src/main/res/values/themes.xml
@@ -14,7 +14,7 @@
         <item name="searchViewStyle">@style/MySearchViewStyle</item>
 
         <!-- Navigation Drawer library -->
-        <item name="drawerType">@integer/DRAWERTYPE_CUSTOM</item>
+        <item name="drawerType">@integer/DRAWERTYPE_IMAGE</item>
         <!-- dark action bar... -->
         <item name="theme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
         <!-- ...but light popup menu (white background) -->
-- 
cgit v1.2.3