From 45ce3ff5ac1289eb2288d6ce497108156b4aa789 Mon Sep 17 00:00:00 2001 From: Mateusz Piesta Date: Tue, 4 Jan 2022 09:16:22 +0100 Subject: [PATCH] [BH-1353] Invalid snooze msg Fixed invalid snooze msg. --- .../presenters/StateController.cpp | 3 ++- .../common/models/AbstractAlarmModel.hpp | 26 +++++++++---------- .../include/common/models/AlarmModel.hpp | 2 +- .../BellHybrid/apps/common/src/AlarmModel.cpp | 4 +-- 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/products/BellHybrid/apps/application-bell-main/presenters/StateController.cpp b/products/BellHybrid/apps/application-bell-main/presenters/StateController.cpp index 573a0ac8ff7ddc86fc8c9e3c4777a627558d2438..8862b2f17dc0d664074b5a4de326641d48e6b110 100644 --- a/products/BellHybrid/apps/application-bell-main/presenters/StateController.cpp +++ b/products/BellHybrid/apps/application-bell-main/presenters/StateController.cpp @@ -276,7 +276,8 @@ namespace app::home_screen alarmModel.snooze(); view.setHeaderViewMode(HeaderViewMode::SnoozeCountdown); view.setSnoozeTime(alarmModel.getTimeOfNextSnooze()); - const auto bottomDescription = utils::time::getBottomDescription(alarmModel.getSnoozeDuration()); + const auto bottomDescription = + utils::time::getBottomDescription(alarmModel.getSnoozeDuration().count()); view.setBottomDescription(bottomDescription); }; auto exit = [](AbstractPresenter &presenter) { presenter.detachTimer(); }; diff --git a/products/BellHybrid/apps/common/include/common/models/AbstractAlarmModel.hpp b/products/BellHybrid/apps/common/include/common/models/AbstractAlarmModel.hpp index 5cebff40e152e3aa1223d184203c453c83666c5a..8debba8e1d7c980d57405e64ad493b9a661a9551 100644 --- a/products/BellHybrid/apps/common/include/common/models/AbstractAlarmModel.hpp +++ b/products/BellHybrid/apps/common/include/common/models/AbstractAlarmModel.hpp @@ -19,19 +19,19 @@ namespace app public: virtual ~AbstractAlarmModel() noexcept = default; - virtual bool isActive() const = 0; - virtual void setDefaultAlarmTime() = 0; - virtual void setAlarmTime(time_t time) = 0; - virtual time_t getAlarmTime() const = 0; - virtual void activate(bool value) = 0; - virtual std::uint32_t getSnoozeDuration() = 0; - virtual bool isSnoozeAllowed() = 0; - virtual bool isSnoozeActive() = 0; - virtual void turnOff() = 0; - virtual void snooze() = 0; - virtual std::chrono::seconds getTimeToNextSnooze() = 0; - virtual std::time_t getTimeOfNextSnooze() = 0; - virtual alarms::AlarmStatus getAlarmStatus() = 0; + virtual bool isActive() const = 0; + virtual void setDefaultAlarmTime() = 0; + virtual void setAlarmTime(time_t time) = 0; + virtual time_t getAlarmTime() const = 0; + virtual void activate(bool value) = 0; + virtual std::chrono::seconds getSnoozeDuration() const = 0; + virtual bool isSnoozeAllowed() = 0; + virtual bool isSnoozeActive() = 0; + virtual void turnOff() = 0; + virtual void snooze() = 0; + virtual std::chrono::seconds getTimeToNextSnooze() = 0; + virtual std::time_t getTimeOfNextSnooze() = 0; + virtual alarms::AlarmStatus getAlarmStatus() = 0; /// Command model to update its internal data virtual void update(AlarmModelReadyHandler callback = AlarmModelReadyHandler()) = 0; }; diff --git a/products/BellHybrid/apps/common/include/common/models/AlarmModel.hpp b/products/BellHybrid/apps/common/include/common/models/AlarmModel.hpp index e5cf378499d89ec684f3221fe645851a0e304116..7242e7eaaf233a6eb3bc7d8df8c264c2e7995cb6 100644 --- a/products/BellHybrid/apps/common/include/common/models/AlarmModel.hpp +++ b/products/BellHybrid/apps/common/include/common/models/AlarmModel.hpp @@ -32,7 +32,7 @@ namespace app time_t getAlarmTime() const override; void activate(bool value) override; void update(AlarmModelReadyHandler callback) override; - std::uint32_t getSnoozeDuration() override; + std::chrono::seconds getSnoozeDuration() const override; bool isSnoozeAllowed() override; bool isSnoozeActive() override; void turnOff() override; diff --git a/products/BellHybrid/apps/common/src/AlarmModel.cpp b/products/BellHybrid/apps/common/src/AlarmModel.cpp index 4d73e81608d26ed43ff4603609f199114f728970..0659e11c49e9e77a002b4aab226c44de49cd4d8b 100644 --- a/products/BellHybrid/apps/common/src/AlarmModel.cpp +++ b/products/BellHybrid/apps/common/src/AlarmModel.cpp @@ -110,13 +110,13 @@ namespace app } return alarmEventPtr->enabled; } - std::uint32_t AlarmModel::getSnoozeDuration() + std::chrono::seconds AlarmModel::getSnoozeDuration() const { const auto snoozeDurationStr = settings.getValue(bell::settings::Snooze::length, settings::SettingsScope::Global); const auto snoozeDuration = utils::getNumericValue(snoozeDurationStr); - return snoozeDuration; + return std::chrono::minutes{snoozeDuration}; } bool AlarmModel::isSnoozeAllowed() {