From 22d9134476faadbdb0f0f45e2bd796f9d4b754ae Mon Sep 17 00:00:00 2001
From: Lefucjusz <marcin.lyda@mudita.com>
Date: Mon, 6 Nov 2023 16:45:10 +0100
Subject: [PATCH] [MOS-1052] Change VoLTE label from 'beta' to 'experimental'

Changed VoLTE label from 'beta' to
'experimental'.
Fixed transition state label font
size to match the design.
---
 image/system_a/data/lang/Deutsch.json         |  1 +
 image/system_a/data/lang/English.json         |  1 +
 image/system_a/data/lang/Espanol.json         |  1 +
 image/system_a/data/lang/Francais.json        |  1 +
 image/system_a/data/lang/Polski.json          |  1 +
 image/system_a/data/lang/Svenska.json         |  1 +
 .../windows/network/NetworkWindow.cpp         | 22 ++++--
 .../windows/network/NetworkWindow.hpp         |  3 +-
 .../apps-common/options/OptionStyle.hpp       |  3 +-
 .../options/type/OptionSetting.cpp            | 67 ++++++++++++++-----
 .../options/type/OptionSetting.hpp            | 39 +++++------
 .../apps-common/widgets/ButtonTriState.cpp    |  3 +-
 products/PurePhone/PurePhoneMain.cpp          |  2 +-
 pure_changelog.md                             |  1 +
 14 files changed, 99 insertions(+), 47 deletions(-)

diff --git a/image/system_a/data/lang/Deutsch.json b/image/system_a/data/lang/Deutsch.json
index f1fd20b6f41e1567455574d3e303d465f4aff9a7..59a8dfd5cdcd2c4bbde442c5a3a0b843874bf4e1 100644
--- a/image/system_a/data/lang/Deutsch.json
+++ b/image/system_a/data/lang/Deutsch.json
@@ -577,6 +577,7 @@
     "common_disconnect": "TRENNEN",
     "common_edit": "\u00c4NDERN",
     "common_emoji": "EMOJI",
+    "common_experimental": "(experimentell)",
     "common_february": "Februar",
     "common_forget": "VERGESSEN",
     "common_fr": "FR",
diff --git a/image/system_a/data/lang/English.json b/image/system_a/data/lang/English.json
index 1f37071fd980916343824d384f388425dbf218f4..576ec1b784cce47a8e29aef0915d7e79e5009ebd 100644
--- a/image/system_a/data/lang/English.json
+++ b/image/system_a/data/lang/English.json
@@ -579,6 +579,7 @@
     "common_disconnect": "DISCONNECT",
     "common_edit": "EDIT",
     "common_emoji": "EMOJI",
+    "common_experimental": "(experimental)",
     "common_february": "February",
     "common_forget": "FORGET",
     "common_fr": "FR",
diff --git a/image/system_a/data/lang/Espanol.json b/image/system_a/data/lang/Espanol.json
index 2ce3235eb13ba8a6fef7dbe065b369ab02dc842c..50b745342671b25e39abc148fab847267dfb5a68 100644
--- a/image/system_a/data/lang/Espanol.json
+++ b/image/system_a/data/lang/Espanol.json
@@ -577,6 +577,7 @@
     "common_disconnect": "DESCONECTAR",
     "common_edit": "EDITAR",
     "common_emoji": "EMOJI",
+    "common_experimental": "(experimental)",
     "common_february": "Febrero",
     "common_forget": "OLVIDAR",
     "common_fr": "V",
diff --git a/image/system_a/data/lang/Francais.json b/image/system_a/data/lang/Francais.json
index 098c9a9221d9e4f9bfd0b26e2d6e838c611d07cd..ce5adeefb9f17aa28e097fb7c857bf763470d98c 100644
--- a/image/system_a/data/lang/Francais.json
+++ b/image/system_a/data/lang/Francais.json
@@ -544,6 +544,7 @@
     "common_disconnect": "D\u00c9CONNECTER",
     "common_edit": "MODIFIER",
     "common_emoji": "EMOJI",
+    "common_experimental": "(expérimental)",
     "common_february": "F\u00e9vrier",
     "common_forget": "OUBLIER",
     "common_fr": "VE",
