From a8eb24eb373e5d8fc1d759fb14656ca23b202936 Mon Sep 17 00:00:00 2001
From: OliE <olie.xdev@googlemail.com>
Date: Sat, 3 Feb 2018 20:35:24 +0100
Subject: [PATCH] move add measurement button to toolbar. remember last
 fragment id.

---
 .../health/openscale/gui/MainActivity.java    |  43 +++++++++++-------
 .../gui/fragments/OverviewFragment.java       |  14 ------
 .../app/src/main/res/drawable-hdpi/ic_add.png | Bin 0 -> 774 bytes
 .../app/src/main/res/drawable-ldpi/ic_add.png | Bin 0 -> 383 bytes
 .../app/src/main/res/drawable-mdpi/ic_add.png | Bin 0 -> 499 bytes
 .../src/main/res/drawable-xhdpi/ic_add.png    | Bin 0 -> 1085 bytes
 .../src/main/res/drawable-xxhdpi/ic_add.png   | Bin 0 -> 1709 bytes
 .../src/main/res/drawable-xxxhdpi/ic_add.png  | Bin 0 -> 2370 bytes
 .../res/layout-large/fragment_overview.xml    |  10 ----
 .../src/main/res/layout/fragment_overview.xml |  28 ------------
 .../app/src/main/res/menu/action_menu.xml     |   8 +++-
 11 files changed, 33 insertions(+), 70 deletions(-)
 create mode 100644 android_app/app/src/main/res/drawable-hdpi/ic_add.png
 create mode 100644 android_app/app/src/main/res/drawable-ldpi/ic_add.png
 create mode 100644 android_app/app/src/main/res/drawable-mdpi/ic_add.png
 create mode 100644 android_app/app/src/main/res/drawable-xhdpi/ic_add.png
 create mode 100644 android_app/app/src/main/res/drawable-xxhdpi/ic_add.png
 create mode 100644 android_app/app/src/main/res/drawable-xxxhdpi/ic_add.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 34050373..9fb91c4c 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
@@ -49,6 +49,7 @@ import com.health.openscale.R;
 import com.health.openscale.core.OpenScale;
 import com.health.openscale.core.bluetooth.BluetoothCommunication;
 import com.health.openscale.core.datatypes.ScaleMeasurement;
+import com.health.openscale.gui.activities.DataEntryActivity;
 import com.health.openscale.gui.activities.SettingsActivity;
 import com.health.openscale.gui.activities.UserSettingsActivity;
 import com.health.openscale.gui.fragments.GraphFragment;
