From 9cbdd7e966fde83a7d7b1abc081f409841831d84 Mon Sep 17 00:00:00 2001
From: Mateusz Grzegorzek <mateusz.grzegorzek@mudita.com>
Date: Fri, 8 Oct 2021 17:05:39 +0200
Subject: [PATCH] [BH-985] UI Fixes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- [BH-985] Wrong time units
- [BH-991] Fix UI for ringing alarm
- [BH-1005] Time and units - 12 ‘space’ h
- [BH-1007] UI fix - time setting
---
 .../apps-common/widgets/AlarmSetSpinner.cpp   |  3 +-
 .../apps-common/widgets/TimeSetFmtSpinner.cpp | 12 ++++--
 .../apps-common/widgets/TimeSetFmtSpinner.hpp |  4 +-
 .../apps-common/widgets/TimeSetSpinner.cpp    | 41 ++++++++++---------
 .../apps-common/widgets/TimeSetSpinner.hpp    | 41 +++++++++++++++----
 .../windows/BellAlarmWindow.cpp               |  2 +-
 .../presenters/StateController.cpp            | 12 +++---
 .../windows/BellHomeScreenWindow.cpp          |  4 +-
 .../widgets/TimeFormatSetListItem.cpp         |  4 +-
 .../widgets/TimeSetListItem.cpp               |  2 +-
 .../common/widgets/BellStatusClock.hpp        |  1 +
 .../BellHybrid/apps/common/src/TimeUtils.cpp  |  4 +-
 .../common/src/widgets/BellStatusClock.cpp    | 11 +++--
 13 files changed, 91 insertions(+), 50 deletions(-)

diff --git a/module-apps/apps-common/widgets/AlarmSetSpinner.cpp b/module-apps/apps-common/widgets/AlarmSetSpinner.cpp
index 5627bc8539643d06adf1c9749a76ec2c06449d20..0833cf485e0bbb21e0e07e3bb9ef2fe7bc3abbcb 100644
--- a/module-apps/apps-common/widgets/AlarmSetSpinner.cpp
+++ b/module-apps/apps-common/widgets/AlarmSetSpinner.cpp
@@ -26,7 +26,7 @@ namespace gui
         alarmImg->setMargins(Margins(0, 0, 0, 0));
         alarmImg->setMinimumSize(style::alarm_set_spinner::arrow::w, style::alarm_set_spinner::arrow::h);
 
-        timeSpinner = new TimeSetFmtSpinner(this);
+        timeSpinner = new TimeSetFmtSpinner(this, TimeSetSpinner::Size::SMALL);
         timeSpinner->setFont(style::window::font::largelight);
         timeSpinner->setEditMode(EditMode::Browse);
         timeSpinner->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Center));
@@ -103,6 +103,7 @@ namespace gui
             break;
         case Status::RINGING:
             alarmImg->setImage("bell_alarm_ringing_W_G");
+            alarmImg->setMinimumSizeToFitImage();
             break;
         case Status::SNOOZE:
             alarmImg->setImage("bell_alarm_snooze_W_M");
diff --git a/module-apps/apps-common/widgets/TimeSetFmtSpinner.cpp b/module-apps/apps-common/widgets/TimeSetFmtSpinner.cpp
index 496d25faef3392a2f10634f9ec953f1c8932e449..9d1176b3bcec4270cb3d24ffd89ea46f11991769 100644
--- a/module-apps/apps-common/widgets/TimeSetFmtSpinner.cpp
+++ b/module-apps/apps-common/widgets/TimeSetFmtSpinner.cpp
@@ -2,7 +2,6 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "TimeSetFmtSpinner.hpp"
-#include "TimeSetSpinner.hpp"
 
 #include <date/date.h>
 #include <gui/core/FontManager.hpp>
