From 5687e46fd3dd1e00fc4b18893d59acf542e0b883 Mon Sep 17 00:00:00 2001
From: Nabil MISSOUM <nabzounabz@gmail.com>
Date: Mon, 27 Mar 2017 20:19:30 +0200
Subject: [PATCH 1/3] GUI changes

---
 android_app/app/app.iml                           |  9 +++++++--
 .../com/health/openscale/gui/MainActivity.java    | 15 ++++++++++++++-
 .../health/openscale/gui/SettingsActivity.java    | 14 +++++++++++++-
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/android_app/app/app.iml b/android_app/app/app.iml
index 3fa63721..01e031b8 100644
--- a/android_app/app/app.iml
+++ b/android_app/app/app.iml
@@ -9,6 +9,7 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
         <afterSyncTasks>
@@ -46,6 +47,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
@@ -53,6 +55,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
@@ -60,6 +63,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
@@ -67,6 +71,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
@@ -74,11 +79,11 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
@@ -89,12 +94,12 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
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 398b26d3..996f60a3 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
@@ -56,7 +56,7 @@ public class MainActivity extends ActionBarActivity implements
 	 * becomes too memory intensive, it may be best to switch to a
 	 * {@link android.support.v4.app.FragmentStatePagerAdapter}.
 	 */
-	private SectionsPagerAdapter mSectionsPagerAdapter;
+	public static SectionsPagerAdapter mSectionsPagerAdapter;
 
 	private static boolean firstAppStart = true;
 	private static int bluetoothStatusIcon = R.drawable.bluetooth_disabled;
@@ -314,5 +314,18 @@ public class MainActivity extends ActionBarActivity implements
 			}
 			return null;
 		}
+
+        @Override
+        public int getItemPosition(Object object) {
+            return POSITION_NONE;
+        }
+
+        @Override
+        public void notifyDataSetChanged() {
+            super.notifyDataSetChanged();
+            tableFrag = new TableFragment();
+            graphFrag = new GraphFragment();
+            overviewFrag = new OverviewFragment();
+        }
 	}
 }
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/SettingsActivity.java b/android_app/app/src/main/java/com/health/openscale/gui/SettingsActivity.java
index ccb75b72..47f1df6e 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/SettingsActivity.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/SettingsActivity.java
@@ -16,6 +16,7 @@
 package com.health.openscale.gui;
 
 import android.preference.PreferenceActivity;
+import android.util.Log;
 
 import com.health.openscale.R;
 
