12 files changed, 21 insertions(+), 23 deletions(-)

M image/assets/lang/Deutsch.json
M image/assets/lang/English.json
M image/assets/lang/Espanol.json
M image/assets/lang/Francais.json
M image/assets/lang/Polski.json
M products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingSettingsWindow.hpp
M products/BellHybrid/apps/application-bell-settings/ApplicationBellSettings.cpp
M products/BellHybrid/apps/application-bell-settings/CMakeLists.txt
R products/BellHybrid/apps/application-bell-settings/include/application-bell-settings/windows/{advanced => }/BellSettingsTimeUnitsWindow.hpp
R products/BellHybrid/apps/application-bell-settings/windows/{advanced => }/BellSettingsTimeUnitsWindow.cpp
M products/BellHybrid/apps/application-bell-settings/windows/BellSettingsWindow.cpp
M products/BellHybrid/apps/application-bell-settings/windows/advanced/BellSettingsAdvancedWindow.cpp

@@ 634,7 634,7 @@
   "app_bell_settings_bedtime_settings_volume": "<text>Lautstärke</text>",
   "app_bell_settings_advanced": "Erweitert",
   "app_bell_settings_turn_off": "Ausschalten",
-  "app_bell_settings_advanced_time_units": "Zeit und Einheiten",
+  "app_bell_settings_time_units": "Zeit und Einheiten",
   "app_bell_settings_advanced_language": "Sprache",
   "app_bell_settings_advanced_about": "Über",
   "app_bell_settings_advanced_about_product": "Mudita Harmony",

@@ 607,7 607,7 @@
   "app_bell_onboarding_info_deep_click_correction": "<text font='gt_pressura' weight='light' size='38'>Be more gentle,<br></br>try </text><text font='gt_pressura' weight='regular' size='38'>light click </text><text font='gt_pressura' weight='light' size='38'>this time</text>",
   "app_bell_onboarding_finalize": "Well done!",
   "app_bell_settings_advanced": "Advanced",
-  "app_bell_settings_advanced_time_units": "Time & units",
+  "app_bell_settings_time_units": "Time & units",
   "app_bell_settings_advanced_temp_scale": "Temperature scale",
   "app_bell_settings_advanced_language": "Language",
   "app_bell_settings_advanced_about": "About",

@@ 633,7 633,7 @@
   "app_bell_settings_bedtime_settings_volume": "Volumen",
   "app_bell_settings_advanced": "Avanzados",
   "app_bell_settings_turn_off": "Apagar",
-  "app_bell_settings_advanced_time_units": "Hora y unidades",
+  "app_bell_settings_time_units": "Hora y unidades",
   "app_bell_settings_advanced_language": "Idioma",
   "app_bell_settings_advanced_about": "Información",
   "app_bell_settings_advanced_about_product": "Mudita Harmony",

@@ 603,7 603,7 @@
   "app_bell_settings_bedtime_settings_volume": "Volume",
   "app_bell_settings_advanced": "Avancé",
   "app_bell_settings_turn_off": "Éteindre",
-  "app_bell_settings_advanced_time_units": "Temps et unités",
+  "app_bell_settings_time_units": "Temps et unités",
   "app_bell_settings_advanced_language": "Langue",
   "app_bell_settings_advanced_about": "À propos",
   "app_bell_settings_advanced_about_product": "Mudita Harmony",

@@ 626,7 626,7 @@
   "app_bell_onboarding_info_deep_click_warning": "<text font='gt_pressura' weight='light' size='38'>Głęboko </text><text font='gt_pressura' weight='regular' size='38'>wciśnięty</text>",
   "app_bell_onboarding_info_deep_click_correction": "<text font='gt_pressura' weight='light' size='38'>Bądź bardziej delikatny, <br></br>spróbuj </text><text font='gt_pressura' weight='regular' size='38'>tym razem </text><text font='gt_pressura' weight='light' size='38'>lekko kliknąć</text>",
   "app_bell_settings_advanced": "Zaawansowane",
-  "app_bell_settings_advanced_time_units": "Czas i jednostki",
+  "app_bell_settings_time_units": "Czas i jednostki",
   "app_bell_settings_advanced_temp_scale": "Skala temperatury",
   "app_bell_settings_alarm_settings": "Alarm",
   "app_bell_settings_alarm_settings_title": "Ustawienia alarmu",

@@ 3,7 3,7 @@
 
 #pragma once
 
