From b4c6a29f47c6206785705991e341cf6ed48e17dd Mon Sep 17 00:00:00 2001 From: rrandomsky Date: Thu, 28 Mar 2024 17:33:47 +0100 Subject: [PATCH] [BH-1915][BH-1911] Update UI texts and translations Updated multiple custom sounds related texts and translations. Post-rebase fixes. --- image/system_a/data/lang/Deutsch.json | 24 ++++++++-------- image/system_a/data/lang/English.json | 12 ++++---- image/system_a/data/lang/Espanol.json | 20 ++++++------- image/system_a/data/lang/Francais.json | 20 ++++++------- image/system_a/data/lang/Polski.json | 18 ++++++------ .../windows/CallLogMainWindow.cpp | 6 ++-- .../windows/CallLogMainWindow.hpp | 4 +-- products/BellHybrid/apps/Application.cpp | 4 ++- .../ApplicationBellBedtime.cpp | 4 +-- .../ApplicationBellSettings.cpp | 2 +- .../include/common/SoundsRepository.hpp | 8 +++--- .../apps/common/src/models/SongsModel.cpp | 4 +-- .../services/db/include/db/SystemSettings.hpp | 28 +++++++++---------- 13 files changed, 77 insertions(+), 77 deletions(-) diff --git a/image/system_a/data/lang/Deutsch.json b/image/system_a/data/lang/Deutsch.json index 8d2fc9afc9e7e572f9139c463d1f672d0c78194b..f6161e398f204635a2c7773503d9498df471c192 100644 --- a/image/system_a/data/lang/Deutsch.json +++ b/image/system_a/data/lang/Deutsch.json @@ -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": "Die Datei wurde gel\u00f6scht.", + "app_bell_audio_file_deleted_message": "Die Datei wurde gel\u00f6scht.", "app_bell_audio_limit_error_message": "Datenlimit \u00fcberschritten.
Es k\u00f6nnte zu Fehlern kommen.", "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": "Lautst\u00e4rke", - "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": "L\u00f6scht alle Benutzerdateien
und setzt das Ger\u00e4t auf
Werkseinstellungen zur\u00fcck.", "app_bell_settings_factory_reset": "Zur\u00fccksetzen", "app_bell_settings_factory_reset_option_back": "Zur\u00fcck", @@ -120,7 +120,7 @@ "app_bell_welcome_message": "Mudita Harmony
ist ausgeschaltet", "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", diff --git a/image/system_a/data/lang/English.json b/image/system_a/data/lang/English.json index db01aea117170e9fd2066d591a2eeb7c68c89619..c149a8a97c0a22f2dab6d10c4f8a42aeb76ba4ec 100644 --- a/image/system_a/data/lang/English.json +++ b/image/system_a/data/lang/English.json @@ -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": "The file has been deleted.", + "app_bell_audio_file_deleted_message": "The file has been deleted.", "app_bell_audio_limit_error_message": "File limit exceeded.
Not all files may be displayed
correctly", "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": "recurring during
snooze", - "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": "Factory reset will delete all
users files and return device
to factory settings.", "app_bell_settings_factory_reset": "Factory reset", "app_bell_settings_factory_reset_option_back": "Back", diff --git a/image/system_a/data/lang/Espanol.json b/image/system_a/data/lang/Espanol.json index 4ae73d19d6f81c9cb42aa8b2e1faeba46ecccc7c..4539bd923d867c25ebb0b778240d935cfba0ce37 100644 --- a/image/system_a/data/lang/Espanol.json +++ b/image/system_a/data/lang/Espanol.json @@ -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": "Se ha eliminado el archivo.", + "app_bell_audio_file_deleted_message": "Se ha eliminado el archivo.", "app_bell_audio_limit_error_message": "L\u00edmite de archivos alcanzado,
pueden producirse errores.", "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": "La configuraci\u00f3n de f\u00e1brica
eliminar\u00e1 todos los archivos.", "app_bell_settings_factory_reset": "Restablecer", diff --git a/image/system_a/data/lang/Francais.json b/image/system_a/data/lang/Francais.json index 70c4ed675fce2c106498398234d20e3ffc19ce55..0d02d3c26bd872be2362a1ff489c86ecdfebb149 100644 --- a/image/system_a/data/lang/Francais.json +++ b/image/system_a/data/lang/Francais.json @@ -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": "Format de fichier non pris en

