From 0f7ae23da4154c6c8a4a74883d2bb4da994f98c1 Mon Sep 17 00:00:00 2001
From: OliE <olie.xdev@googlemail.com>
Date: Mon, 1 Jan 2018 15:20:56 +0100
Subject: [PATCH] added drawer header

---
 .../health/openscale/gui/MainActivity.java    |  15 +++++++-----
 .../drawable-hdpi/ic_preferences_settings.png | Bin 0 -> 593 bytes
 .../drawable-ldpi/ic_preferences_settings.png | Bin 0 -> 310 bytes
 .../drawable-mdpi/ic_preferences_settings.png | Bin 0 -> 409 bytes
 .../ic_preferences_settings.png               | Bin 0 -> 815 bytes
 .../ic_preferences_settings.png               | Bin 0 -> 1385 bytes
 .../ic_preferences_settings.png               | Bin 0 -> 1920 bytes
 .../app/src/main/res/layout/activity_main.xml |   1 +
 .../app/src/main/res/layout/drawer_header.xml |  23 ++++++++++++++++++
 .../app/src/main/res/menu/action_menu.xml     |   6 -----
 .../app/src/main/res/menu/drawer_view.xml     |  13 ++++++++--
 11 files changed, 44 insertions(+), 14 deletions(-)
 create mode 100644 android_app/app/src/main/res/drawable-hdpi/ic_preferences_settings.png
 create mode 100644 android_app/app/src/main/res/drawable-ldpi/ic_preferences_settings.png
 create mode 100644 android_app/app/src/main/res/drawable-mdpi/ic_preferences_settings.png
 create mode 100644 android_app/app/src/main/res/drawable-xhdpi/ic_preferences_settings.png
 create mode 100644 android_app/app/src/main/res/drawable-xxhdpi/ic_preferences_settings.png
 create mode 100644 android_app/app/src/main/res/drawable-xxxhdpi/ic_preferences_settings.png
 create mode 100644 android_app/app/src/main/res/layout/drawer_header.xml

