13 files changed, 22 insertions(+), 49 deletions(-)

M products/BellHybrid/apps/application-bell-onboarding/ApplicationBellOnBoarding.cpp
M products/BellHybrid/apps/application-bell-settings/ApplicationBellSettings.cpp
M products/BellHybrid/apps/application-bell-settings/windows/BellSettingsBedtimeToneWindow.cpp
M products/BellHybrid/apps/application-bell-settings/windows/advanced/BellSettingsFrontlightWindow.cpp
M products/BellHybrid/apps/application-bell-settings/windows/advanced/BellSettingsTimeUnitsWindow.cpp
M products/BellHybrid/apps/application-bell-settings/windows/alarm_settings/BellSettingsAlarmSettingsSnoozeWindow.cpp
M products/BellHybrid/apps/application-bell-settings/windows/alarm_settings/BellSettingsAlarmSettingsWindow.cpp
M products/BellHybrid/apps/application-bell-settings/windows/alarm_settings/BellSettingsPrewakeUpWindow.cpp
M products/BellHybrid/apps/application-bell-settings/windows/bedtime_settings/BellSettingsBedtimeToneSettingsWindow.cpp
M products/BellHybrid/apps/common/include/common/data/BellFinishedWindowSwitchData.hpp
M products/BellHybrid/apps/common/include/common/windows/BellFinishedWindow.hpp
M products/BellHybrid/apps/common/src/windows/BellFinishedCallbackWindow.cpp
M products/BellHybrid/apps/common/src/windows/BellFinishedWindow.cpp

@@ 135,7 135,7 @@ namespace app
     {
         auto [icon, text] = getDisplayDataFromState();
         switchWindow(gui::window::name::informationOnBoardingWindow,
-                     gui::BellFinishedWindowData::Factory::create(icon, utils::translate(text), windowToReturn));
+                     gui::BellFinishedWindowData::Factory::create(icon, windowToReturn));
     }
 
     OnBoarding::InformationDisplay ApplicationBellOnBoarding::getDisplayDataFromState()

@@ 63,10 63,8 @@ namespace app
             if (gui::window::name::bellSettingsLanguage == getCurrentWindow()->getName()) {
 
                 switchWindow(gui::window::bell_finished::defaultName,
-                             gui::BellFinishedWindowData::Factory::create(
-                                 "big_check_W_G",
-                                 utils::translate("app_bell_settings_advanced_language_set"),
-                                 gui::window::name::bellSettingsAdvanced));
+                             gui::BellFinishedWindowData::Factory::create("circle_success_big",
+                                                                          gui::window::name::bellSettingsAdvanced));
 
                 return sys::msgHandled();
             }

@@ 60,9 60,7 @@ namespace gui
         presenter->saveData();
         application->switchWindow(
             window::bell_finished::defaultName,
-            BellFinishedWindowData::Factory::create("circle_success",
-                                                    utils::translate("app_bell_settings_bedtime_tone_finished"),
-                                                    gui::name::window::main_window));
+            BellFinishedWindowData::Factory::create("circle_success_big", gui::name::window::main_window));
     }
 
     void BellSettingsBedtimeToneWindow::onClose(CloseReason reason)

@@ 62,9 62,7 @@ namespace gui
     {
         application->switchWindow(
             window::bell_finished::defaultName,
-            BellFinishedWindowData::Factory::create("big_check_W_G",
-                                                    utils::translate("app_bell_settings_frontlight_finished_message"),
-                                                    window::name::bellSettingsAdvanced));
+            BellFinishedWindowData::Factory::create("circle_success_big", window::name::bellSettingsAdvanced));
     }
     void BellSettingsFrontlightWindow::onClose(Window::CloseReason)
     {

@@ 22,11 22,9 @@ namespace gui
         buildInterface();
 
         finishedCallback = [this]() {
-            application->switchWindow(window::bell_finished::defaultName,
-                                      BellFinishedWindowData::Factory::create(
-                                          "big_check_W_G",
-                                          utils::translate("app_bell_settings_time_units_finished_message"),
-                                          gui::window::name::bellSettingsAdvanced));
+            application->switchWindow(
+                window::bell_finished::defaultName,
+                BellFinishedWindowData::Factory::create("circle_success_big", gui::window::name::bellSettingsAdvanced));
         };
     }
 