-#include <application-bell-settings/windows/advanced/BellSettingsTimeUnitsWindow.hpp>
+#include <application-bell-settings/windows/BellSettingsTimeUnitsWindow.hpp>
 
 namespace gui
 {

@@ 18,7 18,6 @@
 #include "presenter/advanced/FrontlightPresenter.hpp"
 #include "windows/advanced/AboutYourBellWindow.hpp"
 #include "windows/advanced/BellSettingsAdvancedWindow.hpp"
-#include "windows/advanced/BellSettingsTimeUnitsWindow.hpp"
 #include "windows/advanced/BellSettingsLanguageWindow.hpp"
 #include "windows/advanced/BellSettingsFrontlightWindow.hpp"
 #include "windows/alarm_settings/BellSettingsAlarmSettingsMenuWindow.hpp"


@@ 27,6 26,7 @@
 #include "windows/alarm_settings/BellSettingsPrewakeUpWindow.hpp"
 #include "windows/BellSettingsBedtimeToneWindow.hpp"
 #include "windows/BellSettingsHomeViewWindow.hpp"
+#include "windows/BellSettingsTimeUnitsWindow.hpp"
 #include "windows/BellSettingsWindow.hpp"
 #include "widgets/DialogYesNo.hpp"
 


@@ 87,15 87,6 @@ namespace app
                               });
 
         windowsFactory.attach(
-            gui::window::name::bellSettingsTimeUnits, [](ApplicationCommon *app, const std::string &name) {
-                auto temperatureUnitModel = std::make_unique<bell_settings::TemperatureUnitModel>(app);
-                auto timeUnitsProvider    = std::make_shared<bell_settings::TimeUnitsModel>(app);
-                auto presenter            = std::make_unique<bell_settings::TimeUnitsWindowPresenter>(
-                    timeUnitsProvider, std::move(temperatureUnitModel));
-                return std::make_unique<gui::BellSettingsTimeUnitsWindow>(app, std::move(presenter));
-            });
-
-        windowsFactory.attach(
             gui::window::name::bellSettingsLanguage, [&](ApplicationCommon *app, const std::string &name) {
                 auto presenter = std::make_unique<bell_settings::LanguageWindowPresenter>(this);
                 return std::make_unique<gui::BellSettingsLanguageWindow>(app, std::move(presenter), name);


@@ 133,6 124,15 @@ namespace app
                 return std::make_unique<gui::BellSettingsBedtimeToneWindow>(app, std::move(presenter));
             });
 
+        windowsFactory.attach(
+            gui::window::name::bellSettingsTimeUnits, [](ApplicationCommon *app, const std::string &name) {
+                auto temperatureUnitModel = std::make_unique<bell_settings::TemperatureUnitModel>(app);
+                auto timeUnitsProvider    = std::make_shared<bell_settings::TimeUnitsModel>(app);
+                auto presenter            = std::make_unique<bell_settings::TimeUnitsWindowPresenter>(
+                    timeUnitsProvider, std::move(temperatureUnitModel));
+                return std::make_unique<gui::BellSettingsTimeUnitsWindow>(app, std::move(presenter));
+            });
+
         windowsFactory.attach(gui::BellTurnOffOptionWindow::defaultName,
                               [](ApplicationCommon *app, const std::string &name) {
                                   return std::make_unique<gui::BellTurnOffOptionWindow>(app);

@@ 52,12 52,12 @@ target_sources(application-bell-settings
         widgets/DialogYesNo.cpp
 
         windows/BellSettingsBedtimeToneWindow.cpp
+        windows/BellSettingsTimeUnitsWindow.cpp
         windows/BellSettingsHomeViewWindow.cpp
         windows/BellSettingsWindow.cpp
         windows/advanced/AboutYourBellWindow.cpp
         windows/advanced/BellSettingsAdvancedWindow.cpp
         windows/advanced/BellSettingsLanguageWindow.cpp
-        windows/advanced/BellSettingsTimeUnitsWindow.cpp
         windows/advanced/BellSettingsFrontlightWindow.cpp
         windows/alarm_settings/BellSettingsAlarmSettingsSnoozeWindow.cpp
         windows/alarm_settings/BellSettingsAlarmSettingsMenuWindow.cpp


@@ 113,7 113,7 @@ target_sources(application-bell-settings
     PUBLIC
         include/application-bell-settings/models/TimeUnitsModel.hpp
         include/application-bell-settings/presenter/TimeUnitsPresenter.hpp
-        include/application-bell-settings/windows/advanced/BellSettingsTimeUnitsWindow.hpp
+        include/application-bell-settings/windows/BellSettingsTimeUnitsWindow.hpp
         include/application-bell-settings/ApplicationBellSettings.hpp
 )
 

@@ 3,7 3,7 @@
 
 #include "application-bell-settings/ApplicationBellSettings.hpp"
 #include "BellSettingsStyle.hpp"
-#include "windows/advanced/BellSettingsTimeUnitsWindow.hpp"
+#include "windows/BellSettingsTimeUnitsWindow.hpp"
 
 #include <gui/input/InputEvent.hpp>
 #include <apps-common/options/OptionStyle.hpp>


@@ 24,7 24,7 @@ namespace gui
         finishedCallback = [this]() {
             application->switchWindow(
                 window::bell_finished::defaultName,
-                BellFinishedWindowData::Factory::create("circle_success_big", gui::window::name::bellSettingsAdvanced));
+                BellFinishedWindowData::Factory::create("circle_success_big", gui::name::window::main_window));
         };
     }
 

@@ 44,6 44,7 @@ namespace gui
 
         addWinSettings(utils::translate("app_bell_settings_alarm_settings"), BellSettingsAlarmSettingsMenuWindow::name);
         addWinSettings(utils::translate("app_bell_settings_bedtime_tone"), window::name::bellSettingsBedtimeTone);
+        addWinSettings(utils::translate("app_bell_settings_time_units"), window::name::bellSettingsTimeUnits);
         addWinSettings(utils::translate("app_bell_settings_advanced"), window::name::bellSettingsAdvanced);
         addWinSettings(utils::translate("app_bell_settings_turn_off"), BellTurnOffOptionWindow::defaultName);
 

@@ 69,9 69,6 @@ namespace gui
                 std::make_unique<gui::option::OptionBellMenu>(name, callback(window), nullptr, this));
         };
 
-        addOption(utils::translate("app_bell_settings_advanced_time_units"),
-                  gui::window::name::bellSettingsTimeUnits,
-                  defaultCallback);
         addOption(utils::translate("app_bell_settings_advanced_language"),
                   gui::window::name::bellSettingsLanguage,
                   defaultCallback);