@@ -12,8 +11,13 @@
 namespace gui
 {
 
-    TimeSetFmtSpinner::TimeSetFmtSpinner(
-        Item *parent, uint32_t x, uint32_t y, uint32_t w, uint32_t h, utils::time::Locale::TimeFormat timeFormat)
+    TimeSetFmtSpinner::TimeSetFmtSpinner(Item *parent,
+                                         TimeSetSpinner::Size size,
+                                         uint32_t x,
+                                         uint32_t y,
+                                         uint32_t w,
+                                         uint32_t h,
+                                         utils::time::Locale::TimeFormat timeFormat)
         : HBox{parent, x, y, w, h}
     {
         using namespace utils;
@@ -21,7 +25,7 @@ namespace gui
         setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Center));
         setEdges(RectangleEdge::None);
 
-        timeSetSpinner = new TimeSetSpinner(this, 0, 0, 0, 0);
+        timeSetSpinner = new TimeSetSpinner(this, size, 0, 0, 0, 0);
         timeSetSpinner->setFont(focusFontName, noFocusFontName);
         timeSetSpinner->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Center));
         timeSetSpinner->setMargins(Margins(0, 0, 0, 0));
diff --git a/module-apps/apps-common/widgets/TimeSetFmtSpinner.hpp b/module-apps/apps-common/widgets/TimeSetFmtSpinner.hpp
index 4c8c53dc31c2ab588bb064a823670202d75b32ff..83458ee0a562e45b91ccbfe734952849620e38a0 100644
--- a/module-apps/apps-common/widgets/TimeSetFmtSpinner.hpp
+++ b/module-apps/apps-common/widgets/TimeSetFmtSpinner.hpp
@@ -7,13 +7,12 @@
 #include <gui/widgets/TextConstants.hpp>
 #include <time/time_locale.hpp>
 #include <widgets/spinners/Spinners.hpp>
+#include "TimeSetSpinner.hpp"
 
 #include <string>
 
 namespace gui
 {
-    class TimeSetSpinner;
-
     /// Time set spinner widget class with option for dynamic switching between 24/12-hour format
     /// Automatically recalculates hour upon switching format
     /// Can be used as a basic time displaying widget when @ref EditMode set to 'Browse'
@@ -27,6 +26,7 @@ namespace gui
       public:
         explicit TimeSetFmtSpinner(
             Item *parent                               = nullptr,
+            TimeSetSpinner::Size size                  = TimeSetSpinner::Size::SMALL,
             uint32_t x                                 = 0U,
             uint32_t y                                 = 0U,
             uint32_t w                                 = 0U,
diff --git a/module-apps/apps-common/widgets/TimeSetSpinner.cpp b/module-apps/apps-common/widgets/TimeSetSpinner.cpp
index 9bc637eb966e6f7801696f5eb91005129f8ed879..d0293204a542a0240f06427cb996df934cd1c726 100644
--- a/module-apps/apps-common/widgets/TimeSetSpinner.cpp
+++ b/module-apps/apps-common/widgets/TimeSetSpinner.cpp
@@ -5,6 +5,7 @@
 
 #include <FontManager.hpp>
 #include <RawFont.hpp>
+#include <gui/widgets/ImageBox.hpp>
 #include <gui/widgets/Label.hpp>
 
 static constexpr uint32_t hourMin    = 0;
@@ -17,7 +18,8 @@ static constexpr uint32_t noOfDigits = 2;
 
 namespace gui
 {
-    TimeSetSpinner::TimeSetSpinner(Item *parent, Length x, Length y, Length w, Length h) : HBox(parent, x, y, w, h)
+    TimeSetSpinner::TimeSetSpinner(Item *parent, Size size, Length x, Length y, Length w, Length h)
+        : HBox(parent, x, y, w, h), colonIconData(getColonIconData(size))
     {
         setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Center));
         setEdges(RectangleEdge::None);
@@ -33,12 +35,10 @@ namespace gui
 
         addWidget(hour);
 
-        colon = new Label(this);
-        updateColon(noFocusFontName);
+        colon = new ImageBox(this, 0, 0, colonIconData.w, colonIconData.h, new Image(colonIconData.iconName));
         colon->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Center));
         colon->setEdges(RectangleEdge::None);
         colon->activeItem = false;
