diff --git a/app/release/app-release-4.1.3f.apk b/app/release/app-release-4.1.3g.apk similarity index 68% rename from app/release/app-release-4.1.3f.apk rename to app/release/app-release-4.1.3g.apk index 22eb769..f136fd1 100644 Binary files a/app/release/app-release-4.1.3f.apk and b/app/release/app-release-4.1.3g.apk differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 697668d..e1f835e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" package="uk.org.openseizuredetector" android:versionCode="115" - android:versionName="4.1.3f"> + android:versionName="4.1.3g"> diff --git a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java index fbc691a..dec778a 100644 --- a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java +++ b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java @@ -575,7 +575,7 @@ public class MainActivity extends AppCompatActivity { tv.setPaintFlags(tv.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG); } tv = (TextView) findViewById(R.id.fallAlgTv); - tv.setText("Fall"); + tv.setText("Fall "); if (mConnection.mSdServer.mSdData.mFallActive) { tv.setBackgroundColor(okColour); tv.setTextColor(okTextColour); @@ -650,7 +650,7 @@ public class MainActivity extends AppCompatActivity { + getString(R.string.SpO2)+" = " + mConnection.mSdServer.mSdData.mO2Sat + "%"); } else { tv.setText(getString(R.string.HR_Equals) + mConnection.mSdServer.mSdData.mHR + " bpm\n" - + "O2 Sat = ---%"); + + getString(R.string.SpO2)+" = ---%"); } if (mConnection.mSdServer.mSdData.mHRAlarmStanding || mConnection.mSdServer.mSdData.mO2SatAlarmStanding) { tv.setBackgroundColor(alarmColour); @@ -710,7 +710,7 @@ public class MainActivity extends AppCompatActivity { tv.setText(getString(R.string.data_sharing_status) + ": " + getString(R.string.data_sharing_setup_ok) - + ": " + "NDA Logging"); + + ": " + getString(R.string.nda_logging)); else tv.setText(getString(R.string.data_sharing_status) + ": " diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 43d6edc..82962dc 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -471,4 +471,6 @@ Do not display the battery optimisation dialog on start-up (some phones report that OpenSeizureDetector is optimised, even if it is not, so the dialog is a nuissance) Inhibit Battery Optimisation Warning Dialog O2 Sat + Fall + NDA Logging