From 7bff693926c4d246d47851fa5a9d6da447176606 Mon Sep 17 00:00:00 2001
From: OliE <olie.xdev@googlemail.com>
Date: Sun, 4 Feb 2018 13:45:30 +0100
Subject: [PATCH] - fixed memory leak while switching between fragments. -
 added help button. - used another graph icon for navigation icons to avoid
 that the preference tint method is applied to the navigation icon.

---
 .../health/openscale/gui/MainActivity.java    |  38 +++++++++++++-----
 .../res/drawable-hdpi/ic_preferences_help.png | Bin 0 -> 536 bytes
 .../ic_preferences_nav_graph.png              | Bin 0 -> 514 bytes
 .../res/drawable-ldpi/ic_preferences_help.png | Bin 0 -> 287 bytes
 .../ic_preferences_nav_graph.png              | Bin 0 -> 278 bytes
 .../res/drawable-mdpi/ic_preferences_help.png | Bin 0 -> 398 bytes
 .../ic_preferences_nav_graph.png              | Bin 0 -> 354 bytes
 .../drawable-xhdpi/ic_preferences_help.png    | Bin 0 -> 780 bytes
 .../ic_preferences_nav_graph.png              | Bin 0 -> 661 bytes
 .../drawable-xxhdpi/ic_preferences_help.png   | Bin 0 -> 1137 bytes
 .../ic_preferences_nav_graph.png              | Bin 0 -> 1072 bytes
 .../drawable-xxxhdpi/ic_preferences_help.png  | Bin 0 -> 1557 bytes
 .../ic_preferences_nav_graph.png              | Bin 0 -> 1444 bytes
 .../src/main/res/menu/drawer_bottom_view.xml  |   6 +--
 .../app/src/main/res/menu/drawer_view.xml     |   7 +++-
 .../app/src/main/res/values-de/strings.xml    |   1 +
 .../app/src/main/res/values/strings.xml       |   1 +
 17 files changed, 37 insertions(+), 16 deletions(-)
 create mode 100644 android_app/app/src/main/res/drawable-hdpi/ic_preferences_help.png
 create mode 100644 android_app/app/src/main/res/drawable-hdpi/ic_preferences_nav_graph.png
 create mode 100644 android_app/app/src/main/res/drawable-ldpi/ic_preferences_help.png
 create mode 100644 android_app/app/src/main/res/drawable-ldpi/ic_preferences_nav_graph.png
 create mode 100644 android_app/app/src/main/res/drawable-mdpi/ic_preferences_help.png
 create mode 100644 android_app/app/src/main/res/drawable-mdpi/ic_preferences_nav_graph.png
 create mode 100644 android_app/app/src/main/res/drawable-xhdpi/ic_preferences_help.png
 create mode 100644 android_app/app/src/main/res/drawable-xhdpi/ic_preferences_nav_graph.png
 create mode 100644 android_app/app/src/main/res/drawable-xxhdpi/ic_preferences_help.png
 create mode 100644 android_app/app/src/main/res/drawable-xxhdpi/ic_preferences_nav_graph.png
 create mode 100644 android_app/app/src/main/res/drawable-xxxhdpi/ic_preferences_help.png
 create mode 100644 android_app/app/src/main/res/drawable-xxxhdpi/ic_preferences_nav_graph.png

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 26bd3253..2679cd5c 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
@@ -66,13 +66,13 @@ import java.lang.reflect.Field;
 
 import cat.ereza.customactivityoncrash.config.CaocConfig;
 