-        colon->setText(":");
 
         minute = new Spinner(minuteMin, minuteMax, minuteStep, Boundaries::Continuous);
         updateFont(minute, noFocusFontName);
@@ -107,12 +107,6 @@ namespace gui
         return maxWidth;
     }
 
-    uint32_t TimeSetSpinner::getColonWidth(const std::string &fontName) const noexcept
-    {
-        const RawFont *font = FontManager::getInstance().getFont(fontName);
-        return font->getCharPixelWidth(':');
-    }
-
     auto TimeSetSpinner::handleEnterKey() -> bool
     {
         if (focusItem == hour) {
@@ -152,10 +146,9 @@ namespace gui
         noFocusFontName = std::move(newNoFocusFontName);
 
         updateFont(hour, noFocusFontName);
-        updateColon(noFocusFontName);
         updateFont(minute, noFocusFontName);
 
-        setMinimumSize(hour->widgetMinimumArea.w + getColonWidth(noFocusFontName) + minute->widgetMinimumArea.w,
+        setMinimumSize(hour->widgetMinimumArea.w + colonIconData.w + minute->widgetMinimumArea.w,
                        getFontHeight(noFocusFontName));
         resizeItems();
     }
@@ -171,13 +164,6 @@ namespace gui
         elem->setText(elem->getText());
     }
 
-    auto TimeSetSpinner::updateColon(const std::string &fontName) noexcept -> void
-    {
-        colon->setFont(fontName);
-        colon->setMinimumSize(getColonWidth(fontName), getFontHeight(fontName));
-        colon->setText(":");
-    }
-
     auto TimeSetSpinner::setEditMode(EditMode editMode) noexcept -> void
     {
         this->editMode = editMode;
@@ -230,4 +216,21 @@ namespace gui
             setFocusItem(nullptr);
         }
     }
+
+    auto TimeSetSpinner::getColonIconData(Size size) const noexcept -> ColonIconData
+    {
+        using namespace style::time_set_spinner::colonIconSize;
+        static const ColonIconData smallColonIconData  = {"alarm_colon_W_M", smallW, smallH};
+        static const ColonIconData mediumColonIconData = {"alarm_colon_select_W_M", mediumW, mediumH};
+        static const ColonIconData bigColonIconData    = {"alarm_colon_clock_W_M", bigW, bigH};
+        switch (size) {
+        case Size::SMALL:
+            return smallColonIconData;
+        case Size::MEDIUM:
+            return mediumColonIconData;
+        case Size::BIG:
+            return bigColonIconData;
+        }
+        return {};
+    }
 } /* namespace gui */
diff --git a/module-apps/apps-common/widgets/TimeSetSpinner.hpp b/module-apps/apps-common/widgets/TimeSetSpinner.hpp
index 228ac8d12514aa8ff70eae406feb70b8705f56ba..4798bc163a8fe243a48c226b4f3bea5409dad49c 100644
--- a/module-apps/apps-common/widgets/TimeSetSpinner.hpp
+++ b/module-apps/apps-common/widgets/TimeSetSpinner.hpp
@@ -16,21 +16,45 @@ namespace style::time_set_spinner
     {
         inline constexpr auto size = 6U;
     } // namespace focus
