From 891a2436bdbf9ddc4525e9b903dbc0cc0f36181e Mon Sep 17 00:00:00 2001
From: Karola Marky <yonjuni@pinyto.de>
Date: Thu, 29 Jun 2017 17:10:23 +0200
Subject: [PATCH] Menu order updated, nav header updated

---
 app/src/main/res/drawable/nav_header.png   | Bin 2215 -> 0 bytes
 app/src/main/res/layout/nav_header.xml     |  23 +++++++++++----------
 app/src/main/res/menu/menu_drawer_main.xml |   4 ++--
 3 files changed, 14 insertions(+), 13 deletions(-)
 delete mode 100644 app/src/main/res/drawable/nav_header.png

diff --git a/app/src/main/res/drawable/nav_header.png b/app/src/main/res/drawable/nav_header.png
deleted file mode 100644
index 38cccec7b2b3ad372b66935a6e3647389e517462..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2215
zcmeAS@N?(olHy`uVBq!ia0y~yU{+vYU_8XZ1{4ubUV8#au_bxCy8vk*`02d69!PN(
zctjR6FmMZlFeAgPITAoY_7YEDSM~>7lDvxQb84D=fkKict`Q~9`MJ5Nc_j?aMX8A;
zsVNHOnI#zt?w-B@;f;La3=ACno-U3d6}R5rJji=ML4euOVM(DzU&+&uiPZ~c3jK-R
zdA{@#&?qh*pk)k9EDQ_+3fLG842%#dR0azN0|QtDg`wa8Gy)`o%3x%Iil8t!1b~V`
zBG?%Y4M1s-6e<JcQm_aLg9>hk`v%qRaNnS~9ju0GZdbz^YV@!fXfY@psStcr2sL<O
zK#g&D8bFD0cp9LJ+kLR6HG0@Qyrcd@|2&m6pcl0&9DpR%G7QixjARSWzo5i`%0MZf
z;CUR*phB`GDYa5J*#g4>UP{0j*b6G^mRO?^01s|V27w5;lWzBWD-#1lz#(QJ2`^(X
g8PqKA-hE(n*v%~~_jcw~VB9fyy85}Sb4q9e0DW_<4FCWD

diff --git a/app/src/main/res/layout/nav_header.xml b/app/src/main/res/layout/nav_header.xml
index 114249a..7d6b302 100644
--- a/app/src/main/res/layout/nav_header.xml
+++ b/app/src/main/res/layout/nav_header.xml
@@ -2,31 +2,32 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="@dimen/nav_header_height"
-    android:background="@drawable/nav_header"
+    android:background="@color/colorAccent"
     android:gravity="bottom"
     android:orientation="vertical"
-    android:paddingBottom="@dimen/text_margin"
-    android:paddingLeft="@dimen/text_margin"
-    android:paddingRight="@dimen/text_margin"
-    android:paddingTop="@dimen/text_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
     android:theme="@style/ThemeOverlay.AppCompat.Dark">
 
-<RelativeLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal">
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="#ffffff"
+        android:paddingBottom="7dp"
+        android:paddingTop="7dp">
 
     <ImageView
         android:id="@+id/imageView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:contentDescription="App Logo"
+        android:paddingEnd="@dimen/activity_horizontal_margin"
+        android:paddingStart="@dimen/activity_horizontal_margin"
         android:src="@mipmap/ic_launcher_nopfa"/>
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingStart="@dimen/text_margin"
-        android:paddingLeft="@dimen/text_margin"
         android:text="@string/Sudoku"
         android:textColor="@color/colorPrimaryDark"
         android:textSize="18sp"
diff --git a/app/src/main/res/menu/menu_drawer_main.xml b/app/src/main/res/menu/menu_drawer_main.xml
index 2b93d53..e4dd2f1 100644
--- a/app/src/main/res/menu/menu_drawer_main.xml
+++ b/app/src/main/res/menu/menu_drawer_main.xml
@@ -7,14 +7,14 @@
             android:title="@string/menu_main" />
         <item android:id="@+id/nav_highscore_main" android:icon="@android:drawable/ic_menu_myplaces"
             android:title="@string/menu_highscore" />
+        <item android:id="@+id/menu_tutorial_main" android:icon="@drawable/ic_school_black_24dp"
+            android:title="@string/menu_tutorial"/>
     </group>
 
     <group android:id="@+id/group2"
         android:checkableBehavior="all">
         <item android:id="@+id/menu_settings_main" android:icon="@drawable/ic_menu_settings"
             android:title="@string/menu_settings" />
-        <item android:id="@+id/menu_tutorial_main" android:icon="@drawable/ic_school_black_24dp"
-            android:title="@string/menu_tutorial"/>
         <item android:id="@+id/menu_help_main" android:icon="@drawable/ic_menu_help"
             android:title="@string/menu_help" />
         <item android:id="@+id/menu_about_main" android:icon="@drawable/ic_menu_about"