diff --git a/image/system_a/data/lang/Polski.json b/image/system_a/data/lang/Polski.json
index c4200224fe2bd71e9d88bae80d529c9864cb1113..5397f1bcc03f40d8e8498d85c0f267620b4085b4 100644
--- a/image/system_a/data/lang/Polski.json
+++ b/image/system_a/data/lang/Polski.json
@@ -571,6 +571,7 @@
     "common_disconnect": "ROZ\u0141\u0104CZ SI\u0118",
     "common_edit": "EDYTUJ",
     "common_emoji": "EMOJI",
+    "common_experimental": "(eksperymentalne)",
     "common_february": "Luty",
     "common_forget": "ZAPOMNIJ",
     "common_fr": "PT",
diff --git a/image/system_a/data/lang/Svenska.json b/image/system_a/data/lang/Svenska.json
index 34f52f8945e8f6f29754edf12edbd3dd8ea70cec..0c3750a7fff064423f82c513721e4c0ce33de870 100644
--- a/image/system_a/data/lang/Svenska.json
+++ b/image/system_a/data/lang/Svenska.json
@@ -401,6 +401,7 @@
     "common_december": "December",
     "common_edit": "REDIGERA",
     "common_emoji": "EMOJI",
+    "common_experimental": "(experimentell)",
     "common_february": "Februari",
     "common_fr": "FR",
     "common_fri": "Fre",
diff --git a/module-apps/application-settings/windows/network/NetworkWindow.cpp b/module-apps/application-settings/windows/network/NetworkWindow.cpp
index 435d7c38db20d32024164c9a2a64154dd9b51c9f..e95ed9944106716bcb6b1e270b2505d5ff724fa7 100644
--- a/module-apps/application-settings/windows/network/NetworkWindow.cpp
+++ b/module-apps/application-settings/windows/network/NetworkWindow.cpp
@@ -46,7 +46,7 @@ namespace gui
             false));
 
         optionsList.emplace_back(std::make_unique<gui::option::OptionSettings>(
-            getVolteLabel(),
+            getVoltePrimaryLabel(),
             [this]([[maybe_unused]] gui::Item &item) {
                 const auto volteState = getVolteStateFromSettingsApp(application);
                 if (!volteState.permitted) {
@@ -80,7 +80,11 @@ namespace gui
                 return true;
             },
             nullptr,
-            getRightItemSetting()));
+            getRightItemSetting(),
+            false,
+            UTF8(),
+            true,
+            getVolteSecondaryLabel()));
 
 #if DISABLED_SETTINGS_OPTIONS == 1
         auto operatorsOn = operatorsSettings->getOperatorsOn();
@@ -124,7 +128,7 @@ namespace gui
         return optionsList;
     }
 
-    auto NetworkWindow::getVolteLabel() -> std::string
+    auto NetworkWindow::getVoltePrimaryLabel() -> std::string
     {
         const auto &volteState = getVolteStateFromSettingsApp(application);
 
@@ -136,14 +140,20 @@ namespace gui
             labelText += ": ";
             labelText += utils::translate("app_settings_network_volte_not_available");
         }
-        else if (volteState.beta) {
-            labelText += " <b>" + utils::translate("common_beta") + "</b>";
-        }
         labelText += "</text>";
 
         return labelText;
     }
 
