M image/assets/lang/Deutsch.json => image/assets/lang/Deutsch.json +11 -11
@@ 608,7 608,7 @@
"app_bell_goodbye": "Auf Wiedersehen",
"app_bell_settings_time_units_time_fmt_top_message": "Zeitformat",
"app_bell_settings_time_units_time_message": "Zeit",
- "app_bell_settings_advanced_temp_scale": "Temperaturskala",
+ "app_bell_settings_temp_scale": "Temperaturskala",
"app_bell_onboarding_welcome": "Willkommen",
"app_bellmain_home_screen_bottom_desc_dp": "Tief drücken, um zu aktivieren",
"app_bellmain_home_screen_bottom_desc": "Der nächste Alarm klingelt",
@@ 639,14 639,14 @@
"app_bell_settings_advanced": "Erweitert",
"app_bell_settings_turn_off": "Ausschalten",
"app_bell_settings_time_units": "Zeit und Einheiten",
- "app_bell_settings_advanced_language": "Sprache",
- "app_bell_settings_advanced_about": "Information",
- "app_bell_settings_advanced_about_product": "Mudita Harmony",
- "app_bell_settings_advanced_about_version": "<text>OS-Version: <token>$VERSION</token></text>",
- "app_bell_settings_advanced_about_storage_title": "Speicher",
- "app_bell_settings_advanced_about_storage_text": "<text>Verbraucht <token>$USED_MEMORY</token>MB von <token>$TOTAL_MEMORY</token>MB</text>",
- "app_bell_settings_advanced_about_info_title": "Handbuch & Zertifikat-Info",
- "app_bell_settings_advanced_about_info_text": "www.mudita.com",
+ "app_bell_settings_language": "Sprache",
+ "app_bell_settings_about": "Information",
+ "app_bell_settings_about_product": "Mudita Harmony",
+ "app_bell_settings_about_version": "<text>OS-Version: <token>$VERSION</token></text>",
+ "app_bell_settings_about_storage_title": "Speicher",
+ "app_bell_settings_about_storage_text": "<text>Verbraucht <token>$USED_MEMORY</token>MB von <token>$TOTAL_MEMORY</token>MB</text>",
+ "app_bell_settings_about_info_title": "Handbuch & Zertifikat-Info",
+ "app_bell_settings_about_info_text": "www.mudita.com",
"app_bell_settings_alarm_settings_prewake_up": "Sanftes Wecken",
"app_bell_settings_alarm_settings_prewake_up_chime_top_description": "Klang vor dem Aufwachen",
"app_bell_settings_alarm_settings_prewake_up_chime_bottom_description": "vor dem Alarm",
@@ 664,13 664,13 @@
"app_bell_settings_alarm_settings_snooze_chime_interval_bot_desc": "während des Schlummern",
"app_bell_settings_alarm_settings_snooze_chime_tone": "Schlummer-Klang",
"app_bell_settings_alarm_settings_snooze_chime_volume": "Lautstärke",
- "app_bell_settings_advanced_frontlight": "Frontlicht",
+ "app_bell_settings_frontlight": "Frontlicht",
"app_bell_settings_frontlight_mode_top_message": "Frontlichtmodus",
"app_bell_settings_frontlight_mode_auto": "automatisch",
"app_bell_settings_frontlight_mode_on_demand": "manuell",
"app_bell_settings_frontlight_top_message": "Lichtstärke des Frontlichts",
"app_bell_greeting_msg": "Guten Morgen! Stehen Sie auf",
- "app_bell_settings_advanced_factory_reset": "Zurücksetzen",
+ "app_bell_settings_factory_reset": "Zurücksetzen",
"app_bell_settings_display_factory_reset_confirmation": "Zurücksetzen?",
"app_bell_meditation_timer": "Meditation",
"app_bell_meditation_interval_chime": "Intervallschall",
M image/assets/lang/English.json => image/assets/lang/English.json +11 -11
@@ 610,15 610,15 @@
"app_bell_onboarding_welcome": "Welcome",
"app_bell_settings_advanced": "Advanced",
"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",
- "app_bell_settings_advanced_about_product": "Mudita Harmony",
- "app_bell_settings_advanced_about_version": "<text>OS version: <token>$VERSION</token></text>",
- "app_bell_settings_advanced_about_storage_title": "Storage",
- "app_bell_settings_advanced_about_storage_text": "<text><token>$USED_MEMORY</token>MB of <token>$TOTAL_MEMORY</token>MB used</text>",
- "app_bell_settings_advanced_about_info_title": "Manual & certification info",
- "app_bell_settings_advanced_about_info_text": "www.mudita.com",
+ "app_bell_settings_temp_scale": "Temperature scale",
+ "app_bell_settings_language": "Language",
+ "app_bell_settings_about": "About",
+ "app_bell_settings_about_product": "Mudita Harmony",
+ "app_bell_settings_about_version": "<text>OS version: <token>$VERSION</token></text>",
+ "app_bell_settings_about_storage_title": "Storage",
+ "app_bell_settings_about_storage_text": "<text><token>$USED_MEMORY</token>MB of <token>$TOTAL_MEMORY</token>MB used</text>",
+ "app_bell_settings_about_info_title": "Manual & certification info",
+ "app_bell_settings_about_info_text": "www.mudita.com",
"app_bell_settings_alarm_settings": "Alarm",
"app_bell_settings_alarm_settings_title": "Alarm settings",
"app_bell_settings_alarm_settings_tone": "Alarm tone",
@@ 650,7 650,7 @@
"app_bellmain_home_screen_bottom_desc_dp": "Deep press to activate",
"app_bell_alarm_deactivated": "<text>Alarm deactivated</text>",
"app_bell_alarm_set_not_active": "<text>Alarm set.<br />Deep press to activate.</text>",
- "app_bell_settings_advanced_frontlight": "Frontlight",
+ "app_bell_settings_frontlight": "Frontlight",
"app_bell_settings_frontlight_top_message": "Frontlight intensity",
"app_bell_settings_frontlight_mode_top_message": "Frontlight mode",
"app_bell_settings_frontlight_mode_auto": "auto",
@@ 711,6 711,6 @@
"<text>Hejsan!<br />Have a wonderful day!</text>",
"<text>It's a new Day!<br />Spread kindness everywhere you go</text>"
],
- "app_bell_settings_advanced_factory_reset": "Factory reset",
+ "app_bell_settings_factory_reset": "Factory reset",
"app_bell_settings_display_factory_reset_confirmation": "<text>Reset to factory<br></br>settings ?</text>"
}
M image/assets/lang/Espanol.json => image/assets/lang/Espanol.json +11 -11
@@ 613,7 613,7 @@
"app_bell_goodbye": "Adiós",
"app_bell_settings_time_units_time_fmt_top_message": "Formato de hora",
"app_bell_settings_time_units_time_message": "Hora",
- "app_bell_settings_advanced_temp_scale": "Escala de temperatura",
+ "app_bell_settings_temp_scale": "Escala de temperatura",
"app_bell_onboarding_welcome_message": "Mudita Harmony",
"app_bell_onboarding_info_rotate": "<text font='gt_pressura' weight='regular' size='38'>Girar </text><text font='gt_pressura' weight='light' size='38'> para seleccionar</text>",
"app_bell_onboarding_info_light_click": "<text font='gt_pressura' weight='regular' size='38'>Click ligeramente </text><text font='gt_pressura' weight='light' size='38'>para continuar</text>",
@@ 639,15 639,15 @@
"app_bell_settings_advanced": "Avanzados",
"app_bell_settings_turn_off": "Apagar",
"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",
- "app_bell_settings_advanced_about_version": "<text>Versión del SO: <token>$VERSION</token></text>",
- "app_bell_settings_advanced_about_storage_title": "Almacenamiento",
- "app_bell_settings_advanced_about_storage_text": "<text>Usados <token>$USED_MEMORY</token>MB de <token>$TOTAL_MEMORY</token>MB</text>",
- "app_bell_settings_advanced_about_info_title": "Manual y certificación",
- "app_bell_settings_advanced_about_info_text": "www.mudita.com",
- "app_bell_settings_advanced_frontlight": "Luz frontal",
+ "app_bell_settings_language": "Idioma",
+ "app_bell_settings_about": "Información",
+ "app_bell_settings_about_product": "Mudita Harmony",
+ "app_bell_settings_about_version": "<text>Versión del SO: <token>$VERSION</token></text>",
+ "app_bell_settings_about_storage_title": "Almacenamiento",
+ "app_bell_settings_about_storage_text": "<text>Usados <token>$USED_MEMORY</token>MB de <token>$TOTAL_MEMORY</token>MB</text>",
+ "app_bell_settings_about_info_title": "Manual y certificación",
+ "app_bell_settings_about_info_text": "www.mudita.com",
+ "app_bell_settings_frontlight": "Luz frontal",
"app_bell_settings_alarm_settings_prewake_up": "Despertar gradual",
"app_bell_settings_alarm_settings_prewake_up_chime_top_description": "Despertar gradualmente",
"app_bell_settings_alarm_settings_prewake_up_chime_bottom_description": "antes de la alarma",
@@ 670,7 670,7 @@
"app_bell_settings_frontlight_mode_on_demand": "manual",
"app_bell_settings_frontlight_top_message": "Intensidad de luz frontal",
"app_bell_greeting_msg": "¡Hola! Levántate y brilla",
- "app_bell_settings_advanced_factory_reset": "Restablecer",
+ "app_bell_settings_factory_reset": "Restablecer",
"app_bell_settings_display_factory_reset_confirmation": "<text>¿Restablecer la configuración?</text>",
"app_bell_meditation_timer": "Meditación",
"app_bell_meditation_interval_chime": "Intervalo",
M image/assets/lang/Francais.json => image/assets/lang/Francais.json +11 -11
@@ 587,7 587,7 @@
"app_bell_goodbye": "Au revoir",
"app_bell_settings_time_units_time_fmt_top_message": "Format de l'heure",
"app_bell_settings_time_units_time_message": "Heure",
- "app_bell_settings_advanced_temp_scale": "Échelle de température",
+ "app_bell_settings_temp_scale": "Échelle de température",
"app_bell_onboarding_welcome_message": "Mudita Harmony",
"app_bell_onboarding_info_rotate": "<text font='gt_pressura' weight='regular' size='38'>Tourner </text><text font='gt_pressura' weight='light' size='38'>pour sélectionner</text>",
"app_bell_onboarding_info_light_click": "<text font='gt_pressura' weight='regular' size='38'>Cliquer doucement </text><text font='gt_pressura' weight='light' size='38'>pour continuer</text>",
@@ 609,15 609,15 @@
"app_bell_settings_advanced": "Avancé",
"app_bell_settings_turn_off": "Éteindre",
"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",
- "app_bell_settings_advanced_about_version": "<text>Version du système: <token>$VERSION</token></text>",
- "app_bell_settings_advanced_about_storage_title": "Stockage",
- "app_bell_settings_advanced_about_storage_text": "<text><token>$USED_MEMORY</token> Mo sur <token>$TOTAL_MEMORY</token> Mo utilisés</text>",
- "app_bell_settings_advanced_about_info_title": "Manuel et certification",
- "app_bell_settings_advanced_about_info_text": "www.mudita.com",
- "app_bell_settings_advanced_frontlight": "Lumière",
+ "app_bell_settings_language": "Langue",
+ "app_bell_settings_about": "À propos",
+ "app_bell_settings_about_product": "Mudita Harmony",
+ "app_bell_settings_about_version": "<text>Version du système: <token>$VERSION</token></text>",
+ "app_bell_settings_about_storage_title": "Stockage",
+ "app_bell_settings_about_storage_text": "<text><token>$USED_MEMORY</token> Mo sur <token>$TOTAL_MEMORY</token> Mo utilisés</text>",
+ "app_bell_settings_about_info_title": "Manuel et certification",
+ "app_bell_settings_about_info_text": "www.mudita.com",
+ "app_bell_settings_frontlight": "Lumière",
"app_bell_settings_alarm_settings_prewake_up": "Pré-réveil",
"app_bell_settings_alarm_settings_prewake_up_chime_top_description": "Pré-réveil",
"app_bell_settings_alarm_settings_prewake_up_chime_bottom_description": "avant l'alarme",
@@ 640,7 640,7 @@
"app_bell_settings_frontlight_mode_on_demand": "manuel",
"app_bell_settings_frontlight_top_message": "Intensité",
"app_bell_greeting_msg": "Re-bonjour!",
- "app_bell_settings_advanced_factory_reset": "Réinitialisation",
+ "app_bell_settings_factory_reset": "Réinitialisation",
"app_bell_settings_display_factory_reset_confirmation": "<text>Rétablir<br></br>la configuration ?</text>",
"app_bell_meditation_timer": "Méditation",
"app_bell_meditation_interval_chime": "gong intervalle",
M image/assets/lang/Polski.json => image/assets/lang/Polski.json +11 -11
@@ 630,7 630,7 @@
"app_bell_onboarding_welcome": "Witamy",
"app_bell_settings_advanced": "Zaawansowane",
"app_bell_settings_time_units": "Czas i jednostki",
- "app_bell_settings_advanced_temp_scale": "Skala temperatury",
+ "app_bell_settings_temp_scale": "Skala temperatury",
"app_bell_settings_alarm_settings": "Alarm",
"app_bell_settings_alarm_settings_title": "Ustawienia alarmu",
"app_bell_settings_alarm_settings_alarm_tone_and_light": "Główny alarm",
@@ 651,7 651,7 @@
"app_bellmain_home_screen_bottom_desc_and": "i",
"app_bellmain_home_screen_bottom_desc_dp": "Naciśnij głęboko, aby aktywować",
"app_bell_alarm_deactivated": "Alarm wyłączony",
- "app_bell_settings_advanced_frontlight": "Podświetlenie",
+ "app_bell_settings_frontlight": "Podświetlenie",
"app_bell_settings_frontlight_top_message": "Intensywność podświetlenia",
"app_bell_settings_frontlight_mode_top_message": "Tryb podświetlenia",
"app_bell_settings_frontlight_mode_auto": "automatyczny",
@@ 674,16 674,16 @@
"app_bell_settings_alarm_settings_light": "Światło alarmu",
"app_bell_turn_off_question": "Wyłączyć Mudita Harmony?",
"app_bell_goodbye": "Do widzenia",
- "app_bell_settings_advanced_language": "Język",
- "app_bell_settings_advanced_factory_reset": "Reset",
+ "app_bell_settings_language": "Język",
+ "app_bell_settings_factory_reset": "Reset",
"app_bell_settings_display_factory_reset_confirmation": "<text>Ustawienia fabryczne?</text>",
- "app_bell_settings_advanced_about": "O produkcie",
- "app_bell_settings_advanced_about_product": "Mudita Harmony",
- "app_bell_settings_advanced_about_version": "<text>Wersja OS: <token>$VERSION</token></text>",
- "app_bell_settings_advanced_about_storage_title": "Pamięć",
- "app_bell_settings_advanced_about_storage_text": "<text>Zużyto <token>$USED_MEMORY</token>MB z <token>$TOTAL_MEMORY</token>MB</text>",
- "app_bell_settings_advanced_about_info_title": "Instrukcja i informacje dot. certyfikacji",
- "app_bell_settings_advanced_about_info_text": "www.mudita.com",
+ "app_bell_settings_about": "O produkcie",
+ "app_bell_settings_about_product": "Mudita Harmony",
+ "app_bell_settings_about_version": "<text>Wersja OS: <token>$VERSION</token></text>",
+ "app_bell_settings_about_storage_title": "Pamięć",
+ "app_bell_settings_about_storage_text": "<text>Zużyto <token>$USED_MEMORY</token>MB z <token>$TOTAL_MEMORY</token>MB</text>",
+ "app_bell_settings_about_info_title": "Instrukcja i informacje dot. certyfikacji",
+ "app_bell_settings_about_info_text": "www.mudita.com",
"app_bell_meditation_timer": "Medytacja",
"app_bell_meditation_interval_chime": "Dzwonek interwału",
"app_bell_meditation_progress": "Medytacja",
M products/BellHybrid/apps/application-bell-settings/ApplicationBellSettings.cpp => products/BellHybrid/apps/application-bell-settings/ApplicationBellSettings.cpp +7 -14
@@ 4,7 4,7 @@
#include "ApplicationBellSettings.hpp"
#include "presenter/TimeUnitsPresenter.hpp"
#include "models/TemperatureUnitModel.hpp"
-#include "models/advanced/AboutYourBellModel.hpp"
+#include "models/AboutYourBellModel.hpp"
#include "models/alarm_settings/AlarmSettingsListItemProvider.hpp"
#include "models/alarm_settings/PrewakeUpListItemProvider.hpp"
#include "models/alarm_settings/BedtimeSettingsListItemProvider.hpp"
@@ 12,13 12,12 @@
#include "models/alarm_settings/SnoozeListItemProvider.hpp"
#include "models/alarm_settings/SnoozeSettingsModel.hpp"
#include "presenter/BedtimeSettingsPresenter.hpp"
-#include "presenter/advanced/AboutYourBellWindowPresenter.hpp"
+#include "presenter/AboutYourBellWindowPresenter.hpp"
#include "presenter/alarm_settings/SnoozePresenter.hpp"
-#include "presenter/advanced/FrontlightPresenter.hpp"
-#include "windows/advanced/AboutYourBellWindow.hpp"
-#include "windows/advanced/BellSettingsAdvancedWindow.hpp"
-#include "windows/advanced/BellSettingsLanguageWindow.hpp"
-#include "windows/advanced/BellSettingsFrontlightWindow.hpp"
+#include "presenter/FrontlightPresenter.hpp"
+#include "windows/AboutYourBellWindow.hpp"
+#include "windows/BellSettingsLanguageWindow.hpp"
+#include "windows/BellSettingsFrontlightWindow.hpp"
#include "windows/alarm_settings/BellSettingsAlarmSettingsMenuWindow.hpp"
#include "windows/alarm_settings/BellSettingsAlarmSettingsSnoozeWindow.hpp"
#include "windows/alarm_settings/BellSettingsAlarmSettingsWindow.hpp"
@@ 67,7 66,7 @@ namespace app
switchWindow(gui::window::bell_finished::defaultName,
gui::BellFinishedWindowData::Factory::create("circle_success_big",
- gui::window::name::bellSettingsAdvanced));
+ gui::window::name::bellSettings));
return sys::msgHandled();
}
@@ 83,12 82,6 @@ namespace app
return std::make_unique<gui::BellSettingsWindow>(app);
});
- // Advanced
- windowsFactory.attach(gui::window::name::bellSettingsAdvanced,
- [](ApplicationCommon *app, const std::string &name) {
- return std::make_unique<gui::BellSettingsAdvancedWindow>(app);
- });
-
windowsFactory.attach(
gui::window::name::bellSettingsLanguage, [&](ApplicationCommon *app, const std::string &name) {
auto presenter = std::make_unique<bell_settings::LanguageWindowPresenter>(this);
M products/BellHybrid/apps/application-bell-settings/CMakeLists.txt => products/BellHybrid/apps/application-bell-settings/CMakeLists.txt +19 -22
@@ 24,9 24,9 @@ target_sources(application-bell-settings
ApplicationBellSettings.cpp
models/TemperatureUnitModel.cpp
models/TimeUnitsModel.cpp
- models/advanced/AboutYourBellModel.cpp
- models/advanced/FrontlightListItemProvider.cpp
- models/advanced/FrontlightModel.cpp
+ models/AboutYourBellModel.cpp
+ models/FrontlightListItemProvider.cpp
+ models/FrontlightModel.cpp
models/alarm_settings/AlarmSettingsListItemProvider.cpp
models/alarm_settings/AlarmSettingsModel.cpp
models/alarm_settings/BedtimeSettingsListItemProvider.cpp
@@ 38,9 38,9 @@ target_sources(application-bell-settings
presenter/BedtimeSettingsPresenter.cpp
presenter/TimeUnitsPresenter.cpp
- presenter/advanced/FrontlightPresenter.cpp
- presenter/advanced/AboutYourBellWindowPresenter.cpp
- presenter/advanced/LanguageWindowPresenter.cpp
+ presenter/FrontlightPresenter.cpp
+ presenter/AboutYourBellWindowPresenter.cpp
+ presenter/LanguageWindowPresenter.cpp
presenter/alarm_settings/AlarmSettingsPresenter.cpp
presenter/alarm_settings/PrewakeUpPresenter.cpp
presenter/alarm_settings/SnoozePresenter.cpp
@@ 48,24 48,23 @@ target_sources(application-bell-settings
widgets/TemperatureUnitListItem.cpp
widgets/TimeFormatSetListItem.cpp
widgets/TimeSetListItem.cpp
- widgets/advanced/AboutYourBellListItem.cpp
+ widgets/AboutYourBellListItem.cpp
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/BellSettingsFrontlightWindow.cpp
+ windows/AboutYourBellWindow.cpp
+ windows/BellSettingsLanguageWindow.cpp
+ windows/BellSettingsFrontlightWindow.cpp
windows/alarm_settings/BellSettingsAlarmSettingsSnoozeWindow.cpp
windows/alarm_settings/BellSettingsAlarmSettingsMenuWindow.cpp
windows/alarm_settings/BellSettingsAlarmSettingsWindow.cpp
windows/alarm_settings/BellSettingsPrewakeUpWindow.cpp
- models/advanced/AboutYourBellModel.hpp
- models/advanced/FrontlightListItemProvider.hpp
+ models/AboutYourBellModel.hpp
+ models/FrontlightListItemProvider.hpp
models/alarm_settings/AbstractPrewakeUpSettingsModel.hpp
models/alarm_settings/AbstractSnoozeSettingsModel.hpp
models/alarm_settings/AlarmSettingsListItemProvider.hpp
@@ 77,9 76,9 @@ target_sources(application-bell-settings
models/alarm_settings/SettingsListItemProvider.hpp
presenter/BedtimeSettingsPresenter.hpp
- presenter/advanced/FrontlightPresenter.hpp
- presenter/advanced/AboutYourBellWindowPresenter.hpp
- presenter/advanced/LanguageWindowPresenter.hpp
+ presenter/FrontlightPresenter.hpp
+ presenter/AboutYourBellWindowPresenter.hpp
+ presenter/LanguageWindowPresenter.hpp
presenter/alarm_settings/AlarmSettingsPresenter.hpp
presenter/alarm_settings/PrewakeUpPresenter.hpp
presenter/alarm_settings/SnoozePresenter.hpp
@@ 87,19 86,17 @@ target_sources(application-bell-settings
widgets/TemperatureUnitListItem.hpp
widgets/TimeFormatSetListItem.hpp
widgets/TimeSetListItem.hpp
- widgets/advanced/AboutYourBellListItem.hpp
+ widgets/AboutYourBellListItem.hpp
widgets/DialogYesNo.hpp
windows/alarm_settings/BellSettingsAlarmSettingsSnoozeWindow.hpp
windows/alarm_settings/BellSettingsAlarmSettingsWindow.hpp
- windows/advanced/BellSettingsAdvancedWindow.hpp
windows/BellSettingsBedtimeToneWindow.hpp
windows/BellSettingsHomeViewWindow.hpp
windows/BellSettingsWindow.hpp
- windows/advanced/AboutYourBellWindow.hpp
- windows/advanced/BellSettingsLanguageWindow.hpp
- windows/advanced/BellSettingsAdvancedWindow.hpp
- windows/advanced/BellSettingsFrontlightWindow.hpp
+ windows/AboutYourBellWindow.hpp
+ windows/BellSettingsLanguageWindow.hpp
+ windows/BellSettingsFrontlightWindow.hpp
windows/alarm_settings/BellSettingsAlarmSettingsSnoozeWindow.hpp
windows/alarm_settings/BellSettingsAlarmSettingsMenuWindow.hpp
windows/alarm_settings/BellSettingsAlarmSettingsWindow.hpp
M products/BellHybrid/apps/application-bell-settings/include/application-bell-settings/ApplicationBellSettings.hpp => products/BellHybrid/apps/application-bell-settings/include/application-bell-settings/ApplicationBellSettings.hpp +0 -1
@@ 10,7 10,6 @@
namespace gui::window::name
{
inline constexpr auto bellSettings = "BellSettings";
- inline constexpr auto bellSettingsAdvanced = "BellSettingsAdvanced";
inline constexpr auto bellSettingsTimeUnits = "BellSettingsTimeUnits";
inline constexpr auto bellSettingsDialog = "BellSettingsDialog";
inline constexpr auto bellSettingsFinished = "BellSettingsFinished";
R products/BellHybrid/apps/application-bell-settings/models/advanced/AboutYourBellModel.cpp => products/BellHybrid/apps/application-bell-settings/models/AboutYourBellModel.cpp +7 -8
@@ 4,7 4,7 @@
#include "AboutYourBellModel.hpp"
#include <BellSettingsStyle.hpp>
-#include <widgets/advanced/AboutYourBellListItem.hpp>
+#include <widgets/AboutYourBellListItem.hpp>
#include <ProductConfig.hpp>
#include <ListView.hpp>
@@ 43,8 43,8 @@ namespace app::bell_settings
void AboutYourBellModel::createData()
{
internalData.push_back(
- new gui::AboutYourBellListItem(utils::translate("app_bell_settings_advanced_about_product"),
- utils::translate("app_bell_settings_advanced_about_version"),
+ new gui::AboutYourBellListItem(utils::translate("app_bell_settings_about_product"),
+ utils::translate("app_bell_settings_about_version"),
gui::AboutYourBellListItem::TokenMap({{"$VERSION", std::string(VERSION)}})));
#if CONFIG_SHOW_MEMORY_INFO == 1
@@ 58,15 58,14 @@ namespace app::bell_settings
const auto totalMB = (stat.f_frsize * stat.f_blocks) / 1024LLU / 1024LLU;
const auto usedMB = totalMB - (stat.f_bfree * stat.f_bsize) / 1024LLU / 1024LLU;
internalData.push_back(new gui::AboutYourBellListItem(
- utils::translate("app_bell_settings_advanced_about_storage_title"),
- utils::translate("app_bell_settings_advanced_about_storage_text"),
+ utils::translate("app_bell_settings_about_storage_title"),
+ utils::translate("app_bell_settings_about_storage_text"),
gui::AboutYourBellListItem::TokenMap(
{{"$USED_MEMORY", std::to_string(usedMB)}, {"$TOTAL_MEMORY", std::to_string(totalMB)}})));
#endif
- internalData.push_back(
- new gui::AboutYourBellListItem(utils::translate("app_bell_settings_advanced_about_info_title"),
- utils::translate("app_bell_settings_advanced_about_info_text")));
+ internalData.push_back(new gui::AboutYourBellListItem(utils::translate("app_bell_settings_about_info_title"),
+ utils::translate("app_bell_settings_about_info_text")));
for (auto item : internalData) {
item->deleteByList = false;
R products/BellHybrid/apps/application-bell-settings/models/advanced/AboutYourBellModel.hpp => products/BellHybrid/apps/application-bell-settings/models/AboutYourBellModel.hpp +0 -0
R products/BellHybrid/apps/application-bell-settings/models/advanced/FrontlightListItemProvider.cpp => products/BellHybrid/apps/application-bell-settings/models/FrontlightListItemProvider.cpp +1 -1
@@ 29,7 29,7 @@ namespace app::bell_settings
const auto modeAutoStr = utils::translate("app_bell_settings_frontlight_mode_auto");
const auto modeOnDemandsStr = utils::translate("app_bell_settings_frontlight_mode_on_demand");
- auto mode = new gui::UTF8ListItem(model.getModeModel(),
+ auto mode = new gui::UTF8ListItem(model.getModeModel(),
gui::UTF8Spinner::Range{modeOnDemandsStr, modeAutoStr},
utils::translate("app_bell_settings_frontlight_mode_top_message"));
mode->onExit = [this, mode, modeAutoStr]() {
R products/BellHybrid/apps/application-bell-settings/models/advanced/FrontlightListItemProvider.hpp => products/BellHybrid/apps/application-bell-settings/models/FrontlightListItemProvider.hpp +0 -0
R products/BellHybrid/apps/application-bell-settings/models/advanced/FrontlightModel.cpp => products/BellHybrid/apps/application-bell-settings/models/FrontlightModel.cpp +0 -0
M products/BellHybrid/apps/application-bell-settings/models/TimeUnitsModel.cpp => products/BellHybrid/apps/application-bell-settings/models/TimeUnitsModel.cpp +1 -2
@@ 57,8 57,7 @@ namespace app::bell_settings
};
#if CONFIG_ENABLE_TEMP == 1
- temperatureUnitListItem =
- new gui::TemperatureUnitListItem(utils::translate("app_bell_settings_advanced_temp_scale"));
+ temperatureUnitListItem = new gui::TemperatureUnitListItem(utils::translate("app_bell_settings_temp_scale"));
internalData.push_back(temperatureUnitListItem);
#endif
R products/BellHybrid/apps/application-bell-settings/presenter/advanced/AboutYourBellWindowPresenter.cpp => products/BellHybrid/apps/application-bell-settings/presenter/AboutYourBellWindowPresenter.cpp +1 -1
@@ 2,7 2,7 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "AboutYourBellWindowPresenter.hpp"
-#include <models/advanced/AboutYourBellModel.hpp>
+#include <models/AboutYourBellModel.hpp>
namespace app::bell_settings
{
R products/BellHybrid/apps/application-bell-settings/presenter/advanced/AboutYourBellWindowPresenter.hpp => products/BellHybrid/apps/application-bell-settings/presenter/AboutYourBellWindowPresenter.hpp +0 -0
R products/BellHybrid/apps/application-bell-settings/presenter/advanced/FrontlightPresenter.cpp => products/BellHybrid/apps/application-bell-settings/presenter/FrontlightPresenter.cpp +0 -0
R products/BellHybrid/apps/application-bell-settings/presenter/advanced/FrontlightPresenter.hpp => products/BellHybrid/apps/application-bell-settings/presenter/FrontlightPresenter.hpp +1 -1
@@ 5,7 5,7 @@
#pragma once
#include <common/models/FrontlightModel.hpp>
-#include "models/advanced/FrontlightListItemProvider.hpp"
+#include "models/FrontlightListItemProvider.hpp"
#include <apps-common/BasePresenter.hpp>
#include <memory>
R products/BellHybrid/apps/application-bell-settings/presenter/advanced/LanguageWindowPresenter.cpp => products/BellHybrid/apps/application-bell-settings/presenter/LanguageWindowPresenter.cpp +0 -0
R products/BellHybrid/apps/application-bell-settings/presenter/advanced/LanguageWindowPresenter.hpp => products/BellHybrid/apps/application-bell-settings/presenter/LanguageWindowPresenter.hpp +0 -0
R products/BellHybrid/apps/application-bell-settings/widgets/advanced/AboutYourBellListItem.cpp => products/BellHybrid/apps/application-bell-settings/widgets/AboutYourBellListItem.cpp +0 -0
R products/BellHybrid/apps/application-bell-settings/widgets/advanced/AboutYourBellListItem.hpp => products/BellHybrid/apps/application-bell-settings/widgets/AboutYourBellListItem.hpp +0 -0
R products/BellHybrid/apps/application-bell-settings/windows/advanced/AboutYourBellWindow.cpp => products/BellHybrid/apps/application-bell-settings/windows/AboutYourBellWindow.cpp +1 -1
@@ 5,7 5,7 @@
#include <application-settings/windows/WindowNames.hpp>
#include <i18n/i18n.hpp>
-#include <models/advanced/AboutYourBellModel.hpp>
+#include <models/AboutYourBellModel.hpp>
namespace gui
{
R products/BellHybrid/apps/application-bell-settings/windows/advanced/AboutYourBellWindow.hpp => products/BellHybrid/apps/application-bell-settings/windows/AboutYourBellWindow.hpp +1 -1
@@ 3,7 3,7 @@
#pragma once
-#include <presenter/advanced/AboutYourBellWindowPresenter.hpp>
+#include <presenter/AboutYourBellWindowPresenter.hpp>
#include <apps-common/windows/AppWindow.hpp>
#include <ListView.hpp>
R products/BellHybrid/apps/application-bell-settings/windows/advanced/BellSettingsFrontlightWindow.cpp => products/BellHybrid/apps/application-bell-settings/windows/BellSettingsFrontlightWindow.cpp +1 -1
@@ 62,7 62,7 @@ namespace gui
{
application->switchWindow(
window::bell_finished::defaultName,
- BellFinishedWindowData::Factory::create("circle_success_big", window::name::bellSettingsAdvanced));
+ BellFinishedWindowData::Factory::create("circle_success_big", window::name::bellSettings));
}
void BellSettingsFrontlightWindow::onClose(Window::CloseReason reason)
{
R products/BellHybrid/apps/application-bell-settings/windows/advanced/BellSettingsFrontlightWindow.hpp => products/BellHybrid/apps/application-bell-settings/windows/BellSettingsFrontlightWindow.hpp +2 -2
@@ 4,7 4,7 @@
#pragma once
#include "application-bell-settings/ApplicationBellSettings.hpp"
-#include "presenter/advanced/FrontlightPresenter.hpp"
+#include "presenter/FrontlightPresenter.hpp"
#include <apps-common/windows/AppWindow.hpp>
namespace gui
@@ 14,7 14,7 @@ namespace gui
class BellSettingsFrontlightWindow : public AppWindow, public app::bell_settings::FrontlightWindowContract::View
{
public:
- static constexpr auto name = "BellSettingsAdvancedFrontlight";
+ static constexpr auto name = "BellSettingsFrontlight";
explicit BellSettingsFrontlightWindow(
app::ApplicationCommon *app, std::unique_ptr<app::bell_settings::FrontlightPresenter> &&windowPresenter);
R products/BellHybrid/apps/application-bell-settings/windows/advanced/BellSettingsLanguageWindow.cpp => products/BellHybrid/apps/application-bell-settings/windows/BellSettingsLanguageWindow.cpp +1 -1
@@ 32,7 32,7 @@ namespace gui
topMessage->setEdges(gui::RectangleEdge::None);
topMessage->activeItem = false;
topMessage->setAlignment(Alignment(gui::Alignment::Horizontal::Center, gui::Alignment::Vertical::Center));
- topMessage->setText(utils::translate("app_bell_settings_advanced_language"));
+ topMessage->setText(utils::translate("app_bell_settings_language"));
topMessage->drawUnderline(false);
auto data = presenter->getLanguages();
R products/BellHybrid/apps/application-bell-settings/windows/advanced/BellSettingsLanguageWindow.hpp => products/BellHybrid/apps/application-bell-settings/windows/BellSettingsLanguageWindow.hpp +1 -1
@@ 3,7 3,7 @@
#pragma once
-#include <presenter/advanced/LanguageWindowPresenter.hpp>
+#include <presenter/LanguageWindowPresenter.hpp>
#include <ApplicationBellSettings.hpp>
#include <apps-common/widgets/spinners/Spinners.hpp>
M products/BellHybrid/apps/application-bell-settings/windows/BellSettingsWindow.cpp => products/BellHybrid/apps/application-bell-settings/windows/BellSettingsWindow.cpp +58 -13
@@ 1,16 1,22 @@
// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+#include "AboutYourBellWindow.hpp"
+#include "BellSettingsFrontlightWindow.hpp"
#include "BellSettingsWindow.hpp"
#include "alarm_settings/BellSettingsAlarmSettingsMenuWindow.hpp"
#include <application-bell-settings/ApplicationBellSettings.hpp>
#include <data/BellSettingsStyle.hpp>
+#include <application-bell-main/ApplicationBellMain.hpp>
#include <apps-common/messages/DialogMetadataMessage.hpp>
#include <common/options/OptionBellMenu.hpp>
#include <common/popups/BellTurnOffOptionWindow.hpp>
+#include <common/windows/BellFactoryReset.hpp>
#include <apps-common/windows/Dialog.hpp>
+#include <service-appmgr/Constants.hpp>
+#include <service-appmgr/messages/SwitchRequest.hpp>
namespace gui
{
@@ 24,17 30,44 @@ namespace gui
std::list<Option> BellSettingsWindow::settingsOptionsList()
{
+ using ActivatedCallback = std::function<bool(gui::Item &)>;
+ using Callback = std::function<ActivatedCallback(const std::string &window)>;
+
+ auto defaultCallback = [this](const std::string &window) {
+ return [window, this](gui::Item &) {
+ if (window.empty()) {
+ return false;
+ }
+ application->switchWindow(window);
+ return true;
+ };
+ };
+
+ auto factoryResetCallback = [this](const std::string &window) {
+ auto actionCallback = [this]() {
+ auto switchRequest = std::make_unique<app::manager::SwitchRequest>(
+ service::name::appmgr, app::applicationBellName, gui::BellFactoryReset::name, nullptr);
+ application->bus.sendUnicast(std::move(switchRequest), service::name::appmgr);
+ return true;
+ };
+
+ return [this, actionCallback, window](gui::Item &) {
+ auto metaData = std::make_unique<gui::DialogMetadataMessage>(
+ gui::DialogMetadata{utils::translate("app_bell_settings_factory_reset"),
+ "",
+ utils::translate("app_bell_settings_display_factory_reset_confirmation"),
+ "",
+ actionCallback});
+ application->switchWindow(window, gui::ShowMode::GUI_SHOW_INIT, std::move(metaData));
+ return true;
+ };
+ };
+
std::list<gui::Option> settingsOptionList;
- auto addWinSettings = [&](const UTF8 &name, const std::string &window) {
+ auto addWinSettings = [&](const UTF8 &name, const std::string &window, Callback &&callback) {
settingsOptionList.emplace_back(std::make_unique<gui::option::OptionBellMenu>(
name,
- [=](gui::Item &item) {
- if (window.empty()) {
- return false;
- }
- application->switchWindow(window, gui::ShowMode::GUI_SHOW_INIT);
- return true;
- },
+ callback(window),
[=](gui::Item &item) {
// put focus change callback here
return true;
@@ 42,11 75,23 @@ namespace gui
this));
};
- 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);
+ addWinSettings(utils::translate("app_bell_settings_alarm_settings"),
+ BellSettingsAlarmSettingsMenuWindow::name,
+ defaultCallback);
+ addWinSettings(
+ utils::translate("app_bell_settings_bedtime_tone"), window::name::bellSettingsBedtimeTone, defaultCallback);
+ addWinSettings(
+ utils::translate("app_bell_settings_time_units"), window::name::bellSettingsTimeUnits, defaultCallback);
+ addWinSettings(
+ utils::translate("app_bell_settings_language"), gui::window::name::bellSettingsLanguage, defaultCallback);
+ addWinSettings(
+ utils::translate("app_bell_settings_frontlight"), gui::BellSettingsFrontlightWindow::name, defaultCallback);
+ addWinSettings(utils::translate("app_bell_settings_about"), gui::AboutYourBellWindow::name, defaultCallback);
+ addWinSettings(
+ utils::translate("app_bell_settings_turn_off"), BellTurnOffOptionWindow::defaultName, defaultCallback);
+ addWinSettings(utils::translate("app_bell_settings_factory_reset"),
+ gui::window::name::bellSettingsFactoryReset,
+ factoryResetCallback);
return settingsOptionList;
}
D products/BellHybrid/apps/application-bell-settings/windows/advanced/BellSettingsAdvancedWindow.cpp => products/BellHybrid/apps/application-bell-settings/windows/advanced/BellSettingsAdvancedWindow.cpp +0 -87
@@ 1,87 0,0 @@
-// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
-// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-
-#include "application-bell-settings/ApplicationBellSettings.hpp"
-#include "BellSettingsAdvancedWindow.hpp"
-#include "BellSettingsStyle.hpp"
-#include "BellSettingsFrontlightWindow.hpp"
-
-#include <application-bell-main/ApplicationBellMain.hpp>
-#include <apps-common/messages/DialogMetadataMessage.hpp>
-#include <apps-common/windows/Dialog.hpp>
-#include <common/options/OptionBellMenu.hpp>
-#include <service-appmgr/Constants.hpp>
-#include <service-appmgr/messages/UserPowerDownRequest.hpp>
-#include <service-appmgr/messages/SwitchRequest.hpp>
-#include <windows/advanced/AboutYourBellWindow.hpp>
-#include <common/windows/BellFactoryReset.hpp>
-#include <common/windows/BellTurnOffWindow.hpp>
-
-namespace gui
-{
-
- BellSettingsAdvancedWindow::BellSettingsAdvancedWindow(app::ApplicationCommon *app)
- : BellOptionWindow(app, gui::window::name::bellSettingsAdvanced)
- {
- addOptions(settingsOptionsList());
- setListTitle(utils::translate("app_bell_settings_advanced"));
- }
-
- std::list<Option> BellSettingsAdvancedWindow::settingsOptionsList()
- {
- using ActivatedCallback = std::function<bool(gui::Item &)>;
- using Callback = std::function<ActivatedCallback(const std::string &window)>;
-
- std::list<gui::Option> settingsOptionList;
-
- auto defaultCallback = [this](const std::string &window) {
- return [window, this](gui::Item &) {
- if (window.empty()) {
- return false;
- }
- application->switchWindow(window);
- return true;
- };
- };
-
- auto factoryResetCallback = [this](const std::string &window) {
- auto actionCallback = [this]() {
- auto switchRequest = std::make_unique<app::manager::SwitchRequest>(
- service::name::appmgr, app::applicationBellName, gui::BellFactoryReset::name, nullptr);
- application->bus.sendUnicast(std::move(switchRequest), service::name::appmgr);
- return true;
- };
-
- return [this, actionCallback, window](gui::Item &) {
- auto metaData = std::make_unique<gui::DialogMetadataMessage>(
- gui::DialogMetadata{utils::translate("app_bell_settings_advanced_factory_reset"),
- "",
- utils::translate("app_bell_settings_display_factory_reset_confirmation"),
- "",
- actionCallback});
- application->switchWindow(window, gui::ShowMode::GUI_SHOW_INIT, std::move(metaData));
- return true;
- };
- };
-
- auto addOption = [&settingsOptionList, this](const UTF8 &name, const std::string &window, Callback &&callback) {
- settingsOptionList.emplace_back(
- std::make_unique<gui::option::OptionBellMenu>(name, callback(window), nullptr, this));
- };
-
- addOption(utils::translate("app_bell_settings_advanced_language"),
- gui::window::name::bellSettingsLanguage,
- defaultCallback);
- addOption(utils::translate("app_bell_settings_advanced_frontlight"),
- gui::BellSettingsFrontlightWindow::name,
- defaultCallback);
- addOption(
- utils::translate("app_bell_settings_advanced_about"), gui::AboutYourBellWindow::name, defaultCallback);
- addOption(utils::translate("app_bell_settings_advanced_factory_reset"),
- gui::window::name::bellSettingsFactoryReset,
- factoryResetCallback);
-
- return settingsOptionList;
- }
-
-} // namespace gui
D products/BellHybrid/apps/application-bell-settings/windows/advanced/BellSettingsAdvancedWindow.hpp => products/BellHybrid/apps/application-bell-settings/windows/advanced/BellSettingsAdvancedWindow.hpp +0 -20
@@ 1,20 0,0 @@
-// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
-// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-
-#pragma once
-
-#include <common/options/BellOptionWindow.hpp>
-
-namespace gui
-{
-
- class BellSettingsAdvancedWindow : public BellOptionWindow
- {
- public:
- explicit BellSettingsAdvancedWindow(app::ApplicationCommon *app);
-
- private:
- std::list<Option> settingsOptionsList();
- };
-
-} // namespace gui