M image/system_a/data/lang/Deutsch.json => image/system_a/data/lang/Deutsch.json +12 -12
@@ 53,7 53,7 @@
"app_bell_onboarding_shortcuts_step_rotate": "Zum Ausw\u00e4hlen drehen",
"app_bell_onboarding_shortcuts_step_turn_off": "Zum Ausstellen des Ger\u00e4ts R\u00fcckseite 10 Sek. dr\u00fccken",
"app_bell_audio_error_message": "Nicht unterst\u00fctztes Dateiformat",
- "app_bell_audio_file_deleted_message": "<text>Die Datei wurde gel\u00f6scht.</text>",
+ "app_bell_audio_file_deleted_message": "Die Datei wurde gel\u00f6scht.",
"app_bell_audio_limit_error_message": "<text>Datenlimit \u00fcberschritten.<br />Es k\u00f6nnte zu Fehlern kommen.</text>",
"app_bell_relaxation_loop": "endlos",
"app_bell_relaxation_loop_description": "der Titel wird abgespielt, bis Sie ihn ausschalten",
@@ 77,26 77,26 @@
"app_bell_settings_alarm_settings_fade": "Erh\u00f6ht allm\u00e4hlich Alarmlautst\u00e4rke",
"app_bell_settings_alarm_settings_light": "Alarmleuchte",
"app_bell_settings_alarm_settings_prewake_up": "Sanftes Wecken",
- "app_bell_settings_alarm_settings_prewake_up_time_top_description": "Klang vor dem Aufwachen",
+ "app_bell_settings_alarm_settings_prewake_up_time_top_description": "Vor dem Aufwachen spielen",
"app_bell_settings_alarm_settings_prewake_up_time_bottom_description": "vor dem Alarm",
- "app_bell_settings_alarm_settings_prewake_up_chime_top_description": "Klang",
- "app_bell_settings_alarm_settings_prewake_up_chime_volume": "Lautst\u00e4rke",
+ "app_bell_settings_alarm_settings_prewake_up_chime_top_description": "Sanfter Weckton",
+ "app_bell_settings_alarm_settings_prewake_up_chime_volume": "Lautst\u00e4rke vor dem Aufwachen",
"app_bell_settings_alarm_settings_prewake_up_light_top_description": "Licht",
"app_bell_settings_alarm_settings_prewake_up_light_bottom_description": "vor dem Alarm",
"app_bell_settings_alarm_settings_snooze": "Schlummer",
- "app_bell_settings_alarm_settings_snooze_chime_interval": "Schlummer Klangintervall",
+ "app_bell_settings_alarm_settings_snooze_chime_interval": "Schlummerintervall",
"app_bell_settings_alarm_settings_snooze_chime_interval_bot_desc": "w\u00e4hrend des Schlummern",
- "app_bell_settings_alarm_settings_snooze_chime_tone": "Schlummer-Klang",
- "app_bell_settings_alarm_settings_snooze_chime_volume": "Lautst\u00e4rke",
+ "app_bell_settings_alarm_settings_snooze_chime_tone": "Schlummerton",
+ "app_bell_settings_alarm_settings_snooze_chime_volume": "Schlummerlautst\u00e4rke",
"app_bell_settings_alarm_settings_snooze_length": "Schlummerl\u00e4nge",
"app_bell_settings_alarm_settings_title": "Alarmeinstellungen",
"app_bell_settings_alarm_settings_chime": "Hauptalarmton",
"app_bell_settings_alarm_settings_sounds": "T\u00f6ne",
- "app_bell_settings_alarm_settings_custom_sounds": "Benutzerdefinierte T\u00f6ne",
+ "app_bell_settings_alarm_settings_custom_sounds": "Eigene Kl\u00e4nge",
"app_bell_settings_alarm_settings_volume": "Alarmlautst\u00e4rke",
- "app_bell_settings_bedtime_settings_tone": "Klang",
- "app_bell_settings_bedtime_settings_volume": "<text>Lautst\u00e4rke</text>",
- "app_bell_settings_bedtime_chime": "Schlafens-Klang",
+ "app_bell_settings_bedtime_settings_tone": "Schlafenszeitton",
+ "app_bell_settings_bedtime_settings_volume": "Schlafenszeit Lautst\u00e4rke",
+ "app_bell_settings_bedtime_chime": "Schlafenszeit",
"app_bell_settings_display_factory_reset_confirmation": "<text>L\u00f6scht alle Benutzerdateien<br/>und setzt das Ger\u00e4t auf<br/>Werkseinstellungen zur\u00fcck.</text>",
"app_bell_settings_factory_reset": "Zur\u00fccksetzen",
"app_bell_settings_factory_reset_option_back": "Zur\u00fcck",
@@ 120,7 120,7 @@
"app_bell_welcome_message": "<text>Mudita Harmony<br/>ist ausgeschaltet</text>",
"app_bell_alarm_lowBattery_info": "Lade deinen Harmony, damit der Wecker auch sicher klingelt",
"app_bellmain_alarm": "Alarm",
- "app_bellmain_bedtime": "Schlafenzeit",
+ "app_bellmain_bedtime": "Schlafenszeit",
"app_bellmain_home_screen_bottom_desc": "Der n\u00e4chste Alarm klingelt",
"app_bellmain_home_screen_bottom_desc_and": "&",
"app_bellmain_home_screen_bottom_desc_dp": "Tief dr\u00fccken, um zu aktivieren",
M image/system_a/data/lang/English.json => image/system_a/data/lang/English.json +6 -6
@@ 86,7 86,7 @@
"app_bell_onboarding_shortcuts_step_rotate": "Rotate to select",
"app_bell_onboarding_shortcuts_step_turn_off": "Press back for 10s to turn off the device",
"app_bell_audio_error_message": "Unsupported media type",
- "app_bell_audio_file_deleted_message": "<text>The file has been deleted.</text>",
+ "app_bell_audio_file_deleted_message": "The file has been deleted.",
"app_bell_audio_limit_error_message": "<text>File limit exceeded.<br />Not all files may be displayed<br />correctly</text>",
"app_bell_relaxation_loop": "loop",
"app_bell_relaxation_loop_description": "the song will play until you turn it off",
@@ 111,17 111,17 @@
"app_bell_settings_alarm_settings_fade": "Gradually raise the alarm volume",
"app_bell_settings_alarm_settings_light": "Main alarm light",
"app_bell_settings_alarm_settings_prewake_up": "Pre-wake up",
- "app_bell_settings_alarm_settings_prewake_up_time_top_description": "Play Pre-wake up",
+ "app_bell_settings_alarm_settings_prewake_up_time_top_description": "Play pre-wake up",
"app_bell_settings_alarm_settings_prewake_up_time_bottom_description": "before the alarm",
"app_bell_settings_alarm_settings_prewake_up_chime_top_description": "Pre-wake up chime",
"app_bell_settings_alarm_settings_prewake_up_chime_volume": "Pre-wake up volume",
"app_bell_settings_alarm_settings_prewake_up_light_top_description": "Pre-wake up light",
"app_bell_settings_alarm_settings_prewake_up_light_bottom_description": "before the alarm",
"app_bell_settings_alarm_settings_snooze": "Snooze",
- "app_bell_settings_alarm_settings_snooze_chime_interval": "Snooze chime interval",
+ "app_bell_settings_alarm_settings_snooze_chime_interval": "Snooze interval",
"app_bell_settings_alarm_settings_snooze_chime_interval_bot_desc": "<text>recurring during<br />snooze</text>",
- "app_bell_settings_alarm_settings_snooze_chime_tone": "Snooze chime tone",
- "app_bell_settings_alarm_settings_snooze_chime_volume": "Snooze chime volume",
+ "app_bell_settings_alarm_settings_snooze_chime_tone": "Snooze chime",
+ "app_bell_settings_alarm_settings_snooze_chime_volume": "Snooze volume",
"app_bell_settings_alarm_settings_snooze_length": "Snooze length",
"app_bell_settings_alarm_settings_title": "Alarm settings",
"app_bell_settings_alarm_settings_chime": "Main alarm chime",
@@ 130,7 130,7 @@
"app_bell_settings_alarm_settings_volume": "Main alarm volume",
"app_bell_settings_bedtime_settings_tone": "Bedtime chime",
"app_bell_settings_bedtime_settings_volume": "Bedtime volume",
- "app_bell_settings_bedtime_chime": "Bedtime chime",
+ "app_bell_settings_bedtime_chime": "Bedtime",
"app_bell_settings_display_factory_reset_confirmation": "<text>Factory reset will delete all<br/>users files and return device<br/>to factory settings.</text>",
"app_bell_settings_factory_reset": "Factory reset",
"app_bell_settings_factory_reset_option_back": "Back",
M image/system_a/data/lang/Espanol.json => image/system_a/data/lang/Espanol.json +10 -10
@@ 52,7 52,7 @@
"app_bell_onboarding_shortcuts_step_rotate": "Girar para seleccionar",
"app_bell_onboarding_shortcuts_step_turn_off": "Pulsa Volver atr\u00e1s 10 s para apagar el dispositivo",
"app_bell_audio_error_message": "Formato de archivo no admitido",
- "app_bell_audio_file_deleted_message": "<text>Se ha eliminado el archivo.</text>",
+ "app_bell_audio_file_deleted_message": "Se ha eliminado el archivo.",
"app_bell_audio_limit_error_message": "<text>L\u00edmite de archivos alcanzado,<br />pueden producirse errores.</text>",
"app_bell_relaxation_loop": "bucle",
"app_bell_relaxation_loop_description": "la canci\u00f3n se reproducir\u00e1 hasta que la apagues",
@@ 76,25 76,25 @@
"app_bell_settings_alarm_settings_fade": "Aumentar vol. alarma gradualmente",
"app_bell_settings_alarm_settings_light": "Luz de alarma",
"app_bell_settings_alarm_settings_prewake_up": "Despertar gradual",
- "app_bell_settings_alarm_settings_prewake_up_time_top_description": "Despertar gradualmente",
+ "app_bell_settings_alarm_settings_prewake_up_time_top_description": "Reproducir antes de despertar",
"app_bell_settings_alarm_settings_prewake_up_time_bottom_description": "antes de la alarma",
- "app_bell_settings_alarm_settings_prewake_up_chime_top_description": "Tono",
- "app_bell_settings_alarm_settings_prewake_up_chime_volume": "Volumen",
+ "app_bell_settings_alarm_settings_prewake_up_chime_top_description": "Predespertar",
+ "app_bell_settings_alarm_settings_prewake_up_chime_volume": "Volumen antes de despertar",
"app_bell_settings_alarm_settings_prewake_up_light_top_description": "Luz",
"app_bell_settings_alarm_settings_prewake_up_light_bottom_description": "antes de la alarma",
"app_bell_settings_alarm_settings_snooze": "Repetici\u00f3n",
- "app_bell_settings_alarm_settings_snooze_chime_interval": "Intervalo del tono",
+ "app_bell_settings_alarm_settings_snooze_chime_interval": "Intervalo de repetici\u00f3n",
"app_bell_settings_alarm_settings_snooze_chime_interval_bot_desc": "durante la funci\u00f3n de repetici\u00f3n",
- "app_bell_settings_alarm_settings_snooze_chime_tone": "Tono",
- "app_bell_settings_alarm_settings_snooze_chime_volume": "Volumen",
+ "app_bell_settings_alarm_settings_snooze_chime_tone": "Timbre de repetición",
+ "app_bell_settings_alarm_settings_snooze_chime_volume": "Volumen de repetici\u00f3n",
"app_bell_settings_alarm_settings_snooze_length": "Duraci\u00f3n de Repetici\u00f3n",
"app_bell_settings_alarm_settings_title": "Ajustes de alarma",
- "app_bell_settings_alarm_settings_chime": "Timbre de alarma principal",
+ "app_bell_settings_alarm_settings_chime": "Alarma principal",
"app_bell_settings_alarm_settings_sounds": "Sonidos",
"app_bell_settings_alarm_settings_custom_sounds": "Sonidos personalizados",
"app_bell_settings_alarm_settings_volume": "Volumen de alarma",
- "app_bell_settings_bedtime_settings_tone": "Hora de dormir",
- "app_bell_settings_bedtime_settings_volume": "Volumen",
+ "app_bell_settings_bedtime_settings_tone": "Alarma de dormir",
+ "app_bell_settings_bedtime_settings_volume": "Volumen para la hora de dormir",
"app_bell_settings_bedtime_chime": "Hora de dormir",
"app_bell_settings_display_factory_reset_confirmation": "<text>La configuraci\u00f3n de f\u00e1brica<br/>eliminar\u00e1 todos los archivos.</text>",
"app_bell_settings_factory_reset": "Restablecer",
M image/system_a/data/lang/Francais.json => image/system_a/data/lang/Francais.json +10 -10
@@ 54,7 54,7 @@
"app_bell_onboarding_shortcuts_step_rotate": "Faites tourner pour s\u00e9lectionner",
"app_bell_onboarding_shortcuts_step_turn_off": "Appuyez sur Retour pendant 10 sec pour \u00e9teindre l'appareil",
"app_bell_audio_error_message": "<text>Format de fichier non pris en<br></br>charge</text>",
- "app_bell_audio_file_deleted_message": "<text>Le fichier a \u00e9t\u00e9 supprim\u00e9.</text>",
+ "app_bell_audio_file_deleted_message": "Le fichier a \u00e9t\u00e9 supprim\u00e9.",
"app_bell_audio_limit_error_message": "<text>Limite de fichiers exc\u00e9d\u00e9e.<br />Risque de probl\u00e8mes<br />d'affichage</text>",
"app_bell_relaxation_loop": "en boucle",
"app_bell_relaxation_loop_description": "le morceau sera lu jusqu'\u00e0 ce que vous l'\u00e9teigniez",
@@ 78,25 78,25 @@
"app_bell_settings_alarm_settings_fade": "Augmentation graduelle du volume",
"app_bell_settings_alarm_settings_light": "Lumi\u00e8re de r\u00e9veil",
"app_bell_settings_alarm_settings_prewake_up": "Pr\u00e9-r\u00e9veil",
- "app_bell_settings_alarm_settings_prewake_up_time_top_description": "Pr\u00e9-r\u00e9veil",
+ "app_bell_settings_alarm_settings_prewake_up_time_top_description": "Lecture avant le r\u00e9veil",
"app_bell_settings_alarm_settings_prewake_up_time_bottom_description": "avant l'alarme",
- "app_bell_settings_alarm_settings_prewake_up_chime_top_description": "M\u00e9lodie de pr\u00e9-r\u00e9veil",
- "app_bell_settings_alarm_settings_prewake_up_chime_volume": "Volume",
+ "app_bell_settings_alarm_settings_prewake_up_chime_top_description": "Son pr\u00e9-r\u00e9veil",
+ "app_bell_settings_alarm_settings_prewake_up_chime_volume": "Volume avant le r\u00e9veil",
"app_bell_settings_alarm_settings_prewake_up_light_top_description": "Lumi\u00e8re de pr\u00e9-r\u00e9veil",
"app_bell_settings_alarm_settings_prewake_up_light_bottom_description": "avant l'alarme",
"app_bell_settings_alarm_settings_snooze": "Snooze",
- "app_bell_settings_alarm_settings_snooze_chime_interval": "Intervalle de rappel",
+ "app_bell_settings_alarm_settings_snooze_chime_interval": "Intervalle de r\u00e9p\u00e9tition",
"app_bell_settings_alarm_settings_snooze_chime_interval_bot_desc": "pendant le snooze",
- "app_bell_settings_alarm_settings_snooze_chime_tone": "M\u00e9lodie",
- "app_bell_settings_alarm_settings_snooze_chime_volume": "Volume",
+ "app_bell_settings_alarm_settings_snooze_chime_tone": "R\u00e9p\u00e9ter la sonnerie",
+ "app_bell_settings_alarm_settings_snooze_chime_volume": "R\u00e9p\u00e9ter le volume",
"app_bell_settings_alarm_settings_snooze_length": "Dur\u00e9e du snooze",
"app_bell_settings_alarm_settings_title": "Alarme",
- "app_bell_settings_alarm_settings_chime": "Sonnerie de l'alarme principale",
+ "app_bell_settings_alarm_settings_chime": "Son de l'alarme",
"app_bell_settings_alarm_settings_sounds": "Sons",
"app_bell_settings_alarm_settings_custom_sounds": "Sons personnalis\u00e9s",
"app_bell_settings_alarm_settings_volume": "Volume",
- "app_bell_settings_bedtime_settings_tone": "M\u00e9lodie de l'heure du coucher",
- "app_bell_settings_bedtime_settings_volume": "Volume",
+ "app_bell_settings_bedtime_settings_tone": "Son pr\u00e9-sommeil",
+ "app_bell_settings_bedtime_settings_volume": "Volume de l'heure du coucher",
"app_bell_settings_bedtime_chime": "Heure du coucher",
"app_bell_settings_display_factory_reset_confirmation": "<text>La r\u00e9initialisation d'usine<br/>supprimera tous les fichiers de l'utilisateur et remettra l'appareil sur ses param\u00e8tres d'usine.</text>",
"app_bell_settings_factory_reset": "R\u00e9initialisation",
M image/system_a/data/lang/Polski.json => image/system_a/data/lang/Polski.json +9 -9
@@ 53,7 53,7 @@
"app_bell_onboarding_shortcuts_step_rotate": "Obr\u00f3\u0107, aby wybra\u0107",
"app_bell_onboarding_shortcuts_step_turn_off": "Przytrzymaj przycisk wstecz przez 10s aby wy\u0142\u0105czy\u0107 urz\u0105dzenie",
"app_bell_audio_error_message": "Nieobs\u0142ugiwany format pliku",
- "app_bell_audio_file_deleted_message": "<text>Plik zosta\u0142 usuni\u0119ty.</text>",
+ "app_bell_audio_file_deleted_message": "Plik zosta\u0142 usuni\u0119ty.",
"app_bell_audio_limit_error_message": "<text>Przekroczono limit plik\u00f3w.<br />Nie wszystkie pliki mog\u0105 by\u0107<br />wy\u015bwietlone poprawnie</text>",
"app_bell_relaxation_loop": "w p\u0119tli",
"app_bell_relaxation_loop_description": "utw\u00f3r b\u0119dzie odtwarzany do momentu wy\u0142\u0105czenia go",
@@ 79,23 79,23 @@
"app_bell_settings_alarm_settings_prewake_up": "Wst\u0119pne budzenie",
"app_bell_settings_alarm_settings_prewake_up_time_top_description": "Wst\u0119pne budzenie",
"app_bell_settings_alarm_settings_prewake_up_time_bottom_description": "przed alarmem",
- "app_bell_settings_alarm_settings_prewake_up_chime_top_description": "D\u017awi\u0119k wst\u0119pnego budzenia",
- "app_bell_settings_alarm_settings_prewake_up_chime_volume": "G\u0142o\u015bno\u015b\u0107",
+ "app_bell_settings_alarm_settings_prewake_up_chime_top_description": "D\u017awi\u0119k wybudzania",
+ "app_bell_settings_alarm_settings_prewake_up_chime_volume": "G\u0142o\u015bno\u015b\u0107 wybudzania",
"app_bell_settings_alarm_settings_prewake_up_light_top_description": "\u015awiat\u0142o wst\u0119pnego budzenia",
"app_bell_settings_alarm_settings_prewake_up_light_bottom_description": "przed alarmem",
"app_bell_settings_alarm_settings_snooze": "Drzemka",
- "app_bell_settings_alarm_settings_snooze_chime_interval": "Interwa\u0142 d\u017awi\u0119ku",
+ "app_bell_settings_alarm_settings_snooze_chime_interval": "Interwa\u0142 drzemki",
"app_bell_settings_alarm_settings_snooze_chime_interval_bot_desc": "powtarzaj\u0105cy si\u0119 podczas drzemki",
- "app_bell_settings_alarm_settings_snooze_chime_tone": "D\u017awi\u0119k",
- "app_bell_settings_alarm_settings_snooze_chime_volume": "G\u0142o\u015bno\u015b\u0107",
+ "app_bell_settings_alarm_settings_snooze_chime_tone": "D\u017awi\u0119k drzemki",
+ "app_bell_settings_alarm_settings_snooze_chime_volume": "G\u0142o\u015bno\u015b\u0107 drzemki",
"app_bell_settings_alarm_settings_snooze_length": "D\u0142ugo\u015b\u0107 drzemki",
"app_bell_settings_alarm_settings_title": "Ustawienia alarmu",
- "app_bell_settings_alarm_settings_chime": "D\u017awi\u0119k g\u0142\u00f3wnego alarmu",
+ "app_bell_settings_alarm_settings_chime": "D\u017awi\u0119k alarmu",
"app_bell_settings_alarm_settings_sounds": "D\u017awi\u0119ki",
"app_bell_settings_alarm_settings_custom_sounds": "Przes\u0142ane D\u017awi\u0119ki",
"app_bell_settings_alarm_settings_volume": "G\u0142o\u015bno\u015b\u0107 alarmu",
- "app_bell_settings_bedtime_settings_tone": "D\u017awi\u0119k",
- "app_bell_settings_bedtime_settings_volume": "G\u0142o\u015bno\u015b\u0107",
+ "app_bell_settings_bedtime_settings_tone": "D\u017awi\u0119k pory snu",
+ "app_bell_settings_bedtime_settings_volume": "G\u0142o\u015bno\u015b\u0107 pory snu",
"app_bell_settings_bedtime_chime": "Pora snu",
"app_bell_settings_display_factory_reset_confirmation": "<text>Reset usunie wszystkie pliki<br/>i przywr\u00f3ci urz\u0105dzenie do<br/>ustawie\u0144 fabrycznych.</text>",
"app_bell_settings_factory_reset": "Ustaw. fabryczne",
M module-apps/application-calllog/windows/CallLogMainWindow.cpp => module-apps/application-calllog/windows/CallLogMainWindow.cpp +3 -3
@@ 1,4 1,4 @@
-// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2024, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "CallLogMainWindow.hpp"
@@ 10,9 10,11 @@
#include <DialogMetadataMessage.hpp>
#include <service-appmgr/Controller.hpp>
+#include <service-db/DBNotificationMessage.hpp>
#include <queries/calllog/QueryCalllogDeleteAll.hpp>
#include <i18n/i18n.hpp>
#include <Label.hpp>
+#include <ImageBox.hpp>
#include <Margins.hpp>
#include <Style.hpp>
#include <InputEvent.hpp>
@@ 20,7 22,6 @@
#include <cassert>
#include <functional>
#include <memory>
-#include <service-db/DBNotificationMessage.hpp>
using namespace style;
using namespace callLogStyle;
@@ 31,7 32,6 @@ namespace gui
CallLogMainWindow::CallLogMainWindow(app::ApplicationCommon *app)
: AppWindow(app, calllog::settings::MainWindowStr), calllogModel{std::make_shared<CalllogModel>(app)}
{
-
buildInterface();
}
M module-apps/application-calllog/windows/CallLogMainWindow.hpp => module-apps/application-calllog/windows/CallLogMainWindow.hpp +1 -3
@@ 1,4 1,4 @@
-// Copyright (c) 2017-2022, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2024, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
@@ 12,7 12,6 @@
namespace gui
{
-
class CallLogMainWindow : public AppWindow
{
std::shared_ptr<CalllogModel> calllogModel = nullptr;
@@ 41,5 40,4 @@ namespace gui
void onEmptyList();
void onListFilled();
};
-
} /* namespace gui */
M products/BellHybrid/apps/Application.cpp => products/BellHybrid/apps/Application.cpp +3 -1
@@ 20,6 20,8 @@
#include <common/popups/ChargingNotificationWindow.hpp>
#include <apps-common/WindowsPopupFilter.hpp>
#include <service-evtmgr/KbdMessage.hpp>
+#include <service-time/AlarmMessage.hpp>
+#include <products/BellHybrid/keymap/include/keymap/KeyMap.hpp>
namespace app
{
@@ 83,7 85,7 @@ namespace app
break;
case ID::AudioError:
windowsFactory.attach(
- window::audio_error_window, [this](app::ApplicationCommon *app, const std::string &name) {
+ window::audio_error_window, [](app::ApplicationCommon *app, const std::string &name) {
auto presenter = std::make_unique<gui::AudioErrorPresenter>(app);
return std::make_unique<gui::AudioErrorWindow>(app, name, std::move(presenter));
});
M products/BellHybrid/apps/application-bell-bedtime/ApplicationBellBedtime.cpp => products/BellHybrid/apps/application-bell-bedtime/ApplicationBellBedtime.cpp +2 -2
@@ 35,8 35,8 @@ namespace app
{
windowsFactory.attach(
gui::name::window::main_window, [](ApplicationCommon *app, [[maybe_unused]] const std::string &name) {
- auto audioModel = std::make_unique<AudioModel>(app);
- auto bedtimeModel = std::make_unique<bell_bedtime::BedtimeModel>(app, *audioModel);
+ auto audioModel = std::make_unique<AudioModel>(app);
+ auto bedtimeModel = std::make_unique<bell_bedtime::BedtimeModel>(app, *audioModel);
auto provider = std::make_shared<bell_bedtime::BedtimeListItemProvider>(std::move(bedtimeModel));
auto presenter = std::make_unique<bell_bedtime::BellBedtimeWindowPresenter>(provider);
return std::make_unique<gui::BellBedtimeWindow>(app, std::move(presenter));
M products/BellHybrid/apps/application-bell-settings/ApplicationBellSettings.cpp => products/BellHybrid/apps/application-bell-settings/ApplicationBellSettings.cpp +1 -1
@@ 261,7 261,7 @@ namespace app
std::move(alarmFrontlightModel));
auto frontlightModel = std::make_unique<bell_settings::FrontlightModel>(app);
- auto provider = std::make_unique<bell_settings::AlarmSettingsListItemProvider>(*alarmSettingsModel,
+ auto provider = std::make_unique<bell_settings::AlarmSettingsListItemProvider>(*alarmSettingsModel,
std::move(songsModel));
auto audioErrorModel = std::make_unique<bell_settings::AudioErrorModel>();
auto presenter = std::make_unique<bell_settings::AlarmSettingsPresenter>(app,
M products/BellHybrid/apps/common/include/common/SoundsRepository.hpp => products/BellHybrid/apps/common/include/common/SoundsRepository.hpp +4 -4
@@ 14,7 14,7 @@
class AbstractSimpleSoundsRepository
{
public:
- virtual ~AbstractSimpleSoundsRepository() = default;
+ virtual ~AbstractSimpleSoundsRepository() = default;
[[nodiscard]] virtual std::optional<std::filesystem::path> titleToPath(const UTF8 &title) const = 0;
[[nodiscard]] virtual std::optional<UTF8> pathToTitle(std::filesystem::path) const = 0;
virtual std::vector<UTF8> getSongTitles() = 0;
@@ 47,11 47,11 @@ class AbstractSoundsRepository
virtual void init(const std::string &savedPath, OnOffsetUpdateCallback offsetUpdateCallback) = 0;
virtual void getMusicFiles(std::uint32_t offset,
std::uint32_t limit,
- const OnGetMusicFilesListCallback &callback) = 0;
+ const OnGetMusicFilesListCallback &callback) = 0;
- virtual std::uint32_t getFilesCount() = 0;
+ virtual std::uint32_t getFilesCount() = 0;
virtual std::uint32_t getFilesCountFromPath(const std::string &filesPath) = 0;
- virtual void updateFilesCount() = 0;
+ virtual void updateFilesCount() = 0;
};
class SoundsRepository : public AbstractSoundsRepository, public app::AsyncCallbackReceiver
M products/BellHybrid/apps/common/src/models/SongsModel.cpp => products/BellHybrid/apps/common/src/models/SongsModel.cpp +2 -2
@@ 69,8 69,8 @@ namespace app
const std::string &chosenRecordPath) -> void
{
currentlyChosenRecordPath = chosenRecordPath;
- activateCallback = std::move(onActivate);
- focusAcquireCallback = std::move(onFocusAcquire);
+ activateCallback = std::move(onActivate);
+ focusAcquireCallback = std::move(onFocusAcquire);
songsRepository->init(currentlyChosenRecordPath, std::move(offsetUpdateCallback));
}
M products/BellHybrid/services/db/include/db/SystemSettings.hpp => products/BellHybrid/services/db/include/db/SystemSettings.hpp +14 -14
@@ 14,37 14,37 @@ namespace bell::settings
{
inline constexpr auto tonePath = "snooze_tone_path";
inline constexpr auto toneFallbackPath = "snooze_tone_path_default";
- inline constexpr auto active = "snooze_active";
- inline constexpr auto length = "snooze_length";
- inline constexpr auto interval = "snooze_interval";
+ inline constexpr auto active = "snooze_active";
+ inline constexpr auto length = "snooze_length";
+ inline constexpr auto interval = "snooze_interval";
} // namespace Snooze
namespace PrewakeUp
{
inline constexpr auto tonePath = "prewake_up_tone_path";
inline constexpr auto toneFallbackPath = "prewake_up_tone_path_default";
- inline constexpr auto duration = "prewake_up_duration";
- inline constexpr auto lightDuration = "prewake_up_light_duration";
- inline constexpr auto brightness = "prewake_up_brightness";
+ inline constexpr auto duration = "prewake_up_duration";
+ inline constexpr auto lightDuration = "prewake_up_light_duration";
+ inline constexpr auto brightness = "prewake_up_brightness";
} // namespace PrewakeUp
namespace Alarm
{
- inline constexpr auto tonePath = "alarm_tone_path";
+ inline constexpr auto tonePath = "alarm_tone_path";
inline constexpr auto toneFallbackPath = "alarm_tone_path_default";
- inline constexpr auto fadeActive = "alarm_fade_active";
- inline constexpr auto lightActive = "alarm_light_active";
- inline constexpr auto duration = "alarm_duration";
- inline constexpr auto brightness = "alarm_brightness";
+ inline constexpr auto fadeActive = "alarm_fade_active";
+ inline constexpr auto lightActive = "alarm_light_active";
+ inline constexpr auto duration = "alarm_duration";
+ inline constexpr auto brightness = "alarm_brightness";
} // namespace Alarm
namespace Bedtime
{
inline constexpr auto tonePath = "bedtime_tone_path";
inline constexpr auto toneFallbackPath = "bedtime_tone_path_default";
- inline constexpr auto active = "bedtime_active";
- inline constexpr auto time = "bedtime_time";
- inline constexpr auto duration = "bedtime_duration";
+ inline constexpr auto active = "bedtime_active";
+ inline constexpr auto time = "bedtime_time";
+ inline constexpr auto duration = "bedtime_duration";
} // namespace Bedtime
namespace Layout