+    auto NetworkWindow::getVolteSecondaryLabel() -> std::string
+    {
+        const auto &volteState = getVolteStateFromSettingsApp(application);
+        if (volteState.permitted && volteState.beta) {
+            return "<text><b>" + utils::translate("common_experimental") + "</b><text>";
+        }
+        return {};
+    }
+
     auto NetworkWindow::getRightItemSetting() -> option::SettingRightItem
     {
         const auto &volteState = getVolteStateFromSettingsApp(application);
diff --git a/module-apps/application-settings/windows/network/NetworkWindow.hpp b/module-apps/application-settings/windows/network/NetworkWindow.hpp
index ec29d7d71906ea7688a2deb1cdfb95968b9c0ba9..91b1ccec5be79e0941b994040bd7976f52282cf9 100644
--- a/module-apps/application-settings/windows/network/NetworkWindow.hpp
+++ b/module-apps/application-settings/windows/network/NetworkWindow.hpp
@@ -20,7 +20,8 @@ namespace gui
 
       private:
         auto buildOptionsList() -> std::list<Option> override;
-        auto getVolteLabel() -> std::string;
+        auto getVoltePrimaryLabel() -> std::string;
+        auto getVolteSecondaryLabel() -> std::string;
         auto getRightItemSetting() -> option::SettingRightItem;
 
         app::settingsInterface::OperatorsSettings *operatorsSettings = nullptr;
diff --git a/module-apps/apps-common/options/OptionStyle.hpp b/module-apps/apps-common/options/OptionStyle.hpp
index 84f8c11a406e5339cd9090a7c2ec74e27a2092da..49a3cdf7921acf25d9341a0c049e5cbe57f49c7b 100644
--- a/module-apps/apps-common/options/OptionStyle.hpp
+++ b/module-apps/apps-common/options/OptionStyle.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2022, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
@@ -48,6 +48,7 @@ namespace gui::option
         inline constexpr gui::Length option_left_margin   = 10;
         inline constexpr gui::Length option_right_margin  = 10;
         inline constexpr gui::Length option_bottom_margin = style::margins::big;
+        inline constexpr gui::Length option_label_spacer  = style::margins::small;
         inline constexpr uint32_t optionsListTopMargin    = 10U;
         inline constexpr uint32_t optionsListX            = style::window::default_left_margin;
         inline constexpr uint32_t optionsListY            = style::window::default_vertical_pos + optionsListTopMargin;
diff --git a/module-apps/apps-common/options/type/OptionSetting.cpp b/module-apps/apps-common/options/type/OptionSetting.cpp
index c72b59e10817d03f042f684ab94b69650be3ea0b..f4411a4cae7441c640dd66e57790d0dd38aa7b9e 100644
--- a/module-apps/apps-common/options/type/OptionSetting.cpp
+++ b/module-apps/apps-common/options/type/OptionSetting.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include <TextFixedSize.hpp>
@@ -8,15 +8,29 @@
 
 namespace gui::option
 {
+    OptionSettings::OptionSettings(const UTF8 &primaryText,
+                                   std::function<bool(Item &)> activatedCallback,
+                                   std::function<bool(Item &)> focusChangedCallback,
+                                   gui::AppWindow *app,
+                                   gui::option::SettingRightItem rightItem,
+                                   bool indent,
+                                   const UTF8 &textOnRight,
+                                   bool isTextOnRightSmall,
+                                   const UTF8 &secondaryText)
+        : primaryText(primaryText), secondaryText(secondaryText), activatedCallback(std::move(activatedCallback)),
+          focusChangedCallback(std::move(focusChangedCallback)), app(app), rightItem(rightItem), indent(indent),
+          textOnRight(textOnRight), isTextOnRightSmall(isTextOnRightSmall)
+    {}
+
     auto OptionSettings::build() const -> ListItem *
     {
-        auto optionItem = new gui::ListItem();
+        const auto optionItem = new gui::ListItem();
         optionItem->setMinimumSize(style::window::default_body_width, style::window::label::big_h);
         optionItem->setMargins(Margins(0, 0, 0, window::option_bottom_margin));
         optionItem->activatedCallback    = activatedCallback;
         optionItem->focusChangedCallback = focusChangedCallback;
 
-        auto optionBodyHBox = new HBox(optionItem, 0, 0, 0, 0);
+        const auto optionBodyHBox = new HBox(optionItem, 0, 0, 0, 0);
         optionBodyHBox->setAlignment(Alignment(gui::Alignment::Horizontal::Center, gui::Alignment::Vertical::Center));
         style::window::decorate(optionBodyHBox);
 
@@ -26,13 +40,32 @@ namespace gui::option
             return true;
         };
 
-        auto optionText = new TextFixedSize(optionBodyHBox, 0, 0, 0, 0);
-        optionText->drawUnderline(false);
-        optionText->setAlignment(gui::Alignment::Vertical::Center);
-        optionText->setMaximumSize(style::window::default_body_width, style::window::label::big_h);
-        optionText->setMargins(Margins(window::option_left_margin, 0, 0, 0));
-        optionText->setFont(style::window::font::big);
-        optionText->setRichText(text);
+        const auto primaryOptionText = new TextFixedSize(optionBodyHBox, 0, 0, 0, 0);
+        primaryOptionText->drawUnderline(false);
+        primaryOptionText->setAlignment(gui::Alignment::Vertical::Center);
+        primaryOptionText->setMargins(Margins(window::option_left_margin, 0, 0, 0));
+        primaryOptionText->setFont(style::window::font::big);
+        primaryOptionText->setRichText(primaryText);
+
+        if (!secondaryText.empty()) {
+            /* Set primary text box size to use only the space required for text to be shown */
+            primaryOptionText->setMinimumHeightToFitText();
+            primaryOptionText->setMinimumWidthToFitText();
+
+            /* Set secondary text box to take all the remaining space */
+            const auto secondaryOptionText = new TextFixedSize(optionBodyHBox, 0, 0, 0, 0);
+            secondaryOptionText->drawUnderline(false);
+            secondaryOptionText->setAlignment(
+                Alignment(gui::Alignment::Horizontal::Left, gui::Alignment::Vertical::Center));
+            secondaryOptionText->setMaximumSize(style::window::default_body_width, style::window::label::small_h);
+            secondaryOptionText->setMargins(Margins(window::option_label_spacer, 0, 0, 0));
+            secondaryOptionText->setFont(style::window::font::small);
+            secondaryOptionText->setRichText(secondaryText);
+        }
+        else {
+            /* Set primary text box to take all the space */
+            primaryOptionText->setMaximumSize(style::window::default_body_width, style::window::label::big_h);
+        }
 
         std::string imageName;
         ButtonTriState *button = nullptr;
@@ -66,10 +99,9 @@ namespace gui::option
             imageName = "sim2_option_32px_W_G";
             break;
         case SettingRightItem::Text: {
-            auto optionTextRight = new TextFixedSize(optionBodyHBox, 0, 0, 0, 0);
+            const auto optionTextRight = new TextFixedSize(optionBodyHBox, 0, 0, 0, 0);
             optionTextRight->drawUnderline(false);
-            optionTextRight->setFont((textOnRightIsSmall) ? style::window::font::verysmall
-                                                          : style::window::font::medium);
+            optionTextRight->setFont(isTextOnRightSmall ? style::window::font::verysmall : style::window::font::medium);
             optionTextRight->setMinimumWidthToFitText(textOnRight);
             optionTextRight->setMinimumHeight(style::window::label::big_h);
             optionTextRight->setAlignment(
@@ -86,14 +118,19 @@ namespace gui::option
             new gui::Image(optionBodyHBox, 0, 0, 0, 0, imageName);
         }
 
-        if (button) {
+        if (button != nullptr) {
             button->setMargins(Margins(0, 0, window::option_right_margin, 0));
         }
 
         if (indent) {
-            optionText->setMargins(Margins(window::option_left_margin * 2, 0, 0, 0));
+            primaryOptionText->setMargins(Margins(window::option_left_margin * 2, 0, 0, 0));
         }
 
         return optionItem;
     }
+
+    auto OptionSettings::str() const -> std::string
+    {
+        return primaryText + secondaryText;
+    }
 } // namespace gui::option
diff --git a/module-apps/apps-common/options/type/OptionSetting.hpp b/module-apps/apps-common/options/type/OptionSetting.hpp
index 01793e8e8cdbb39c71ba88652995c140183d4b6a..b6396b5fe5f9bf7e2150890f8de16f8ac444247e 100644
--- a/module-apps/apps-common/options/type/OptionSetting.hpp
+++ b/module-apps/apps-common/options/type/OptionSetting.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
@@ -10,33 +10,28 @@ namespace gui::option
 {
     class OptionSettings : public option::Base
     {
-      protected:
-        UTF8 text;
-        std::function<bool(Item &)> activatedCallback    = nullptr;
-        std::function<bool(Item &)> focusChangedCallback = nullptr;
-        AppWindow *app                                   = nullptr;
-        SettingRightItem rightItem                       = SettingRightItem::Disabled;
-        bool indent                                      = false;
-        UTF8 textOnRight;
-        bool textOnRightIsSmall = true;
-
       public:
-        OptionSettings(UTF8 text,
+        OptionSettings(const UTF8 &primaryText,
                        std::function<bool(Item &)> activatedCallback,
                        std::function<bool(Item &)> focusChangedCallback,
                        AppWindow *app,
                        SettingRightItem rightItem = SettingRightItem::Disabled,
                        bool indent                = false,
-                       UTF8 textOnRight           = UTF8(),
-                       bool textOnRightIsSmall    = true)
-            : text(std::move(text)), activatedCallback(std::move(activatedCallback)),
-              focusChangedCallback(std::move(focusChangedCallback)), app(app), rightItem(rightItem), indent(indent),
-              textOnRight(std::move(textOnRight)), textOnRightIsSmall(textOnRightIsSmall)
-        {}
+                       const UTF8 &textOnRight    = UTF8(),
+                       bool isTextOnRightSmall    = true,
+                       const UTF8 &secondaryText  = UTF8());
         [[nodiscard]] auto build() const -> ListItem * override;
-        [[nodiscard]] auto str() const -> std::string override
-        {
-            return text;
-        }
+        [[nodiscard]] auto str() const -> std::string override;
+
+      private:
+        UTF8 primaryText;
+        UTF8 secondaryText;
+        std::function<bool(Item &)> activatedCallback    = nullptr;
+        std::function<bool(Item &)> focusChangedCallback = nullptr;
+        AppWindow *app                                   = nullptr;
+        SettingRightItem rightItem                       = SettingRightItem::Disabled;
+        bool indent                                      = false;
+        UTF8 textOnRight;
+        bool isTextOnRightSmall = true;
     };
 } // namespace gui::option
diff --git a/module-apps/apps-common/widgets/ButtonTriState.cpp b/module-apps/apps-common/widgets/ButtonTriState.cpp
index 1e1a28aba298275f600c750c58564247cf0f6b70..7128251e0db221736e2584821020c98e2792398b 100644
--- a/module-apps/apps-common/widgets/ButtonTriState.cpp
+++ b/module-apps/apps-common/widgets/ButtonTriState.cpp
@@ -16,10 +16,10 @@ namespace gui
 
     void ButtonTriState::switchState(State requestedState)
     {
-        setFont(style::window::font::small);
         setPenWidth(style::buttonTriState::penWidth);
 
         const auto setRectangleStyle = [this](State state) {
+            setFont(style::window::font::small);
             setAlignment(Alignment(gui::Alignment::Horizontal::Center, gui::Alignment::Vertical::Center));
             setEdges(RectangleEdge::All);
             setCorners(RectangleRoundedCorner::All);
@@ -30,6 +30,7 @@ namespace gui
         };
 
         const auto setTextOnlyStyle = [this](const std::string &text) {
+            setFont(style::window::font::verysmall);
             setAlignment(Alignment(gui::Alignment::Horizontal::Right, gui::Alignment::Vertical::Center));
             setEdges(RectangleEdge::None);
             setCorners(RectangleRoundedCorner::None);
diff --git a/products/PurePhone/PurePhoneMain.cpp b/products/PurePhone/PurePhoneMain.cpp
index 2d0d4350e713c7267a02c4a3ee5a15e963bdea2e..bd7df77376a6aaa0b97957d9eca8c16d6e65cb1a 100644
--- a/products/PurePhone/PurePhoneMain.cpp
+++ b/products/PurePhone/PurePhoneMain.cpp
@@ -131,7 +131,7 @@ int main()
     if (!sys::SystemWatchdog::getInstance().init()) {
         LOG_ERROR("System watchdog failed to initialize");
         // wait for the hardware watchdog (initialized in reset ISR) to reset the system
-        while (1)
+        while (true)
             ;
     }
 
diff --git a/pure_changelog.md b/pure_changelog.md
index 8b02e47ec9a0607bd28bf5079768f94cbd1068bf..b76db9555c705b9df771c9695b47a251eaf35d61 100644
--- a/pure_changelog.md
+++ b/pure_changelog.md
@@ -10,6 +10,7 @@
 
 * Disabled USB MTP protocol
 * Changed UI flow on discharged device window.
+* Changed VoLTE label from 'beta' to 'experimental'.
 
 ### Fixed