+    namespace colonIconSize
+    {
+        inline constexpr auto smallW  = 4U;
+        inline constexpr auto smallH  = 21U;
+        inline constexpr auto mediumW = 7U;
+        inline constexpr auto mediumH = 26U;
+        inline constexpr auto bigW    = 24U;
+        inline constexpr auto bigH    = 84U;
+    } // namespace colonIconSize
 } // namespace style::time_set_spinner
 
 namespace gui
 {
+    class ImageBox;
+
     class TimeSetSpinner : public HBox
     {
       public:
-        TimeSetSpinner(Item *parent, Length x, Length y, Length w, Length h);
+        enum class Size
+        {
+            SMALL,
+            MEDIUM,
+            BIG
+        };
+
+        struct ColonIconData
+        {
+            std::string iconName;
+            Length w;
+            Length h;
+        };
+
+        TimeSetSpinner(Item *parent, Size size, Length x, Length y, Length w, Length h);
 
         auto setHour(int value) noexcept -> void;
         auto setMinute(int value) noexcept -> void;
         auto setFont(const std::string &newFontName) noexcept -> void;
         auto setFont(std::string newFocusFontName, std::string newNoFocusFontName) noexcept -> void;
         auto updateFont(TextFixedSize *elem, const std::string &fontName) noexcept -> void;
-        auto updateColon(const std::string &fontName) noexcept -> void;
         auto setEditMode(EditMode editMode) noexcept -> void;
         auto setHourMax(std::uint32_t newMax) noexcept -> void;
         auto setHourMin(std::uint32_t newMin) noexcept -> void;
@@ -38,11 +62,12 @@ namespace gui
         [[nodiscard]] auto getMinute() const noexcept -> int;
 
       private:
-        Spinner *hour        = nullptr;
-        Label *colon         = nullptr;
-        Spinner *minute      = nullptr;
-        EditMode editMode    = EditMode::Edit;
-        Item *lastFocus      = nullptr;
+        Spinner *hour   = nullptr;
+        ImageBox *colon = nullptr;
+        const ColonIconData colonIconData{};
+        Spinner *minute             = nullptr;
+        EditMode editMode           = EditMode::Edit;
+        Item *lastFocus             = nullptr;
         std::string focusFontName   = style::window::font::supersizeme;
         std::string noFocusFontName = style::window::font::supersizemelight;
 
@@ -52,6 +77,6 @@ namespace gui
         auto onInput(const InputEvent &inputEvent) -> bool override;
         [[nodiscard]] auto getFontHeight(const std::string &fontName) const noexcept -> uint16_t;
         [[nodiscard]] auto getWidestDigitWidth(const std::string &fontName) const noexcept -> uint32_t;
-        [[nodiscard]] auto getColonWidth(const std::string &fontName) const noexcept -> uint32_t;
+        [[nodiscard]] auto getColonIconData(Size size) const noexcept -> ColonIconData;
     };
 } /* namespace gui */
diff --git a/products/BellHybrid/apps/application-bell-alarm/windows/BellAlarmWindow.cpp b/products/BellHybrid/apps/application-bell-alarm/windows/BellAlarmWindow.cpp
index 2766bdb50307d8f0ed39fa4ef77b4da7abc54fd8..061604b465fcef7930604b5bd6d359113c6b533f 100644
--- a/products/BellHybrid/apps/application-bell-alarm/windows/BellAlarmWindow.cpp
+++ b/products/BellHybrid/apps/application-bell-alarm/windows/BellAlarmWindow.cpp
@@ -45,7 +45,7 @@ namespace gui
         topText->activeItem = false;
         topText->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Center));
 
-        timeSetFmtSpinner = new TimeSetFmtSpinner(body->getCenterBox());
+        timeSetFmtSpinner = new TimeSetFmtSpinner(body->getCenterBox(), TimeSetSpinner::Size::MEDIUM);
         timeSetFmtSpinner->setFont(bell_alarm_style::time_set_fmt_spinner::focusFont,
                                    bell_alarm_style::time_set_fmt_spinner::noFocusFont);
         timeSetFmtSpinner->setMaximumSize(style::bell_base_layout::w, style::bell_base_layout::h);