diff --git a/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java b/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java
index e735d147..3559a744 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java
@@ -57,13 +57,13 @@ public class MainActivity extends AppCompatActivity {
     private static boolean firstAppStart = true;
     private static int bluetoothStatusIcon = R.drawable.ic_bluetooth_disabled;
     private static MenuItem bluetoothStatus;
+    private static CharSequence fragmentTitle;
 
     private DrawerLayout drawerLayout;
     private Toolbar toolbar;
     private NavigationView navDrawer;
     private ActionBarDrawerToggle drawerToggle;
 
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -104,8 +104,11 @@ public class MainActivity extends AppCompatActivity {
         // Initial first fragment
         if(savedInstanceState == null) {
             getSupportFragmentManager().beginTransaction().replace(R.id.fragment_content,new OverviewFragment()).commit();
+            fragmentTitle = getString(R.string.title_overview);
         }
 
+        setTitle(fragmentTitle);
+
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
 
         if (prefs.getBoolean("firstStart", true)) {
@@ -149,6 +152,9 @@ public class MainActivity extends AppCompatActivity {
             case R.id.nav_statistic:
                 fragmentClass = StatisticsFragment.class;
                 break;
+            case R.id.nav_settings:
+                startActivityForResult(new Intent(this, SettingsActivity.class), 1);
+                return;
             default:
                 fragmentClass = OverviewFragment.class;
         }
@@ -168,7 +174,8 @@ public class MainActivity extends AppCompatActivity {
         menuItem.setChecked(true);
 
         // Set action bar title
-        //setTitle(menuItem.getTitle());
+        setTitle(menuItem.getTitle());
+        fragmentTitle = menuItem.getTitle();
 
         // Close the navigation drawer
         drawerLayout.closeDrawers();
@@ -185,10 +192,6 @@ public class MainActivity extends AppCompatActivity {
             case android.R.id.home:
                 drawerLayout.openDrawer(GravityCompat.START);
                 return true;
-            case R.id.action_general_settings:
-                Intent intent = new Intent(this, SettingsActivity.class);
-                startActivityForResult(intent, 1);
-                return true;
             case R.id.action_bluetooth_status:
                 invokeSearchBluetoothDevice();
                 return true;
diff --git a/android_app/app/src/main/res/drawable-hdpi/ic_preferences_settings.png b/android_app/app/src/main/res/drawable-hdpi/ic_preferences_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..784025d11fb511cd9eeb5c52deb08de2e95922fd
GIT binary patch
literal 593
zcmV-X0<QguP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0RI60
z0RN!9r;`8x0tQJ$K~zYIwbn~WR#6ZK@Skame315_bwQ?Pp)0|nRbfz2xhcV@Mf-wU
z1hsb+5oC+j6-E$53n`;kEm~C26SEJLPzWSw8JV@X^VR9=eh(}EaJcu({LjqXb7tmT
zYQqp_P>3;u!!@q02{*ALnePnQU*Qy<U;yp7f{*A;IK3eo#b)e{H7BbXKacz9#7n%!
zFj{iBEjWrd!R^EZ&XqHM1`p8~^ERxk7Ey58;=K`%a5|6p96c2bwP0I}<_f$XJk3+=
z$2+Vmk$2%Pre#|&5$|`<QNmpxHumK?=#uScLn1qbDIAQ*PsHfPVCW7c{06+0oyQ*-
z#j#|*RhIJ|7?XYWNQ`H=9=al@h~v1N8Xm$p=CL}F-;U_Ua1r$-kzNWXgSeIGTEo^j
zj=&uH;<JlripaLhQZU`N)XA$@SHP-7*Bv%z8}Ln5Bq=sxGD!EZkmFz>bbYde-6X3U
z;TRTI<Sc}`<hfXeBXo5MKNoY@js8T|Bum9Eyik6NiWNNV_buuVo3r)dU>Ij{6<_cb
zyYK-UV!;D^PmEu{XW4<S!Hv+h;xX3B65%KE()7LRX*#7!nii2)XalmtE>~!i*pu)p
z7FxMh(Gk%W{Av{iT*H<UZpBtnt=TpE$7Z+e?V4r2aEe&!mDz3yS7tf<*GoSSL$ZSU
f6k}eEzb!uixu%MF;eT>q00000NkvXXu0mjf%6}5B

literal 0
HcmV?d00001

diff --git a/android_app/app/src/main/res/drawable-ldpi/ic_preferences_settings.png b/android_app/app/src/main/res/drawable-ldpi/ic_preferences_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..57e4889cb71d258dd84653795d1a34106edbff37
GIT binary patch
literal 310
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&kwj^(N7l!{JxM1({$v~0Uo-U3d
z8WU45*?KuUO0+&yH}5om#K+<&{(z}PU~7r6m|0j@)J<-|EgLs)C}kEiOHz(_A;-h<
zP9f=0yp9dC_}>Qx#_4J2c;5S*{x6lF`?vazsd{u~_=aY^dj&%O89x6w!s?d#*ifs)
zXr1!MTM}718LE5RYxg9#S<Xp{$_rlD?|H_y=i`*e$3HF$+<!=|ZxY}69X)ZA?wp?0
zt9AU^%pZMTrpHZRnZ<4Fm0pv~csk-}5>tL*$7(Kq$MDBGF4Gp3?XkLEr8DILbG+l7
z+={sZvqk6pvAdJ^Yw`k-Bdo_P-BO)5v)%A|wADWTG5ef2Ba<a6&yNAU&EV<k=d#Wz
Gp$P!V;(iwZ

literal 0
HcmV?d00001

diff --git a/android_app/app/src/main/res/drawable-mdpi/ic_preferences_settings.png b/android_app/app/src/main/res/drawable-mdpi/ic_preferences_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ba16f88cabd978f5fcc8a1c5955210bbd25b49e
GIT binary patch
literal 409
zcmV;K0cQS*P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x0ZvIoK~y-6rPDi0Tu~GS;BQ8ZqJ~t#2T?S25^S7CK?EZP5e2pIZ&;Wj
zeFEk;gh;}q62U^j2N-{Yg@q`J-~*chZ4?xXyOlGJiJ%J(?7P=m_ndXlzB&KKSLCC<
z!k7POK^>;hijP=GxCQhFHx=44)Z;e__<<4BCVVYMgDc=yc<%5ST@Re<b*%g7!gSi`
zz|Z7)2t|C0Rm7)+pG7-VMWcXyY=v+DCul}PaPM)A9aKkz-5kE-Ehce^Ic(xDHe!Q5
zbfXjFsKFoX<YR}iFgIflEr}V{@g`2vh>P&N%&Wxp13kzEmrI*@oMRC$a1?P4(VOV{
za3K3|#}Q!>XSZ(~h$!<>58@PU!SA6dOlz1x39GjewlN&_3YPIML?wK{QkcoEc{`2r
z>_MuRjc2#VN4ZBf_GP2Y6Mv?%E4hamyo$Oci&=pitUpGJkt=-#00000NkvXXu0mjf
DxDT&C

literal 0
HcmV?d00001

diff --git a/android_app/app/src/main/res/drawable-xhdpi/ic_preferences_settings.png b/android_app/app/src/main/res/drawable-xhdpi/ic_preferences_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..7fef9f53cff7a6c66f1d0968176d9fe73f0fd987
GIT binary patch
literal 815
zcmV+~1JL}5P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x0^~_VK~z|U#n<1DT~ibX@Xr;K5mQ4)M?_mAN~Q_XnuZR+1J5Mlkw>YD
z9~JRdhG<09?~-_J{{)GI@FtD$T0g3^+EUe0Z3iJFbv>+glWX5|&pmfY?l;*l>-Roq
zt?%BO;W2}KIE!|!v-ljB4;$>9B@}Q!j$;;Ua?RqW)D4AmYjoqeektTDa0CYm`C&{~
z#F@mOxf){~zQ^BKzy!A7)0FL~@Y#{Ny?8Wz7E*Q;*ELPP9w+e<Zo?V;CU*QVR@L~f
zPMd@2a~ikeW$}yF4@y3VpYckUY#y62)^rDH`ye)U$zBy3o9pK^jvw$kT0<mjiWYX_
zSmx@%wD@1QHw?HMx8$n(E#0_7jO@kz47Q1Xeq$f~1$YWyiTVFER~!4W70degZp0#<
zt*dZCjNJnjx|_x4+lza#yh}HQ`|z2Vp7{#@%^Carx&ofS*LoXn9)I9@!5#PDJ<;t4
z@h<L8-3#~~Hxx0(#3VglSHM0zRLGX$J8Z{=cpoRSm^*P->VC{ZCh?*mtBE4kBlx0B
zdQ}G4EgIyqLjSbj`7wNe4{=dN@yoF%ix|tzJXzSR%pAKj=bBa;9v6*uLa<i{EgVYO
zUw9L1#XMKx5`2kG;>#`I%ED$_+RaMpZVT$I!qust!aI1bk6kym<LwOIt|*{`b!ZPd
z4Ofb>JcVoUNrM7D#<hZa7X@GR#W2TlOYCS6+QY;hWcaOUxG6E?Rr6iqCczccVrq`m
z8Mj1-pAiId438By-{2WbYr?IfkGk=in6y=bS<MJ~d_%J_+>?n)T#Ao08^fKMv*!xe
zl!#90C8E>*O+<$^B%*HgqvAQi<4vh}QSWFsqT;&4XoKjJL5I;%Twmee=r9`TalFEa
zFC^y~@s*4bUrIapKd$8mEb&_2!AKt_9gGW7De)F|RmgXxuEeC8e_r=C?Dw8KDLQ{c
tA-_W0mP(Xw%m0iS!Ite}?YD&I`9JEJ=2p?<=*<8C002ovPDHLkV1nn<jxPWJ

literal 0
HcmV?d00001

diff --git a/android_app/app/src/main/res/drawable-xxhdpi/ic_preferences_settings.png b/android_app/app/src/main/res/drawable-xxhdpi/ic_preferences_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..951fa7cbd2d985cd464648988fc52bda3657193f
GIT binary patch
literal 1385
zcmV-v1(y1WP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00006VoOIv0RI60
z0RN!9r;`8x1s+L6K~!jg)tXCe6;&9=f4z`etSz;qU@eqtTU#Q!(FOR3K^hleArUK4
z!LX?t6$p<grZu`z>jQkmppl3hH3pX$Um?-3kcElSB1Vf9^!C<QjM#@3?X8RNKg=-B
z%$>QNmhw*~-#zDiuXE-+zVFP1bg>@z9vBBEe9t)04|Jqyup~uY3xVU9qep<euRQ}S
z6Kw=?DcVj2Yq62;j^KGjJZsW2nn_C$P%1hS!80s+L0U%RcAyQ|5A*;vzP1Wr1F$)P
z-OZAz@YUDI#(v=D1o|TJ05+eU#ds3999RJC#zx#}`w5#$VOT33hkrym=1b=fp0+%2
z-(;QNDn$dpHNZn2M~6MX_W(B#?~P`F8ztj(X4v!lLEu{1%#-ZRo&{&Y^#k>u`c5g%
z0r%q0{bEom9XaXj^t3IO?Lr$vAa+V{0B8wlUk%Jnsx$&~fmH$ZEm-F!fbDUWt&u>E
zVCSbBt+<`IHIBerVqP|dP9?>1%%?Z}4YLE7e-mxPPSj#>1<(Los&WnsG5U(s*XHvr
z5_P~J*5jQCjI;nRW817h4sxCoz+Rv^fnH}l=5Pn3AX>5BP5|u%crOB;15S(o6mS6O
z0ygUD2HpYw6wes&EO21~-R<K4RX)W=Eifv<$_TzDpci*^HxRw8mSP=p-qIJ?0TzZz
z`7i=p63=zRi!u;(h&188rM*Cz>KlPwz(>F_Js)C+pyTWu;8onwjq1c!@jV~c`Eu-J
z%zB*iqZ0T^inpq69`G9QFYcTl(&Lo>0rmmalG(2MUTi7`VGcI`hbTPd0Ju|1ACKU1
z-q1@bw*ud(?n~fq;9?JdH8#DDisv})8S{$j_C(n05zqQChI(wlbO49MygY=r5nF`)
zSXeyI<NOoAtO!SDd7SA}$I7tv^EbBj2H|?i9FmXic*2`I<dAo}%Ml)!y&#^uRDNCM
zCnFs9<7vt4Q+XrNZy|%bwL8xkaC-?hdbPl#z#kI$5qK{^Q3>waSb#0QW574S)mS<i
z2eYwx-;7Palfci|Ja3SLeyqaMR)8wtG5JCs_%x>BrBeQ;%H1m86I0%cO_F_B<+oK{
z5>x&Nkk4SF8r0(;G>9G*y-D<7OnEQf_37vpy)34D9w<qg6W59kiq>J%?)QXx!1n)B
zz#^5MTZ-7>0whoBookr5Z>$(3y6Q>V0cVuzL<g`1RUOP8i5e`C$@+9=gV}?T!A3J~
zuTO|xDf)?MtVF|y)uJDZF7??cgbXm@-9~$`!vyS*IuIh*j~!k$*rHBj8_i;CVi3zE
zg3y5*GnHYnRn}=3<@`IyMuBw>!+c-`mic_Z%nc>pmyav>{{`C_tP}Gy5splEFt=Mg
zw?*)rL7Z^9LXM^tPJd2{;WWTgxVL0sSd49>lTB!{xQAH~c8RYiuJaH-rCfxKUa=|V
zXSn-+5Q<JIlO*-!*n0Vk_(}aJHlkCK)YswOgeAFFsmG>XAK}+3-(uVC!Vn!nNPMm0
z>@ZykjQG(E+=7M7oAkSB68gGGkk~s{i(%)$xxjUVTrCFSyuaK9*ul)ZUf+>aX(tw(
z{el}Qf}2JTVGFV<sbUYRq{BJvydN^IlI?NM{_v3qTR8Whn6?z_yo39hzK?v~o9(=8
zr-GFf{>*w<hPOrN*(RRD6#mS*a?)NWL<jLZklOzx()?0?TC_ZZ$B8({(lR<#fA;t~
rgl7pe_|G0-x5rt+W1%c5|J~+4(81u{JlX7F00000NkvXXu0mjff?%U>

literal 0
HcmV?d00001

diff --git a/android_app/app/src/main/res/drawable-xxxhdpi/ic_preferences_settings.png b/android_app/app/src/main/res/drawable-xxxhdpi/ic_preferences_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..42d5e3a20e84789ba8e350d8aa7a2990c7517f1a
GIT binary patch
literal 1920
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
GLSTYhorrA!

literal 0
HcmV?d00001

diff --git a/android_app/app/src/main/res/layout/activity_main.xml b/android_app/app/src/main/res/layout/activity_main.xml
index ee7381f6..5404c9af 100644
--- a/android_app/app/src/main/res/layout/activity_main.xml
+++ b/android_app/app/src/main/res/layout/activity_main.xml
@@ -39,6 +39,7 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_gravity="start"
+        app:headerLayout="@layout/drawer_header"
         app:menu="@menu/drawer_view" />
 
 </android.support.v4.widget.DrawerLayout>
\ No newline at end of file
diff --git a/android_app/app/src/main/res/layout/drawer_header.xml b/android_app/app/src/main/res/layout/drawer_header.xml
new file mode 100644
index 00000000..df2a6016
--- /dev/null
+++ b/android_app/app/src/main/res/layout/drawer_header.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:background="@color/blue_pressed">
+
+    <ImageView
+        android:id="@+id/profileImageView"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:src="@drawable/ic_launcher_openscale"
+        android:layout_gravity="left|top"
+        android:layout_margin="20dp" />
+    <TextView
+        android:id="@+id/nameTxt"
+        android:text="@string/app_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="#FFFFFF"
+        android:textSize="20sp"
+        android:layout_gravity="center"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/android_app/app/src/main/res/menu/action_menu.xml b/android_app/app/src/main/res/menu/action_menu.xml
index 44cc8cb2..c3bdd814 100644
--- a/android_app/app/src/main/res/menu/action_menu.xml
+++ b/android_app/app/src/main/res/menu/action_menu.xml
@@ -8,10 +8,4 @@
         android:icon="@drawable/ic_bluetooth_disabled"
         android:title="@string/action_bluetooth_status"
         app:showAsAction="ifRoom"/>
-
-    <item
-        android:id="@+id/action_general_settings"
-        android:orderInCategory="100"
-        android:title="@string/action_settings"
-        app:showAsAction="never"/>
 </menu>
diff --git a/android_app/app/src/main/res/menu/drawer_view.xml b/android_app/app/src/main/res/menu/drawer_view.xml
index 47d78e08..d204da48 100644
--- a/android_app/app/src/main/res/menu/drawer_view.xml
+++ b/android_app/app/src/main/res/menu/drawer_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <group android:checkableBehavior="single">
+    <group android:id="@+id/menu_top"
+           android:checkableBehavior="single">
 
         <item
             android:id="@+id/nav_overview"
@@ -23,4 +24,12 @@
             android:title="@string/title_statistics" />
 
     </group>
-</menu>
\ No newline at end of file
+    <group android:id="@+id/menu_bottom"
+           android:checkableBehavior="none">
+
+        <item
+            android:id="@+id/nav_settings"
+            android:icon="@drawable/ic_preferences_settings"
+            android:title="@string/action_settings" />
+        </group>
+    </menu>
\ No newline at end of file