From cd0cc6dc1a24355eb8637e8b3af1c07dde272c3e Mon Sep 17 00:00:00 2001 From: Mateusz Piesta Date: Tue, 21 Sep 2021 11:15:49 +0200 Subject: [PATCH] [BH-890] Home screen alarm popups Added proper handling of deep up/down keys when in intermediate states (alarm deactivate/activate). --- .../apps/application-bell-main/presenters/StateController.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/products/BellHybrid/apps/application-bell-main/presenters/StateController.cpp b/products/BellHybrid/apps/application-bell-main/presenters/StateController.cpp index 195a24d8e66c9a16cc79d87f1767b52a9b928f1a..cfabfd5571e40280d20bc33eb5b3126bf9d36d3f 100644 --- a/products/BellHybrid/apps/application-bell-main/presenters/StateController.cpp +++ b/products/BellHybrid/apps/application-bell-main/presenters/StateController.cpp @@ -43,7 +43,7 @@ namespace app::home_screen detachTimer(presenter); }; - auto isAlarmActive = [](AbstractAlarmModel &alarmModel) -> bool { return alarmModel.isActive(); }; + auto isAlarmActive = [](AbstractAlarmModel &alarmModel) -> bool { return alarmModel.isActive(); }; auto isSnoozeAllowed = [](AbstractAlarmModel &alarmModel) -> bool { return alarmModel.isSnoozeAllowed(); }; } // namespace Helpers @@ -240,6 +240,7 @@ namespace app::home_screen "DeactivatedWait"_s + sml::on_exit<_> / DeactivatedWait::exit, "DeactivatedWait"_s + event = "Deactivated"_s, "DeactivatedWait"_s + event/ Helpers::switchToMenu = "Deactivated"_s, + "DeactivatedWait"_s + event / Helpers::detachTimer = "ActivatedWait"_s, "DeactivatedEdit"_s + sml::on_entry<_> / AlarmEdit::entry, "DeactivatedEdit"_s + sml::on_exit<_> / AlarmEdit::exit, @@ -259,6 +260,7 @@ namespace app::home_screen "ActivatedWait"_s + sml::on_exit<_> / ActivatedWait::exit, "ActivatedWait"_s + event / Helpers::makeAlarmNonEditable = "Activated"_s, "ActivatedWait"_s + event/ Helpers::switchToMenu = "Activated"_s, + "ActivatedWait"_s + event/ Helpers::detachTimer = "DeactivatedWait"_s, "Activated"_s + sml::on_entry<_> / Activated::entry, "Activated"_s [not Helpers::isAlarmActive] = "Deactivated"_s,