From fd29d27e61e531378f0c37c78028fb2e86989dea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 27 Jan 2015 09:37:07 +0100
Subject: Temporary nav drawer fixes

---
 OpenKeychain/src/main/res/drawable/mat2.jpg        | Bin 11737 -> 0 bytes
 OpenKeychain/src/main/res/layout/custom_drawer.xml |  16 ++++++++++++++++
 OpenKeychain/src/main/res/values/strings.xml       |   1 +
 OpenKeychain/src/main/res/values/themes.xml        |  12 ++++++++++--
 4 files changed, 27 insertions(+), 2 deletions(-)
 delete mode 100644 OpenKeychain/src/main/res/drawable/mat2.jpg
 create mode 100644 OpenKeychain/src/main/res/layout/custom_drawer.xml

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/drawable/mat2.jpg b/OpenKeychain/src/main/res/drawable/mat2.jpg
deleted file mode 100644
index e35902ec7..000000000
Binary files a/OpenKeychain/src/main/res/drawable/mat2.jpg and /dev/null differ
diff --git a/OpenKeychain/src/main/res/layout/custom_drawer.xml b/OpenKeychain/src/main/res/layout/custom_drawer.xml
new file mode 100644
index 000000000..021226ba3
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/custom_drawer.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:background="@color/colorPrimary">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:text="@string/app_name"
+        android:textColor="@color/white"
+        android:layout_gravity="center_horizontal" />
+</LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 459bdf99c..6c4ba7b08 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -41,6 +41,7 @@
     <string name="title_create_key">"Create Key"</string>
     <string name="title_exchange_keys">"Exchange Keys"</string>
     <string name="title_advanced_key_info">"Advanced Key Info"</string>
+    <string name="title_keys">"Keys"</string>
 
     <!-- section -->
     <string name="section_user_ids">"Identities"</string>
diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml
index 5b9e43c3a..3b7d66963 100644
--- a/OpenKeychain/src/main/res/values/themes.xml
+++ b/OpenKeychain/src/main/res/values/themes.xml
@@ -12,8 +12,16 @@
         <item name="colorAccent">@color/accent</item>
 
         <!-- Navigation Drawer library -->
-        <item name="drawerType">@integer/DRAWERTYPE_IMAGE</item>
-        <item name="multipaneSupport">true</item>
+        <item name="drawerType">@integer/DRAWERTYPE_CUSTOM</item>
+        <item name="theme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
+        <item name="popupTheme">@style/Base.V21.Theme.AppCompat.Light.Dialog</item>
+        <item name="drawerColor">#fafafa</item>
+        <item name="singleAccount">false</item>
+        <item name="sectionStyle">@style/MaterialSectionTheme.Light</item>
+        <item name="subheaderStyle">@style/MaterialSubheaderTheme.Light</item>
+        <item name="multipaneSupport">false</item>
+        <item name="rippleBackport">false</item>
+        <item name="uniqueToolbarColor">false</item>
     </style>
 
     <!-- http://android-developers.blogspot.de/2014/10/appcompat-v21-material-design-for-pre.html -->
-- 
cgit v1.2.3