charge", - "app_bell_audio_file_deleted_message": "Le fichier a \u00e9t\u00e9 supprim\u00e9.", + "app_bell_audio_file_deleted_message": "Le fichier a \u00e9t\u00e9 supprim\u00e9.", "app_bell_audio_limit_error_message": "Limite de fichiers exc\u00e9d\u00e9e.
Risque de probl\u00e8mes
d'affichage", "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": "La r\u00e9initialisation d'usine
supprimera tous les fichiers de l'utilisateur et remettra l'appareil sur ses param\u00e8tres d'usine.", "app_bell_settings_factory_reset": "R\u00e9initialisation", diff --git a/image/system_a/data/lang/Polski.json b/image/system_a/data/lang/Polski.json index ee9df5015de92a3ef67c7ea917ef0401deca42b2..645263c94a32291221e9985ac274fd0e302df64f 100644 --- a/image/system_a/data/lang/Polski.json +++ b/image/system_a/data/lang/Polski.json @@ -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": "Plik zosta\u0142 usuni\u0119ty.", + "app_bell_audio_file_deleted_message": "Plik zosta\u0142 usuni\u0119ty.", "app_bell_audio_limit_error_message": "Przekroczono limit plik\u00f3w.
Nie wszystkie pliki mog\u0105 by\u0107
wy\u015bwietlone poprawnie", "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": "Reset usunie wszystkie pliki
i przywr\u00f3ci urz\u0105dzenie do
ustawie\u0144 fabrycznych.", "app_bell_settings_factory_reset": "Ustaw. fabryczne", diff --git a/module-apps/application-calllog/windows/CallLogMainWindow.cpp b/module-apps/application-calllog/windows/CallLogMainWindow.cpp index a732e4a6ad1a8a360f154bcde4500e9df80790ca..580fb349ad05201001cdc255775b705775360393 100644 --- a/module-apps/application-calllog/windows/CallLogMainWindow.cpp +++ b/module-apps/application-calllog/windows/CallLogMainWindow.cpp @@ -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 #include +#include #include #include #include +#include #include #include #include @@ -20,7 +22,6 @@ #include #include #include -#include 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(app)} { - buildInterface(); } diff --git a/module-apps/application-calllog/windows/CallLogMainWindow.hpp b/module-apps/application-calllog/windows/CallLogMainWindow.hpp index 2d3daa5d9459d1ccf802fc18ea3b48418dc68fd9..1817caa92ee51040c08032eea0a215249be90091 100644 --- a/module-apps/application-calllog/windows/CallLogMainWindow.hpp +++ b/module-apps/application-calllog/windows/CallLogMainWindow.hpp @@ -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 = nullptr; @@ -41,5 +40,4 @@ namespace gui void onEmptyList(); void onListFilled(); }; - } /* namespace gui */ diff --git a/products/BellHybrid/apps/Application.cpp b/products/BellHybrid/apps/Application.cpp index ed34f2002f325e20cf4256fd8477f5c168d1bc65..6d232abd0fc7545767ce93e28f6a5259c3567b9b 100644 --- a/products/BellHybrid/apps/Application.cpp +++ b/products/BellHybrid/apps/Application.cpp @@ -20,6 +20,8 @@ #include #include #include +#include +#include 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(app); return std::make_unique(app, name, std::move(presenter)); }); diff --git a/products/BellHybrid/apps/application-bell-bedtime/ApplicationBellBedtime.cpp b/products/BellHybrid/apps/application-bell-bedtime/ApplicationBellBedtime.cpp index 12ed05b3bfb94d119b40fc41021b81446c1b7990..13bb37f8cfe7c6f017553874bf5ec6584877b309 100644 --- a/products/BellHybrid/apps/application-bell-bedtime/ApplicationBellBedtime.cpp +++ b/products/BellHybrid/apps/application-bell-bedtime/ApplicationBellBedtime.cpp @@ -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(app); - auto bedtimeModel = std::make_unique(app, *audioModel); + auto audioModel = std::make_unique(app); + auto bedtimeModel = std::make_unique(app, *audioModel); auto provider = std::make_shared(std::move(bedtimeModel)); auto presenter = std::make_unique(provider); return std::make_unique(app, std::move(presenter)); diff --git a/products/BellHybrid/apps/application-bell-settings/ApplicationBellSettings.cpp b/products/BellHybrid/apps/application-bell-settings/ApplicationBellSettings.cpp index 7c8745a0b82d5519852ee466ec0b0ce6ccb07b4d..5735fbb15ccd892e8e3061359f06f905d7afea82 100644 --- a/products/BellHybrid/apps/application-bell-settings/ApplicationBellSettings.cpp +++ b/products/BellHybrid/apps/application-bell-settings/ApplicationBellSettings.cpp @@ -261,7 +261,7 @@ namespace app std::move(alarmFrontlightModel)); auto frontlightModel = std::make_unique(app); - auto provider = std::make_unique(*alarmSettingsModel, + auto provider = std::make_unique(*alarmSettingsModel, std::move(songsModel)); auto audioErrorModel = std::make_unique(); auto presenter = std::make_unique(app, diff --git a/products/BellHybrid/apps/common/include/common/SoundsRepository.hpp b/products/BellHybrid/apps/common/include/common/SoundsRepository.hpp index 984a19a2df0eaf68ae1cb4624b460b0b597241fb..e9b945e45e38f7ec5f302042a2342042bcdce991 100644 --- a/products/BellHybrid/apps/common/include/common/SoundsRepository.hpp +++ b/products/BellHybrid/apps/common/include/common/SoundsRepository.hpp @@ -14,7 +14,7 @@ class AbstractSimpleSoundsRepository { public: - virtual ~AbstractSimpleSoundsRepository() = default; + virtual ~AbstractSimpleSoundsRepository() = default; [[nodiscard]] virtual std::optional titleToPath(const UTF8 &title) const = 0; [[nodiscard]] virtual std::optional pathToTitle(std::filesystem::path) const = 0; virtual std::vector 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 diff --git a/products/BellHybrid/apps/common/src/models/SongsModel.cpp b/products/BellHybrid/apps/common/src/models/SongsModel.cpp index a7636cf39d58419a414099676ab051b6f18f37c6..01e074ec3254ef878c5b3c8fd396fd8f9d478866 100644 --- a/products/BellHybrid/apps/common/src/models/SongsModel.cpp +++ b/products/BellHybrid/apps/common/src/models/SongsModel.cpp @@ -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)); } diff --git a/products/BellHybrid/services/db/include/db/SystemSettings.hpp b/products/BellHybrid/services/db/include/db/SystemSettings.hpp index dbd401466b5b0166ea00c1f5005d4e9083c628e1..f1cd06a1b28ea9e3c59897463c1ab82b2106db77 100644 --- a/products/BellHybrid/services/db/include/db/SystemSettings.hpp +++ b/products/BellHybrid/services/db/include/db/SystemSettings.hpp @@ -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