diff --git a/app/release/app-release-2.6.0.apk b/app/release/app-release-2.6.0.apk index b0966ac..4280194 100644 Binary files a/app/release/app-release-2.6.0.apk and b/app/release/app-release-2.6.0.apk differ diff --git a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java index 21a00ac..18789b8 100644 --- a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java +++ b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java @@ -427,12 +427,12 @@ public class MainActivity extends AppCompatActivity { tv.setBackgroundColor(okColour); tv.setTextColor(okTextColour); } else { - tv.setBackgroundColor(warnColour); - tv.setTextColor(warnTextColour); + tv.setBackgroundColor(alarmColour); + tv.setTextColor(alarmTextColour); } } else { if (mConnection.mSdServer.mSdData.pebbleConnected) { - tv.setText("Watch Connected OK"); + tv.setText("HR Alarm OFF"); tv.setBackgroundColor(okColour); tv.setTextColor(okTextColour); diff --git a/app/src/main/java/uk/org/openseizuredetector/StartupActivity.java b/app/src/main/java/uk/org/openseizuredetector/StartupActivity.java index 44e6cbd..32a4205 100644 --- a/app/src/main/java/uk/org/openseizuredetector/StartupActivity.java +++ b/app/src/main/java/uk/org/openseizuredetector/StartupActivity.java @@ -489,10 +489,10 @@ public class StartupActivity extends Activity { + "http://openseizuredetector.org.uk, or the app Facebook page at https://www.facebook.com/openseizuredetector. " + "so I can get in touch if necessary.\nThank you! Graham \ngraham@openseizuredetector.org.uk " + "\n\nChanges in this version:" - + "\n- Added support for 'Wifi Datasources' - initially for the experimental ESP8266 based seizure detector." - + "\n " - + "\n " + + "\n- Upgraded to be compatible with Android Version 8 (a requirement of Google Play Store)" + + "\n- Added support for an experimental Gramin based seizure detector with Heart Rate alarm " + "\n " + + "\n PLEASE NOTE - THIS IS A BETA TEST VERSION SO MAY NOT WORK!" + "\n ." ); // This makes the links display as links, but they do not respond to clicks for some reason... @@ -523,8 +523,10 @@ public class StartupActivity extends Activity { + "http://openseizuredetector.org.uk, or the app Facebook page at https://www.facebook.com/openseizuredetector. " + "so I can get in touch if necessary.\nThank you! Graham \ngraham@openseizuredetector.org.uk " + "\n\nChanges in this version:" - + "\n- Added support for 'Wifi Datasources' - initially for the experimental ESP8266 based seizure detector." - + "\n- Improved logging of network status to help debugging network data source issues." + + "\n- Upgraded to be compatible with Android Version 8 (a requirement of Google Play Store)" + + "\n- Added support for an experimental Gramin based seizure detector with Heart Rate alarm " + + "\n " + + "\n PLEASE NOTE - THIS IS A BETA TEST VERSION SO MAY NOT WORK!" + "\n- " ); // This makes the links display as links, but they do not respond to clicks for some reason... diff --git a/app/src/main/res/layout/about_layout.xml b/app/src/main/res/layout/about_layout.xml index 198f57e..554e8c1 100644 --- a/app/src/main/res/layout/about_layout.xml +++ b/app/src/main/res/layout/about_layout.xml @@ -47,6 +47,7 @@ The following libraries are used:\n - jBeep - http://www.ultraduz.com.br\n - Chartjs - http://www.chartjs.org\n - MPAndroidChart - https://github.com/PhilJay/MPAndroidChart\n +- UCE-Handler - https://github.com/RohitSurwase/UCE-Handler\n \n The Logo is based on Star of life2 by Verdy P, \n Licensed under Public Domain via\n