@@ 62,11 62,9 @@ namespace gui
     void BellSettingsAlarmSettingsSnoozeWindow::exit()
     {
         presenter->saveData();
-        application->switchWindow(window::bell_finished::defaultName,
-                                  BellFinishedWindowData::Factory::create(
-                                      "big_check_W_G",
-                                      utils::translate("app_bell_settings_alarm_settings_snooze_finished"),
-                                      BellSettingsAlarmSettingsMenuWindow::name));
+        application->switchWindow(
+            window::bell_finished::defaultName,
+            BellFinishedWindowData::Factory::create("circle_success_big", BellSettingsAlarmSettingsMenuWindow::name));
     }
     void BellSettingsAlarmSettingsSnoozeWindow::onClose(Window::CloseReason)
     {

@@ 64,10 64,7 @@ namespace gui
         presenter->saveData();
         application->switchWindow(
             window::bell_finished::defaultName,
-            BellFinishedWindowData::Factory::create(
-                "circle_success",
-                utils::translate("app_bell_settings_alarm_settings_alarm_tone_and_light_finished"),
-                BellSettingsAlarmSettingsMenuWindow::name));
+            BellFinishedWindowData::Factory::create("circle_success_big", BellSettingsAlarmSettingsMenuWindow::name));
     }
 
     void BellSettingsAlarmSettingsWindow::onClose(CloseReason reason)

@@ 61,11 61,9 @@ namespace gui
     void BellSettingsPrewakeUpWindow::exit()
     {
         presenter->saveData();
-        application->switchWindow(window::bell_finished::defaultName,
-                                  BellFinishedWindowData::Factory::create(
-                                      "big_check_W_G",
-                                      utils::translate("app_bell_settings_alarm_settings_prewake_up_finished"),
-                                      BellSettingsAlarmSettingsMenuWindow::name));
+        application->switchWindow(
+            window::bell_finished::defaultName,
+            BellFinishedWindowData::Factory::create("circle_success_big", BellSettingsAlarmSettingsMenuWindow::name));
     }
 
     void BellSettingsPrewakeUpWindow::onClose(CloseReason reason)

@@ 63,10 63,7 @@ namespace gui
         presenter->saveData();
         application->switchWindow(
             BellFinishedWindow::defaultName,
-            BellFinishedWindowData::Factory::create(
-                "circle_success",
-                utils::translate("app_bell_settings_alarm_settings_alarm_tone_and_light_finished"),
-                app::applicationBellSettingsName));
+            BellFinishedWindowData::Factory::create("circle_success_big", app::applicationBellSettingsName));
     }
 
     void BellSettingsBedtimeToneSettingsWindow::onClose(CloseReason reason)

@@ 14,22 14,20 @@ namespace gui
         struct Factory
         {
             static std::unique_ptr<BellFinishedWindowData> create(const UTF8 &icon,
-                                                                  const UTF8 &text,
                                                                   const std::string &windowToReturn)
             {
-                return std::unique_ptr<BellFinishedWindowData>(new BellFinishedWindowData(icon, text, windowToReturn));
+                return std::unique_ptr<BellFinishedWindowData>(new BellFinishedWindowData(icon, windowToReturn));
             }
         };
 
         UTF8 icon{};
-        UTF8 text{};
         std::string windowToReturn;
 
       private:
         BellFinishedWindowData() = default;
 
-        BellFinishedWindowData(const UTF8 &icon, const UTF8 &text, const std::string &windowToReturn)
-            : icon{icon}, text{text}, windowToReturn{windowToReturn}
+        BellFinishedWindowData(const UTF8 &icon, const std::string &windowToReturn)
+            : icon{icon}, windowToReturn{windowToReturn}
         {}
     };
 } // namespace gui

@@ 12,8 12,6 @@ namespace gui
     namespace window::bell_finished
     {
         constexpr inline auto defaultName         = "BellFinishedWindow";
-        constexpr inline auto image_top_margin    = 112U;
-        constexpr inline auto image_bottom_margin = 30U;
     } // namespace window::bell_finished
 
     class Icon;

@@ 32,7 32,7 @@ namespace gui
         bottomBar->setVisible(false);
 
         icon = new Icon(this, 0, 0, style::window_width, style::window_height, {}, {});
-        icon->text->setFont(style::window::font::verybiglight);
+        icon->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Center));
     }
 
     bool BellFinishedCallbackWindow::onInput(const InputEvent &inputEvent)


@@ 52,7 52,6 @@ namespace gui
 
         if (auto metadata = dynamic_cast<BellFinishedCallbackWindowSwitchData *>(data)) {
             icon->image->set(metadata->icon);
-            icon->text->setRichText(metadata->text);
             finishCallback = metadata->finishCallback;
         }
     }

@@ 27,13 27,9 @@ namespace gui
         statusBar->setVisible(false);
         header->setTitleVisibility(false);
         bottomBar->setVisible(false);
-
         if (icon == nullptr) {
             icon = new Icon(this, 0, 0, style::window_width, style::window_height, {}, {});
-            icon->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Top));
-            icon->image->setMargins(
-                {0, window::bell_finished::image_top_margin, 0, window::bell_finished::image_bottom_margin});
-            icon->text->setFont(style::window::font::verybiglight);
+            icon->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Center));
         }
     }
 


@@ 52,7 48,7 @@ namespace gui
 
         if (auto metadata = dynamic_cast<BellFinishedWindowData *>(data)) {
             icon->image->set(metadata->icon);
-            icon->text->setRichText(metadata->text);
+            icon->resizeItems();
             windowToReturn = metadata->windowToReturn;
         }
     }