diff --git a/products/BellHybrid/apps/application-bell-main/presenters/StateController.cpp b/products/BellHybrid/apps/application-bell-main/presenters/StateController.cpp
index eb15acfa537af7239f32316135fb3732214329e5..21ea43acec274743b0a94dfd4dc2a46ebcf1b5d0 100644
--- a/products/BellHybrid/apps/application-bell-main/presenters/StateController.cpp
+++ b/products/BellHybrid/apps/application-bell-main/presenters/StateController.cpp
@@ -197,11 +197,13 @@ namespace app::home_screen
 
         namespace AlarmRinging
         {
-            auto entry = [](AbstractView &view, AbstractPresenter &presenter) {
-                presenter.spawnTimer(defaultAlarmRingingTime);
-                view.setAlarmTimeVisible(false);
-                view.setAlarmTriggered();
-            };
+            auto entry =
+                [](AbstractView &view, AbstractTemperatureModel &temperatureModel, AbstractPresenter &presenter) {
+                    presenter.spawnTimer(defaultAlarmRingingTime);
+                    view.setAlarmTimeVisible(false);
+                    view.setAlarmTriggered();
+                    view.setTemperature(temperatureModel.getTemperature());
+                };
             auto exit = [](AbstractPresenter &presenter) { presenter.detachTimer(); };
         } // namespace AlarmRinging
 
diff --git a/products/BellHybrid/apps/application-bell-main/windows/BellHomeScreenWindow.cpp b/products/BellHybrid/apps/application-bell-main/windows/BellHomeScreenWindow.cpp
index 6b8708297f7d8a43fc344c195dd51fe5df87e903..851941922cf9e22225fadde7995a1e6c0e9706cb 100644
--- a/products/BellHybrid/apps/application-bell-main/windows/BellHomeScreenWindow.cpp
+++ b/products/BellHybrid/apps/application-bell-main/windows/BellHomeScreenWindow.cpp
@@ -98,7 +98,7 @@ namespace gui
         alarm->setAlarmStatus(AlarmSetSpinner::Status::DEACTIVATED);
         alarm->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Center));
 
-        time = new TimeSetFmtSpinner(body->centerBox);
+        time = new TimeSetFmtSpinner(body->centerBox, TimeSetSpinner::Size::BIG);
         time->setMaximumSize(style::bell_base_layout::w, style::bell_base_layout::h);
         time->setFont(bellMainStyle::mainWindow::time::font);
         time->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Center));
@@ -160,7 +160,7 @@ namespace gui
     void BellHomeScreenWindow::setTemperature(utils::temperature::Temperature newTemp)
     {
         bottomText->setFont(bellMainStyle::mainWindow::bottomDescription::font_normal);
-        bottomText->setAlignment(Alignment(Alignment::Horizontal::Right, Alignment::Vertical::Center));
+        bottomText->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Center));
         bottomText->setText(utils::temperature::tempToStrDec(newTemp));
         bottomBox->resizeItems();
     }
diff --git a/products/BellHybrid/apps/application-bell-settings/widgets/TimeFormatSetListItem.cpp b/products/BellHybrid/apps/application-bell-settings/widgets/TimeFormatSetListItem.cpp
index 5fc345436a13e48faa2a3d2a211b36903d15f180..5a8a8f34ae9b9a35d590faaaba3634fee0cda44a 100644
--- a/products/BellHybrid/apps/application-bell-settings/widgets/TimeFormatSetListItem.cpp
+++ b/products/BellHybrid/apps/application-bell-settings/widgets/TimeFormatSetListItem.cpp
@@ -12,8 +12,8 @@
 
 namespace
 {
-    constexpr auto fmtSpinner12H = "12h";
-    constexpr auto fmtSpinner24H = "24h";
+    constexpr auto fmtSpinner12H = "12 h";
+    constexpr auto fmtSpinner24H = "24 h";
 } // namespace
 
 namespace gui
