From 8e6490863a74d30442b434f91b90a2f07095e2d3 Mon Sep 17 00:00:00 2001 From: Mateusz Grzegorzek Date: Wed, 21 Jul 2021 16:41:54 +0200 Subject: [PATCH] [BH-395] Librarize application-settings Librarize application-settings --- module-apps/CMakeLists.txt | 3 +- .../ApplicationOnBoarding.cpp | 6 - .../OnBoardingChangeDateAndTimeWindow.hpp | 1 - .../ApplicationSettings.cpp | 104 +++++------ .../application-settings/CMakeLists.txt | 174 ++++++++++-------- .../application-settings/data/ApnListData.hpp | 4 +- .../data/AutoLockData.hpp | 1 - .../data/BluetoothStatusData.hpp | 2 +- .../data/ChangePasscodeData.hpp | 20 -- .../application-settings/data/DeviceData.hpp | 2 +- .../data/LanguagesData.hpp | 2 +- .../data/PINSettingsLockStateData.hpp | 3 +- .../data/PINSettingsSimData.hpp | 3 +- .../data/PhoneNameData.hpp | 5 +- .../data/QuoteSwitchData.hpp | 4 +- .../data/SettingsInternals.hpp | 2 - .../data/SettingsItemData.hpp | 3 +- .../ApplicationSettings.hpp | 4 +- .../models/advanced/ColorTestModel.cpp | 1 + .../models/advanced/ColorTestModel.hpp | 4 +- .../models/apps/AbstractSoundsModel.hpp | 3 +- .../models/apps/AudioSettingsModel.cpp | 1 - .../models/apps/SoundsModel.cpp | 2 +- .../models/apps/SoundsModel.hpp | 2 - .../models/display-keypad/CategoriesModel.cpp | 1 + .../models/display-keypad/CategoriesModel.hpp | 2 - .../models/display-keypad/QuotesModel.cpp | 2 +- .../models/display-keypad/QuotesModel.hpp | 2 - .../models/network/ApnSettingsModel.cpp | 1 + .../models/network/ApnSettingsModel.hpp | 4 +- .../models/network/NewApnModel.hpp | 3 +- .../models/system/DateAndTimeModel.cpp | 3 +- .../models/system/DateAndTimeModel.hpp | 3 +- .../models/system/FactoryData.cpp | 2 +- .../models/system/SARInfoRepository.cpp | 1 + .../models/system/SARInfoRepository.hpp | 2 +- .../system/TechnicalInformationModel.cpp | 3 +- .../system/TechnicalInformationModel.hpp | 2 +- .../system/SARInfoWindowPresenter.hpp | 1 + .../widgets/SettingsStyle.hpp | 2 +- .../widgets/advanced/ColorTestListItem.cpp | 4 +- .../widgets/advanced/ColorTestListItem.hpp | 2 - .../widgets/advanced/ColorTestListView.cpp | 1 + .../widgets/apps/SettingsSoundItem.hpp | 2 +- .../widgets/display-keypad/CategoryWidget.cpp | 2 + .../widgets/display-keypad/CategoryWidget.hpp | 2 +- .../widgets/display-keypad/QuoteWidget.cpp | 2 + .../widgets/display-keypad/QuoteWidget.hpp | 3 +- .../widgets/network/ApnInputWidget.cpp | 1 + .../widgets/network/ApnInputWidget.hpp | 1 + .../widgets/network/ApnListItem.hpp | 2 + .../widgets/system/SettingsDateItem.cpp | 2 +- .../widgets/system/SettingsDateItem.hpp | 2 +- .../system/TechnicalInformationItem.hpp | 1 - .../windows/BaseSettingsWindow.cpp | 1 - .../windows/BaseSettingsWindow.hpp | 4 +- .../windows/OptionsWidgetMaker.cpp | 1 + .../windows/OptionsWidgetMaker.hpp | 3 +- .../windows/SettingsMainWindow.cpp | 5 +- .../windows/SettingsMainWindow.hpp | 3 +- .../windows/WindowNames.hpp | 1 - .../advanced/AdvancedOptionsWindow.hpp | 3 +- .../windows/advanced/ColorTestWindow.cpp | 2 +- .../windows/advanced/ColorTestWindow.hpp | 6 +- .../windows/advanced/EinkModeWindow.cpp | 7 +- .../windows/advanced/EinkModeWindow.hpp | 2 +- .../windows/advanced/InformationWindow.cpp | 3 +- .../windows/advanced/InformationWindow.hpp | 3 +- .../windows/advanced/UITestWindow.cpp | 3 +- .../windows/advanced/UITestWindow.hpp | 2 +- .../windows/apps/AlarmClockWindow.cpp | 3 +- .../windows/apps/AlarmClockWindow.hpp | 2 +- .../windows/apps/AppsWindow.cpp | 2 - .../windows/apps/MessagesWindow.cpp | 4 +- .../windows/apps/MessagesWindow.hpp | 2 +- .../windows/apps/PhoneWindow.cpp | 6 +- .../windows/apps/PhoneWindow.hpp | 2 +- .../windows/apps/SoundSelectWindow.cpp | 4 +- .../windows/apps/SoundSelectWindow.hpp | 1 - .../windows/bluetooth/AddDeviceWindow.cpp | 8 +- .../windows/bluetooth/AddDeviceWindow.hpp | 2 +- .../windows/bluetooth/AllDevicesWindow.cpp | 8 +- .../bluetooth/BluetoothCheckPasskeyWindow.cpp | 5 +- .../bluetooth/BluetoothCheckPasskeyWindow.hpp | 1 - .../windows/bluetooth/BluetoothWindow.cpp | 3 +- .../windows/bluetooth/PhoneNameWindow.cpp | 6 +- .../windows/bluetooth/PhoneNameWindow.hpp | 2 +- .../display-keypad/DisplayAndKeypadWindow.cpp | 2 +- .../display-keypad/DisplayLightWindow.cpp | 4 - .../display-keypad/EditQuotesWindow.cpp | 3 +- .../windows/display-keypad/FontSizeWindow.cpp | 2 - .../display-keypad/InputLanguageWindow.cpp | 5 +- .../display-keypad/InputLanguageWindow.hpp | 1 + .../display-keypad/KeypadLightWindow.cpp | 4 +- .../display-keypad/KeypadLightWindow.hpp | 2 +- .../display-keypad/QuoteCategoriesWindow.cpp | 3 +- .../display-keypad/QuoteCategoriesWindow.hpp | 3 +- .../display-keypad/QuotesAddWindow.cpp | 2 - .../display-keypad/QuotesAddWindow.hpp | 4 +- .../display-keypad/QuotesMainWindow.cpp | 6 +- .../display-keypad/QuotesMainWindow.hpp | 6 +- .../display-keypad/QuotesOptionsWindow.cpp | 4 +- .../display-keypad/QuotesOptionsWindow.hpp | 2 +- .../display-keypad/WallpaperWindow.cpp | 3 +- .../windows/network/ApnOptionsWindow.cpp | 3 +- .../windows/network/ApnOptionsWindow.hpp | 2 - .../windows/network/ApnSettingsWindow.cpp | 6 +- .../windows/network/ApnSettingsWindow.hpp | 3 +- .../windows/network/NetworkWindow.cpp | 5 +- .../windows/network/NewApnWindow.cpp | 2 +- .../windows/network/NewApnWindow.hpp | 1 - .../windows/network/SimCardsWindow.cpp | 4 +- .../windows/network/SimPINSettingsWindow.cpp | 5 +- .../phone-modes/ConnectionFrequencyWindow.cpp | 3 +- .../phone-modes/DoNotDisturbWindow.cpp | 4 +- .../phone-modes/DoNotDisturbWindow.hpp | 1 + .../windows/phone-modes/OfflineWindow.cpp | 3 +- .../windows/phone-modes/PhoneModesWindow.cpp | 3 +- .../windows/security/AutolockWindow.cpp | 2 + .../windows/security/SecurityMainWindow.cpp | 1 + .../windows/system/CertificationWindow.cpp | 4 +- .../system/ChangeDateAndTimeWindow.cpp | 6 +- .../system/ChangeDateAndTimeWindow.hpp | 3 +- .../windows/system/ChangeTimeZone.cpp | 5 +- .../windows/system/DateAndTimeMainWindow.cpp | 3 +- .../windows/system/DateAndTimeMainWindow.hpp | 1 + .../windows/system/LanguagesWindow.cpp | 2 - .../windows/system/LanguagesWindow.hpp | 2 +- .../windows/system/SARInfoWindow.cpp | 1 + .../windows/system/SARInfoWindow.hpp | 1 + .../windows/system/SystemMainWindow.cpp | 4 +- .../system/TechnicalInformationWindow.hpp | 3 +- module-bluetooth/CMakeLists.txt | 1 + .../service-bluetooth/ServiceBluetooth.hpp | 2 +- products/PurePhone/CMakeLists.txt | 1 + 135 files changed, 306 insertions(+), 364 deletions(-) delete mode 100644 module-apps/application-settings/data/ChangePasscodeData.hpp rename module-apps/application-settings/{ => include/application-settings}/ApplicationSettings.hpp (98%) diff --git a/module-apps/CMakeLists.txt b/module-apps/CMakeLists.txt index 90c83e8dd8e968f0598e8a6896ff2109fcc72614..9a6f805948af54ab4db2464876bf6d2bf611e03a 100644 --- a/module-apps/CMakeLists.txt +++ b/module-apps/CMakeLists.txt @@ -22,12 +22,12 @@ add_subdirectory(application-music-player) add_subdirectory(application-notes) add_subdirectory(application-phonebook) add_subdirectory(application-calllog) +add_subdirectory(application-settings) add_subdirectory(application-special-input) add_subdirectory(apps-common) set(APPLICATIONS clock - settings onboarding alarm-clock ) @@ -82,6 +82,7 @@ endif() target_link_libraries(${PROJECT_NAME} PRIVATE application-messages + application-settings apps-common date::date eventstore diff --git a/module-apps/application-onboarding/ApplicationOnBoarding.cpp b/module-apps/application-onboarding/ApplicationOnBoarding.cpp index 6351b6676ad7fd3b28300738bdbedcd0275da990..3811d3d6d8f70af96f6ce5e1e617c8930ed82fbd 100644 --- a/module-apps/application-onboarding/ApplicationOnBoarding.cpp +++ b/module-apps/application-onboarding/ApplicationOnBoarding.cpp @@ -1,8 +1,6 @@ // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md -#include - #include "ApplicationOnBoarding.hpp" #include "data/OnBoardingMessages.hpp" @@ -18,12 +16,8 @@ #include "windows/OnBoardingDateAndTimeWindow.hpp" #include "windows/OnBoardingChangeDateAndTimeWindow.hpp" -#include -#include #include #include -#include -#include #include namespace app diff --git a/module-apps/application-onboarding/windows/OnBoardingChangeDateAndTimeWindow.hpp b/module-apps/application-onboarding/windows/OnBoardingChangeDateAndTimeWindow.hpp index 7fc2935394f389df08d2c5aa2dde6cb364b9f820..9750bde59a4f1c1632b60db99b84baf344ab9483 100644 --- a/module-apps/application-onboarding/windows/OnBoardingChangeDateAndTimeWindow.hpp +++ b/module-apps/application-onboarding/windows/OnBoardingChangeDateAndTimeWindow.hpp @@ -4,7 +4,6 @@ #pragma once #include -#include namespace app::onBoarding { diff --git a/module-apps/application-settings/ApplicationSettings.cpp b/module-apps/application-settings/ApplicationSettings.cpp index b51b643132b677f4eb0efa80ceb155c9ff586a61..4052b39f910e6a0c686c76a2cc2e2302d88f3b3f 100644 --- a/module-apps/application-settings/ApplicationSettings.cpp +++ b/module-apps/application-settings/ApplicationSettings.cpp @@ -1,85 +1,85 @@ // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md -#include "ApplicationSettings.hpp" - +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include +#include +#include #include #include -#include -#include -#include +#include +#include +#include +#include +#include #include #include -#include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include #include #include -#include -#include -#include -#include #include +#include +#include +#include #include +#include +#include #include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include -#include -#include -#include -#include -#include -#include +#include #include -#include -#include -#include -#include -#include -#include +#include #include +#include +#include +#include +#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include + +#include +#include +#include +#include #include #include -#include #include #include #include #include #include #include +#include #include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/module-apps/application-settings/CMakeLists.txt b/module-apps/application-settings/CMakeLists.txt index 3100b7dfd3e4cc6b4354c1a7cac5921c2aeb7abb..9ae970ebf9e9f1a26efa9dde3907ab894bd37699 100644 --- a/module-apps/application-settings/CMakeLists.txt +++ b/module-apps/application-settings/CMakeLists.txt @@ -1,146 +1,162 @@ - -include_directories( ${CMAKE_PROJECT_NAME} - - PUBLIC - "${CMAKE_CURRENT_LIST_DIR}" -) - -include_directories( ${PROJECT_NAME} +add_library(application-settings STATIC) +target_include_directories(application-settings + PRIVATE + $ PUBLIC - ${CMAKE_CURRENT_LIST_DIR} + $ ) -target_sources( ${PROJECT_NAME} - +target_sources(application-settings PRIVATE ApplicationSettings.cpp models/advanced/ColorTestModel.cpp + models/apps/AudioSettingsModel.cpp + models/apps/AudioSettingsModel.cpp + models/apps/SoundsModel.cpp + models/apps/SoundsModel.cpp models/bluetooth/BluetoothSettingsModel.cpp + models/display-keypad/CategoriesModel.cpp + models/display-keypad/CategoriesModel.cpp + models/display-keypad/QuotesModel.cpp + models/display-keypad/QuotesModel.cpp models/network/ApnSettingsModel.cpp models/network/NewApnModel.cpp models/network/SimContactsImportModel.cpp models/network/SimContactsRepository.cpp - models/display-keypad/QuotesModel.cpp - models/display-keypad/CategoriesModel.cpp - models/apps/AudioSettingsModel.cpp - models/apps/SoundsModel.cpp models/system/DateAndTimeModel.cpp - models/system/SARInfoRepository.cpp - models/system/TechnicalInformationRepository.cpp models/system/FactoryData.cpp + models/system/SARInfoRepository.cpp + models/system/SARInfoRepository.cpp models/system/TechnicalInformationModel.cpp + models/system/TechnicalInformationRepository.cpp presenter/network/SimContactsImportWindowPresenter.cpp presenter/system/SARInfoWindowPresenter.cpp presenter/system/TechnicalWindowPresenter.cpp - widgets/SpinBoxOptionSettings.cpp widgets/advanced/ColorTestListItem.cpp widgets/advanced/ColorTestListView.cpp + widgets/SpinBoxOptionSettings.cpp + widgets/apps/SettingsSoundItem.cpp + widgets/display-keypad/CategoryWidget.cpp + widgets/display-keypad/QuoteWidget.cpp widgets/network/ApnInputWidget.cpp widgets/network/SimContactImportSelectWidget.cpp - widgets/display-keypad/QuoteWidget.cpp - widgets/display-keypad/CategoryWidget.cpp - widgets/apps/SettingsSoundItem.cpp widgets/system/SettingsDateItem.cpp widgets/system/SettingsTimeItem.cpp widgets/system/TechnicalInformationItem.cpp - windows/SettingsMainWindow.cpp windows/BaseSettingsWindow.cpp windows/OptionsWidgetMaker.cpp + windows/SettingsMainWindow.cpp windows/advanced/AdvancedOptionsWindow.cpp + windows/advanced/ColorTestWindow.cpp + windows/advanced/EinkModeWindow.cpp windows/advanced/InformationWindow.cpp windows/advanced/UITestWindow.cpp - windows/advanced/EinkModeWindow.cpp - windows/advanced/ColorTestWindow.cpp + windows/apps/AlarmClockWindow.cpp + windows/apps/AppsWindow.cpp + windows/apps/MessagesWindow.cpp + windows/apps/PhoneWindow.cpp + windows/apps/SoundSelectWindow.cpp windows/bluetooth/AddDeviceWindow.cpp windows/bluetooth/AllDevicesWindow.cpp + windows/bluetooth/BluetoothCheckPasskeyWindow.cpp windows/bluetooth/BluetoothWindow.cpp windows/bluetooth/PhoneNameWindow.cpp - windows/bluetooth/BluetoothCheckPasskeyWindow.cpp - windows/network/NetworkWindow.cpp - windows/network/SimCardsWindow.cpp - windows/network/SimPINSettingsWindow.cpp - windows/network/SimContactsImportWindow.cpp - windows/network/ApnSettingsWindow.cpp - windows/network/ApnOptionsWindow.cpp - windows/network/NewApnWindow.cpp windows/display-keypad/DisplayAndKeypadWindow.cpp windows/display-keypad/DisplayLightWindow.cpp + windows/display-keypad/EditQuotesWindow.cpp windows/display-keypad/FontSizeWindow.cpp - windows/display-keypad/WallpaperWindow.cpp - windows/display-keypad/QuotesMainWindow.cpp + windows/display-keypad/InputLanguageWindow.cpp + windows/display-keypad/KeypadLightWindow.cpp + windows/display-keypad/QuoteCategoriesWindow.cpp windows/display-keypad/QuotesAddWindow.cpp + windows/display-keypad/QuotesMainWindow.cpp windows/display-keypad/QuotesOptionsWindow.cpp - windows/display-keypad/EditQuotesWindow.cpp - windows/display-keypad/QuoteCategoriesWindow.cpp - windows/display-keypad/KeypadLightWindow.cpp - windows/display-keypad/InputLanguageWindow.cpp - windows/phone-modes/PhoneModesWindow.cpp + windows/display-keypad/WallpaperWindow.cpp + windows/network/ApnOptionsWindow.cpp + windows/network/ApnSettingsWindow.cpp + windows/network/NetworkWindow.cpp + windows/network/NewApnWindow.cpp + windows/network/SimCardsWindow.cpp + windows/network/SimContactsImportWindow.cpp + windows/network/SimPINSettingsWindow.cpp + windows/phone-modes/ConnectionFrequencyWindow.cpp windows/phone-modes/DoNotDisturbWindow.cpp windows/phone-modes/OfflineWindow.cpp - windows/phone-modes/ConnectionFrequencyWindow.cpp - windows/apps/AppsWindow.cpp - windows/apps/PhoneWindow.cpp - windows/apps/MessagesWindow.cpp - windows/apps/AlarmClockWindow.cpp - windows/apps/SoundSelectWindow.cpp - windows/security/SecurityMainWindow.cpp + windows/phone-modes/PhoneModesWindow.cpp windows/security/AutolockWindow.cpp - windows/system/SystemMainWindow.cpp - windows/system/LanguagesWindow.cpp - windows/system/DateAndTimeMainWindow.cpp - windows/system/ChangeTimeZone.cpp + windows/security/SecurityMainWindow.cpp + windows/system/CertificationWindow.cpp windows/system/ChangeDateAndTimeWindow.cpp + windows/system/ChangeTimeZone.cpp + windows/system/DateAndTimeMainWindow.cpp + windows/system/LanguagesWindow.cpp windows/system/SARInfoWindow.cpp - windows/system/CertificationWindow.cpp + windows/system/SystemMainWindow.cpp windows/system/TechnicalInformationWindow.cpp - - PUBLIC - ApplicationSettings.hpp + PRIVATE models/advanced/ColorTestModel.hpp widgets/SettingsStyle.hpp widgets/advanced/ColorTestListItem.hpp - widgets/advanced/ColorTestListItem.hpp widgets/advanced/ColorTestListStyle.hpp - widgets/network/ApnInputWidget.hpp + widgets/advanced/ColorTestListView.hpp widgets/display-keypad/CategoryWidget.hpp - windows/SettingsMainWindow.hpp + widgets/network/ApnInputWidget.hpp windows/BaseSettingsWindow.hpp + windows/SettingsMainWindow.hpp windows/WindowNames.hpp windows/advanced/AdvancedOptionsWindow.hpp + windows/advanced/ColorTestWindow.hpp + windows/advanced/EinkModeWindow.hpp windows/advanced/InformationWindow.hpp windows/advanced/UITestWindow.hpp - windows/advanced/EinkModeWindow.hpp - windows/advanced/ColorTestWindow.hpp - windows/network/SimCardsWindow.hpp - windows/network/NewApnWindow.hpp + windows/apps/AppsWindow.hpp + windows/apps/MessagesWindow.hpp windows/display-keypad/DisplayAndKeypadWindow.hpp windows/display-keypad/DisplayLightWindow.hpp - windows/display-keypad/FontSizeWindow.hpp - windows/display-keypad/WallpaperWindow.hpp windows/display-keypad/EditQuotesWindow.hpp - windows/display-keypad/QuoteCategoriesWindow.hpp - windows/display-keypad/KeypadLightWindow.hpp + windows/display-keypad/FontSizeWindow.hpp windows/display-keypad/InputLanguageWindow.hpp - windows/apps/AppsWindow.hpp - windows/apps/MessagesWindow.hpp + windows/display-keypad/KeypadLightWindow.hpp + windows/display-keypad/QuoteCategoriesWindow.hpp + windows/display-keypad/WallpaperWindow.hpp + windows/network/NewApnWindow.hpp + windows/network/SimCardsWindow.hpp windows/security/AutolockWindow.hpp - windows/system/SystemMainWindow.hpp - windows/system/LanguagesWindow.hpp - windows/system/DateAndTimeMainWindow.hpp - windows/system/ChangeDateAndTimeWindow.hpp windows/system/CertificationWindow.hpp + windows/system/ChangeDateAndTimeWindow.hpp + windows/system/DateAndTimeMainWindow.hpp + windows/system/LanguagesWindow.hpp + windows/system/SystemMainWindow.hpp windows/system/TechnicalInformationWindow.hpp + PUBLIC + include/application-settings/ApplicationSettings.hpp ) -add_dependencies(${PROJECT_NAME} version) - -target_link_libraries(${PROJECT_NAME} - PUBLIC - service-bluetooth - eventstore +target_link_libraries(application-settings PRIVATE + apps-common + eventstore + module-bluetooth + module-bsp + module-gui + module-utils + module-vfs service-appmgr - service-eink - service-time-api + service-audio + service-bluetooth + service-cellular + service-db + service-desktop + service-evtmgr + service-time +) + +add_dependencies(application-settings version) + +option(ENABLE_APP_SETTINGS "Enable application settings" ON) + +target_compile_definitions(application-settings + INTERFACE + $<$:ENABLE_APP_SETTINGS> ) diff --git a/module-apps/application-settings/data/ApnListData.hpp b/module-apps/application-settings/data/ApnListData.hpp index 4ae571db3d9320404009346ef4b75b13e027ac35..287ef232ac9a36403d4c3d6c481d8fef8f069fee 100644 --- a/module-apps/application-settings/data/ApnListData.hpp +++ b/module-apps/application-settings/data/ApnListData.hpp @@ -3,10 +3,8 @@ #pragma once +#include #include -#include - -#include namespace gui { diff --git a/module-apps/application-settings/data/AutoLockData.hpp b/module-apps/application-settings/data/AutoLockData.hpp index 5721524f20d0f77f1c07d25552d7ed017f739282..ff95cfd62b47c29d9437a52cbbb1cb8d9886b0e6 100644 --- a/module-apps/application-settings/data/AutoLockData.hpp +++ b/module-apps/application-settings/data/AutoLockData.hpp @@ -3,7 +3,6 @@ #pragma once -#include #include namespace gui diff --git a/module-apps/application-settings/data/BluetoothStatusData.hpp b/module-apps/application-settings/data/BluetoothStatusData.hpp index 624ae15ca581f5925197bf7e3abb578e6b1ac958..447eeaf63788fdd524d23d3c37b309778799340c 100644 --- a/module-apps/application-settings/data/BluetoothStatusData.hpp +++ b/module-apps/application-settings/data/BluetoothStatusData.hpp @@ -3,8 +3,8 @@ #pragma once +#include #include -#include namespace gui { diff --git a/module-apps/application-settings/data/ChangePasscodeData.hpp b/module-apps/application-settings/data/ChangePasscodeData.hpp deleted file mode 100644 index 334faad1979c9d7707286ac7635a88e64995322f..0000000000000000000000000000000000000000 --- a/module-apps/application-settings/data/ChangePasscodeData.hpp +++ /dev/null @@ -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 - -enum class ChangePasscodeAction -{ - OnlyCheckCurrentPasscode, - OnlyProvideNewPasscode, - ChangeCurrentPasscode -}; - -class ChangePasscodeData : public gui::SwitchData -{ - public: - explicit ChangePasscodeData(ChangePasscodeAction passcodeAction) : changePasscodeAction{passcodeAction} - {} - - const ChangePasscodeAction changePasscodeAction; -}; diff --git a/module-apps/application-settings/data/DeviceData.hpp b/module-apps/application-settings/data/DeviceData.hpp index 237899b74ba82322d9bad8265474f278cdd91a3a..42ec41814d07632861bed71fa73599d29eae423f 100644 --- a/module-apps/application-settings/data/DeviceData.hpp +++ b/module-apps/application-settings/data/DeviceData.hpp @@ -3,7 +3,7 @@ #pragma once -#include +#include namespace gui { diff --git a/module-apps/application-settings/data/LanguagesData.hpp b/module-apps/application-settings/data/LanguagesData.hpp index 775d3d84afd7a27aa96faea171f8a733f4a3a8b8..07cde04dfe303e595c9bb63272ef715ba8635f59 100644 --- a/module-apps/application-settings/data/LanguagesData.hpp +++ b/module-apps/application-settings/data/LanguagesData.hpp @@ -3,7 +3,7 @@ #pragma once -#include +#include class LanguagesData : public gui::SwitchData { diff --git a/module-apps/application-settings/data/PINSettingsLockStateData.hpp b/module-apps/application-settings/data/PINSettingsLockStateData.hpp index 850501e02070a9ce8869a5d53708e688894e09d0..bb65c13708075ac9491fea16ae98712ad6eaff9f 100644 --- a/module-apps/application-settings/data/PINSettingsLockStateData.hpp +++ b/module-apps/application-settings/data/PINSettingsLockStateData.hpp @@ -3,8 +3,7 @@ #pragma once -#include -#include +#include namespace gui { diff --git a/module-apps/application-settings/data/PINSettingsSimData.hpp b/module-apps/application-settings/data/PINSettingsSimData.hpp index 656e0ee3436f40de84eb5b0d1427c945d946b7de..ca5bbb9d2748c15ec070d5a7a1f359b0c3907675 100644 --- a/module-apps/application-settings/data/PINSettingsSimData.hpp +++ b/module-apps/application-settings/data/PINSettingsSimData.hpp @@ -3,8 +3,7 @@ #pragma once -#include -#include +#include namespace gui { diff --git a/module-apps/application-settings/data/PhoneNameData.hpp b/module-apps/application-settings/data/PhoneNameData.hpp index 021155715da844fa13954e30b6e04c632a8fc36c..c04abd8d5a00cb6d26b268f285ea9ff70fccc094 100644 --- a/module-apps/application-settings/data/PhoneNameData.hpp +++ b/module-apps/application-settings/data/PhoneNameData.hpp @@ -2,8 +2,9 @@ // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #pragma once -#include -#include + +#include + namespace gui { class PhoneNameData : public SwitchData diff --git a/module-apps/application-settings/data/QuoteSwitchData.hpp b/module-apps/application-settings/data/QuoteSwitchData.hpp index 95b2c94973f231a96696e6a4eda0aa3a91c4b83b..2d45b7661b805477411b537e0ba1b35e44f55d48 100644 --- a/module-apps/application-settings/data/QuoteSwitchData.hpp +++ b/module-apps/application-settings/data/QuoteSwitchData.hpp @@ -3,8 +3,8 @@ #pragma once -#include -#include +#include +#include namespace Quotes { diff --git a/module-apps/application-settings/data/SettingsInternals.hpp b/module-apps/application-settings/data/SettingsInternals.hpp index fca5eb5e1d640ed2e605bebc9c9a88ed273059db..0fdd57971a1d6d73fff8f83981ee1cc650cd6c63 100644 --- a/module-apps/application-settings/data/SettingsInternals.hpp +++ b/module-apps/application-settings/data/SettingsInternals.hpp @@ -3,8 +3,6 @@ #pragma once -#include - namespace settingsInternals { enum class ListItemName diff --git a/module-apps/application-settings/data/SettingsItemData.hpp b/module-apps/application-settings/data/SettingsItemData.hpp index d9ad73e2bad0aed2089ff3efb6e69749a90e19e7..66339d8956a7f2c83a20333067e127321f91093b 100644 --- a/module-apps/application-settings/data/SettingsItemData.hpp +++ b/module-apps/application-settings/data/SettingsItemData.hpp @@ -3,9 +3,8 @@ #pragma once +#include #include -#include -#include class ApnItemData : public gui::SwitchData { diff --git a/module-apps/application-settings/ApplicationSettings.hpp b/module-apps/application-settings/include/application-settings/ApplicationSettings.hpp similarity index 98% rename from module-apps/application-settings/ApplicationSettings.hpp rename to module-apps/application-settings/include/application-settings/ApplicationSettings.hpp index 88f4660c954a6a11a91ecf13db423e7b5ba0b692..0b4ecf2b16da7e5717d96de5052e6054b31640b5 100644 --- a/module-apps/application-settings/ApplicationSettings.hpp +++ b/module-apps/application-settings/include/application-settings/ApplicationSettings.hpp @@ -5,11 +5,9 @@ #include "Application.hpp" -#include -#include +#include #include #include -#include namespace app { diff --git a/module-apps/application-settings/models/advanced/ColorTestModel.cpp b/module-apps/application-settings/models/advanced/ColorTestModel.cpp index ae21fb15afad911b312a54171da2b69c0a5d169b..9ed611d395616de2998ccc05c19af979141488b8 100644 --- a/module-apps/application-settings/models/advanced/ColorTestModel.cpp +++ b/module-apps/application-settings/models/advanced/ColorTestModel.cpp @@ -2,6 +2,7 @@ // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include "ColorTestModel.hpp" + #include namespace gui diff --git a/module-apps/application-settings/models/advanced/ColorTestModel.hpp b/module-apps/application-settings/models/advanced/ColorTestModel.hpp index 607f0be03f17070fc49fb09b6202d07292064e36..968b08c1c299dbe6e1de0057ea09dec6a1ae1631 100644 --- a/module-apps/application-settings/models/advanced/ColorTestModel.hpp +++ b/module-apps/application-settings/models/advanced/ColorTestModel.hpp @@ -3,12 +3,10 @@ #pragma once -#include "application-settings/widgets/advanced/ColorTestListItem.hpp" +#include -#include #include #include -#include namespace gui { diff --git a/module-apps/application-settings/models/apps/AbstractSoundsModel.hpp b/module-apps/application-settings/models/apps/AbstractSoundsModel.hpp index 167490e942e5c2b77e33b2276ed5021b983039bb..59d6504e12549e1847e488e8f2ebff925eab9356 100644 --- a/module-apps/application-settings/models/apps/AbstractSoundsModel.hpp +++ b/module-apps/application-settings/models/apps/AbstractSoundsModel.hpp @@ -3,8 +3,9 @@ #pragma once +#include "AudioSettingsModel.hpp" + #include -#include namespace app { diff --git a/module-apps/application-settings/models/apps/AudioSettingsModel.cpp b/module-apps/application-settings/models/apps/AudioSettingsModel.cpp index 0459f18e059cb3d7680409eefe86a961fa9b889d..155ef313bd0ecb94355bc288af37d516a03855d7 100644 --- a/module-apps/application-settings/models/apps/AudioSettingsModel.cpp +++ b/module-apps/application-settings/models/apps/AudioSettingsModel.cpp @@ -4,7 +4,6 @@ #include "AudioSettingsModel.hpp" #include -#include namespace audio_settings { diff --git a/module-apps/application-settings/models/apps/SoundsModel.cpp b/module-apps/application-settings/models/apps/SoundsModel.cpp index f4e060e23b11d3e99ac3d13968ceb5a90ead0ece..9e12bf93bb488702c906f918a460c511e9f347c6 100644 --- a/module-apps/application-settings/models/apps/SoundsModel.cpp +++ b/module-apps/application-settings/models/apps/SoundsModel.cpp @@ -5,9 +5,9 @@ #include +#include #include #include -#include unsigned int SoundsModel::requestRecordsCount() { diff --git a/module-apps/application-settings/models/apps/SoundsModel.hpp b/module-apps/application-settings/models/apps/SoundsModel.hpp index 00df3ddfc96d724f720d60f372966cde86fad3db..ffd4f250ca7fc1a55530ad7d1eafeefceb6baebe 100644 --- a/module-apps/application-settings/models/apps/SoundsModel.hpp +++ b/module-apps/application-settings/models/apps/SoundsModel.hpp @@ -6,8 +6,6 @@ #include "AbstractSoundsModel.hpp" #include -#include -#include