@@ -24,6 +25,7 @@ import java.util.List;
 
 public class SettingsActivity extends PreferenceActivity {
     private static List<String> fragments = new ArrayList<String>();
+    static int backPressed = 0;
 
     @Override
     public void onBuildHeaders(List<Header> target) {
@@ -36,7 +38,17 @@ public class SettingsActivity extends PreferenceActivity {
     }
 
     @Override
-    protected boolean isValidFragment (String fragmentName) {
+    protected boolean isValidFragment(String fragmentName) {
         return fragments.contains(fragmentName);
     }
+
+    public void onBackPressed() {
+        super.onBackPressed();
+        Log.d("### ", "on back pressed setting activity ******************");
+        backPressed++;
+        if (backPressed == 1) {
+            MainActivity.mSectionsPagerAdapter.notifyDataSetChanged();
+            backPressed = 0;
+        }
+    }
 }

From 0c69e7087f7db4c9dab370392c2b33374a178634 Mon Sep 17 00:00:00 2001
From: Nabil MISSOUM <nabzounabz@gmail.com>
Date: Tue, 28 Mar 2017 13:21:16 +0200
Subject: [PATCH 2/3] fixed bug for GUI changes

---
 .../src/main/java/com/health/openscale/gui/SettingsActivity.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/android_app/app/src/main/java/com/health/openscale/gui/SettingsActivity.java b/android_app/app/src/main/java/com/health/openscale/gui/SettingsActivity.java
index 47f1df6e..6d26e9ca 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/SettingsActivity.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/SettingsActivity.java
@@ -44,7 +44,6 @@ public class SettingsActivity extends PreferenceActivity {
 
     public void onBackPressed() {
         super.onBackPressed();
-        Log.d("### ", "on back pressed setting activity ******************");
         backPressed++;
         if (backPressed == 1) {
             MainActivity.mSectionsPagerAdapter.notifyDataSetChanged();

From 9de48c7ec8fc023453052fb35dc251740c365aac Mon Sep 17 00:00:00 2001
From: OliE <olie.xdev@googlemail.com>
Date: Fri, 31 Mar 2017 14:29:01 +0200
Subject: [PATCH 3/3] update GUI changes immediately via activity result

---
 .../health/openscale/gui/MainActivity.java    | 27 ++++++++++++-------
 .../openscale/gui/SettingsActivity.java       | 11 --------
 2 files changed, 18 insertions(+), 20 deletions(-)

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 996f60a3..dd0efbd6 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
@@ -56,7 +56,7 @@ public class MainActivity extends ActionBarActivity implements
 	 * becomes too memory intensive, it may be best to switch to a
 	 * {@link android.support.v4.app.FragmentStatePagerAdapter}.
 	 */
-	public static SectionsPagerAdapter mSectionsPagerAdapter;
+	private SectionsPagerAdapter mSectionsPagerAdapter;
 
 	private static boolean firstAppStart = true;
 	private static int bluetoothStatusIcon = R.drawable.bluetooth_disabled;
@@ -149,7 +149,7 @@ public class MainActivity extends ActionBarActivity implements
 
 		if (id == R.id.action_general_settings) {
 			Intent intent = new Intent(this, SettingsActivity.class);
-			startActivityForResult(intent, 0);
+			startActivityForResult(intent, 1);
 			return true;
 		}
 
@@ -259,7 +259,15 @@ public class MainActivity extends ActionBarActivity implements
 	public void onTabReselected(ActionBar.Tab tab,
 			FragmentTransaction fragmentTransaction) {
 	}
-	
+
+	@Override
+	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+
+		if (requestCode == 1) {
+			mSectionsPagerAdapter.notifyDataSetChanged();
+		}
+	}
+
 	/**
 	 * A {@link FragmentPagerAdapter} that returns a fragment corresponding to
 	 * one of the sections/tabs/pages.
@@ -315,14 +323,15 @@ public class MainActivity extends ActionBarActivity implements
 			return null;
 		}
 
-        @Override
-        public int getItemPosition(Object object) {
-            return POSITION_NONE;
-        }
+		@Override
+		public int getItemPosition(Object object) {
+			return POSITION_NONE;
+		}
 
-        @Override
+		@Override
         public void notifyDataSetChanged() {
-            super.notifyDataSetChanged();
+			super.notifyDataSetChanged();
+
             tableFrag = new TableFragment();
             graphFrag = new GraphFragment();
             overviewFrag = new OverviewFragment();
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/SettingsActivity.java b/android_app/app/src/main/java/com/health/openscale/gui/SettingsActivity.java
index 6d26e9ca..a582241b 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/SettingsActivity.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/SettingsActivity.java
@@ -16,7 +16,6 @@
 package com.health.openscale.gui;
 
 import android.preference.PreferenceActivity;
-import android.util.Log;
 
 import com.health.openscale.R;
 
@@ -25,7 +24,6 @@ import java.util.List;
 
 public class SettingsActivity extends PreferenceActivity {
     private static List<String> fragments = new ArrayList<String>();
-    static int backPressed = 0;
 
     @Override
     public void onBuildHeaders(List<Header> target) {
@@ -41,13 +39,4 @@ public class SettingsActivity extends PreferenceActivity {
     protected boolean isValidFragment(String fragmentName) {
         return fragments.contains(fragmentName);
     }
-
-    public void onBackPressed() {
-        super.onBackPressed();
-        backPressed++;
-        if (backPressed == 1) {
-            MainActivity.mSectionsPagerAdapter.notifyDataSetChanged();
-            backPressed = 0;
-        }
-    }
 }