diff --git a/products/BellHybrid/apps/application-bell-settings/widgets/TimeSetListItem.cpp b/products/BellHybrid/apps/application-bell-settings/widgets/TimeSetListItem.cpp
index 7fe924cbc4ac73433d2a78949988d4623c297b97..01e9b4326856af983c763da422b10e80d2d664e0 100644
--- a/products/BellHybrid/apps/application-bell-settings/widgets/TimeSetListItem.cpp
+++ b/products/BellHybrid/apps/application-bell-settings/widgets/TimeSetListItem.cpp
@@ -14,7 +14,7 @@ namespace gui
         : BellSideListItem(std::move(description))
     {
         setMinimumSize(style::sidelistview::list_item::w, style::sidelistview::list_item::h);
-        timeSetFmtSpinner = new TimeSetFmtSpinner(body->getCenterBox());
+        timeSetFmtSpinner = new TimeSetFmtSpinner(body->getCenterBox(), TimeSetSpinner::Size::MEDIUM);
         timeSetFmtSpinner->setMaximumSize(style::bell_base_layout::w, style::bell_base_layout::h);
         timeSetFmtSpinner->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Center));
         setFocusItem(body);
diff --git a/products/BellHybrid/apps/common/include/common/widgets/BellStatusClock.hpp b/products/BellHybrid/apps/common/include/common/widgets/BellStatusClock.hpp
index 0b55936a60378540e21321b6adabacf44f8f282c..5882903d9d47f8d4520d90df11be90c1b6ae7470 100644
--- a/products/BellHybrid/apps/common/include/common/widgets/BellStatusClock.hpp
+++ b/products/BellHybrid/apps/common/include/common/widgets/BellStatusClock.hpp
@@ -12,6 +12,7 @@ namespace gui
       public:
         explicit BellStatusClock(
             Item *parent                               = nullptr,
+            TimeSetSpinner::Size size                  = TimeSetSpinner::Size::SMALL,
             uint32_t x                                 = 0U,
             uint32_t y                                 = 0U,
             uint32_t w                                 = 0U,
diff --git a/products/BellHybrid/apps/common/src/TimeUtils.cpp b/products/BellHybrid/apps/common/src/TimeUtils.cpp
index 134e948a93edde863f2e22e944a0ff8a52f70622..c87b79927a94c84dd7c01944edb79e94a7c02f2a 100644
--- a/products/BellHybrid/apps/common/src/TimeUtils.cpp
+++ b/products/BellHybrid/apps/common/src/TimeUtils.cpp
@@ -29,10 +29,10 @@ namespace utils::time
                 return std::to_string(minutes) + " min";
             }
             else if (minutes == 0) {
-                return std::to_string(hours) + " hrs";
+                return std::to_string(hours) + " h";
             }
             else {
-                return std::to_string(hours) + " hrs & " + std::to_string(minutes) + " min";
+                return std::to_string(hours) + " h & " + std::to_string(minutes) + " min";
             }
         }(duration.getHours(), duration.getMinutes());
         return UTF8("<text>" + prefix + "<br />" + translate("app_bellmain_home_screen_bottom_desc_in") + " " +
diff --git a/products/BellHybrid/apps/common/src/widgets/BellStatusClock.cpp b/products/BellHybrid/apps/common/src/widgets/BellStatusClock.cpp
index 39952b7a7b0869f86203e058e99ff93dfd3c059d..9086eaff7de99fcb4e57d2c9ece7e576f94e86ef 100644
--- a/products/BellHybrid/apps/common/src/widgets/BellStatusClock.cpp
+++ b/products/BellHybrid/apps/common/src/widgets/BellStatusClock.cpp
@@ -8,9 +8,14 @@
 namespace gui
 {
 
-    BellStatusClock::BellStatusClock(
-        Item *parent, uint32_t x, uint32_t y, uint32_t w, uint32_t h, utils::time::Locale::TimeFormat timeFormat)
-        : TimeSetFmtSpinner{parent, x, y, w, h, timeFormat}
+    BellStatusClock::BellStatusClock(Item *parent,
+                                     TimeSetSpinner::Size size,
+                                     uint32_t x,
+                                     uint32_t y,
+                                     uint32_t w,
+                                     uint32_t h,
+                                     utils::time::Locale::TimeFormat timeFormat)
+        : TimeSetFmtSpinner{parent, size, x, y, w, h, timeFormat}
     {
         setFont(bell_style::statusClockFont);
         setEditMode(EditMode::Browse);