From bfe02682e872a5602347cec529c5feb863e1e093 Mon Sep 17 00:00:00 2001
From: Graham Jones <grahamjones139@gmail.com>
Date: Sat, 10 Jun 2023 20:17:48 +0100
Subject: [PATCH] Removed fall detection from main screen algorithms display. 
 Fixes #94

---
 app/src/main/AndroidManifest.xml                      |  4 ++--
 .../java/uk/org/openseizuredetector/MainActivity.java |  7 ++++++-
 app/src/main/res/layout/main.xml                      | 11 +++++++++--
 app/src/main/res/values/strings.xml                   |  8 ++++----
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0599cf6..53e61a6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:versionCode="119"
-    android:versionName="4.1.5">
+    android:versionCode="120"
+    android:versionName="4.1.6">
     <!-- android:allowBackup="false" -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
diff --git a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java
index e0bf5f2..ba6132e 100644
--- a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java
+++ b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java
@@ -530,6 +530,10 @@ public class MainActivity extends AppCompatActivity {
                         tv.setBackgroundColor(okColour);
                         tv.setTextColor(okTextColour);
                     }
+                    tv = (TextView) findViewById(R.id.algsTv);
+                    tv.setText("Algorithms");
+                    tv.setBackgroundColor(okColour);
+                    tv.setTextColor(okTextColour);
                     tv = (TextView) findViewById(R.id.osdAlgTv);
                     tv.setText("OSD ");
                     if (mConnection.mSdServer.mSdData.mOsdAlarmActive) {
@@ -574,7 +578,7 @@ public class MainActivity extends AppCompatActivity {
                         tv.setTextColor(okTextColour);
                         tv.setPaintFlags(tv.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
                     }
-                    tv = (TextView) findViewById(R.id.fallAlgTv);
+                    /* tv = (TextView) findViewById(R.id.fallAlgTv);
                     tv.setText("Fall ");
                     if (mConnection.mSdServer.mSdData.mFallActive) {
                         tv.setBackgroundColor(okColour);
@@ -585,6 +589,7 @@ public class MainActivity extends AppCompatActivity {
                         tv.setTextColor(okTextColour);
                         tv.setPaintFlags(tv.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
                     }
+                     */
                 }
                 tv = (TextView) findViewById(R.id.serverIpTv);
                 tv.setText(getString(R.string.AccessServerAt) + " http://"
diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml
index 7e6fbfd..026c1f3 100644
--- a/app/src/main/res/layout/main.xml
+++ b/app/src/main/res/layout/main.xml
@@ -33,6 +33,11 @@
                 android:layout_height="wrap_content"
                 android:padding="10dp"
                 android:orientation="vertical">
+                <TextView
+                    android:id="@+id/algsTv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Algorithms" />
 
                 <LinearLayout
                     android:layout_width="wrap_content"
@@ -69,11 +74,13 @@
                         android:layout_height="wrap_content"
                         android:text="---" />
 
-                    <TextView
+                    <!--<TextView
                         android:id="@+id/fallAlgTv"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="---" />
+                        android:text=""
+                        android:visibility="gone"/>
+                        -->
                 </LinearLayout>
             </LinearLayout>
         </LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4abb678..0caf0b8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,10 +3,10 @@
     <string name="app_name">OpenSeizureDetector</string>
     <string name="changelog">
         "\n
-        \nV4.1.5 - Added progress notification to data export, added header to exported .csv file, fixed another notification bug.
-        \nV4.1.4 - Fixed bug in notifications on Android 12, added an Export Data function to save heart rate and accelerometer data to a file.
-        \nV4.1.3 - Fixed display of O2 Saturation in Network Data Source, and added Polish Translations by Jacek Błoniarz-Łuczak.  Fixed crash when displaying main activity during alarm on some devices.  Added adaptive Heart Rate alarms
-        \nV4.1.2 - Added Machine Learning (Artificial Intelligence) Detection Algorithm Option (CNN V0.24) and 'Normal Daily Activity (NDA) logging function
+        \nV4.1.x - Added Machine Learning (Artificial Intelligence) Detection Algorithm Option (CNN V0.24).
+        Added Polish Translations by Jacek Błoniarz-Łuczak.
+        Added an Export Data function to save data to a file.
+        Added adaptive heart rate alarms.
           "</string>
     <string name="UpgradeMsg">
         Please enable the new &lt;b>Data Sharing&lt;/b> feature to help improve OpenSeizureDetector!&lt;br/>