@@ -64,7 +65,6 @@ public class MainActivity extends AppCompatActivity {
     private static boolean valueOfCountModified = false;
     private static int bluetoothStatusIcon = R.drawable.ic_bluetooth_disabled;
     private static MenuItem bluetoothStatus;
-    private static CharSequence fragmentTitle;
 
     private DrawerLayout drawerLayout;
     private Toolbar toolbar;
@@ -118,16 +118,10 @@ public class MainActivity extends AppCompatActivity {
         // Setup drawer view
         setupDrawerContent(navDrawer);
 
-        // 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);
 
+        selectDrawerItem(prefs.getInt("lastFragmentId", R.id.nav_overview));
+
         if (prefs.getBoolean("firstStart", true)) {
             Intent intent = new Intent(this, UserSettingsActivity.class);
             intent.putExtra(UserSettingsActivity.EXTRA_MODE, UserSettingsActivity.ADD_USER_REQUEST);
@@ -224,7 +218,9 @@ public class MainActivity extends AppCompatActivity {
                 new NavigationView.OnNavigationItemSelectedListener() {
                     @Override
                     public boolean onNavigationItemSelected(MenuItem menuItem) {
-                        selectDrawerItem(menuItem);
+                        selectDrawerItem(menuItem.getItemId());
+                        // Highlight the selected item has been done by NavigationView
+                        menuItem.setChecked(true);
                         return true;
 
                     }
@@ -232,23 +228,34 @@ public class MainActivity extends AppCompatActivity {
                 });
     }
 
-    public void selectDrawerItem(MenuItem menuItem) {
+    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;
 
-        switch(menuItem.getItemId()) {
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+
+        switch(menuItemId) {
             case R.id.nav_overview:
                 fragmentClass = OverviewFragment.class;
+                fragmentTitle = getResources().getString(R.string.title_overview);
+                prefs.edit().putInt("lastFragmentId", menuItemId).commit();
                 break;
             case R.id.nav_graph:
                 fragmentClass = GraphFragment.class;
+                fragmentTitle = getResources().getString(R.string.title_graph);
+                prefs.edit().putInt("lastFragmentId", menuItemId).commit();
                 break;
             case R.id.nav_table:
                 fragmentClass = TableFragment.class;
+                fragmentTitle = getResources().getString(R.string.title_table);
+                prefs.edit().putInt("lastFragmentId", menuItemId).commit();
                 break;
             case R.id.nav_statistic:
                 fragmentClass = StatisticsFragment.class;
+                fragmentTitle = getResources().getString(R.string.title_statistics);
+                prefs.edit().putInt("lastFragmentId", menuItemId).commit();
                 break;
             case R.id.nav_settings:
                 Intent settingsIntent = new Intent(this, SettingsActivity.class);
@@ -257,6 +264,8 @@ public class MainActivity extends AppCompatActivity {
                 return;
             default:
                 fragmentClass = OverviewFragment.class;
+                fragmentTitle = getResources().getString(R.string.title_overview);
+                prefs.edit().putInt("lastFragmentId", menuItemId).commit();
         }
 
         try {
@@ -270,12 +279,8 @@ public class MainActivity extends AppCompatActivity {
         FragmentManager fragmentManager = getSupportFragmentManager();
         fragmentManager.beginTransaction().replace(R.id.fragment_content, fragment).commit();
 
-        // Highlight the selected item has been done by NavigationView
-        menuItem.setChecked(true);
-
         // Set action bar title
-        setTitle(menuItem.getTitle());
-        fragmentTitle = menuItem.getTitle();
+        setTitle(fragmentTitle);
 
         // Close the navigation drawer
         drawerLayout.closeDrawers();
@@ -292,6 +297,10 @@ public class MainActivity extends AppCompatActivity {
             case android.R.id.home:
                 drawerLayout.openDrawer(GravityCompat.START);
                 return true;
+            case R.id.action_add_measurement:
+                Intent intent = new Intent(getApplicationContext(), DataEntryActivity.class);
+                startActivityForResult(intent, 1);
+                return true;
             case R.id.action_bluetooth_status:
                 invokeSearchBluetoothDevice();
                 return true;
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/fragments/OverviewFragment.java b/android_app/app/src/main/java/com/health/openscale/gui/fragments/OverviewFragment.java
index 9b01235f..1b4693de 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/fragments/OverviewFragment.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/fragments/OverviewFragment.java
@@ -16,7 +16,6 @@
 package com.health.openscale.gui.fragments;
 
 import android.content.Context;
-import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.graphics.Color;
@@ -39,7 +38,6 @@ import com.health.openscale.core.datatypes.ScaleMeasurement;
 import com.health.openscale.core.datatypes.ScaleUser;
 import com.health.openscale.core.utils.Converters;
 import com.health.openscale.core.utils.DateTimeHelpers;
-import com.health.openscale.gui.activities.DataEntryActivity;
 import com.health.openscale.gui.views.BMIMeasurementView;
 import com.health.openscale.gui.views.BMRMeasurementView;
 import com.health.openscale.gui.views.BoneMeasurementView;
@@ -150,12 +148,6 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener
         pieChartLast.setOnValueTouchListener(new PieChartLastTouchListener());
         pieChartLast.setChartRotationEnabled(false);
 
-        overviewView.findViewById(R.id.btnInsertData).setOnClickListener(new View.OnClickListener() {
-            public void onClick(View view) {
-                btnOnClickInsertData();
-            }
-        });
-
         userSelectedData = null;
 
         spinUserAdapter = new ArrayAdapter<>(overviewView.getContext(), R.layout.support_simple_spinner_dropdown_item, new ArrayList<String>());
@@ -421,12 +413,6 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener
         pieChartLast.setPieChartData(pieChartData);
     }
 
-    public void btnOnClickInsertData()
-    {
-        Intent intent = new Intent(overviewView.getContext(), DataEntryActivity.class);
-        startActivityForResult(intent, 1);
-    }
-
     private class PieChartLastTouchListener implements PieChartOnValueSelectListener
     {
         @Override
diff --git a/android_app/app/src/main/res/drawable-hdpi/ic_add.png b/android_app/app/src/main/res/drawable-hdpi/ic_add.png
new file mode 100644
index 0000000000000000000000000000000000000000..d824ad6a1fc701e53492f6b5f0d9201288a4ad3f
GIT binary patch
literal 774
zcmV+h1Nr=kP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00006VoOIv0RI60
z0RN!9r;`8x0=r2>K~z|U&6vweRZ$d&fBUGJub?0(NkT|M3o0rIjfx5k=M5S}^P+)N
zP=85*lo3rzn>LfI%nTwTl`=DovVttBS+Dywxa;Efbj<U(cJGG6fwkBAt?xY7-peWB
z05(eMl5|kgCP|Hws%-kFr1z30B@IZr?VNj?G)EkW6~GDL5s+iym<65zqrm6TTn-ok
zjssOoXNm{Y1-!BZzkxfzNnjgL6X9P2YzIyOgBAlY33O%wsRepGkSoCE6gsWIRS)b^
z)P*c1vL1M10;9l=q#zNRJArZ2d<?8h0yAZSH-Xx$FrIcDaLcr(mV~l^!ky^>DvAZ;
z<){EIdv|K_$LGB>H-MnnFd?Wu%XM)vrz7U@9H?6^7%yKv@X~S~4o_ABFYHU$v)nLV
z-VXa$jV*XRfMZ75`@dkk+}ADlQQtUXq^&7MyMc2lW4BuFp@N~s2=Ap4G>vKCLx%VV
z2Gtx$D*Vp-(+Wy*cBCEs7T+02YB%Fx2EnZ3uASQhNo|slG*LPpjY;|?sV$JyBx%k$
z_q|j!&bc4TucMj*Nez-d#t8&Y1D}8|{vm0Dq_ttY`F6+T`YLHvrSgv}ZkhNk>05-o
zLHU<*E@CbhQ`<?x0ke_<=iHi@fqxC)jif5)Tw_L!>Oj)8q}Bhdy30I(mC8T%=|J;e
zS4*jYl>gELNfUvjAu}E*8IH8y&O-v4?YEt^bj)OkFO-g^f?+sgaXkZ^O&MD#uJ?Uo
z*)2cHYk_8y<+FtKoXTgBZ;s`)4YB}#qu2-37ZIj`BpbyLRN+od0(*-9v(LNG_*-dD
zz;8C>fL_u!8?G_m#!2362nmMUF~h)lU>8sw;a?5x1}*>(DONislw`4nRStLuJhfvc
zVm?vBD)CN%d`s_;qz*}2BsFVcOYgO$apjBlK+=}p9|ND)UNo;#4gdfE07*qoM6N<$
Ef)#FC*#H0l

literal 0
HcmV?d00001

diff --git a/android_app/app/src/main/res/drawable-ldpi/ic_add.png b/android_app/app/src/main/res/drawable-ldpi/ic_add.png
new file mode 100644
index 0000000000000000000000000000000000000000..de9dee2c0fabd468ed62ad1a91c64ddfb99aa9e8
GIT binary patch
literal 383
zcmV-_0f7FAP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00006VoOIv0RI60
z0RN!9r;`8x0W?WOK~y-6rIfu&15pr#zgg26k+j+=Vx>>uPYRWwD2Q5!FBW_ND|;oV
zQSmv%La+=$!OqXZyRwAcRpY>gojGUboaO!mC82Hu2f!-OO637?51dEDWm#Wwz`S~=
z_S8eQS-_g9cBS^!xvC-S>Z7_-tM<j+P29CnU@-wpKMg7LETx`>V(~%U{OyoJUq`*o
zlMVHvhCHjz*5Ez0odL%{w?_CVajK#V9B04^a8pB!w5p;HtTupVM7)mJodHgOTqsjB
zK;SGQp1)Nh2I_R9LPcPhzTcChLCQbM_zmDqohrJDh!@~AxtjzgBI2}EQCq+;OaIuZ
zaF)BX2Hyhu`S$lJr~JJA*J?XY9@M=W)v6);-v=@k7S*ReUXkV0voH$$|I!u+V?QIM
dCw82N?Gvi86Bk&2`T+m{002ovPDHLkV1oaDtjYiY

literal 0
HcmV?d00001

diff --git a/android_app/app/src/main/res/drawable-mdpi/ic_add.png b/android_app/app/src/main/res/drawable-mdpi/ic_add.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ec539bfe303a5cda3ae0a1a56aa4baec7aaf66e
GIT binary patch
literal 499
zcmV<P0Sx|$P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0RI60
z0RN!9r;`8x0jNntK~zYIwU#|=R8bIypSf&nt%f9|&|o2E{USwvfFDGo{sCJx3MvQ|
zwsy8QLLjwm6qA5|KvI}ADHIU`@uO55CHh$G*>E)X?%vJrPIu-!^UmCJm^nA-VCo2P
z377?r0b^-v3)lo+0!tCGU8NBf!sEar;5x7YECFwUuL(H_G*j~9z#{NCBDOje+!nv8
zepgr2(>3@r>Z<xpo$ChQSAVLvx>m9`_I8TBR|Q;4z=dALGmVQ$<I4XV6Y3B3=6=O9
zt@(7sW4UudUG7&r(_2-awHM>+ubLM+rJk(8olQqIih5UlQ?s(CyOnik*VH=&a2|M7
zC#XkT2F?}0QCiJ3XxjiL8??IeOBs>w<pEG6*C`;>=V|>1coGq7CE=feLk(Kvq9_3X
zc7TuB`bc6wWWL`Ou>nK__yim-B_h^=_3Vod0F8)vSRtC*2(VoM?|~CF0(!M6;9Ws$
zQg$9v`?Jfyi@edMyG5u?wONCkNt&Z=$AY@jf6==MUjNgO*|57Y0P(%UE^Q2NTxY=W
p9-Isu=#x40N53>dmZ<OFmcQp=V_(Nfd*1*6002ovPDHLkV1hF3+|>X8

literal 0
HcmV?d00001

diff --git a/android_app/app/src/main/res/drawable-xhdpi/ic_add.png b/android_app/app/src/main/res/drawable-xhdpi/ic_add.png
new file mode 100644
index 0000000000000000000000000000000000000000..8042a72f5b2b482e8ba6111fe333a574b346e293
GIT binary patch
literal 1085
zcmV-D1j74?P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00006VoOIv0RI60
z0RN!9r;`8x1M*2kK~!jg<(kWn6-5-rzv^5O6^$T1Fc2IV7$(3-qNA?Vg}OE|6E{L!
zVI~G+f)iIJ`~k!b#zc*YacNxoh_Cnv6Gib!Vj={Lg1i>!IDiTaKNoe{IW#>zxBC|N
zGV$B=?OUh5@4I!os{5SkpacMxNxE0k-I4|*t&((oA?y!H`y~A&=?h7pg%A#<&~F4_
z5%3i770s~=*a9qU>LWBTzC_Y9k~T|PP-xySX^*4>l8z~kx)lG7TO{>K8j`f4&~H-G
zOOm#S5RTRL)UNS)z!>nS8^I~yV_+1xtp-;g@Fehwapaf)wgOkAHope=#tEGUUI11m
z;O+-r1padTyMfgyybBlsPCD{;Qy4GN=?C6(I+MU7osy0L=Z)}pU?h>>D$Px19@8Fc
zN;K+5<5yr^Vy{)&L%>0&|3qDa5jVMh1eRVRuT>tFnKr<=wl61OgPTx46PL}N09axk
zFi*G7)?q&IgLOCs40XwCm8T81>H&NQTv-*o&0TkocF|`gfXAJ$=Vl68%Jg#ic9%WQ
z3b({g0=Je0?681;fPo%(tOPI!oH38j7aJGbH4pG|k37x_;8pi8Eb<LcyXC4sk=T6V
zBf+=8HHkP^yXAe0Z`f^LzMn$KIM=y}H=L07L*v{fNtsQEJFNYUR6@G&Q9Vn@`=%X-
zftxc)_q)c+ZuKca?lDNZFH=kdCFwv2;Ye>hwT}?OK}o;Z={=dGK|A@rH<lV9_d1wq
zI=$Q9BQs5qdtK3zl&`19>#_h>OS(%^tE9QleI5p`Es2?u^koR)R88sJ>*AKC6Z5(x
zlJu#hJKKocQPH+XG10GslXhH?Nup+FkFy>0&2g?lpWHJo#gU(<i%TT!-~q*QNf`zt
zy<?vrRvhUv9BrVRUyhS4Nhc&NlyqZVmJq^e#Tw8>C_Fy=7D6bEYlxfdcp_6Q_epWY
z<_dDJ`!Y#;?WE_~R}JJ|_hypD?PNKyyhn!G2C*iU7a4YDl6JcG2fJ^nHXgDglE$+T
z!eL3D+n1XX3i;*vd_vxhb{zk&5bP3~DPT<s72qmjJ@sq5W2fL;%XFpif`rDWl&_=^
zyA%LkD@`e_(I@q3D#Hm;nbcc=FRQ%O1CNzpwz7%^J?rw=(Jp(O5yWk%99ydbi>1Z&
zUGzDVr}j&W)}f!c)dO&t8e2!H0jvU!o0kdN-B@8Rm)9M^+}+@CL>t}G^|wv(lr^5B
zUPi2t=bC4L$2uh~Zt{HqtWD(E>#PSpayp%F@;UP2HtSj9U9saEo^ii!oH^2MvpS*6
za-;kI^Qu7+%+;4YX818>uiM-p={gIUP%IuKf8FL^Flr~iQO~5^00000NkvXXu0mjf
DK#Kq~

literal 0
HcmV?d00001

diff --git a/android_app/app/src/main/res/drawable-xxhdpi/ic_add.png b/android_app/app/src/main/res/drawable-xxhdpi/ic_add.png
new file mode 100644
index 0000000000000000000000000000000000000000..0df8cdd29b599048cf037d03039e33cbd3d5a728
GIT binary patch
literal 1709
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
D8=V@I

literal 0
HcmV?d00001

diff --git a/android_app/app/src/main/res/drawable-xxxhdpi/ic_add.png b/android_app/app/src/main/res/drawable-xxxhdpi/ic_add.png
new file mode 100644
index 0000000000000000000000000000000000000000..17a51fca3b37383d40cef858463a5778596f46c3
GIT binary patch
literal 2370
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

literal 0
HcmV?d00001

diff --git a/android_app/app/src/main/res/layout-large/fragment_overview.xml b/android_app/app/src/main/res/layout-large/fragment_overview.xml
index 501ff4dd..3ac90126 100644
--- a/android_app/app/src/main/res/layout-large/fragment_overview.xml
+++ b/android_app/app/src/main/res/layout-large/fragment_overview.xml
@@ -93,14 +93,4 @@
 
         </LinearLayout>
     </ScrollView>
-
-    <Button
-        android:id="@+id/btnInsertData"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/flat_selector"
-        android:text="+"
-        android:textColor="@android:color/white" />
-
-
 </LinearLayout>
diff --git a/android_app/app/src/main/res/layout/fragment_overview.xml b/android_app/app/src/main/res/layout/fragment_overview.xml
index b817077a..a0b3793a 100644
--- a/android_app/app/src/main/res/layout/fragment_overview.xml
+++ b/android_app/app/src/main/res/layout/fragment_overview.xml
@@ -84,34 +84,6 @@
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent"></TableLayout>
 
-            <Space
-                android:layout_width="match_parent"
-                android:layout_height="80dp" />
-
         </LinearLayout>
-
     </ScrollView>
-
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/btnInsertData"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="16dp"
-        android:clickable="true"
-        android:textColor="@android:color/white"
-        app:backgroundTint="#33B5E5"
-        app:layout_anchor="@id/scrollView"
-        app:layout_anchorGravity="bottom|right|end" />
-
-
-    <TextView
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:text="+"
-        android:elevation="6dp"
-        android:textSize="18dp"
-        android:textColor="#fff"
-        app:layout_anchor="@id/btnInsertData"
-        app:layout_anchorGravity="center"/>
-
 </android.support.design.widget.CoordinatorLayout>
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 c3bdd814..2ed09eaf 100644
--- a/android_app/app/src/main/res/menu/action_menu.xml
+++ b/android_app/app/src/main/res/menu/action_menu.xml
@@ -3,9 +3,15 @@
     xmlns:tools="http://schemas.android.com/tools"
     tools:context="com.example.openscale.MainActivity" >
 
+    <item
+        android:id="@+id/action_add_measurement"
+        android:icon="@drawable/ic_add"
+        android:title="+"
+        app:showAsAction="always" />
+
     <item
         android:id="@+id/action_bluetooth_status"
         android:icon="@drawable/ic_bluetooth_disabled"
         android:title="@string/action_bluetooth_status"
-        app:showAsAction="ifRoom"/>
+        app:showAsAction="always" />
 </menu>