gudbjartur22/clinx02-androidpebble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed some more hard-coded strings.

Browse Source
This commit is contained in:
Graham Jones
2023-02-09 20:59:51 +00:00
parent b3677038f9
commit a6770a6fb7
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/release/app-release-4.1.3f.apk → app/release/app-release-4.1.3g.apk
View File

Binary file not shown.

2
app/src/main/AndroidManifest.xml
View File

@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
package="uk.org.openseizuredetector" package="uk.org.openseizuredetector"
android:versionCode="115" android:versionCode="115"
android:versionName="4.1.3f"> android:versionName="4.1.3g">
<!-- android:allowBackup="false" --> <!-- android:allowBackup="false" -->
<uses-permission android:name="android.permission.BLUETOOTH" /> <uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />

6
app/src/main/java/uk/org/openseizuredetector/MainActivity.java
View File

@@ -575,7 +575,7 @@ public class MainActivity extends AppCompatActivity {
tv.setPaintFlags(tv.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG); tv.setPaintFlags(tv.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
} }
tv = (TextView) findViewById(R.id.fallAlgTv); tv = (TextView) findViewById(R.id.fallAlgTv);
tv.setText("Fall"); tv.setText("Fall ");
if (mConnection.mSdServer.mSdData.mFallActive) { if (mConnection.mSdServer.mSdData.mFallActive) {
tv.setBackgroundColor(okColour); tv.setBackgroundColor(okColour);
tv.setTextColor(okTextColour); tv.setTextColor(okTextColour);
@@ -650,7 +650,7 @@ public class MainActivity extends AppCompatActivity {
+ getString(R.string.SpO2)+" = " + mConnection.mSdServer.mSdData.mO2Sat + "%"); + getString(R.string.SpO2)+" = " + mConnection.mSdServer.mSdData.mO2Sat + "%");
} else { } else {
tv.setText(getString(R.string.HR_Equals) + mConnection.mSdServer.mSdData.mHR + " bpm\n" 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) { if (mConnection.mSdServer.mSdData.mHRAlarmStanding || mConnection.mSdServer.mSdData.mO2SatAlarmStanding) {
tv.setBackgroundColor(alarmColour); tv.setBackgroundColor(alarmColour);
@@ -710,7 +710,7 @@ public class MainActivity extends AppCompatActivity {
tv.setText(getString(R.string.data_sharing_status) tv.setText(getString(R.string.data_sharing_status)
+ ": " + ": "
+ getString(R.string.data_sharing_setup_ok) + getString(R.string.data_sharing_setup_ok)
+ ": " + "NDA Logging"); + ": " + getString(R.string.nda_logging));
else else
tv.setText(getString(R.string.data_sharing_status) tv.setText(getString(R.string.data_sharing_status)
+ ": " + ": "

2
app/src/main/res/values/strings.xml
View File

@@ -471,4 +471,6 @@
<string name="prevent_bat_opt_summary">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)</string> <string name="prevent_bat_opt_summary">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)</string>
<string name="prevent_bat_opt_title">Inhibit Battery Optimisation Warning Dialog</string> <string name="prevent_bat_opt_title">Inhibit Battery Optimisation Warning Dialog</string>
<string name="o2_sat">O2 Sat</string> <string name="o2_sat">O2 Sat</string>
<string name="fall">Fall</string>
<string name="nda_logging">NDA Logging</string>
</resources> </resources>