diff options
| author | Francesco Gazzetta <fgaz@fgaz.me> | 2022-01-17 17:50:55 (GMT) |
|---|---|---|
| committer | Daniel Thompson <daniel.thompson@linaro.org> | 2022-02-02 12:20:06 (GMT) |
| commit | 5f28d05cc093b54153a72860dc68af7f01dd4e19 (patch) | |
| tree | ac33545431c1fcc6cd60f572e2c62583013de0b3 | |
| parent | 4b7cf885767e94b3a212d18bdcb4d76be519d547 (diff) | |
Alarm: swap stop and snooze controls
It was too easy to accidentally stop the alarm by touching the screen,
either by moving around or by trying to press the side button to snooze.
Snoozing instead of stopping is better than the opposite because it
poses no risk of missing the alarm, so we swap the controls to:
touch -> snooze
press -> stop
Signed-off-by: Francesco Gazzetta <fgaz@fgaz.me>
| -rw-r--r-- | wasp/apps/alarm.py | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/wasp/apps/alarm.py b/wasp/apps/alarm.py index 227a677..662b099 100644 --- a/wasp/apps/alarm.py +++ b/wasp/apps/alarm.py @@ -147,14 +147,12 @@ class AlarmApp: def press(self, button, state): """"Notify the application of a button press event.""" - if self.page == _RINGING_PAGE: - self._snooze() wasp.system.navigate(wasp.EventType.HOME) def swipe(self, event): """"Notify the application of a swipe event.""" if self.page == _RINGING_PAGE: - self._silence_alarm() + self._snooze() elif self.page > _HOME_PAGE: self._save_alarm() self._draw() @@ -164,7 +162,7 @@ class AlarmApp: def touch(self, event): """Notify the application of a touchscreen touch event.""" if self.page == _RINGING_PAGE: - self._silence_alarm() + self._snooze() elif self.page > _HOME_PAGE: if self.hours_wid.touch(event) or self.min_wid.touch(event): return @@ -239,11 +237,13 @@ class AlarmApp: draw.fill() draw.set_font(fonts.sans24) draw.string("Alarm", 0, 150, width=240) + draw.string("Touch to snooze", 0, 180, width=240) draw.blit(icon, 73, 50) draw.line(35, 1, 35, 239) - draw.string('Z', 10, 80) - draw.string('z', 10, 110) - draw.string('z', 10, 140) + draw.string('S', 10, 65) + draw.string('t', 10, 95) + draw.string('o', 10, 125) + draw.string('p', 10, 155) def _draw_edit_page(self): draw = wasp.watch.drawable @@ -315,12 +315,6 @@ class AlarmApp: now = wasp.watch.rtc.get_localtime() alarm = (now[0], now[1], now[2], now[3], now[4] + 10, now[5], 0, 0, 0) wasp.system.set_alarm(time.mktime(alarm), self._alert) - - def _silence_alarm(self): - mute = wasp.watch.display.mute - mute(True) - self._draw() - mute(False) wasp.system.navigate(wasp.EventType.HOME) def _set_pending_alarms(self): |