From 026527d57681646b75303128e643b2ad9ff1f7ed Mon Sep 17 00:00:00 2001
From: Victor Kareh <vkareh@redhat.com>
Date: Thu, 9 Jan 2025 16:41:35 -0500
Subject: [PATCH] alarm: Long press to stop alarm

This change prevents accidentally turning off alarm by ensuring that
there is a deliberate long press, similar to resetting the Timer app.
---
 src/displayapp/screens/Alarm.cpp | 49 +++++++++++++++++++++++++++++---
 src/displayapp/screens/Alarm.h   | 10 +++++++
 2 files changed, 55 insertions(+), 4 deletions(-)

diff --git a/src/displayapp/screens/Alarm.cpp b/src/displayapp/screens/Alarm.cpp
index 4cf4392157..9bec7a139f 100644
--- a/src/displayapp/screens/Alarm.cpp
+++ b/src/displayapp/screens/Alarm.cpp
@@ -74,6 +74,13 @@ Alarm::Alarm(Controllers::AlarmController& alarmController,
   lv_label_set_text_static(colonLabel, ":");
   lv_obj_align(colonLabel, lv_scr_act(), LV_ALIGN_CENTER, 0, -29);
 
+  progressStop = lv_bar_create(lv_scr_act(), nullptr);
+  lv_bar_set_range(progressStop, 0, 240);
+  lv_bar_set_value(progressStop, 0, LV_ANIM_OFF);
+  lv_obj_set_size(progressStop, 240, 50);
+  lv_obj_align(progressStop, nullptr, LV_ALIGN_CENTER, 0, 0);
+  lv_obj_set_style_local_bg_color(progressStop, LV_BAR_PART_INDIC, LV_STATE_DEFAULT, LV_COLOR_ORANGE);
+
   btnStop = lv_btn_create(lv_scr_act(), nullptr);
   btnStop->user_data = this;
   lv_obj_set_event_cb(btnStop, btnEventHandler);
@@ -122,12 +129,27 @@ Alarm::Alarm(Controllers::AlarmController& alarmController,
   } else {
     SetSwitchState(LV_ANIM_OFF);
   }
+
+  taskRefresh = lv_task_create(RefreshTaskCallback, 50, LV_TASK_PRIO_MID, this);
+}
+
+void Alarm::Refresh() {
+  if (stopBtnPressing && xTaskGetTickCount() > stopBtnPressTime + pdMS_TO_TICKS(150)) {
+    stopPosition += 15;
+    if (stopPosition > 240) {
+      ResetStopProgress();
+      StopAlerting();
+    } else {
+      UpdateStopProgress();
+    }
+  }
 }
 
 Alarm::~Alarm() {
   if (alarmController.IsAlerting()) {
     StopAlerting();
   }
+  lv_task_del(taskRefresh);
   lv_obj_clean(lv_scr_act());
   alarmController.SaveAlarm();
 }
@@ -139,12 +161,31 @@ void Alarm::DisableAlarm() {
   }
 }
 
+void Alarm::StopButtonPressed() {
+  stopBtnPressTime = xTaskGetTickCount();
+  stopBtnPressing = true;
+}
+
+void Alarm::ResetStopProgress() {
+  stopBtnPressing = false;
+  stopPosition = 0;
+  UpdateStopProgress();
+}
+
+void Alarm::UpdateStopProgress() {
+  lv_bar_set_value(progressStop, stopPosition, LV_ANIM_OFF);
+}
+
 void Alarm::OnButtonEvent(lv_obj_t* obj, lv_event_t event) {
-  if (event == LV_EVENT_CLICKED) {
-    if (obj == btnStop) {
-      StopAlerting();
-      return;
+  if (obj == btnStop) {
+    if (event == LV_EVENT_PRESSED) {
+      StopButtonPressed();
+    } else if (event == LV_EVENT_RELEASED || event == LV_EVENT_PRESS_LOST) {
+      ResetStopProgress();
     }
+    return;
+  }
+  if (event == LV_EVENT_CLICKED) {
     if (obj == btnInfo) {
       ShowInfo();
       return;
diff --git a/src/displayapp/screens/Alarm.h b/src/displayapp/screens/Alarm.h
index a875b2756e..e9c9529dd3 100644
--- a/src/displayapp/screens/Alarm.h
+++ b/src/displayapp/screens/Alarm.h
@@ -35,12 +35,15 @@ namespace Pinetime {
                        System::SystemTask& systemTask,
                        Controllers::MotorController& motorController);
         ~Alarm() override;
+        void Refresh() override;
         void SetAlerting();
         void OnButtonEvent(lv_obj_t* obj, lv_event_t event);
         bool OnButtonPushed() override;
         bool OnTouchEvent(TouchEvents event) override;
         void OnValueChanged();
         void StopAlerting();
+        void StopButtonPressed();
+        void ResetStopProgress();
 
       private:
         Controllers::AlarmController& alarmController;
@@ -51,6 +54,7 @@ namespace Pinetime {
         lv_obj_t* lblampm = nullptr;
         lv_obj_t* txtMessage = nullptr;
         lv_obj_t* btnMessage = nullptr;
+        lv_task_t* taskRefresh = nullptr;
         lv_task_t* taskStopAlarm = nullptr;
 
         enum class EnableButtonState { On, Off, Alerting };
@@ -62,8 +66,14 @@ namespace Pinetime {
         void HideInfo();
         void ToggleRecurrence();
         void UpdateAlarmTime();
+        void UpdateStopProgress();
         Widgets::Counter hourCounter = Widgets::Counter(0, 23, jetbrains_mono_76);
         Widgets::Counter minuteCounter = Widgets::Counter(0, 59, jetbrains_mono_76);
+
+        lv_obj_t* progressStop;
+        bool stopBtnPressing = false;
+        TickType_t stopBtnPressTime = 0;
+        lv_coord_t stopPosition = 0;
       };
     }