From 9455ea9b5dbfd2a3968813b2a2ed77920323e995 Mon Sep 17 00:00:00 2001
From: Przemyslaw Brudny <przemyslaw.brudny@mudita.com>
Date: Thu, 7 Oct 2021 11:43:12 +0200
Subject: [PATCH] [EGD-7759] Alarm audio duration fix

Alarm audio duration fix. Changed Alarm audio priority.
Fixed SpinBox bottomBar modes.
---
 .../widgets/SpinBoxOptionSettings.cpp         | 12 ++++++---
 .../widgets/SpinBoxOptionSettings.hpp         |  7 ++++--
 .../windows/apps/AlarmClockWindow.cpp         | 14 ++++-------
 .../display-keypad/DisplayLightWindow.cpp     | 12 +++------
 module-apps/apps-common/widgets/SpinBox.cpp   | 25 ++++++++++++++++---
 module-apps/apps-common/widgets/SpinBox.hpp   |  6 ++++-
 module-audio/Audio/AudioMux.cpp               |  6 ++---
 module-audio/Audio/test/unittest_audio.cpp    |  4 +--
 .../alarms/src/actions/PlayAudioActions.cpp   |  3 +--
 9 files changed, 55 insertions(+), 34 deletions(-)

diff --git a/module-apps/application-settings/widgets/SpinBoxOptionSettings.cpp b/module-apps/application-settings/widgets/SpinBoxOptionSettings.cpp
index 5758d78ce3414f9c453e497ec9d872da8d1c9b9b..05ceae97e2272804ad8c6ccfae58a8644e77530e 100644
--- a/module-apps/application-settings/widgets/SpinBoxOptionSettings.cpp
+++ b/module-apps/application-settings/widgets/SpinBoxOptionSettings.cpp
@@ -11,19 +11,23 @@ namespace gui
                                                  std::uint8_t value,
                                                  std::uint8_t maxValue,
                                                  std::function<bool(uint8_t)> updateCallback,
-                                                 std::function<bool(Item &)> focusChangedCallback,
+                                                 std::function<void(const UTF8 &text)> bottomBarTemporaryMode,
+                                                 std::function<void()> bottomBarRestoreFromTemporaryMode,
                                                  bool indent)
-        : updateCallback(std::move(updateCallback)), maxValue(maxValue), value(value), text(text), indent(indent)
+        : updateCallback(std::move(updateCallback)), bottomBarTemporaryMode(std::move(bottomBarTemporaryMode)),
+          bottomBarRestoreFromTemporaryMode(std::move(bottomBarRestoreFromTemporaryMode)), maxValue(maxValue),
+          value(value), text(text), indent(indent)
     {}
 
     auto SpinBoxOptionSettings::build() const -> ListItem *
     {
-        auto spinBox = new SpinBox(nullptr, text, updateCallback, maxValue, value);
+        auto spinBox = new SpinBox(
+            nullptr, text, updateCallback, maxValue, value, bottomBarTemporaryMode, bottomBarRestoreFromTemporaryMode);
 
         auto optionItem = new gui::ListItem();
         optionItem->setMinimumSize(style::window::default_body_width, style::window::label::big_h);
         optionItem->inputCallback            = spinBox->inputCallback;
-        optionItem->focusChangedCallback     = [spinBox](Item &item) { return spinBox->focusChangedCallback(item); };
+        optionItem->focusChangedCallback     = spinBox->focusChangedCallback;
         optionItem->dimensionChangedCallback = [spinBox](gui::Item &, const BoundingBox &newDim) -> bool {
             spinBox->setArea({0, 0, newDim.w, newDim.h});
             return true;
diff --git a/module-apps/application-settings/widgets/SpinBoxOptionSettings.hpp b/module-apps/application-settings/widgets/SpinBoxOptionSettings.hpp
index 07c2738aea73f36978bb07d372512319bd46e56d..a7f3941ad5e6451be21e6ab889144cc150cc71b7 100644
--- a/module-apps/application-settings/widgets/SpinBoxOptionSettings.hpp
+++ b/module-apps/application-settings/widgets/SpinBoxOptionSettings.hpp
@@ -14,13 +14,16 @@ namespace gui
                               uint8_t value,
                               uint8_t maxValue,
                               std::function<bool(uint8_t)> updateCallback,
-                              std::function<bool(Item &)> focusChangedCallback = nullptr,
-                              bool indent                                      = false);
+                              std::function<void(const UTF8 &text)> bottomBarTemporaryMode,
+                              std::function<void()> bottomBarRestoreFromTemporaryMode,
+                              bool indent = false);
 
         [[nodiscard]] auto build() const -> ListItem * override;
 
       private:
         std::function<bool(uint8_t)> updateCallback;
+        std::function<void(const UTF8 &text)> bottomBarTemporaryMode = nullptr;
+        std::function<void()> bottomBarRestoreFromTemporaryMode      = nullptr;
         std::uint8_t maxValue;
         std::uint8_t value;
         UTF8 text;
