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

Tidied up mute alarms button wording (in English!) to avoid the button expanding when muted.

Browse Source
This commit is contained in:
Graham Jones
2022-01-10 19:02:07 +00:00
parent e1f46efe30
commit fefca589dd
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -709,7 +709,7 @@ public class MainActivity extends AppCompatActivity {
acceptAlarmButton.setEnabled(true); acceptAlarmButton.setEnabled(true);
} else { } else {
acceptAlarmButton.setText(R.string.AcceptAlarm); acceptAlarmButton.setText(R.string.AcceptAlarm);
acceptAlarmButton.setBackgroundColor(Color.DKGRAY); //acceptAlarmButton.setBackgroundColor(Color.DKGRAY);
if (mConnection.mBound) if (mConnection.mBound)
if ((mConnection.mSdServer.isLatchAlarms()) if ((mConnection.mSdServer.isLatchAlarms())
|| mConnection.mSdServer.mSdData.mFallActive) { || mConnection.mSdServer.mSdData.mFallActive) {
@@ -730,15 +730,17 @@ public class MainActivity extends AppCompatActivity {
if (mConnection.mBound) if (mConnection.mBound)
if (mConnection.mSdServer.isAudibleCancelled()) { if (mConnection.mSdServer.isAudibleCancelled()) {
cancelAudibleButton.setText(getString(R.string.AudibleAlarmsCancelledFor) cancelAudibleButton.setText(getString(R.string.AudibleAlarmsCancelledFor)
+ mConnection.mSdServer. + " " +mConnection.mSdServer.
cancelAudibleTimeRemaining() cancelAudibleTimeRemaining()
+ " sec." + " sec");
+ getString(R.string.PressToReEnable)); cancelAudibleButton.setEnabled(true);
} else { } else {
if (mConnection.mSdServer.mAudibleAlarm) { if (mConnection.mSdServer.mAudibleAlarm) {
cancelAudibleButton.setText(R.string.CancelAudibleAlarms); cancelAudibleButton.setText(R.string.CancelAudibleAlarms);
cancelAudibleButton.setEnabled(true);
} else { } else {
cancelAudibleButton.setText(R.string.AudibleAlarmsOff); cancelAudibleButton.setText(R.string.AudibleAlarmsOff);
cancelAudibleButton.setEnabled(false);
} }
} }

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

@@ -66,9 +66,9 @@
<string name="SMSWillBeSentIn">SMS Will Be Sent in </string> <string name="SMSWillBeSentIn">SMS Will Be Sent in </string>
<string name="Cancel">CANCEL?</string> <string name="Cancel">CANCEL?</string>
<string name="AcceptAlarm">Accept Alarm</string> <string name="AcceptAlarm">Accept Alarm</string>
<string name="AudibleAlarmsCancelledFor">Audible Alarms Cancelled for </string> <string name="AudibleAlarmsCancelledFor">Muted for </string>
<string name="PressToReEnable"> Press to re-enable</string> <string name="PressToReEnable"> Restore</string>
<string name="CancelAudibleAlarms">Cancel Audible Alarms (temporarily)</string> <string name="CancelAudibleAlarms">Mute Alarms</string>
<string name="AudibleAlarmsOff">Audible Alarms OFF</string> <string name="AudibleAlarmsOff">Audible Alarms OFF</string>
<string name="Fault">FAULT</string> <string name="Fault">FAULT</string>
<string name="authenticate">Authenticate</string> <string name="authenticate">Authenticate</string>