From bc9982c090de31c38a0479402105f4ff623ef548 Mon Sep 17 00:00:00 2001 From: Dawid Wojtas Date: Fri, 15 Mar 2024 12:58:13 +0100 Subject: [PATCH] [BH-1876] Change main alarm list to vertical Now the main alarm uses the vertical list to display songs. Fixed the order of songs from the database. Added translations. --- image/system_a/data/lang/Deutsch.json | 4 +++- image/system_a/data/lang/English.json | 4 +++- image/system_a/data/lang/Espanol.json | 4 +++- image/system_a/data/lang/Francais.json | 4 +++- image/system_a/data/lang/Polski.json | 4 +++- module-db/Tables/MultimediaFilesTable.cpp | 4 ++-- module-db/Tables/MultimediaFilesTable.hpp | 2 +- .../service-db/test/lang/English.json | 4 +++- .../ApplicationBellSettings.cpp | 24 ++++++++++++------- .../application-bell-settings/CMakeLists.txt | 2 ++ .../AbstractAlarmSettingsModel.hpp | 0 .../AlarmSettingsListItemProvider.cpp | 14 +++++------ .../AlarmSettingsListItemProvider.hpp | 9 ++++--- .../alarm_settings/AlarmSettingsModel.cpp | 12 +++------- .../alarm_settings}/AlarmSettingsModel.hpp | 7 +----- .../alarm_settings/AlarmSettingsPresenter.cpp | 13 ++++++---- .../alarm_settings/AlarmSettingsPresenter.hpp | 3 +-- .../BellHybrid/apps/common/CMakeLists.txt | 2 -- .../include/common/SoundsRepository.hpp | 2 +- .../apps/common/src/SoundsRepository.cpp | 4 ++-- 20 files changed, 68 insertions(+), 54 deletions(-) rename products/BellHybrid/apps/{common/include/common/models => application-bell-settings/models/alarm_settings}/AbstractAlarmSettingsModel.hpp (100%) rename products/BellHybrid/apps/{common/include/common/models => application-bell-settings/models/alarm_settings}/AlarmSettingsModel.hpp (91%) diff --git a/image/system_a/data/lang/Deutsch.json b/image/system_a/data/lang/Deutsch.json index a27672f126423ccfc2e48370d12fa99f892d9eeb..cec2c01593e4c07edb99680f055742993c4fcac1 100644 --- a/image/system_a/data/lang/Deutsch.json +++ b/image/system_a/data/lang/Deutsch.json @@ -90,7 +90,9 @@ "app_bell_settings_alarm_settings_snooze_chime_volume": "Lautst\u00e4rke", "app_bell_settings_alarm_settings_snooze_length": "Schlummerl\u00e4nge", "app_bell_settings_alarm_settings_title": "Alarmeinstellungen", - "app_bell_settings_alarm_settings_tone": "Alarmton", + "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_volume": "Alarmlautst\u00e4rke", "app_bell_settings_bedtime_settings_tone": "Klang", "app_bell_settings_bedtime_settings_volume": "Lautst\u00e4rke", diff --git a/image/system_a/data/lang/English.json b/image/system_a/data/lang/English.json index 8c3655772f7514f30177aaed0ef17b54a3618bd2..4d5de8d431f62b65bf6a145e6a7377a74e6bfa80 100644 --- a/image/system_a/data/lang/English.json +++ b/image/system_a/data/lang/English.json @@ -124,7 +124,9 @@ "app_bell_settings_alarm_settings_snooze_chime_volume": "Snooze chime volume", "app_bell_settings_alarm_settings_snooze_length": "Snooze length", "app_bell_settings_alarm_settings_title": "Alarm settings", - "app_bell_settings_alarm_settings_tone": "Main alarm tone", + "app_bell_settings_alarm_settings_chime": "Main alarm chime", + "app_bell_settings_alarm_settings_sounds": "Sounds", + "app_bell_settings_alarm_settings_custom_sounds": "Custom sounds", "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", diff --git a/image/system_a/data/lang/Espanol.json b/image/system_a/data/lang/Espanol.json index 9353263c3dd6af1ae131fe0f4f90b5c8beff237e..19c345c757da13805ff062d4d22922ecd2d6f79b 100644 --- a/image/system_a/data/lang/Espanol.json +++ b/image/system_a/data/lang/Espanol.json @@ -89,7 +89,9 @@ "app_bell_settings_alarm_settings_snooze_chime_volume": "Volumen", "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_tone": "Tono de alarma", + "app_bell_settings_alarm_settings_chime": "Timbre de 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", diff --git a/image/system_a/data/lang/Francais.json b/image/system_a/data/lang/Francais.json index 213e9dde3326d3e7798a92df450a8512fe4e685a..b566c2a02d39338fc317642cc64feedee9667581 100644 --- a/image/system_a/data/lang/Francais.json +++ b/image/system_a/data/lang/Francais.json @@ -91,7 +91,9 @@ "app_bell_settings_alarm_settings_snooze_chime_volume": "Volume", "app_bell_settings_alarm_settings_snooze_length": "Dur\u00e9e du snooze", "app_bell_settings_alarm_settings_title": "Alarme", - "app_bell_settings_alarm_settings_tone": "M\u00e9lodie de r\u00e9veil", + "app_bell_settings_alarm_settings_chime": "Sonnerie de l'alarme principale", + "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", diff --git a/image/system_a/data/lang/Polski.json b/image/system_a/data/lang/Polski.json index 91b53daa1a9bd53892e910b7dc1f6c524bcae470..de9171642eb3a7761a8c7ead44b64efb7d6a1e06 100644 --- a/image/system_a/data/lang/Polski.json +++ b/image/system_a/data/lang/Polski.json @@ -90,7 +90,9 @@ "app_bell_settings_alarm_settings_snooze_chime_volume": "G\u0142o\u015bno\u015b\u0107", "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_tone": "D\u017awi\u0119k alarmu", + "app_bell_settings_alarm_settings_chime": "D\u017awi\u0119k g\u0142\u00f3wnego 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", diff --git a/module-db/Tables/MultimediaFilesTable.cpp b/module-db/Tables/MultimediaFilesTable.cpp index 0cbd979740a205466ec5fff5a4e858da12e5a0f0..f526d706cad3c583c0dea1edc1e7ca151372bbd1 100644 --- a/module-db/Tables/MultimediaFilesTable.cpp +++ b/module-db/Tables/MultimediaFilesTable.cpp @@ -13,8 +13,8 @@ namespace std::string getSorting(db::multimedia_files::SortingBy sorting) { switch (sorting) { - case db::multimedia_files::SortingBy::IdAscending: - return "_id ASC"; + case db::multimedia_files::SortingBy::TrackIdAscending: + return "track ASC"; case db::multimedia_files::SortingBy::TitleAscending: default: return "title ASC"; diff --git a/module-db/Tables/MultimediaFilesTable.hpp b/module-db/Tables/MultimediaFilesTable.hpp index 3873d1c0cd097eed63618dd62c64b3c54a6f0953..54d63fd9c1c36101cd089d21b67bf0d060157532 100644 --- a/module-db/Tables/MultimediaFilesTable.hpp +++ b/module-db/Tables/MultimediaFilesTable.hpp @@ -73,7 +73,7 @@ namespace db::multimedia_files enum class SortingBy { TitleAscending, - IdAscending + TrackIdAscending }; class MultimediaFilesTable : public Table diff --git a/module-services/service-db/test/lang/English.json b/module-services/service-db/test/lang/English.json index 3baa273a29620aac043602eb8afb091b8445d804..bc062c2c33e299c9f08bed601a82c4d58abd7ea6 100644 --- a/module-services/service-db/test/lang/English.json +++ b/module-services/service-db/test/lang/English.json @@ -652,7 +652,9 @@ "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", + "app_bell_settings_alarm_settings_chime": "Main alarm chime", + "app_bell_settings_alarm_settings_sounds": "Sounds", + "app_bell_settings_alarm_settings_custom_sounds": "Custom sounds", "app_bell_settings_alarm_settings_volume": "Alarm volume", "app_bell_settings_alarm_settings_light": "Alarm light", "app_bell_settings_alarm_settings_prewake_up": "Pre-wake up", diff --git a/products/BellHybrid/apps/application-bell-settings/ApplicationBellSettings.cpp b/products/BellHybrid/apps/application-bell-settings/ApplicationBellSettings.cpp index c60691d9924656d1e91ab7bd452c8bc89d042179..0dca88e8151d68b903c104a0878725954b2fc073 100644 --- a/products/BellHybrid/apps/application-bell-settings/ApplicationBellSettings.cpp +++ b/products/BellHybrid/apps/application-bell-settings/ApplicationBellSettings.cpp @@ -12,6 +12,7 @@ #include "models/alarm_settings/PrewakeUpSettingsModel.hpp" #include "models/alarm_settings/SnoozeListItemProvider.hpp" #include "models/alarm_settings/SnoozeSettingsModel.hpp" +#include "models/alarm_settings/AlarmSettingsModel.hpp" #include "presenter/BedtimeSettingsPresenter.hpp" #include "presenter/AboutYourBellWindowPresenter.hpp" #include "presenter/alarm_settings/SnoozePresenter.hpp" @@ -42,7 +43,6 @@ #include #include #include -#include #include #include @@ -180,7 +180,7 @@ namespace app const auto &pathSorting = SoundsRepository::PathSorting{paths::audio::proprietary() / paths::audio::preWakeup(), - SoundsRepository::SortingBy::TitleAscending}; + SoundsRepository::SortingBy::TrackIdAscending}; auto soundsRepository = std::make_unique(this, pathSorting); auto songsModel = std::make_unique(this, std::move(soundsRepository)); @@ -225,9 +225,18 @@ namespace app windowsFactory.attach( gui::BellSettingsAlarmSettingsWindow::name, [this](ApplicationCommon *app, [[maybe_unused]] const std::string &name) { - auto soundsRepository = - std::make_unique(paths::audio::proprietary() / paths::audio::alarm()); - auto alarmToneModel = std::make_unique(this, *soundsRepository); + const auto &pathSorting = std::vector{ + {paths::audio::proprietary() / paths::audio::alarm(), + SoundsRepository::SortingBy::TrackIdAscending}, + {paths::audio::userApp() / paths::audio::alarm(), SoundsRepository::SortingBy::TitleAscending}}; + const app::LabelsWithPaths labelsWithPaths{ + {"app_bell_settings_alarm_settings_sounds", paths::audio::proprietary() / paths::audio::alarm()}, + {"app_bell_settings_alarm_settings_custom_sounds", + paths::audio::userApp() / paths::audio::alarm()}}; + auto soundsRepository = std::make_unique(this, pathSorting); + auto songsModel = std::make_unique(this, std::move(soundsRepository), labelsWithPaths); + + auto alarmToneModel = std::make_unique(this); auto alarmVolumeModel = std::make_unique(*audioModel); auto alarmFadeOnOffModel = std::make_unique(this); auto alarmLightOnOffModel = std::make_unique(this); @@ -240,12 +249,11 @@ namespace app std::move(alarmFrontlightModel)); auto frontlightModel = std::make_unique(app); - auto provider = std::make_unique( - *alarmSettingsModel, soundsRepository->getSongTitles()); + auto provider = std::make_unique(*alarmSettingsModel, + std::move(songsModel)); auto presenter = std::make_unique(std::move(provider), std::move(alarmSettingsModel), *audioModel, - std::move(soundsRepository), std::move(frontlightModel)); return std::make_unique(app, std::move(presenter)); }); diff --git a/products/BellHybrid/apps/application-bell-settings/CMakeLists.txt b/products/BellHybrid/apps/application-bell-settings/CMakeLists.txt index a437cca87fcc83021791e35de70ece8c64aec259..4e75b8d95c08d0e747d7b386e8c836db23764c01 100644 --- a/products/BellHybrid/apps/application-bell-settings/CMakeLists.txt +++ b/products/BellHybrid/apps/application-bell-settings/CMakeLists.txt @@ -74,12 +74,14 @@ target_sources(application-bell-settings models/FrontlightListItemProvider.hpp models/alarm_settings/AbstractPrewakeUpSettingsModel.hpp models/alarm_settings/AbstractSnoozeSettingsModel.hpp + models/alarm_settings/AbstractAlarmSettingsModel.hpp models/alarm_settings/AlarmSettingsListItemProvider.hpp models/alarm_settings/BedtimeSettingsListItemProvider.cpp models/alarm_settings/PrewakeUpListItemProvider.hpp models/alarm_settings/PrewakeUpSettingsModel.hpp models/alarm_settings/SnoozeListItemProvider.hpp models/alarm_settings/SnoozeSettingsModel.hpp + models/alarm_settings/AlarmSettingsModel.hpp models/alarm_settings/SettingsListItemProvider.hpp presenter/BedtimeSettingsPresenter.hpp diff --git a/products/BellHybrid/apps/common/include/common/models/AbstractAlarmSettingsModel.hpp b/products/BellHybrid/apps/application-bell-settings/models/alarm_settings/AbstractAlarmSettingsModel.hpp similarity index 100% rename from products/BellHybrid/apps/common/include/common/models/AbstractAlarmSettingsModel.hpp rename to products/BellHybrid/apps/application-bell-settings/models/alarm_settings/AbstractAlarmSettingsModel.hpp diff --git a/products/BellHybrid/apps/application-bell-settings/models/alarm_settings/AlarmSettingsListItemProvider.cpp b/products/BellHybrid/apps/application-bell-settings/models/alarm_settings/AlarmSettingsListItemProvider.cpp index 11c1b9ba4f857639c059c5630561c2b1c045c384..cc5347b558f2dc4a9ee5d30f7e522b931617eef1 100644 --- a/products/BellHybrid/apps/application-bell-settings/models/alarm_settings/AlarmSettingsListItemProvider.cpp +++ b/products/BellHybrid/apps/application-bell-settings/models/alarm_settings/AlarmSettingsListItemProvider.cpp @@ -10,19 +10,20 @@ #include #include #include +#include namespace app::bell_settings { using namespace gui; AlarmSettingsListItemProvider::AlarmSettingsListItemProvider(AbstractAlarmSettingsModel &settingsModel, - std::vector alarmToneRange) - : settingsModel{settingsModel} + std::shared_ptr songsModel) + : settingsModel{settingsModel}, songsModel{std::move(songsModel)} { - buildListItems(std::move(alarmToneRange)); + buildListItems(); } - void AlarmSettingsListItemProvider::buildListItems(std::vector alarmTonesRange) + void AlarmSettingsListItemProvider::buildListItems() { constexpr auto brightnessMin = 1U; constexpr auto brightnessMax = 10U; @@ -30,9 +31,8 @@ namespace app::bell_settings constexpr auto itemCount = 5U; internalData.reserve(itemCount); - auto alarmTone = new list_items::Text(std::move(alarmTonesRange), - settingsModel.getAlarmTone(), - utils::translate("app_bell_settings_alarm_settings_tone")); + auto alarmTone = new SongsListViewItem( + utils::translate("app_bell_settings_alarm_settings_chime"), settingsModel.getAlarmTone(), songsModel); alarmTone->set_on_value_change_cb([this](const auto &val) { if (onToneChange) { onToneChange(val); diff --git a/products/BellHybrid/apps/application-bell-settings/models/alarm_settings/AlarmSettingsListItemProvider.hpp b/products/BellHybrid/apps/application-bell-settings/models/alarm_settings/AlarmSettingsListItemProvider.hpp index 2dcef9c029a081eba96f34bf5a75253f5a490112..a315fc9126d66359481d4b4d618258b8c666eeda 100644 --- a/products/BellHybrid/apps/application-bell-settings/models/alarm_settings/AlarmSettingsListItemProvider.hpp +++ b/products/BellHybrid/apps/application-bell-settings/models/alarm_settings/AlarmSettingsListItemProvider.hpp @@ -4,8 +4,9 @@ #pragma once #include "SettingsListItemProvider.hpp" -#include +#include "AbstractAlarmSettingsModel.hpp" #include +#include namespace app::list_items { @@ -18,14 +19,16 @@ namespace app::bell_settings class AlarmSettingsListItemProvider : public SettingsListItemProvider { public: - AlarmSettingsListItemProvider(AbstractAlarmSettingsModel &settingsModel, std::vector alarmToneRange); + AlarmSettingsListItemProvider(AbstractAlarmSettingsModel &settingsModel, + std::shared_ptr songsModel); auto getCurrentVolume() -> std::uint8_t; private: - void buildListItems(std::vector alarmTonesRange); + void buildListItems(); AbstractAlarmSettingsModel &settingsModel; app::list_items::NumericWithBar *alarmVolume{nullptr}; + std::shared_ptr songsModel; }; } // namespace app::bell_settings diff --git a/products/BellHybrid/apps/application-bell-settings/models/alarm_settings/AlarmSettingsModel.cpp b/products/BellHybrid/apps/application-bell-settings/models/alarm_settings/AlarmSettingsModel.cpp index 603d288f86e91ad52785265593bf635ce77370f7..93b6dd8c828d797a12047c5289febc5a0a1c94f4 100644 --- a/products/BellHybrid/apps/application-bell-settings/models/alarm_settings/AlarmSettingsModel.cpp +++ b/products/BellHybrid/apps/application-bell-settings/models/alarm_settings/AlarmSettingsModel.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2017-2024, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md -#include +#include "AlarmSettingsModel.hpp" #include namespace app::bell_settings @@ -18,20 +18,14 @@ namespace app::bell_settings } } - AlarmToneModel::AlarmToneModel(sys::Service *app, SimpleSoundsRepository &soundsRepository) - : gui::SettingsModel{app}, soundsRepository{soundsRepository} - {} - void AlarmToneModel::setValue(UTF8 value) { - const auto &path = soundsRepository.titleToPath(value).value_or(""); - settings.setValue(bell::settings::Alarm::tonePath, path, settings::SettingsScope::Global); + settings.setValue(bell::settings::Alarm::tonePath, value, settings::SettingsScope::Global); } UTF8 AlarmToneModel::getValue() const { - const auto &path = settings.getValue(bell::settings::Alarm::tonePath, settings::SettingsScope::Global); - return soundsRepository.pathToTitle(path).value_or(""); + return settings.getValue(bell::settings::Alarm::tonePath, settings::SettingsScope::Global); } void AlarmVolumeModel::setValue(std::uint8_t value) diff --git a/products/BellHybrid/apps/common/include/common/models/AlarmSettingsModel.hpp b/products/BellHybrid/apps/application-bell-settings/models/alarm_settings/AlarmSettingsModel.hpp similarity index 91% rename from products/BellHybrid/apps/common/include/common/models/AlarmSettingsModel.hpp rename to products/BellHybrid/apps/application-bell-settings/models/alarm_settings/AlarmSettingsModel.hpp index 264df30680c017254fb4a78eede2cb65b704501d..4a6d062b4dee96b79e9d96369c5f05f2cf39c744 100644 --- a/products/BellHybrid/apps/common/include/common/models/AlarmSettingsModel.hpp +++ b/products/BellHybrid/apps/application-bell-settings/models/alarm_settings/AlarmSettingsModel.hpp @@ -6,21 +6,16 @@ #include "AbstractAlarmSettingsModel.hpp" #include #include -#include -#include namespace app::bell_settings { class AlarmToneModel : public gui::SettingsModel { public: - AlarmToneModel(sys::Service *app, SimpleSoundsRepository &soundsRepository); + using SettingsModel::SettingsModel; void setValue(UTF8 value) override; UTF8 getValue() const override; - - private: - SimpleSoundsRepository &soundsRepository; }; class AlarmVolumeModel : public gui::AbstractSettingsModel diff --git a/products/BellHybrid/apps/application-bell-settings/presenter/alarm_settings/AlarmSettingsPresenter.cpp b/products/BellHybrid/apps/application-bell-settings/presenter/alarm_settings/AlarmSettingsPresenter.cpp index 4d021772809f036bcd242019be542b3ea5186b1b..6ecc4c949446da7b1165ea4aa05e626c9efa8626 100644 --- a/products/BellHybrid/apps/application-bell-settings/presenter/alarm_settings/AlarmSettingsPresenter.cpp +++ b/products/BellHybrid/apps/application-bell-settings/presenter/alarm_settings/AlarmSettingsPresenter.cpp @@ -9,28 +9,31 @@ namespace app::bell_settings AlarmSettingsPresenter::AlarmSettingsPresenter(std::unique_ptr &&provider, std::unique_ptr &&settingsModel, AbstractAudioModel &audioModel, - std::unique_ptr &&soundsRepository, std::unique_ptr &&frontlight) : provider{std::move(provider)}, settingsModel{std::move(settingsModel)}, audioModel{audioModel}, - soundsRepository{std::move(soundsRepository)}, frontlight{std::move(frontlight)} + frontlight{std::move(frontlight)} { auto playSound = [this](const UTF8 &val) { + currentSoundPath = val; this->audioModel.setVolume(this->provider->getCurrentVolume(), AbstractAudioModel::PlaybackType::Alarm); - this->audioModel.play( - this->soundsRepository->titleToPath(val).value_or(""), AbstractAudioModel::PlaybackType::Alarm, {}); + this->audioModel.play(currentSoundPath, AbstractAudioModel::PlaybackType::Alarm, {}); }; this->provider->onExit = [this]() { getView()->exit(); }; this->provider->onToneEnter = playSound; + this->provider->onToneExit = [this](const auto &) { stopSound(); }; this->provider->onToneChange = playSound; this->provider->onVolumeEnter = playSound; this->provider->onVolumeExit = [this](const auto &) { stopSound(); }; - this->provider->onVolumeChange = [this](const auto &val) { + this->provider->onVolumeChange = [this, playSound](const auto &val) { this->audioModel.setVolume( val, AbstractAudioModel::PlaybackType::Alarm, audio::VolumeUpdateType::SkipUpdateDB); + if (this->audioModel.hasPlaybackFinished()) { + playSound(currentSoundPath); + } }; auto setBrightness = [this](const auto &brightness) { diff --git a/products/BellHybrid/apps/application-bell-settings/presenter/alarm_settings/AlarmSettingsPresenter.hpp b/products/BellHybrid/apps/application-bell-settings/presenter/alarm_settings/AlarmSettingsPresenter.hpp index 8bbc47422e3c440b6afb9353d5afc6545021f812..4f07cb00e4681ebedcdfc76a1d027d475dac257a 100644 --- a/products/BellHybrid/apps/application-bell-settings/presenter/alarm_settings/AlarmSettingsPresenter.hpp +++ b/products/BellHybrid/apps/application-bell-settings/presenter/alarm_settings/AlarmSettingsPresenter.hpp @@ -49,7 +49,6 @@ namespace app::bell_settings AlarmSettingsPresenter(std::unique_ptr &&provider, std::unique_ptr &&settingsModel, AbstractAudioModel &audioModel, - std::unique_ptr &&soundsRepository, std::unique_ptr &&frontlight); auto getPagesProvider() const -> std::shared_ptr override; @@ -65,7 +64,7 @@ namespace app::bell_settings std::shared_ptr provider; std::unique_ptr settingsModel; AbstractAudioModel &audioModel; - std::unique_ptr soundsRepository; std::unique_ptr frontlight; + UTF8 currentSoundPath; }; } // namespace app::bell_settings diff --git a/products/BellHybrid/apps/common/CMakeLists.txt b/products/BellHybrid/apps/common/CMakeLists.txt index f9b0322a0021dc7df398f863847fad472111987f..0a2289e279f297905a3b2f11c6f1c095c181389a 100644 --- a/products/BellHybrid/apps/common/CMakeLists.txt +++ b/products/BellHybrid/apps/common/CMakeLists.txt @@ -116,8 +116,6 @@ target_sources(application-bell-common include/common/models/UserSessionModel.hpp include/common/models/AudioModel.hpp include/common/models/FrontlightModel.hpp - include/common/models/AlarmSettingsModel.hpp - include/common/models/AbstractAlarmSettingsModel.hpp include/common/models/LayoutModel.hpp include/common/models/LowBatteryInfoModel.hpp include/common/models/QuoteModel.hpp diff --git a/products/BellHybrid/apps/common/include/common/SoundsRepository.hpp b/products/BellHybrid/apps/common/include/common/SoundsRepository.hpp index 8f3b0a11f4c4e50c6a50f89c7bd29d1249effeea..d1b95397e9889655665cef8b14d6dec12c951a93 100644 --- a/products/BellHybrid/apps/common/include/common/SoundsRepository.hpp +++ b/products/BellHybrid/apps/common/include/common/SoundsRepository.hpp @@ -57,7 +57,7 @@ class SoundsRepository : public AbstractSoundsRepository, public app::AsyncCallb public: enum class SortingBy { - IdAscending, + TrackIdAscending, TitleAscending }; struct PathSorting diff --git a/products/BellHybrid/apps/common/src/SoundsRepository.cpp b/products/BellHybrid/apps/common/src/SoundsRepository.cpp index a8cbeb03b8a341f7df515c1a48cdca5b73d7756e..5b44c7baa3d93d721ea8f16863c1d357e4783a6d 100644 --- a/products/BellHybrid/apps/common/src/SoundsRepository.cpp +++ b/products/BellHybrid/apps/common/src/SoundsRepository.cpp @@ -34,8 +34,8 @@ namespace constexpr db::multimedia_files::SortingBy transformSorting(SoundsRepository::SortingBy sorting) { switch (sorting) { - case SoundsRepository::SortingBy::IdAscending: - return db::multimedia_files::SortingBy::IdAscending; + case SoundsRepository::SortingBy::TrackIdAscending: + return db::multimedia_files::SortingBy::TrackIdAscending; case SoundsRepository::SortingBy::TitleAscending: default: return db::multimedia_files::SortingBy::TitleAscending;