Skip to content

alarm: Long press to stop alarm #2222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vkareh wants to merge 1 commit into
base: main
Choose a base branch
from
Open

alarm: Long press to stop alarm #2222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 48 additions & 4 deletions src/displayapp/screens/Alarm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,14 @@ 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, progressBarSize);
lv_bar_set_value(progressStop, 0, LV_ANIM_OFF);
lv_obj_set_size(progressStop, progressBarSize, 10);
lv_obj_align(progressStop, nullptr, LV_ALIGN_IN_TOP_MID, 0, 0);
lv_obj_set_style_local_bg_color(progressStop, LV_BAR_PART_INDIC, LV_STATE_DEFAULT, LV_COLOR_ORANGE);
lv_obj_set_hidden(progressStop, true);

btnStop = lv_btn_create(lv_scr_act(), nullptr);
btnStop->user_data = this;
lv_obj_set_event_cb(btnStop, btnEventHandler);
Expand Down Expand Up @@ -122,12 +130,28 @@ 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 (stopBtnPressTime.has_value()) {
TickType_t elapsed = xTaskGetTickCount() - stopBtnPressTime.value();
if (elapsed >= longPressTimeout) {
ResetStopProgress();
StopAlerting();
} else {
lv_coord_t stopPosition = (elapsed * progressBarSize) / longPressTimeout;
UpdateStopProgress(stopPosition);
}
}
}

Alarm::~Alarm() {
if (alarmController.IsAlerting()) {
StopAlerting();
}
lv_task_del(taskRefresh);
lv_obj_clean(lv_scr_act());
alarmController.SaveAlarm();
}
Expand All @@ -139,12 +163,32 @@ void Alarm::DisableAlarm() {
}
}

void Alarm::StopButtonPressed() {
stopBtnPressTime = xTaskGetTickCount();
UpdateStopProgress(0);
lv_obj_set_hidden(progressStop, false);
}

void Alarm::ResetStopProgress() {
stopBtnPressTime = std::nullopt;
lv_obj_set_hidden(progressStop, true);
UpdateStopProgress(0);
}

void Alarm::UpdateStopProgress(lv_coord_t stopPosition) {
lv_bar_set_value(progressStop, progressBarSize - 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;
Expand Down
11 changes: 11 additions & 0 deletions src/displayapp/screens/Alarm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include "displayapp/Controllers.h"
#include "systemtask/WakeLock.h"
#include "Symbols.h"
#include <optional>

namespace Pinetime {
namespace Applications {
Expand All @@ -35,12 +36,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;
Expand All @@ -51,6 +55,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 };
Expand All @@ -62,8 +67,14 @@ namespace Pinetime {
void HideInfo();
void ToggleRecurrence();
void UpdateAlarmTime();
void UpdateStopProgress(lv_coord_t stopPosition);
Widgets::Counter hourCounter = Widgets::Counter(0, 23, jetbrains_mono_76);
Widgets::Counter minuteCounter = Widgets::Counter(0, 59, jetbrains_mono_76);

lv_obj_t* progressStop;
std::optional<TickType_t> stopBtnPressTime;
static constexpr TickType_t longPressTimeout = pdMS_TO_TICKS(1000);
static constexpr lv_coord_t progressBarSize = 240;
};
}

Expand Down