From 4f649a85448fc79b55202d9db0e8f4c8828975e3 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Tue, 18 Jan 2022 19:08:03 +0200
Subject: Improved alarm alert handling

---
 src/displayapp/screens/Alarm.h | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/displayapp/screens/Alarm.h')

diff --git a/src/displayapp/screens/Alarm.h b/src/displayapp/screens/Alarm.h
index a7f35232..f74dd68e 100644
--- a/src/displayapp/screens/Alarm.h
+++ b/src/displayapp/screens/Alarm.h
@@ -27,28 +27,34 @@ namespace Pinetime {
     namespace Screens {
       class Alarm : public Screen {
       public:
-        Alarm(DisplayApp* app, Controllers::AlarmController& alarmController, Pinetime::Controllers::Settings& settingsController);
+        Alarm(DisplayApp* app,
+              Controllers::AlarmController& alarmController,
+              Pinetime::Controllers::Settings& settingsController,
+              System::SystemTask& systemTask);
         ~Alarm() override;
         void SetAlerting();
         void OnButtonEvent(lv_obj_t* obj, lv_event_t event);
         bool OnButtonPushed() override;
+        bool OnTouchEvent(TouchEvents event) override;
+        void StopAlerting();
 
       private:
         uint8_t alarmHours;
         uint8_t alarmMinutes;
         Controllers::AlarmController& alarmController;
         Controllers::Settings& settingsController;
+        System::SystemTask& systemTask;
 
         lv_obj_t *time, *lblampm, *btnStop, *txtStop, *btnMinutesUp, *btnMinutesDown, *btnHoursUp, *btnHoursDown, *txtMinUp,
           *txtMinDown, *txtHrUp, *txtHrDown, *btnRecur, *txtRecur, *btnInfo, *txtInfo, *enableSwitch;
         lv_obj_t* txtMessage = nullptr;
         lv_obj_t* btnMessage = nullptr;
+        lv_task_t* taskStopAlarm = nullptr;
 
         enum class EnableButtonState { On, Off, Alerting };
         void SetRecurButtonState();
         void SetSwitchState(lv_anim_enable_t anim);
         void SetAlarm();
-        void StopAlerting();
         void ShowInfo();
         void HideInfo();
         void ToggleRecurrence();
-- 
cgit v1.2.3-70-g09d2