hollorol/Clockplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix 24 hour numpad not disabling FAB for invalid 3-digit times upon backspacing

Browse Source
This commit is contained in:
Phillip Hsu 2016-08-25 17:35:29 -07:00
parent eaff0fcb5d
commit 5188b7e128
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/philliphsu/clock2/editalarm/NumpadTimePicker.java
View File

@ -408,6 +408,7 @@ public class NumpadTimePicker extends GridLayoutNumpad {
int len = mFormattedInput.length(); int len = mFormattedInput.length();
mFormattedInput.delete(len - 1, len); mFormattedInput.delete(len - 1, len);
if (count() == 3) { if (count() == 3) {
int value = getInput();
// Move the colon from its 4-digit position to its 3-digit position, // Move the colon from its 4-digit position to its 3-digit position,
// unless doing so gives an invalid time. // unless doing so gives an invalid time.
// e.g. 17:55 becomes 1:75, which is invalid. // e.g. 17:55 becomes 1:75, which is invalid.
@ -417,14 +418,19 @@ public class NumpadTimePicker extends GridLayoutNumpad {
// in the 24-hour clock can only go up to 15:5[0-9] or be within the range // in the 24-hour clock can only go up to 15:5[0-9] or be within the range
// [20:00, 23:59] if they are to remain valid when they become three digits. // [20:00, 23:59] if they are to remain valid when they become three digits.
// The is24HourFormat() check is therefore unnecessary. // The is24HourFormat() check is therefore unnecessary.
int value = getInput();
if (value <= 155 || value >= 200 && value <= 235) { if (value <= 155 || value >= 200 && value <= 235) {
mFormattedInput.deleteCharAt(mFormattedInput.indexOf(":")); mFormattedInput.deleteCharAt(mFormattedInput.indexOf(":"));
mFormattedInput.insert(1, ":"); mFormattedInput.insert(1, ":");
} else {
// previously [16:00, 19:59]
mAmPmState = UNSPECIFIED;
} }
} else if (count() == 2) { } else if (count() == 2) {
// Remove the colon // Remove the colon
mFormattedInput.deleteCharAt(mFormattedInput.indexOf(":")); mFormattedInput.deleteCharAt(mFormattedInput.indexOf(":"));
// No time can be valid with only 2 digits in either system.
// I don't think we actually need this, but it can't hurt?
mAmPmState = UNSPECIFIED;
} }
} }