-
 public class MainActivity extends AppCompatActivity {
     private static boolean firstAppStart = true;
     private static boolean valueOfCountModified = false;
     private static int bluetoothStatusIcon = R.drawable.ic_bluetooth_disabled;
     private static MenuItem bluetoothStatus;
 
+    private Fragment currentFragment;
     private DrawerLayout drawerLayout;
     private Toolbar toolbar;
     private NavigationView navDrawer;
@@ -95,6 +95,8 @@ public class MainActivity extends AppCompatActivity {
 
         setContentView(R.layout.activity_main);
 
+        currentFragment = null;
+
         // Set a Toolbar to replace the ActionBar.
         toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
@@ -250,7 +252,6 @@ public class MainActivity extends AppCompatActivity {
 
     public void selectDrawerItem(int menuItemId) {
         // Create a new fragment and specify the fragment to show based on nav item clicked
-        Fragment fragment = null;
         Class fragmentClass;
         String fragmentTitle;
 
@@ -282,22 +283,37 @@ public class MainActivity extends AppCompatActivity {
                 settingsIntent.putExtra(SettingsActivity.EXTRA_TINT_COLOR, navDrawer.getItemTextColor().getDefaultColor());
                 startActivityForResult(settingsIntent, 1);
                 return;
+            case R.id.nav_help:
+                startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/oliexdev/openScale/wiki")));
+                return;
             default:
                 fragmentClass = OverviewFragment.class;
                 fragmentTitle = getResources().getString(R.string.title_overview);
                 prefs.edit().putInt("lastFragmentId", menuItemId).commit();
         }
 
-        try {
-            fragment = (Fragment) fragmentClass.newInstance();
+        FragmentManager fragmentManager = getSupportFragmentManager();
 
-        } catch (Exception e) {
-            e.printStackTrace();
+        // hide previous fragment if it available
+        if (currentFragment != null) {
+            fragmentManager.beginTransaction().hide(currentFragment).commit();
         }
 
-        // Insert the fragment by replacing any existing fragment
-        FragmentManager fragmentManager = getSupportFragmentManager();
-        fragmentManager.beginTransaction().replace(R.id.fragment_content, fragment).commit();
+        // try to find selected fragment
+        currentFragment = fragmentManager.findFragmentByTag(""+menuItemId);
+
+        // if fragment not found then add the fragment
+        if (currentFragment == null) {
+            try {
+                currentFragment = (Fragment) fragmentClass.newInstance();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
+            fragmentManager.beginTransaction().add(R.id.fragment_content, currentFragment, "" + menuItemId).commit();
+        } else { // otherwise show fragment
+            fragmentManager.beginTransaction().show(currentFragment).commit();
+        }
 
         // Set action bar title
         setTitle(fragmentTitle);
@@ -468,10 +484,10 @@ public class MainActivity extends AppCompatActivity {
                 BottomNavigationItemView item = (BottomNavigationItemView) menuView.getChildAt(i);
                 //noinspection RestrictedApi
                 item.setShiftingMode(false);
-                item.setPadding(0, 15, 0, 0);
+                //item.setPadding(0, 15, 0, 0);
                 // set once again checked value, so view will be updated
                 //noinspection RestrictedApi
-                item.setChecked(item.getItemData().isChecked());
+                //item.setChecked(item.getItemData().isChecked());
             }
         } catch (NoSuchFieldException e) {
             Log.e("BNVHelper", "Unable to get shift mode field", e);
diff --git a/android_app/app/src/main/res/drawable-hdpi/ic_preferences_help.png b/android_app/app/src/main/res/drawable-hdpi/ic_preferences_help.png
new file mode 100644
index 0000000000000000000000000000000000000000..98b05242c1e31d3b5fc60dc01dbd2276d5501e4e
GIT binary patch
literal 536
zcmV+z0_XjSP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0RI60
z0RN!9r;`8x0nJH7K~zYIwbjjwj!_r}@ZY>7b|f+L&LkUFzFsM6%92EbE&l)|WGDZE
zvXPH67HU=^8Vy;<R@vAvYAEupXeiS##^T)1czVZq-bZ?`dg|#u*LB^ebME^-J*v@*
z{TRXkRz&<GUg9Qh;9UowdFaPQOk+08Mll@UC|<?dG|r=0*Zcs!VFs7c%J6!yB@)iy
zEB19VKY?Eu$L6{_ibT&M(Xkw9C<ynl^dHO%EW?BF*wen)#3Y_nm~X<#_%>D~8OIl?
zK;}@KV@`M)Kc!2ZjsH^_ZY#Vl6@k?uxSA2{4by8_i*>jjvE3QXNO%sw@gQ%_kjL-=
zi%YR3QZI~VG~2@SXahU(7LPLIAGnRFQtZ3b2g@^>hj@=&r1Bce5McotZL#(KG*}LI
z@s!jc!xh9bS~!Exp<7eIy@JX1opr)lsTm(*5HC6j7UB*1Y9?4Do$rns+<v@n;5jy!
zf6o7dhICI84cwBtZhH;kJ?Zi~VGt|BTT?2<T%(n72nTEMMx-j68y6Q;kBS1Hq^7Gv
zF)GfLgMB&=yFy$w#>>NQRr_LB$8~|OJ~#!s`eYX9>Z4yqFOEpHKOs%jsrbKx!~Sxa
aW&8#J@P+;}<-pef0000<MNUMnLSTYYul7j*

literal 0
HcmV?d00001

diff --git a/android_app/app/src/main/res/drawable-hdpi/ic_preferences_nav_graph.png b/android_app/app/src/main/res/drawable-hdpi/ic_preferences_nav_graph.png
new file mode 100644
index 0000000000000000000000000000000000000000..2051f376f62b5c18f8c1d2e9b4180953076ccae9
GIT binary patch
literal 514
zcmV+d0{#7oP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0RI60
z0RN!9r;`8x0k=s+K~zYIwbngoRY4F1;P1U${No`}0zyD-got1vVkII;3K10)L2P0n
z7FsBl3U(5LO@xFL7HNVYYNcI3u&@x(PW&N=1_IiM1T`wrsKsuv+@Gf*_Z?Wc40F%f
znLRr!+}A;5*i<v;DqKVlMw>O0!x?PFD~xwSpoO=1hgOEg8p*q`2U~Cgry5v~&oz)Y
za6{PnYi!3z6Sr$1hhcodNE*zraRsD9ID~nu#_4=QR`OF1F5n|3uv9_54d>#zi9!6y
zCzZKq0<+jrwxa|~_!&vR;cHn^Sq0sAiVg9*3Olh5(>NJL3dmQ`#Bba~KaL8QCXfBN
zf&+Mi$5p$?S8xeWFoRoIz+Ifh3!$Q3jN&jpRS}m73}7#g;ChTb$8p>dX3RYLun!;p
zMV<=u;u;PLElM$mNul3kcqv?_|3Vhm6wV9QB)B6TA=ARS3<@n=7JfwX6fH#q>=MqS
zk&8bP+Lz)OE{h~H7|$hK#qL~eQ5Xe<%hV1{e6NUiEr+O`z)JA|zd9-KP|<m{3JfbA
za;*Yw(ZKt-QfwB+z(NvRE4)BvbGdzj6H|9}V-24D1qNkQTa`T=pa1{>07*qoM6N<$
Ef@HPQPXGV_

literal 0
HcmV?d00001

diff --git a/android_app/app/src/main/res/drawable-ldpi/ic_preferences_help.png b/android_app/app/src/main/res/drawable-ldpi/ic_preferences_help.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe2ea70fa2d1f92e8e813c32eedc8478f85ee4e8
GIT binary patch
literal 287
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&kwj^(N7l!{JxM1({$v}}So-U3d
z8WVdjDf&4F3ba04|NdaM<^(R01*f<I-imQZI|vFHNC>c8bN&z-`n5GgpoEp_C=<hF
z2Pc6u+>_axJlE~`ztghVs647})geQ^kCJN+@UHtf@!qXtvU(e4{gBct>|QHXW^h=+
z_Ku_d-S)&AdWCJ4Zi;aaMSkDl*_@t}5WXeaKX3AhxJPy$<(7Fz9E%qEru18Io>0AG
z=#SleO5Z($H9p+yU|BC=ZuNbG#zo%kkwU-sJ^wf3hNawsx8EbeA6*IU-@5AHe*1M(
ikL;0}o50<B^#_wnzj|w4qF5l%e+-_kelF{r5}E)PcXTTN

literal 0
HcmV?d00001

diff --git a/android_app/app/src/main/res/drawable-ldpi/ic_preferences_nav_graph.png b/android_app/app/src/main/res/drawable-ldpi/ic_preferences_nav_graph.png
new file mode 100644
index 0000000000000000000000000000000000000000..65d8f7c1450a73ca0a0d6f889579eebd6ac6abe4
GIT binary patch
literal 278
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&kwj^(N7l!{JxM1({$v~0Qo-U3d
z8WVdj7<xMe%CLTzKfRq#FG+ApbMq4cK}B9R*W~Ktt}mj0IO@8WZCmjE!UY*$US6TI
zKznpqdHL?K_q$)RKK;Moz2*0LpWEjpWh|JwAnL*ecgqJm8!F_he|Qx1T<1Mx<#+Lj
z?lxwvkDu7WEf1So?eOMznxh)?!059BZ}g9&<yjs^t#Kb(6vYgWaWub~&Zs`)k*v2(
z0(<_ClheIEw7PFmn*Tufdws5Af=s3LGqK|3GoJGPPn_3(rT343`?c2d#<PrN62!xP
X<jL);YiGU+^cI7stDnm{r-UW|ci3)?

literal 0
HcmV?d00001

diff --git a/android_app/app/src/main/res/drawable-mdpi/ic_preferences_help.png b/android_app/app/src/main/res/drawable-mdpi/ic_preferences_help.png
new file mode 100644
index 0000000000000000000000000000000000000000..dfefc0a06b41f284ff3657b9ad861f1db7ab7315
GIT binary patch
literal 398
zcmV;90df9`P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x0YgbdK~y-6b<@2{ok0)=;KwgVy#bE~TSdg<1!%8W<Q8HP)J{t;K^uut
zP!Pn6u=2M_D*Gg;jfL19jep2NP)M=+#V>o-7Y3G@*>`7W-k}{0tl}4%(SG79M$+V>
za_+(gzT*jBB3T17XyFIe(U}r;;V@cHrm7Nk9AiJ;`G+kWB+NBTM5|T&ojAf~=@`YI
z<mK*I?kUdVx4M%`ZZT3|4%@h{BuwKuk~i>z&y{!+JD4pniQVL{O`+?r(N58y<m|?~
z9`R8geOSbOtfq>7Jk-z;Er)r0!jzzkHWawT;5!5b_HdGk4dL=bJPZh<NzuYNt}?L&
zToAf^BQKz3EM@$4Vf4eL<C}INiKHoUDWsLuxi3h$o_VoEuOQ_;|Em*k%XEh|jKvGR
s7#Ei4&O6IgMY+zug(kLy5oXu<FB^VE48NHZeE<Le07*qoM6N<$g0nQS3;+NC

literal 0
HcmV?d00001

diff --git a/android_app/app/src/main/res/drawable-mdpi/ic_preferences_nav_graph.png b/android_app/app/src/main/res/drawable-mdpi/ic_preferences_nav_graph.png
new file mode 100644
index 0000000000000000000000000000000000000000..963e6046dae57d4423e6b7ea780531d99948ce19
GIT binary patch
literal 354
zcmV-o0iFJdP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x0T)R`K~y-6ozk%@#9<f*@DJ`}Ad@RsQU;SN%4VR*U^CinvMM)787&42
zizxqqGFh0&AQ?`HLaah5b#jJ#@%p*bxu>3bzt8)8zt8u1dm*pBXn_>k>LB-H22YK3
zPVdAk-eKUM<P6raigY6;Yb3TJi)GB=8O0RRQPT(>ahf2vhlyEChaM2WK@UbTo2XOX
zHG^B+#TTjQT*5?9AH;DqWC@!A7b^**F^>)GVG6xyLJnJaLtnz#m(@I0@DiLXVhm?t
z$VrkI3yk9u1zh=lpfxODw;K6V-~!tLHwW8ri1V=0p90qr?o$10mqPxCRE5TBaijcs
zemST$x-pb2Heeq|0q1a!hk%E15Y8PT3(?)q2N=FJA{5-f0{{R307*qoM6N<$f^74V
AZU6uP

literal 0
HcmV?d00001

diff --git a/android_app/app/src/main/res/drawable-xhdpi/ic_preferences_help.png b/android_app/app/src/main/res/drawable-xhdpi/ic_preferences_help.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f7488ce965f6a7be27ce49f2af3344e3463f537
GIT binary patch
literal 780
zcmV+n1M~ceP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x0>Mc{K~z|U#n)Ynl~oi6@ZUM=;H3D1FWF!zsN-uIco9TOiBSq(2&Rq*
zLSMjdAb8=0f_P&{fg*i?!0J*VQc9r<UrNP9ol?{?bi&cf>U6Q!@i`vPJTK#*f7m={
z_WG~2_UyIS+H2R8$0V%7YAnQS=nC22=*I;d#g`bUU^^GD;vgQPQF1)Q;aKRfF%Em$
z9QR{CHem(k$5;__ALHj1{v+%|cU9-TINxIE+i+3_HLS$R7X6c$QP%lV+z!RN=nJD&
zQNvd0EHrm-agov-+zN#Y(oQ@p7T{vbB3>Sf_!7<r@w{~EM+%c$7V#a%b|UQx!ta<{
zU~nq7<FgpsV=fQ9Qb-%v-7f6GU<fx97<yk8*Vb_t?-l574(?x4xF6$_5S%D5unZ4^
z`=hjLyJQ(Nh}U!UYqIS4v^hCJ_TR58Sio1oJL<_ecH>ycjuhB<H+c6k9=629FY?oE
zj8t+Pc%y@Sxomq!=h&&^MsPRQu_^>dVsa>q3&Vr>p@aNVe7i6)$IgHFB7U!`ONEEx
z_}{}?tieAW<Zs6JkKpFvczl<^Z_33#4?Q>+b`F%_zZ2Zsq?k1@Zy1h0!soKIyn$&Y
z^m>E;C)vTOx`1vep3ORN8na63K3+gw);PRUaRH-cS+icsg8q`aJ@Fl=<7)gdv*H3;
zaSZ=f;5U6;sY@3S>0mrBG<}^RD?~S?B2gBja9!$vMpe{n_8S{{vJ@9xCheFZ=YAgo
zA80GZq^7fhQ_6QgGo>2xtL#t}p@#3ZT}Gs|coc#UOB#DymV$4U)af(CbqsrzZ%CTh
z7NZPu8xm4sIpqbmWH1GngLoNBM!@-U*<0bK@R5rpxMt+r@~c=>R(U$UF>()+uN60~
zPoWDtJ=@dl0d`2;)UYudhg5%@9+Y0txu_D`PS5k^w%#$!=lTDrkM9rYG*%w~0000<
KMNUMnLSTZR26Ht4

literal 0
HcmV?d00001

diff --git a/android_app/app/src/main/res/drawable-xhdpi/ic_preferences_nav_graph.png b/android_app/app/src/main/res/drawable-xhdpi/ic_preferences_nav_graph.png
new file mode 100644
index 0000000000000000000000000000000000000000..0965cae3482ce8ec4d1c36c95f19cd9f2a63cb40
GIT binary patch
literal 661
zcmV;G0&4w<P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x0!m3lK~z|U#n(%SPGJ}a@ZTrKWyXweAsMrfDGQ2)OAT3&jZ!W}$wpWy
z8M3jMg~U!a3KJGCrCf?ANg{SkYK(GCGL*Yvd~VIKc+aQL={qxL%*>g8ecw6feV%jv
z|L1w%=XuY8R#Y286fhw}z8ofDnBrfCn1Y9B!voZ3EuaZ!k;iE?Wi6l@FQfBz)R65O
z*oW`9iH~T2>!{3td;{KKbtIxL1J1u#Aw)b|$abOB_}t+3fra=K9hDO>&}$%vS(qLj
zKVW%@eNYADa30U_4qve@=95~$DqO@#)Tb0M505bd<I#c1Jqbwa12b>{r|=r*QVM{I
z=vTzA-fk$DfsHs5osUE}s#1`T!)Lq~qTf@-C)E^8LnpT4Nc6zby^xQ=EgZrYTuSgu
zH3bWVR=Hh>ss-1Cc`b(up~t_%CSd_~^&&V?z<lh+Qar^`EWsVz#mt!haA9L9U`<-$
z(wj?>$8j{`Ny&H@HVduvDt2O}5czu{t&96g9v6_qF<ilk1pi%li~T~Xzu~aZVmtdv
z9v83!wL<;(gce~-ZH}(D2^qN89|4P^2hA0Bs#5%pUAGElc~HneEpGo0c@YJnW|x(*
zHDGL+@j78ozk#V`>}zo$f$yI(EM}lt=;3ip6e{6MY`k5Fx&x0Ah*F_ghI<q2jhNFP
zg0uqS^PCw5>!q|?%An$nXrOQz_tQ8IRtECIN63%~Xu$fR6p$LlHBf_}3HB->rE!eH
vj|5w#@LE>RRwL{?c@%PZA>)sP614pR8R~sw`BiMz00000NkvXXu0mjf)P^bj

literal 0
HcmV?d00001

diff --git a/android_app/app/src/main/res/drawable-xxhdpi/ic_preferences_help.png b/android_app/app/src/main/res/drawable-xxhdpi/ic_preferences_help.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e957ea7d98fab0c1689b1248870f33ea71f31ea
GIT binary patch
literal 1137
zcmV-%1djWOP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00006VoOIv0RI60
z0RN!9r;`8x1SUyDK~!jg<=WkgRaF=U@Smp-NSxHMYz(BZF4PhUO`>kXx`^r`Dx%BG
zG73Wqih`mb2<c0+$cree3#&W(1Bys13Wp4$5A{YU(@`5|#=x4K>0-@p*50$voLPHs
z)S(9s?Ai0K=XuXQYpwTV?HQWEJlu%uaW$4;R>9^3e!>s<5})IbhV(084j#fToWf}0
z=M;8g-5A$t!veg5p$bm7`wZeG^rSj7Bf<7OY`}9SP7gSYPw^do9Q!*)50>H@+=Tfh
z97A{>TkubUZyj+3dQE(Chw&;_N_!YHunL>dSHim+iyHFX?KoZ#IE3}MpaK4w!Y_NI
zpwW+8>yod<aDn)3%&kjYf_d0h&>F`5RSDN(BqBSGyK1}H8TSf{I@2A&eW@h3$v^pD
zh5h|>VL1*)`hVk=sSdtUe$M}f%NuvGGZx`@`8CmTVV{pZ(V!t=+dETOi9aKMdWG%0
zEuNKMM0ZyZU52eVAWXyIvFo>RRRz9#3O+s6&hSzpU&##LPZT-_n@yfpoD!mVE0KG9
z#4(6V%8cHWpZBv9Mc$jl@#5#*MDA`OXlCO#6%8(ypKFgL3OrnJa39tP(`lKom+vpw
zJea8QL^Sq<5I6qAhUlM1mFGI`Fl%f~HvThomDqI&DRgGnCq&_?qDx4>v+?WWf5v&v
zYYC);;1<u%vLr1-k9-z;N21p2(b#XYn+xQB+U1F)FGpjyPr?4<$bMs@){1EC2<Er2
zIx;wb?-NNcimrd2g8lyJIyL|A6*d?`M!UL&Ya@f5iG=Wpu-6ZaU3Wt4^iT!8FQV&J
zEuntRkoxpthcFEnPGS5^`4o9i1-)2fG5PH+by20_jY#XHHUX&v?u<Bofn(8)>l$%$
zB9`DI`ORWWMXnnnjwA3_bfd|Xd7&_0i`CqyFbz^-O^jvozhdqSR7tkl;YAZ29~FYx
zy!OL7BKHMaLRijlVGZIUich##NFQz%rfpTkIoja4LZQ$-cB9IonhLh!k%qWpANyO_
z8{JskkVp|t_IP3+_ZGiEY8r7S5c{~Vg|DI;tEDxlPB&UYS1-e^mhlvqkV&p+NbG2I
z-PaK3D&y;QM3h#1ZG3Cm+>lteP^E3tT=zMS<hi^puBeVFFG#AOt3j^W@&!$<qMIw<
z4STWy!3TsOc~Xt`V1#Fk`!}GZX5SbY3<_O}Iye;Z9jwW9nS9OuLYYyqt@1%l(cKZ(
zw>7ywlz+Hw1McJUdCQs_qDzGWXNP(La$UivM<+9$_N_&xd2=_zv~I6wnAQgz8On~B
z-Z6Resw#SfhH|V`>xd~s*&$y)o>sjqjL{_oseuxW+J}4@+8wj@sejB`Je?esaLoF@
zIp~gYR=sLa2WQ309!*tWWv|=JF`h~f2^&G<uiN|!dur!$-V7;(00000NkvXXu0mjf
Dh;Ag1

literal 0
HcmV?d00001

diff --git a/android_app/app/src/main/res/drawable-xxhdpi/ic_preferences_nav_graph.png b/android_app/app/src/main/res/drawable-xxhdpi/ic_preferences_nav_graph.png
new file mode 100644
index 0000000000000000000000000000000000000000..5769f1838af0d4b6cb10081bd4580ad6a2af84e2
GIT binary patch
literal 1072
zcmV-01kd}4P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00006VoOIv0RI60
z0RN!9r;`8x1La9XK~!jg?b%ysTtyhb@t<i-V`7_9iQui)qNrH(L9{B;haz6+LnvBo
zB}GvbK}AGSQ9;BAT7^=4@rGiwXcbx?yr4pgA{tS!N(HfydU^0JSQIU-Ss%VRWZmrU
zIVVZ88|WW4XLrt=nfd0sp2<AyKtDb-2kFGw_`cN(nJOKvUO-9uafaA<%pC#x@Cts$
zF8qKs+0DHeZq2$1GmHZm!XQ4yKUhxt3osx1@N8AvaTv!#bHRjq(S={D+I|-r>7)HM
zK$y%QxD-qA94Z)~{RLQrFT{eYKhI<xe#8?kSz10l_&}J;)p!qo<AUl=XNmaQZggV=
z|Kh6D_Pnr|wx<Ix3sbqXs=clNpW*)5Syv$r6DD23#+rL|1!y-Xeq1bmQ=NO01n8{O
zX*M|?7m7snHg3Yr*p54j4A4peHV9McNxy%?V&S;!h4bc8CKGqy1S~A^Oe2=zDSU-h
zSS_?Lj&<pK;YAf;ji>~_6B%)<=?QX?2$R=~7pgaLALiloG6NMcq0{gZ#_&Lz;6@?H
z4P_>)qLQvXRc+Z?3h#bKUKDyzsCH>p+ZK@#4=+1e;#mACOlSbt;1}%48FNZe=qQoO
zf2wNxMwq~&G;vw_#7>`z*HYUaT#o%^1}fqMJH)PROcSpVrt`J`m$*ea5$}jPf3@%@
zI7cMa(&U-Y$wC9Q)!=?yS8}d?VK)14acX-wjkln{^OH;{PXpazhYkn_CTf&3@rfvD
zheZ0%V<FxW8!{-gFe5b6z!tGP*QSXpxGml5!V9Tw8;)o)M=wT2avH3;H!Te`6JSFc
z_{H?QRsceSn^OCTaB4UjD@C;F6s180ch#Bapa`&Bgt=W}_ZkV1ajV$fFY&1GkBTt8
z&(rru8Z2tYeP97z6|w&c{8eD!&8hE6q6m9e#P)5%Uq*0ufpJPxFAqE|vhO+(F^aMs
zJ4K`!5Ly_<5)nEpjUSylwHmkuSBjc^>*VgabPJ7T$*3Ysv6+KUi)sN@;4yrxU@cyU
z*Tp;bJvc@9#wt<kA2jyj4SXxgf+Y?5Ef)39+9qT52z#$icsoT@YQ&60p^Atim*fo4
zRbY}1+-o9i&d=#TV^L^GzN(iCJ8#A~cBk*7rcfT2AroNKM5)k-W5f|(Z6<9gnE<=R
z&NZV~)I3F0J!{N`)9I!h5?}@x7f~qBgzM7kgDv8nVob4`YZC1sz*zcBiFPod%S6>$
z<gIQJ?I6HPad39zR32^z0j9+v0a{HKh0ep1IeoLk+_mD3tr^SG^>!2g-)h9U>AG3|
qsoeRZn9SDtQTC_y&}y!H-v1BnFd-|{6ZP5v0000<MNUMnLSTXu-|*T1

literal 0
HcmV?d00001

diff --git a/android_app/app/src/main/res/drawable-xxxhdpi/ic_preferences_help.png b/android_app/app/src/main/res/drawable-xxxhdpi/ic_preferences_help.png
new file mode 100644
index 0000000000000000000000000000000000000000..867dbef1524e709e2f2df818becefb9e5db59016
GIT binary patch
literal 1557
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
Hu0mjfMI6&T

literal 0
HcmV?d00001

diff --git a/android_app/app/src/main/res/drawable-xxxhdpi/ic_preferences_nav_graph.png b/android_app/app/src/main/res/drawable-xxxhdpi/ic_preferences_nav_graph.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2ac30c3bd1112081f453a4b2249fb88bfccb5f9
GIT binary patch
literal 1444
zcmV;V1zY-wP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00006VoOIv0RI60
z0RN!9r;`8x1zAZ%K~#90?b~UH9Yqia@ZUzGNkq|jMh%`ski-Lm7>O667=j{-20T%W
zf+q?J`oZW2LF0i3UU;H-M?5f!!4nB8ilPSZTVp(uh)29)cKuL2%w+TOcINHuKHrOf
zSbAP{Pfc}ocU5(DFU-OF*uWZ!CFsL0?G~gR7}0J4+Ksi_Ex<5gBTPXLUcu60Wj8N@
zk(iCYL?8Ro^VL`<Yt+pOxJ};iFYtNc_gz_|ZdJg}=oNiCr9eM1(R;Bg-K&7JMZaEb
zP&Y5to!`w~AT#hw8`LdM<yzgWfVWe*Kej2*$Kl}g{3hMI1bXnH=-Wcf5*}euqP-!-
zLEWl=<K#xL|KEGqHfy*z5ho72h(m`%v0U`)7F?8`|HMp;DK?&khZF*X4#zZk;B%W;
z3cIA=jSON}VJeo1&d$MFiQZHJBQbh7q#I)Fgdapl=UaK2H&wt3_)%;aIu+ybrRe0_
zR_#ku1$4R>7>7^f)_s!(ZC0y*P7j2};u-89HaiE&qr6h+lzhM_9Dzyr883+_Zcd^t
z#Uc2n73Tl-B`^V>S~ZyYB9*^k&jEOJtPL0=@BB}=4-ew+L|cvnOYm8(0$N=Hn_>pG
z79;Q&7PQE#8IHyF!oBT|ZxekQ<_bUm>0m!nbp{-cU#vVGdvT43y6VKOiT{-i>RwHC
z$CThxn-`db`?0<_OSnc@;U1BIIHw}Nf$(c8$26!LnaV#0`;jU$;P%w^1*}`3Uzq5N
z)azQ0l#krb4d{Pi^Adb&GlK7?wukqlkCyMgwkyG>EJom+#CI8<6fQ8^=3ZWsPi;o<
z=T!C&HAl%e9)DEi*$f8=H%Kgl>FK!-*Nd4qXjGX2vs2rTuvvkAL!y7EK0`P~c$hvs
zihbm>;k=5xYFh%E$$ju*JRyu><_$hp$g~UsS#;NjXXW;0u2s|AWl);}&eb@@^eeuX
z8^XyI1uSAm;qUwKn(#Oo+Nyx5^3gvFcckaJ*jQ{yGb8z%h|Q~FD}0uCEJ%Eds9gbN
zUDj53MEKr2ah(`xA|_vguSHD$B-X>@xVVClTZlu9?eKv}XD_MneoH8$fOYV&SpRR~
zv?gtr;V|4NjNvR1%?;#jHWH^bJBq}{fg(vW<S63?XUQ${u?CL3R^SX_Brn3r;`Yf2
zLMbO;UlBLFiF?HcXOh_Pw7jit70qnGba~KmbicYw6a9uJyibzbjrn3~_cx&b$nD0I
z0c5S+1~i)i+v099YB!3lXjR-HM)P6pm1y7NCK1M-DtDX5h|3GZiq$D#T_N;Xye`~d
ztC)w=agT79ljT$VR$*7hW5Ypwqh+kl2wp1$U5cZ`XblEgqVhQ_ukR%ymq0qJA8s^K
zz;R+~_TqTq<_3#wTf1e0y78&}y@u~pMt=oN6zdZ%6Go>F%oE;W51d(`&k*N$L|$Ro
zQB=VCBFnlSo)<2x8T$H_&G0p@NYB^dE0N28AjvQXFP9U!eq?U&E%{k`nIywxkr<g;
z@;g1aKy0Zq7q}cZTRFMX3`4pX$OPKEBJ--4kiNA-<5Qew81lWq1*%QOR_+%UBgsmq
zI75M=0v^Lv72cg8rt{2NB^qWF6>y1i1}#GtI`3AWIKz*k0(#pfMH|uSr^AEB{|acg
z0PRMnDIl{`E9zp{DHkL%+$0WOp00~wrzzm6^j8}?Z3*<K9zHikrzzlSe24w&V%TX4
zm>>>eCk)iEEILgAwc~#Uv|E67V~tlpF%HPCyp=_EOJoCam8~p_nc*t$kzbbDq~g0<
yr*cH$y<RNr5h<~;6$R-Q%palg|JAK2SoANK2a~(YeUu0Q0000<MNUMnLSTY2ud+@6

literal 0
HcmV?d00001

diff --git a/android_app/app/src/main/res/menu/drawer_bottom_view.xml b/android_app/app/src/main/res/menu/drawer_bottom_view.xml
index 3437642e..b73292cb 100644
--- a/android_app/app/src/main/res/menu/drawer_bottom_view.xml
+++ b/android_app/app/src/main/res/menu/drawer_bottom_view.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <group android:id="@+id/menu_top"
-           android:checkableBehavior="single">
-
+    <group android:checkableBehavior="single">
         <item
             android:id="@+id/nav_overview"
             android:icon="@drawable/ic_preferences_home"
@@ -10,7 +8,7 @@
 
         <item
             android:id="@+id/nav_graph"
-            android:icon="@drawable/ic_preferences_graph"
+            android:icon="@drawable/ic_preferences_nav_graph"
             android:title="@string/title_graph" />
 
         <item
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 d204da48..b2904938 100644
--- a/android_app/app/src/main/res/menu/drawer_view.xml
+++ b/android_app/app/src/main/res/menu/drawer_view.xml
@@ -10,7 +10,7 @@
 
         <item
             android:id="@+id/nav_graph"
-            android:icon="@drawable/ic_preferences_graph"
+            android:icon="@drawable/ic_preferences_nav_graph"
             android:title="@string/title_graph" />
 
         <item
@@ -31,5 +31,10 @@
             android:id="@+id/nav_settings"
             android:icon="@drawable/ic_preferences_settings"
             android:title="@string/action_settings" />
+
+        <item
+            android:id="@+id/nav_help"
+            android:icon="@drawable/ic_preferences_help"
+            android:title="@string/label_help" />
         </group>
     </menu>
\ No newline at end of file
diff --git a/android_app/app/src/main/res/values-de/strings.xml b/android_app/app/src/main/res/values-de/strings.xml
index d38cd090..252bcf7b 100644
--- a/android_app/app/src/main/res/values-de/strings.xml
+++ b/android_app/app/src/main/res/values-de/strings.xml
@@ -184,4 +184,5 @@
     <string name="info_app_restart_required">Um die Änderungen zu übernehmen, ist ein App Neustart erforderlich</string>
     <string name="label_share">Teilen</string>
     <string name="label_bluetooth_searching_finished">Suche beendet nach Bluetooth Waagen</string>
+    <string name="label_help">Hilfe</string>
 </resources>
\ No newline at end of file
diff --git a/android_app/app/src/main/res/values/strings.xml b/android_app/app/src/main/res/values/strings.xml
index 87916a95..3fa94ee5 100644
--- a/android_app/app/src/main/res/values/strings.xml
+++ b/android_app/app/src/main/res/values/strings.xml
@@ -189,6 +189,7 @@
     <string name="label_regression_line">Regression weight line</string>
     <string name="label_regression_line_degree">Regression polynom degree</string>
     <string name="label_goal_line">Goal line</string>
+    <string name="label_help">Help</string>
 
     <string name="label_feedback_message_enjoying">Enjoying openScale?</string>
     <string name="label_feedback_message_rate_app">How about a rating on GooglePlay or on GitHub, then?</string>