diff --git a/module-apps/application-settings/windows/apps/AlarmClockWindow.cpp b/module-apps/application-settings/windows/apps/AlarmClockWindow.cpp
index 0f203baccb76549ead25484f40d26eac29efe6a7..92089db0b1aa491628b250b48a6d3a41a92226fa 100644
--- a/module-apps/application-settings/windows/apps/AlarmClockWindow.cpp
+++ b/module-apps/application-settings/windows/apps/AlarmClockWindow.cpp
@@ -19,7 +19,7 @@ namespace gui
     std::list<Option> AlarmClockWindow::buildOptionsList()
     {
         std::list<gui::Option> optionList;
-        mVibrationsEnabled = mAudioModel->isVibrationEnabled();
+        mVibrationsEnabled   = mAudioModel->isVibrationEnabled();
         mManualVolumeEnabled = mAudioModel->isSystemSoundEnabled();
         mWidgetMaker.addSwitchOption(optionList, utils::translate("app_settings_vibration"), mVibrationsEnabled, [&]() {
             switchVibrationState();
@@ -30,13 +30,6 @@ namespace gui
                                      mManualVolumeEnabled,
                                      [&]() { switchManualVolumeState(); });
 
-        auto focusCallback = [&](gui::Item &item) {
-            if (item.focus) {
-                setBottomBarText(UTF8(), BottomBar::Side::CENTER);
-            }
-            return true;
-        };
-
         if (mManualVolumeEnabled) {
             optionList.emplace_back(std::make_unique<gui::SpinBoxOptionSettings>(
                 utils::translate("app_settings_volume"),
@@ -46,7 +39,10 @@ namespace gui
                     setVolume(value);
                     return true;
                 },
-                focusCallback,
+                [&](const UTF8 &text) {
+                    application->getCurrentWindow()->bottomBarTemporaryMode(text, BottomBar::Side::CENTER, false);
+                },
+                [&]() { application->getCurrentWindow()->bottomBarRestoreFromTemporaryMode(); },
                 true));
         }
 
diff --git a/module-apps/application-settings/windows/display-keypad/DisplayLightWindow.cpp b/module-apps/application-settings/windows/display-keypad/DisplayLightWindow.cpp
index 584861158179b79fa443ceb940a3cae78697700c..4cebb4bcbba1907ce5cc00096e2d8c283e1119ce 100644
--- a/module-apps/application-settings/windows/display-keypad/DisplayLightWindow.cpp
+++ b/module-apps/application-settings/windows/display-keypad/DisplayLightWindow.cpp
@@ -108,19 +108,15 @@ namespace gui
             return true;
         };
 
-        auto setBottomBarOnSpinnerFocus = [&](gui::Item &item) {
-            if (item.focus) {
-                setBottomBarText(utils::translate(style::strings::common::set), BottomBar::Side::CENTER);
-            }
-            return true;
-        };
-
         auto spinner = std::make_unique<gui::SpinBoxOptionSettings>(
             utils::translate("app_settings_display_light_brightness"),
             std::ceil(brightnessValue / brightnessStep),
             std::ceil(screen_light_control::ManualModeParameters::MAX_BRIGHTNESS / brightnessStep),
             setBrightness,
-            setBottomBarOnSpinnerFocus);
+            [&](const UTF8 &text) {
+                application->getCurrentWindow()->bottomBarTemporaryMode(text, BottomBar::Side::CENTER, false);
+            },
+            [&]() { application->getCurrentWindow()->bottomBarRestoreFromTemporaryMode(); });
 
         return spinner;
     }
diff --git a/module-apps/apps-common/widgets/SpinBox.cpp b/module-apps/apps-common/widgets/SpinBox.cpp
index fd0e6170a2d66b8c1411411b5c2644fbbea02589..e2b29ef139eba526e0772c57ebe081e52a291143 100644
--- a/module-apps/apps-common/widgets/SpinBox.cpp
+++ b/module-apps/apps-common/widgets/SpinBox.cpp
@@ -8,12 +8,20 @@
 #include <InputEvent.hpp>
 #include <Text.hpp>
 #include <Image.hpp>
