[EGD-3959] Gong sound added (#857)

Author: mkamonMdt

changelog.md

@@ -4,6 +4,7 @@
 
 ### Added
 
+* `[meditation]` Added gong sound on meditation intervals
 * `[meditation]` Added basic meditation functionalities and settings
 * `[cellular]` Handling incoming calls and sms in sleep mode
 

module-apps/application-meditation/widgets/MeditationTimer.cpp

@@ -79,12 +79,14 @@ namespace gui
         return true;
     }
 
-    void MeditationTimer::reset(std::chrono::seconds _duration) noexcept
+    void MeditationTimer::reset(std::chrono::seconds _duration, std::chrono::seconds _intervalPeriod) noexcept
     {
         assert(_duration != std::chrono::seconds::zero()); // Pre-condition check.
 
         duration = _duration;
         elapsed  = std::chrono::seconds::zero();
+        intervalPeriod = _intervalPeriod;
+        hasInterval    = _intervalPeriod != std::chrono::seconds::zero();
         onReset();
     }
 
@@ -113,11 +115,13 @@ namespace gui
             if (isFinished() && timeoutCallback != nullptr) {
                 timeoutCallback();
             }
-
             return true;
         }
 
         ++elapsed;
+        if (intervalReached() || isFinished()) {
+            onInterval();
+        }
         update();
         return true;
     }
@@ -131,6 +135,12 @@ namespace gui
     {
         return !isRunning;
     }
+
+    auto MeditationTimer::intervalReached() const noexcept -> bool
+    {
+        return hasInterval && (elapsed.count() % intervalPeriod.count()) == 0;
+    }
+
     auto MeditationTimer::calculatePercentageValue() const noexcept -> unsigned int
     {
         const auto percentage = static_cast<float>(elapsed.count()) / duration.count();
@@ -142,11 +152,21 @@ namespace gui
         isRunning = false;
     }
 
-    void MeditationTimer::setTimerVisible(bool isVisible) noexcept
+    void MeditationTimer::setCounterVisible(bool isVisible) noexcept
     {
         timer->setVisible(isVisible);
     }
 
+    namespace
+    {
+        constexpr auto intervalSoundPath = "assets/audio/ringtone.wav";
+    }
+
+    void MeditationTimer::onInterval() const
+    {
+        AudioServiceAPI::PlaybackStart(application, audio::PlaybackType::Multimedia, intervalSoundPath);
+    }
+
     void MeditationTimer::registerTimeoutCallback(const std::function<void()> &cb)
     {
         timeoutCallback = cb;

module-apps/application-meditation/widgets/MeditationTimer.hpp

@@ -22,13 +22,14 @@ namespace gui
                         app::ApplicationMeditation *app,
                         Item *_parent = nullptr);
 
-        auto onDimensionChanged(const BoundingBox &oldDim, const BoundingBox &newDim) -> bool override;
+        [[nodiscard]] auto onDimensionChanged(const BoundingBox &oldDim, const BoundingBox &newDim) -> bool override;
 
         void start();
         void stop();
-        void reset(std::chrono::seconds _duration) noexcept;
-        auto isStopped() const noexcept -> bool;
-        void setTimerVisible(bool) noexcept;
+        void reset(std::chrono::seconds _duration, std::chrono::seconds period = std::chrono::seconds::zero()) noexcept;
+        [[nodiscard]] auto isStopped() const noexcept -> bool;
+        void onInterval() const;
+        void setCounterVisible(bool isVisible) noexcept;
         void registerTimeoutCallback(const std::function<void()> &);
 
       private:
@@ -38,13 +39,16 @@ namespace gui
         void onReset();
 
         void startTimer();
-        auto onTimerTimeout(Item &self, Timer &timerTask) -> bool;
-        auto isFinished() const noexcept -> bool;
-        auto calculatePercentageValue() const noexcept -> unsigned int;
+        [[nodiscard]] auto onTimerTimeout(Item &self, Timer &timerTask) -> bool;
+        [[nodiscard]] auto isFinished() const noexcept -> bool;
+        [[nodiscard]] auto intervalReached() const noexcept -> bool;
+        [[nodiscard]] auto calculatePercentageValue() const noexcept -> unsigned int;
 
         std::atomic_bool isRunning{false};
         std::chrono::seconds duration{std::chrono::seconds::zero()};
         std::chrono::seconds elapsed{std::chrono::seconds::zero()};
+        std::chrono::seconds intervalPeriod{std::chrono::seconds::zero()};
+        bool hasInterval = false;
 
         app::ApplicationMeditation *application = nullptr;
         CircularProgressBar *progressBar        = nullptr;

module-apps/application-meditation/widgets/TimerSetter.hpp

@@ -18,7 +18,7 @@ namespace gui
             static constexpr int defaultIncrementValue = 15;
 
             bool resetValueOnNumeric = true;
-            int timeInMinutes        = minimalValue;
+            int timeInMinutes        = defaultIncrementValue;
 
           public:
             std::chrono::minutes getTime() const noexcept

module-apps/application-meditation/windows/MeditationTimerWindow.cpp

@@ -59,6 +59,7 @@ void MeditationTimerWindow::onBeforeShow(ShowMode mode, SwitchData *data)
     assert(timerData);
     setVisiblePreparation();
     meditationTime = timerData->getMeditationTime();
+    meditationIntervalPeriod = timerData->getMeditationIntervals();
 
     auto onPreparation = [&]() -> void {
         setVisibleRunning();
@@ -67,13 +68,13 @@ void MeditationTimerWindow::onBeforeShow(ShowMode mode, SwitchData *data)
             application->refreshWindow(RefreshModes::GUI_REFRESH_FAST);
         };
         timer->registerTimeoutCallback(onMeditationEnd);
-        timer->reset(meditationTime);
+        timer->reset(meditationTime, meditationIntervalPeriod);
         timer->start();
         application->refreshWindow(RefreshModes::GUI_REFRESH_FAST);
     };
 
     timer->registerTimeoutCallback(onPreparation);
-    timer->setTimerVisible(timerData->isCounterEnabled());
+    timer->setCounterVisible(timerData->isCounterEnabled());
     timer->reset(timerData->getPreparationTime());
     timer->start();
 }

module-apps/application-meditation/windows/MeditationTimerWindow.hpp

@@ -13,6 +13,7 @@ namespace gui
         Text *meditationInfo   = nullptr;
         bool finished          = false;
         std::chrono::seconds meditationTime{0};
+        std::chrono::seconds meditationIntervalPeriod{0};
 
         void setWidgetVisible(bool topBar, bool bottomBar, bool counter);
         void setVisibleRunning();