+#include <utility>
 
 namespace gui
 {
-    SpinBox::SpinBox(
-        Item *parent, const std::string &title, UpdateCallback updateCallback, uint8_t maxValue, uint8_t startValue)
-        : HBox(parent, style::window::default_left_margin), updateBarCallback(std::move(updateCallback))
+    SpinBox::SpinBox(Item *parent,
+                     const std::string &title,
+                     UpdateCallback updateCallback,
+                     uint8_t maxValue,
+                     uint8_t startValue,
+                     std::function<void(const UTF8 &text)> bottomBarTemporaryMode,
+                     std::function<void()> bottomBarRestoreFromTemporaryMode)
+        : HBox(parent, style::window::default_left_margin), updateBarCallback(std::move(updateCallback)),
+          bottomBarTemporaryMode(std::move(bottomBarTemporaryMode)),
+          bottomBarRestoreFromTemporaryMode(std::move(bottomBarRestoreFromTemporaryMode))
     {
         setMinimumSize(style::window::default_body_width, style::window::label::big_h);
         setPenWidth(style::window::default_border_no_focus_w);
@@ -29,6 +37,17 @@ namespace gui
             leftArrow->setVisible(item.focus);
             rightArrow->setVisible(item.focus);
             resizeItems();
+
+            if (item.focus) {
+                if (this->bottomBarTemporaryMode) {
+                    this->bottomBarTemporaryMode("");
+                }
+            }
+            else {
+                if (this->bottomBarRestoreFromTemporaryMode) {
+                    this->bottomBarRestoreFromTemporaryMode();
+                }
+            }
             return true;
         };
 
diff --git a/module-apps/apps-common/widgets/SpinBox.hpp b/module-apps/apps-common/widgets/SpinBox.hpp
index 3553f4c36ebb90e289657f6a49dc7d99d9d54495..7c54647bf13bb0c5039e330148b399efa32b84d4 100644
--- a/module-apps/apps-common/widgets/SpinBox.hpp
+++ b/module-apps/apps-common/widgets/SpinBox.hpp
@@ -18,7 +18,9 @@ namespace gui
                 const std::string &title,
                 UpdateCallback updateCallback,
                 std::uint8_t maxValue,
-                std::uint8_t startValue);
+                std::uint8_t startValue,
+                std::function<void(const UTF8 &text)> bottomBarTemporaryMode = nullptr,
+                std::function<void()> bottomBarRestoreFromTemporaryMode      = nullptr);
 
       private:
         auto addArrow(Item *parent, const std::string &arrowName, Alignment::Horizontal aligment, bool visible)
@@ -31,5 +33,7 @@ namespace gui
         Image *leftArrow;
         Image *rightArrow;
         UpdateCallback updateBarCallback;
+        std::function<void(const UTF8 &text)> bottomBarTemporaryMode = nullptr;
+        std::function<void()> bottomBarRestoreFromTemporaryMode      = nullptr;
     };
 } // namespace gui
diff --git a/module-audio/Audio/AudioMux.cpp b/module-audio/Audio/AudioMux.cpp
index 94ff1cce9a962d169a63efc4409a64bee61e8146..a65b2f9bf0366bf7c0d25119e1fe44dc9d10e055 100644
--- a/module-audio/Audio/AudioMux.cpp
+++ b/module-audio/Audio/AudioMux.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "AudioMux.hpp"
@@ -11,8 +11,8 @@ namespace audio
         const std::map<PlaybackType, uint8_t> PlaybackTypePriority = {
             {PlaybackType::Meditation, 1},
             {PlaybackType::CallRingtone, 2},
-            {PlaybackType::Multimedia, 3},
-            {PlaybackType::Alarm, 4},
+            {PlaybackType::Alarm, 3},
+            {PlaybackType::Multimedia, 4},
             {PlaybackType::TextMessageRingtone, 5},
             {PlaybackType::Notifications, 5},
             {PlaybackType::KeypadSound, 6},
diff --git a/module-audio/Audio/test/unittest_audio.cpp b/module-audio/Audio/test/unittest_audio.cpp
index e748c6f4e8fb0005758466d7d8ded235848380e3..853598ce8504c9c86ebd2a289d15e8060bda4745 100644
--- a/module-audio/Audio/test/unittest_audio.cpp
+++ b/module-audio/Audio/test/unittest_audio.cpp
@@ -352,8 +352,8 @@ TEST_CASE("Test AudioMux")
         std::vector<AudioMux::Input> audioInputs;
         AudioMux aMux(audioInputs);
 
-        auto testPlaybackTypeLowPrio  = PlaybackType::Alarm;
-        auto testPlaybackTypeMidPrio  = PlaybackType::Multimedia;
+        auto testPlaybackTypeLowPrio  = PlaybackType::Multimedia;
+        auto testPlaybackTypeMidPrio  = PlaybackType::Alarm;
         auto testPlaybackTypeHighPrio = PlaybackType::CallRingtone;
 
         auto mergableType = PlaybackType::Notifications;
diff --git a/products/PurePhone/alarms/src/actions/PlayAudioActions.cpp b/products/PurePhone/alarms/src/actions/PlayAudioActions.cpp
index 7f3cf996df890ace4145cfed5a4409e8567661da..d50c96c16f0636f3e60922c01c95c8e849fb4cad 100644
--- a/products/PurePhone/alarms/src/actions/PlayAudioActions.cpp
+++ b/products/PurePhone/alarms/src/actions/PlayAudioActions.cpp
@@ -12,7 +12,6 @@
 namespace
 {
     constexpr auto timerName = "playDurationTimer";
-    constexpr std::chrono::seconds defaultTimerTime{30};
 } // namespace
 
 namespace alarms
@@ -59,6 +58,6 @@ namespace alarms
     {
         const auto tonePath = std::filesystem::path{record.musicTone};
         LOG_DEBUG("play some music: %s", record.musicTone.c_str());
-        return play(tonePath, defaultTimerTime);
+        return play(tonePath);
     }
 } // namespace alarms