231 files changed, 333 insertions(+), 341 deletions(-)

M module-apps/CMakeLists.txt
M module-apps/application-antenna/CMakeLists.txt
M module-apps/application-calculator/widgets/MathOperationsBox.hpp
M module-apps/application-calendar/ApplicationCalendar.cpp
M module-apps/application-calendar/models/NewEditEventModel.cpp
M module-apps/application-calendar/widgets/CalendarDateItem.cpp
M module-apps/application-calendar/widgets/CalendarTimeItem.cpp
M module-apps/application-calendar/widgets/CalendarTimeItem.hpp
M module-apps/application-calendar/widgets/RepeatAndReminderItem.hpp
M module-apps/application-desktop/ApplicationDesktop.cpp
M module-apps/application-desktop/windows/PostUpdateWindow.hpp
M module-apps/application-desktop/windows/UpdateProgress.hpp
M module-apps/application-meditation/widgets/MeditationTimer.hpp
M module-apps/application-messages/windows/OptionsMessages.cpp
M module-apps/application-notes/ApplicationNotes.cpp
M module-apps/application-notes/model/NotesListModel.cpp
M module-apps/application-notes/model/NotesListProvider.hpp
M module-apps/application-notes/model/NotesRepository.hpp
M module-apps/application-notes/presenter/NoteEditWindowPresenter.hpp
M module-apps/application-notes/presenter/NotePreviewWindowPresenter.hpp
M module-apps/application-notes/presenter/NotesMainWindowPresenter.hpp
M module-apps/application-notes/presenter/NotesSearchResultPresenter.hpp
M module-apps/application-notes/windows/NoteEditWindow.cpp
M module-apps/application-notes/windows/NotePreviewWindow.cpp
M module-apps/application-notes/windows/NotesOptions.cpp
M module-apps/application-notes/windows/SearchEngineWindow.cpp
M module-apps/application-notes/windows/SearchEngineWindow.hpp
M module-apps/application-notes/windows/SearchResultsWindow.cpp
M module-apps/application-notes/windows/SearchResultsWindow.hpp
M module-apps/application-onboarding/ApplicationOnBoarding.cpp
M module-apps/application-onboarding/windows/ConfigurationSuccessfulDialogWindow.cpp
M module-apps/application-onboarding/windows/NoConfigurationDialogWindow.cpp
M module-apps/application-onboarding/windows/OnBoardingDateAndTimeWindow.cpp
M module-apps/application-onboarding/windows/OnBoardingSimSelectWindow.cpp
M module-apps/application-onboarding/windows/StartConfigurationWindow.cpp
M module-apps/application-settings-new/ApplicationSettings.cpp
M module-apps/application-settings-new/models/ApnSettingsModel.hpp
M module-apps/application-settings-new/models/DateAndTimeModel.cpp
M module-apps/application-settings-new/widgets/SettingsDateItem.cpp
M module-apps/application-settings-new/widgets/SettingsDateItem.hpp
M module-apps/application-settings-new/widgets/SettingsTimeItem.cpp
M module-apps/application-settings-new/widgets/SpinBoxOptionSettings.hpp
M module-apps/application-settings-new/windows/DisplayLightWindow.hpp
M module-apps/application-settings-new/windows/EditQuotesWindow.cpp
M module-apps/application-settings-new/windows/QuoteCategoriesWindow.hpp
M module-apps/application-settings-new/windows/QuotesMainWindow.hpp
M module-apps/application-special-input/widgets/SpecialInputTableWidget.hpp
R module-apps/{ => apps-common}/Application.cpp
R module-apps/{ => apps-common}/Application.hpp
R module-apps/{ => apps-common}/ApplicationLauncher.hpp
R module-apps/{ => apps-common}/AsyncTask.cpp
R module-apps/{ => apps-common}/AsyncTask.hpp
R module-apps/{ => apps-common}/BasePresenter.hpp
A module-apps/apps-common/CMakeLists.txt
R module-apps/{ => apps-common}/CallbackStorage.cpp
R module-apps/{ => apps-common}/CallbackStorage.hpp
R module-apps/{ => apps-common}/DOMResponder.cpp
R module-apps/{ => apps-common}/DOMResponder.hpp
R module-apps/{ => apps-common}/DatabaseModel.hpp
R module-apps/{ => apps-common}/GuiTimer.cpp
R module-apps/{ => apps-common}/GuiTimer.hpp
R module-apps/{ => apps-common}/InternalModel.hpp
R module-apps/{ => apps-common}/StatusBarManager.cpp
R module-apps/{ => apps-common}/StatusBarManager.hpp
R module-apps/{ => apps-common}/WindowsFactory.cpp
R module-apps/{ => apps-common}/WindowsFactory.hpp
R module-apps/{ => apps-common}/WindowsStack.hpp
A module-apps/apps-common/locks/CMakeLists.txt
R module-apps/{ => apps-common}/locks/data/LockData.hpp
R module-apps/{ => apps-common}/locks/data/LockStyle.hpp
R module-apps/{ => apps-common}/locks/data/PhoneLockMessages.hpp
R module-apps/{ => apps-common}/locks/data/SimLockMessages.hpp
R module-apps/{ => apps-common}/locks/handlers/LockPolicyHandler.cpp
R module-apps/{ => apps-common}/locks/handlers/LockPolicyHandler.hpp
R module-apps/{ => apps-common}/locks/handlers/PhoneLockHandler.cpp
R module-apps/{ => apps-common}/locks/handlers/PhoneLockHandler.hpp
R module-apps/{ => apps-common}/locks/handlers/PhoneLockSubject.cpp
R module-apps/{ => apps-common}/locks/handlers/PhoneLockSubject.hpp
R module-apps/{ => apps-common}/locks/handlers/SimLockHandler.cpp
R module-apps/{ => apps-common}/locks/handlers/SimLockHandler.hpp
R module-apps/{ => apps-common}/locks/handlers/SimLockSubject.cpp
R module-apps/{ => apps-common}/locks/handlers/SimLockSubject.hpp
R module-apps/{ => apps-common}/locks/widgets/Lock.cpp
R module-apps/{ => apps-common}/locks/widgets/Lock.hpp
R module-apps/{ => apps-common}/locks/widgets/LockBox.hpp
R module-apps/{ => apps-common}/locks/widgets/LockBoxAlternatingSize.cpp
R module-apps/{ => apps-common}/locks/widgets/LockBoxAlternatingSize.hpp
R module-apps/{ => apps-common}/locks/widgets/LockBoxConstantSize.cpp
R module-apps/{ => apps-common}/locks/widgets/LockBoxConstantSize.hpp
R module-apps/{ => apps-common}/locks/widgets/LockHash.hpp
R module-apps/{ => apps-common}/locks/widgets/PhoneLockBox.cpp
R module-apps/{ => apps-common}/locks/widgets/PhoneLockBox.hpp
R module-apps/{ => apps-common}/locks/widgets/SimLockBox.cpp
R module-apps/{ => apps-common}/locks/widgets/SimLockBox.hpp
R module-apps/{ => apps-common}/locks/windows/LockInputWindow.cpp
R module-apps/{ => apps-common}/locks/windows/LockInputWindow.hpp
R module-apps/{ => apps-common}/messages/AppMessage.hpp
R module-apps/{ => apps-common}/messages/BaseAppMessage.hpp
R module-apps/{ => apps-common}/messages/DialogMetadataMessage.hpp
R module-apps/{ => apps-common}/messages/OptionsWindow.hpp
R module-apps/{ => apps-common}/notifications/NotificationData.cpp
R module-apps/{ => apps-common}/notifications/NotificationData.hpp
R module-apps/{ => apps-common}/notifications/NotificationListItem.cpp
R module-apps/{ => apps-common}/notifications/NotificationListItem.hpp
R module-apps/{ => apps-common}/notifications/NotificationProvider.cpp
R module-apps/{ => apps-common}/notifications/NotificationProvider.hpp
R module-apps/{ => apps-common}/notifications/NotificationsModel.cpp
R module-apps/{ => apps-common}/notifications/NotificationsModel.hpp
R module-apps/{ => apps-common}/notifications/README.md
R module-apps/{ => apps-common}/notifications/doc/notifications_model_owner_structure.puml
R module-apps/{ => apps-common}/notifications/doc/notifications_model_owner_structure.svg
R module-apps/{ => apps-common}/notifications/doc/notifications_model_structure.puml
R module-apps/{ => apps-common}/notifications/doc/notifications_model_structure.svg
R module-apps/{ => apps-common}/notifications/doc/notifications_mvp_general_overview.puml
R module-apps/{ => apps-common}/notifications/doc/notifications_mvp_general_overview.svg
R module-apps/{ => apps-common}/notifications/doc/notifications_provider_owner_structure.puml
R module-apps/{ => apps-common}/notifications/doc/notifications_provider_owner_structure.svg
R module-apps/{ => apps-common}/notifications/doc/notifications_provider_structure.puml
R module-apps/{ => apps-common}/notifications/doc/notifications_provider_structure.svg
R module-apps/{ => apps-common}/options/Option.hpp
R module-apps/{ => apps-common}/options/OptionStyle.hpp
R module-apps/{ => apps-common}/options/OptionsModel.cpp
R module-apps/{ => apps-common}/options/OptionsModel.hpp
R module-apps/{ => apps-common}/options/type/OptionBase.hpp
R module-apps/{ => apps-common}/options/type/OptionCall.cpp
R module-apps/{ => apps-common}/options/type/OptionCall.hpp
R module-apps/{ => apps-common}/options/type/OptionContact.cpp
R module-apps/{ => apps-common}/options/type/OptionContact.hpp
R module-apps/{ => apps-common}/options/type/OptionSetting.cpp
R module-apps/{ => apps-common}/options/type/OptionSetting.hpp
R module-apps/{ => apps-common}/options/type/OptionSimple.cpp
R module-apps/{ => apps-common}/options/type/OptionSimple.hpp
R module-apps/{ => apps-common}/options/type/OptionWithActiveIcons.cpp
R module-apps/{ => apps-common}/options/type/OptionWithActiveIcons.hpp
A module-apps/apps-common/popups/CMakeLists.txt
R module-apps/{ => apps-common}/popups/HomeModesWindow.cpp
R module-apps/{ => apps-common}/popups/HomeModesWindow.hpp
R module-apps/{ => apps-common}/popups/Popups.cpp
R module-apps/{ => apps-common}/popups/Popups.hpp
R module-apps/{ => apps-common}/popups/PowerOffWindow.cpp
R module-apps/{ => apps-common}/popups/PowerOffWindow.hpp
R module-apps/{ => apps-common}/popups/TetheringConfirmationPopup.cpp
R module-apps/{ => apps-common}/popups/TetheringConfirmationPopup.hpp
R module-apps/{ => apps-common}/popups/TetheringNotificationPopup.cpp
R module-apps/{ => apps-common}/popups/TetheringNotificationPopup.hpp
R module-apps/{ => apps-common}/popups/TetheringOffPopup.cpp
R module-apps/{ => apps-common}/popups/TetheringOffPopup.hpp
R module-apps/{ => apps-common}/popups/TetheringPhoneModePopup.cpp
R module-apps/{ => apps-common}/popups/TetheringPhoneModePopup.hpp
R module-apps/{ => apps-common}/popups/VolumeWindow.cpp
R module-apps/{ => apps-common}/popups/VolumeWindow.hpp
R module-apps/{ => apps-common}/popups/WindowWithTimer.cpp
R module-apps/{ => apps-common}/popups/WindowWithTimer.hpp
R module-apps/{ => apps-common}/popups/data/PhoneModeParams.hpp
R module-apps/{ => apps-common}/popups/data/PopupData.hpp
R module-apps/{ => apps-common}/popups/data/PopupRequestParams.hpp
R module-apps/{ => apps-common}/popups/lock-popups/PhoneLockChangeInfoWindow.cpp
R module-apps/{ => apps-common}/popups/lock-popups/PhoneLockChangeInfoWindow.hpp
R module-apps/{ => apps-common}/popups/lock-popups/PhoneLockInputWindow.cpp
R module-apps/{ => apps-common}/popups/lock-popups/PhoneLockInputWindow.hpp
R module-apps/{ => apps-common}/popups/lock-popups/PhoneLockedInfoWindow.cpp
R module-apps/{ => apps-common}/popups/lock-popups/PhoneLockedInfoWindow.hpp
R module-apps/{ => apps-common}/popups/lock-popups/PhoneLockedWindow.cpp
R module-apps/{ => apps-common}/popups/lock-popups/PhoneLockedWindow.hpp
R module-apps/{ => apps-common}/popups/lock-popups/SimInfoWindow.cpp
R module-apps/{ => apps-common}/popups/lock-popups/SimInfoWindow.hpp
R module-apps/{ => apps-common}/popups/lock-popups/SimLockInputWindow.cpp
R module-apps/{ => apps-common}/popups/lock-popups/SimLockInputWindow.hpp
R module-apps/{ => apps-common}/popups/lock-popups/SimNotReadyWindow.cpp
R module-apps/{ => apps-common}/popups/lock-popups/SimNotReadyWindow.hpp
R module-apps/{ => apps-common}/popups/presenter/PowerOffPresenter.cpp
R module-apps/{ => apps-common}/popups/presenter/PowerOffPresenter.hpp
R module-apps/{ => apps-common}/widgets/ActiveIconFactory.cpp
R module-apps/{ => apps-common}/widgets/ActiveIconFactory.hpp
R module-apps/{ => apps-common}/widgets/BarGraph.cpp
R module-apps/{ => apps-common}/widgets/BarGraph.hpp
R module-apps/{ => apps-common}/widgets/BightnessBox.hpp
R module-apps/{ => apps-common}/widgets/BrightnessBox.cpp
R module-apps/{ => apps-common}/widgets/ButtonOnOff.cpp
R module-apps/{ => apps-common}/widgets/ButtonOnOff.hpp
R module-apps/{ => apps-common}/widgets/DateAndTimeStyle.hpp
R module-apps/{ => apps-common}/widgets/DateOrTimeListItem.hpp
R module-apps/{ => apps-common}/widgets/DateWidget.cpp
R module-apps/{ => apps-common}/widgets/DateWidget.hpp
R module-apps/{ => apps-common}/widgets/IceBox.cpp
R module-apps/{ => apps-common}/widgets/IceBox.hpp
R module-apps/{ => apps-common}/widgets/InputBox.cpp
R module-apps/{ => apps-common}/widgets/InputBox.hpp
R module-apps/{ => apps-common}/widgets/ModesBox.cpp
R module-apps/{ => apps-common}/widgets/ModesBox.hpp
R module-apps/{ => apps-common}/widgets/TextWithIconsWidget.cpp
R module-apps/{ => apps-common}/widgets/TextWithIconsWidget.hpp
R module-apps/{ => apps-common}/widgets/TimeWidget.cpp
R module-apps/{ => apps-common}/widgets/TimeWidget.hpp
R module-apps/{ => apps-common}/widgets/WidgetsUtils.cpp
R module-apps/{ => apps-common}/widgets/WidgetsUtils.hpp
R module-apps/{ => apps-common}/windows/AppWindow.cpp
R module-apps/{ => apps-common}/windows/AppWindow.hpp
R module-apps/{ => apps-common}/windows/BrightnessWindow.cpp
R module-apps/{ => apps-common}/windows/BrightnessWindow.hpp
R module-apps/{ => apps-common}/windows/Dialog.cpp
R module-apps/{ => apps-common}/windows/Dialog.hpp
R module-apps/{ => apps-common}/windows/DialogMetadata.hpp
R module-apps/{ => apps-common}/windows/NoEvents.cpp
R module-apps/{ => apps-common}/windows/NoEvents.hpp
R module-apps/{ => apps-common}/windows/OptionWindow.cpp
R module-apps/{ => apps-common}/windows/OptionWindow.hpp
D module-apps/locks/CMakeLists.txt
D module-apps/popups/CMakeLists.txt
D module-apps/targets/Target_Linux.cmake
D module-apps/targets/Target_RT1051.cmake
M module-apps/tests/CMakeLists.txt
M module-services/CMakeLists.txt
M module-services/service-antenna/CMakeLists.txt
M module-services/service-appmgr/CMakeLists.txt
M module-services/service-appmgr/data/NotificationsChangedActionsParams.cpp
M module-services/service-appmgr/model/ApplicationHandle.cpp
M module-services/service-appmgr/model/ApplicationManager.cpp
M module-services/service-appmgr/model/ApplicationsRegistry.cpp
M module-services/service-appmgr/service-appmgr/ApplicationManifest.hpp
M module-services/service-appmgr/service-appmgr/messages/BaseMessage.hpp
M module-services/service-appmgr/service-appmgr/model/ApplicationHandle.hpp
M module-services/service-appmgr/service-appmgr/model/ApplicationManager.hpp
M module-services/service-audio/service-audio/AudioMessage.hpp
M module-services/service-desktop/endpoints/security/SecurityEndpointHelper.cpp
M module-services/service-evtmgr/EventManager.cpp
M module-sys/CMakeLists.txt
M module-sys/SystemManager/SystemManager.hpp
M module-sys/SystemManager/messages/TetheringQuestionRequest.hpp
M products/BellHybrid/BellHybridMain.cpp
M products/PurePhone/CMakeLists.txt

@@ 6,50 6,10 @@ project(module-apps VERSION 1.0
 
 module_is_test_entity()
 
-if(${PROJECT_TARGET} STREQUAL "TARGET_RT1051")
-    include(targets/Target_RT1051.cmake)
-elseif(${PROJECT_TARGET} STREQUAL "TARGET_Linux")
-    include(targets/Target_Linux.cmake)
-else()
-    message(FATAL_ERROR "Invalid target!")
-endif()
+add_library(${PROJECT_NAME} STATIC)
 
-set( SOURCES 
-    "Application.cpp"
-    "GuiTimer.cpp"
-    "DOMResponder.cpp"
-    "WindowsFactory.cpp"
-    "StatusBarManager.cpp"
-    "AsyncTask.cpp"
-    "CallbackStorage.cpp"
-    "windows/AppWindow.cpp"
-    "windows/OptionWindow.cpp"
-    "windows/Dialog.cpp"
-    "windows/NoEvents.cpp"
-    "widgets/ButtonOnOff.cpp"
-    "widgets/InputBox.cpp"
-    "windows/BrightnessWindow.cpp"
-    "widgets/BrightnessBox.cpp"
-    "widgets/ModesBox.cpp"
-    "widgets/BarGraph.cpp"
-    "widgets/ActiveIconFactory.cpp"
-    "widgets/TextWithIconsWidget.cpp"
-    "widgets/DateWidget.cpp"
-    "widgets/IceBox.cpp"
-    "widgets/TimeWidget.cpp"
-    "widgets/WidgetsUtils.cpp"
-    "notifications/NotificationListItem.cpp"
-    "notifications/NotificationsModel.cpp"
-    "notifications/NotificationProvider.cpp"
-    "options/OptionsModel.cpp"
-    "options/type/OptionSimple.cpp"
-    "options/type/OptionCall.cpp"
-    "options/type/OptionContact.cpp"
-    "options/type/OptionSetting.cpp"
-    "options/type/OptionWithActiveIcons.cpp"
-    "notifications/NotificationData.cpp")
-
-add_library(${PROJECT_NAME} STATIC ${SOURCES} ${BOARD_SOURCES})
+add_subdirectory(apps-common)
+add_subdirectory(application-antenna)
 
 set(APPLICATIONS
     clock


@@ 64,7 24,6 @@ set(APPLICATIONS
     messages
     calllog
     special-input
-    antenna
     music-player
     meditation
     calculator


@@ 108,20 67,11 @@ if(${ENABLE_VOLTE})
     target_compile_definitions(${PROJECT_NAME} PUBLIC ENABLE_VOLTE=1)
 endif()
 
-include_directories( ../module-sys )
-include_directories( ../module-utils )
-include_directories( ../module-services )
-include_directories( ../module-gui )
-include_directories( ../module-os )
-include_directories( ../module-bsp )
-include_directories( ../module-db )
-
-add_subdirectory(popups)
-add_subdirectory(locks)
 add_subdirectory(application-bell-main)
 
 target_link_libraries(${PROJECT_NAME}
     PRIVATE
+        apps-common
         date::date
         service-antenna
         service-appmgr


@@ 160,20 110,9 @@ target_include_directories(${PROJECT_NAME}
         PUBLIC
 
         ${CMAKE_CURRENT_SOURCE_DIR}
-        ${CMAKE_CURRENT_SOURCE_DIR}/messages
-        ${CMAKE_CURRENT_SOURCE_DIR}/windows
-        ${CMAKE_CURRENT_SOURCE_DIR}/options
-        ${CMAKE_CURRENT_SOURCE_DIR}/options/type
         ${CMAKE_BINARY_DIR}
 )
 
-
-target_compile_definitions(${PROJECT_NAME}
-
-        PUBLIC
-
-        )
-
 target_compile_options(${PROJECT_NAME}
 
         PUBLIC


@@ 188,11 127,6 @@ target_compile_options(${PROJECT_NAME}
 
 )
 
-target_compile_features(${PROJECT_NAME} PUBLIC
-
-        cxx_std_14
-)
-
 if (${ENABLE_TESTS})
     add_subdirectory(tests)
 endif()

@@ 1,29 1,34 @@
-
-include_directories( ${CMAKE_PROJECT_NAME}
+# Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+# For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-	PUBLIC
-		"${CMAKE_CURRENT_LIST_DIR}"
+add_library(application-antenna STATIC)
+
+target_include_directories(application-antenna
+
+    PUBLIC
+        "${CMAKE_CURRENT_LIST_DIR}"
 )
 
-include_directories( ${PROJECT_NAME}
+target_sources(application-antenna
 
-	PUBLIC
-		"${CMAKE_CURRENT_LIST_DIR}"
+    PRIVATE
+        ApplicationAntenna.cpp
+        windows/AntennaMainWindow.cpp
+        windows/ScanModesWindow.cpp
+        windows/AlgoParamsWindow.cpp
+    PUBLIC
+        ApplicationAntenna.hpp
 )
 
-target_sources( ${PROJECT_NAME}
 
-	PRIVATE
-		"${CMAKE_CURRENT_LIST_DIR}/ApplicationAntenna.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/windows/AntennaMainWindow.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/windows/ScanModesWindow.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/windows/AlgoParamsWindow.cpp"
-	PUBLIC
-		"${CMAKE_CURRENT_LIST_DIR}/ApplicationAntenna.hpp"
+target_compile_options(application-antenna
+    PRIVATE
+        $<$<CONFIG:DEBUG>: -Os>
 )
 
-target_link_libraries(${PROJECT_NAME}
+target_link_libraries(application-antenna
     PRIVATE
+        apps-common
         service-cellular
 )
 

@@ 1,8 1,8 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
-#include "module-apps/Application.hpp"
+#include <apps-common/Application.hpp>
 #include <module-gui/gui/widgets/Item.hpp>
 #include <module-gui/gui/widgets/GridLayout.hpp>
 

@@ 14,7 14,7 @@
 #include <application-calendar/windows/NewEditEventWindow.hpp>
 #include <application-calendar/windows/CustomRepeatWindow.hpp>
 #include <application-calendar/windows/EventReminderWindow.hpp>
-#include <module-apps/messages/DialogMetadataMessage.hpp>
+#include <apps-common/messages/DialogMetadataMessage.hpp>
 #include <module-db/queries/calendar/QueryEventsAdd.hpp>
 #include <service-db/DBServiceAPI.hpp>
 #include <service-db/QueryMessage.hpp>

@@ 13,7 13,7 @@
 #include <application-calendar/ApplicationCalendar.hpp>
 #include <module-db/queries/calendar/QueryEventsAdd.hpp>
 #include <module-db/queries/calendar/QueryEventsEdit.hpp>
-#include <module-apps/messages/DialogMetadataMessage.hpp>
+#include <apps-common/messages/DialogMetadataMessage.hpp>
 
 #include <service-db/DBServiceAPI.hpp>
 #include <time/time_conversion.hpp>

@@ 2,9 2,9 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "CalendarDateItem.hpp"
-#include <module-apps/widgets/DateAndTimeStyle.hpp>
-#include <module-apps/widgets/DateWidget.hpp>
-#include <module-apps/widgets/WidgetsUtils.hpp>
+#include <apps-common/widgets/DateAndTimeStyle.hpp>
+#include <apps-common/widgets/DateWidget.hpp>
+#include <apps-common/widgets/WidgetsUtils.hpp>
 
 namespace date_and_time = style::window::date_and_time;
 

@@ 3,8 3,8 @@
 
 #include "CalendarDateItem.hpp"
 #include "CalendarTimeItem.hpp"
-#include <module-apps/widgets/DateAndTimeStyle.hpp>
-#include <module-apps/widgets/WidgetsUtils.hpp>
+#include <apps-common/widgets/DateAndTimeStyle.hpp>
+#include <apps-common/widgets/WidgetsUtils.hpp>
 #include <module-gui/gui/input/InputEvent.hpp>
 
 namespace date_and_time = style::window::date_and_time;

@@ 4,7 4,7 @@
 #pragma once
 
 #include "CalendarListItem.hpp"
-#include <module-apps/widgets/TimeWidget.hpp>
+#include <apps-common/widgets/TimeWidget.hpp>
 
 namespace gui
 {

@@ 7,7 7,7 @@
 #include <Label.hpp>
 #include <Text.hpp>
 #include <BoxLayout.hpp>
-#include <module-apps/Application.hpp>
+#include <apps-common/Application.hpp>
 #include <module-apps/application-calendar/ApplicationCalendar.hpp>
 
 namespace gui

@@ 31,7 31,7 @@
 #include <module-services/service-db/agents/settings/SystemSettings.hpp>
 #include <magic_enum.hpp>
 #include <module-services/service-desktop/service-desktop/Constants.hpp>
-#include <module-apps/messages/AppMessage.hpp>
+#include <apps-common/messages/AppMessage.hpp>
 #include <SystemManager/messages/SystemManagerMessage.hpp>
 #include <module-gui/gui/widgets/status-bar/SIM.hpp>
 #include <service-db/DBNotificationMessage.hpp>

@@ 3,7 3,7 @@
 
 #pragma once
 
-#include <module-apps/windows/AppWindow.hpp>
+#include <apps-common/windows/AppWindow.hpp>
 #include <module-gui/gui/widgets/Text.hpp>
 #include <module-gui/gui/widgets/Icon.hpp>
 

@@ 4,13 4,13 @@
 #pragma once
 
 #include <vector>
-#include <module-apps/windows/AppWindow.hpp>
-#include <module-apps/windows/Dialog.hpp>
+#include <apps-common/windows/AppWindow.hpp>
+#include <apps-common/windows/Dialog.hpp>
 #include <module-gui/gui/widgets/Label.hpp>
 #include <module-gui/gui/widgets/TextFixedSize.hpp>
 #include <module-gui/gui/widgets/Image.hpp>
 #include <module-gui/gui/widgets/BottomBar.hpp>
-#include <module-apps/widgets/BarGraph.hpp>
+#include <apps-common/widgets/BarGraph.hpp>
 
 namespace gui
 {

@@ 6,7 6,7 @@
 #include <atomic>
 #include <chrono>
 
-#include <module-apps/GuiTimer.hpp>
+#include <apps-common/GuiTimer.hpp>
 #include <application-meditation/ApplicationMeditation.hpp>
 
 #include "BoxLayout.hpp"

@@ 12,8 12,8 @@
 
 #include <memory>
 #include <module-services/service-db/service-db/DBServiceAPI.hpp>
-#include <module-apps/options/type/OptionCall.hpp>
-#include <module-apps/options/type/OptionContact.hpp>
+#include <apps-common/options/type/OptionCall.hpp>
+#include <apps-common/options/type/OptionContact.hpp>
 
 std::list<gui::Option> smsWindowOptions(app::ApplicationMessages *app, const SMSRecord &record)
 {

@@ 15,8 15,8 @@
 #include <module-apps/application-notes/presenter/NotesMainWindowPresenter.hpp>
 #include <module-apps/application-notes/presenter/NotePreviewWindowPresenter.hpp>
 #include <module-apps/application-notes/presenter/NoteEditWindowPresenter.hpp>
-#include <module-apps/windows/OptionWindow.hpp>
-#include <module-apps/windows/Dialog.hpp>
+#include <apps-common/windows/OptionWindow.hpp>
+#include <apps-common/windows/Dialog.hpp>
 #include <module-services/service-db/service-db/DBNotificationMessage.hpp>
 #include <utility>
 

@@ 7,7 7,7 @@
 #include "module-apps/application-notes/style/NotesListStyle.hpp"
 #include "module-apps/application-notes/windows/NotesOptions.hpp"
 #include "module-apps/application-notes/data/NoteSwitchData.hpp"
-#include <module-apps/messages/OptionsWindow.hpp>
+#include <apps-common/messages/OptionsWindow.hpp>
 
 #include <module-gui/gui/widgets/ListView.hpp>
 #include <module-gui/gui/input/InputEvent.hpp>

@@ 3,9 3,9 @@
 
 #pragma once
 
-#include <module-apps/DatabaseModel.hpp>
+#include <apps-common/DatabaseModel.hpp>
 #include <module-db/Interface/NotesRecord.hpp>
-#include <module-apps/Application.hpp>
+#include <apps-common/Application.hpp>
 
 namespace app::notes
 {

@@ 5,7 5,7 @@
 
 #include <functional>
 
-#include <module-apps/Application.hpp>
+#include <apps-common/Application.hpp>
 
 #include <module-db/Interface/NotesRecord.hpp>
 

@@ 1,9 1,9 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
 
-#include <module-apps/BasePresenter.hpp>
+#include <apps-common/BasePresenter.hpp>
 
 #include <module-apps/application-notes/model/NotesRepository.hpp>
 

@@ 1,9 1,9 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
 
-#include <module-apps/BasePresenter.hpp>
+#include <apps-common/BasePresenter.hpp>
 
 #include <module-apps/application-notes/model/NotesRepository.hpp>
 

@@ 3,7 3,7 @@
 
 #pragma once
 
-#include <module-apps/BasePresenter.hpp>
+#include <apps-common/BasePresenter.hpp>
 
 #include <module-apps/application-notes/model/NotesListModel.hpp>
 

@@ 3,7 3,7 @@
 
 #pragma once
 
-#include <module-apps/BasePresenter.hpp>
+#include <apps-common/BasePresenter.hpp>
 
 #include <module-apps/application-notes/model/NotesSearchListModel.hpp>
 #include <module-services/service-db/service-db/DBNotificationMessage.hpp>

@@ 11,7 11,7 @@
 #include <module-apps/application-notes/windows/NotesOptions.hpp>
 #include <module-apps/application-notes/data/NoteSwitchData.hpp>
 #include <module-apps/application-notes/style/NoteEditStyle.hpp>
-#include <module-apps/messages/OptionsWindow.hpp>
+#include <apps-common/messages/OptionsWindow.hpp>
 
 #include <i18n/i18n.hpp>
 

@@ 7,7 7,7 @@
 #include <module-apps/application-notes/data/NoteSwitchData.hpp>
 #include <module-apps/application-notes/style/NotePreviewStyle.hpp>
 #include <module-apps/application-notes/windows/NotesOptions.hpp>
-#include <module-apps/messages/OptionsWindow.hpp>
+#include <apps-common/messages/OptionsWindow.hpp>
 
 #include <i18n/i18n.hpp>
 #include <time/time_conversion.hpp>

@@ 6,8 6,8 @@
 #include <Option.hpp>
 #include <Clipboard.hpp>
 
-#include <module-apps/windows/DialogMetadata.hpp>
-#include <module-apps/messages/DialogMetadataMessage.hpp>
+#include <apps-common/windows/DialogMetadata.hpp>
+#include <apps-common/messages/DialogMetadataMessage.hpp>
 
 #include <i18n/i18n.hpp>
 

@@ 5,7 5,7 @@
 
 #include <module-apps/application-notes/ApplicationNotes.hpp>
 #include <module-apps/application-notes/data/NotesFoundData.hpp>
-#include <module-apps/widgets/InputBox.hpp>
+#include <apps-common/widgets/InputBox.hpp>
 
 #include <i18n/i18n.hpp>
 

@@ 5,7 5,7 @@
 
 #include "AppWindow.hpp"
 
-#include <module-apps/Application.hpp>
+#include <apps-common/Application.hpp>
 #include <module-apps/application-notes/presenter/SearchEngineWindowPresenter.hpp>
 
 #include <module-gui/gui/input/InputEvent.hpp>

@@ 6,8 6,8 @@
 #include <module-apps/application-notes/ApplicationNotes.hpp>
 #include <module-apps/application-notes/data/NotesFoundData.hpp>
 #include <module-apps/application-notes/style/NotesListStyle.hpp>
-#include <module-apps/windows/DialogMetadata.hpp>
-#include <module-apps/messages/DialogMetadataMessage.hpp>
+#include <apps-common/windows/DialogMetadata.hpp>
+#include <apps-common/messages/DialogMetadataMessage.hpp>
 
 namespace app::notes
 {

@@ 7,7 7,7 @@
 
 #include "AppWindow.hpp"
 
-#include <module-apps/Application.hpp>
+#include <apps-common/Application.hpp>
 #include <module-apps/application-notes/presenter/NotesSearchResultPresenter.hpp>
 
 #include <module-gui/gui/widgets/ListView.hpp>

@@ 22,8 22,8 @@
 #include <module-apps/application-settings-new/data/LanguagesData.hpp>
 #include <module-services/service-db/agents/settings/SystemSettings.hpp>
 #include <module-apps/application-settings-new/windows/ChangeTimeZone.hpp>
-#include <module-apps/locks/data/PhoneLockMessages.hpp>
-#include <module-apps/locks/data/SimLockMessages.hpp>
+#include <apps-common/locks/data/PhoneLockMessages.hpp>
+#include <apps-common/locks/data/SimLockMessages.hpp>
 #include <service-appmgr/service-appmgr/model/ApplicationManager.hpp>
 
 namespace app

@@ 5,7 5,7 @@
 
 #include <module-apps/application-onboarding/ApplicationOnBoarding.hpp>
 #include <module-apps/application-onboarding/data/OnBoardingSwitchData.hpp>
-#include <module-apps/messages/DialogMetadataMessage.hpp>
+#include <apps-common/messages/DialogMetadataMessage.hpp>
 #include <widgets/IceBox.hpp>
 #include <service-appmgr/Controller.hpp>
 

@@ 5,7 5,7 @@
 
 #include <module-apps/application-onboarding/ApplicationOnBoarding.hpp>
 #include <module-apps/application-onboarding/data/OnBoardingSwitchData.hpp>
-#include <module-apps/messages/DialogMetadataMessage.hpp>
+#include <apps-common/messages/DialogMetadataMessage.hpp>
 #include <widgets/IceBox.hpp>
 #include <service-appmgr/Controller.hpp>
 

@@ 7,7 7,7 @@
 #include <application-onboarding/ApplicationOnBoarding.hpp>
 #include <module-gui/gui/input/InputEvent.hpp>
 #include <module-apps/application-onboarding/data/OnBoardingSwitchData.hpp>
-#include <module-apps/messages/DialogMetadataMessage.hpp>
+#include <apps-common/messages/DialogMetadataMessage.hpp>
 #include <widgets/IceBox.hpp>
 #include <service-appmgr/Controller.hpp>
 

@@ 9,7 9,7 @@
 
 #include <widgets/IceBox.hpp>
 #include <service-appmgr/Controller.hpp>
-#include <module-apps/messages/DialogMetadataMessage.hpp>
+#include <apps-common/messages/DialogMetadataMessage.hpp>
 
 namespace app::onBoarding
 {

@@ 6,8 6,8 @@
 #include <application-onboarding/ApplicationOnBoarding.hpp>
 #include <application-onboarding/data/OnBoardingSwitchData.hpp>
 
-#include <module-apps/windows/DialogMetadata.hpp>
-#include <module-apps/messages/DialogMetadataMessage.hpp>
+#include <apps-common/windows/DialogMetadata.hpp>
+#include <apps-common/messages/DialogMetadataMessage.hpp>
 #include <widgets/IceBox.hpp>
 #include <service-appmgr/Controller.hpp>
 

@@ 78,8 78,8 @@
 #include <module-services/service-appmgr/service-appmgr/messages/Message.hpp>
 #include <module-services/service-appmgr/service-appmgr/model/ApplicationManager.hpp>
 #include <module-apps/application-desktop/windows/Names.hpp>
-#include <module-apps/messages/DialogMetadataMessage.hpp>
-#include <module-apps/windows/Dialog.hpp>
+#include <apps-common/messages/DialogMetadataMessage.hpp>
+#include <apps-common/windows/Dialog.hpp>
 
 #include <i18n/i18n.hpp>
 

@@ 5,7 5,7 @@
 
 #include <service-cellular/PacketDataTypes.hpp>
 #include <service-cellular/CellularServiceAPI.hpp>
-#include <module-apps/Application.hpp>
+#include <apps-common/Application.hpp>
 
 class ApnSettingsModel
 {

@@ 5,7 5,7 @@
 #include <application-settings-new/widgets/SettingsTimeItem.hpp>
 #include "DateAndTimeModel.hpp"
 #include <ListView.hpp>
-#include <module-apps/widgets/DateAndTimeStyle.hpp>
+#include <apps-common/widgets/DateAndTimeStyle.hpp>
 #include <time/DateAndTimeSettings.hpp>
 
 DateAndTimeModel::DateAndTimeModel(app::Application *application) : app(application)

@@ 2,8 2,8 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "SettingsDateItem.hpp"
-#include <module-apps/widgets/DateAndTimeStyle.hpp>
-#include <module-apps/widgets/WidgetsUtils.hpp>
+#include <apps-common/widgets/DateAndTimeStyle.hpp>
+#include <apps-common/widgets/WidgetsUtils.hpp>
 #include <module-gui/gui/input/InputEvent.hpp>
 
 namespace date_and_time = style::window::date_and_time;

@@ 3,7 3,7 @@
 
 #pragma once
 
-#include <module-apps/widgets/DateWidget.hpp>
+#include <apps-common/widgets/DateWidget.hpp>
 #include <widgets/DateOrTimeListItem.hpp>
 
 namespace gui

@@ 3,8 3,8 @@
 
 #include "SettingsDateItem.hpp"
 #include "SettingsTimeItem.hpp"
-#include <module-apps/widgets/DateAndTimeStyle.hpp>
-#include <module-apps/widgets/WidgetsUtils.hpp>
+#include <apps-common/widgets/DateAndTimeStyle.hpp>
+#include <apps-common/widgets/WidgetsUtils.hpp>
 
 namespace date_and_time = style::window::date_and_time;
 

@@ 7,7 7,7 @@
 #include "OptionWindow.hpp"
 #include "Application.hpp"
 
-#include <module-apps/options/type/OptionSetting.hpp>
+#include <apps-common/options/type/OptionSetting.hpp>
 
 namespace gui
 {

@@ 3,7 3,7 @@
 
 #pragma once
 
-#include <module-apps/GuiTimer.hpp>
+#include <apps-common/GuiTimer.hpp>
 #include <module-services/service-evtmgr/screen-light-control/ScreenLightControl.hpp>
 #include <module-apps/application-settings-new/widgets/SpinBox.hpp>
 #include <module-apps/application-settings-new/ApplicationSettings.hpp>

@@ 4,7 4,7 @@
 #include "EditQuotesWindow.hpp"
 
 #include <module-apps/application-settings-new/ApplicationSettings.hpp>
-#include <module-apps/options/type/OptionSetting.hpp>
+#include <apps-common/options/type/OptionSetting.hpp>
 
 #include <i18n/i18n.hpp>
 

@@ 7,7 7,7 @@
 #include <application-settings-new/widgets/CategoryWidget.hpp>
 #include <application-settings-new/models/CategoriesModel.hpp>
 #include <module-gui/gui/widgets/ListView.hpp>
-#include <module-apps/InternalModel.hpp>
+#include <apps-common/InternalModel.hpp>
 
 namespace gui
 {

@@ 9,7 9,7 @@
 
 #include <purefs/filesystem_paths.hpp>
 #include <module-gui/gui/widgets/ListView.hpp>
-#include <module-apps/InternalModel.hpp>
+#include <apps-common/InternalModel.hpp>
 #include <utility>
 
 namespace gui

@@ 1,4 1,4 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once


@@ 8,7 8,7 @@
 #include <TextFixedSize.hpp>
 #include <ImageBox.hpp>
 #include <module-gui/gui/widgets/GridLayout.hpp>
-#include <module-apps/Application.hpp>
+#include <apps-common/Application.hpp>
 #include <module-apps/application-special-input/data/SpecialCharactersTableStyle.hpp>
 #include <module-apps/application-special-input/windows/SpecialInputMainWindow.hpp>
 

@@ 0,0 1,103 @@
+# Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+# For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+add_library(apps-common STATIC)
+
+target_sources(apps-common
+    PRIVATE
+        Application.cpp
+        AsyncTask.cpp
+        CallbackStorage.cpp
+        DOMResponder.cpp
+        GuiTimer.cpp
+        StatusBarManager.cpp
+        WindowsFactory.cpp
+        notifications/NotificationData.cpp
+        notifications/NotificationListItem.cpp
+        notifications/NotificationProvider.cpp
+        notifications/NotificationsModel.cpp
+        options/OptionsModel.cpp
+        options/type/OptionCall.cpp
+        options/type/OptionContact.cpp
+        options/type/OptionSetting.cpp
+        options/type/OptionSimple.cpp
+        options/type/OptionWithActiveIcons.cpp
+        widgets/ActiveIconFactory.cpp
+        widgets/BarGraph.cpp
+        widgets/BrightnessBox.cpp
+        widgets/ButtonOnOff.cpp
+        widgets/DateWidget.cpp
+        widgets/IceBox.cpp
+        widgets/InputBox.cpp
+        widgets/ModesBox.cpp
+        widgets/TextWithIconsWidget.cpp
+        widgets/TimeWidget.cpp
+        widgets/WidgetsUtils.cpp
+        windows/AppWindow.cpp
+        windows/BrightnessWindow.cpp
+        windows/Dialog.cpp
+        windows/NoEvents.cpp
+        windows/OptionWindow.cpp
+)
+
+add_subdirectory(popups)
+add_subdirectory(locks)
+
+target_link_libraries(apps-common
+    PRIVATE
+        date::date
+        eventstore
+        Microsoft.GSL::GSL
+        service-antenna
+        service-appmgr
+        service-audio
+        service-cellular
+        service-db
+        service-evtmgr
+        service-time
+    PUBLIC
+        module-audio
+        module-bsp
+        module-db
+        module-gui
+        module-os
+        module-services
+        module-sys
+        module-utils
+        time
+        utf8
+)
+
+# Board specific compilation definitions,options,include directories and features
+target_compile_definitions(apps-common PUBLIC ${PROJECT_CONFIG_DEFINITIONS})
+target_compile_definitions(apps-common PUBLIC ${PROJECT_TARGET})
+target_compile_definitions(apps-common PUBLIC ${TARGET_COMPILE_DEFINITIONS})
+target_include_directories(apps-common PUBLIC ${BOARD_DIR_INCLUDES})
+target_include_directories(apps-common PUBLIC ${PROJECT_INCLUDES})
+target_compile_features(apps-common PUBLIC ${TARGET_COMPILE_FEATURES})
+target_compile_options(apps-common PUBLIC ${TARGET_COMPILE_OPTIONS})
+
+target_include_directories(apps-common
+
+        PUBLIC
+
+        ${CMAKE_CURRENT_SOURCE_DIR}
+        ${CMAKE_CURRENT_SOURCE_DIR}/messages
+        ${CMAKE_CURRENT_SOURCE_DIR}/windows
+        ${CMAKE_CURRENT_SOURCE_DIR}/options
+        ${CMAKE_CURRENT_SOURCE_DIR}/options/type
+)
+
+target_compile_options(apps-common
+
+        PUBLIC
+
+        -Wall
+
+        $<$<COMPILE_LANGUAGE:C>:-std=gnu11>
+        $<$<COMPILE_LANGUAGE:C>:-Wno-discarded-qualifiers>
+
+        $<$<COMPILE_LANGUAGE:CXX>:-fno-non-call-exceptions>
+        $<$<COMPILE_LANGUAGE:CXX>:-Wno-literal-suffix>
+
+)<
\ No newline at end of file

@@ 2,9 2,9 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "GuiTimer.hpp"
-#include "Item.hpp"                    // for Item
+#include "Item.hpp" // for Item
 
-#include "module-apps/Application.hpp" // for Application
+#include <apps-common/Application.hpp> // for Application
 
 #include "module-sys/Timers/SystemTimer.hpp" // for Timer, Timer::Type, Timer::Ty...
 #include "module-sys/Timers/TimerFactory.hpp"

@@ 0,0 1,39 @@
+target_include_directories(apps-common
+	PRIVATE
+		"${CMAKE_CURRENT_LIST_DIR}"		
+)
+
+target_sources(apps-common
+
+	PRIVATE
+		handlers/PhoneLockHandler.cpp
+		handlers/PhoneLockSubject.cpp
+		handlers/SimLockHandler.cpp
+		handlers/SimLockSubject.cpp
+		handlers/LockPolicyHandler.cpp
+		widgets/Lock.cpp
+		widgets/LockBoxConstantSize.cpp
+		widgets/LockBoxAlternatingSize.cpp
+		widgets/PhoneLockBox.cpp
+		widgets/SimLockBox.cpp
+		windows/LockInputWindow.cpp
+
+	PRIVATE
+		data/LockData.hpp
+		data/LockStyle.hpp
+		data/PhoneLockMessages.hpp
+		data/SimLockMessages.hpp
+		handlers/PhoneLockHandler.hpp
+		handlers/PhoneLockSubject.hpp
+		handlers/LockPolicyHandler.hpp
+		handlers/SimLockHandler.hpp
+		handlers/SimLockSubject.hpp
+		widgets/LockHash.hpp
+		widgets/Lock.hpp
+		widgets/LockBox.hpp
+		widgets/LockBoxConstantSize.hpp
+		widgets/LockBoxAlternatingSize.hpp
+		widgets/PhoneLockBox.hpp
+		widgets/SimLockBox.hpp
+		windows/LockInputWindow.hpp
+)

@@ 20,7 20,7 @@ namespace style::window::lock_input
         constexpr inline auto h            = 60;
         constexpr inline auto label_margin = 10;
         constexpr inline auto top_margin   = 30;
-    } // namespace pin_label
+    } // namespace input_box
 
     namespace primary_text
     {

@@ 8,7 8,7 @@
 #include <Utils.hpp>
 #include <memory>
 
-#include <module-apps/popups/data/PopupRequestParams.hpp>
+#include <apps-common/popups/data/PopupRequestParams.hpp>
 #include <module-services/service-db/agents/settings/SystemSettings.hpp>
 
 namespace locks

@@ 55,4 55,4 @@ namespace locks
         owner->bus.sendUnicast(std::make_shared<UnLockPhoneInput>(inputData),
                                app::manager::ApplicationManager::ServiceName);
     }
-} // namespace lock
+} // namespace locks

@@ 7,7 7,7 @@
 #include <Utils.hpp>
 #include <memory>
 
-#include <module-apps/popups/data/PopupRequestParams.hpp>
+#include <apps-common/popups/data/PopupRequestParams.hpp>
 #include <EventStore.hpp>
 #include <module-sys/Timers/TimerFactory.hpp>
 #include <service-cellular-api>

@@ 15,7 15,6 @@ namespace locks
     class Lock
     {
       public:
-
         enum class LockState
         {
             Unlocked,


@@ 101,4 100,4 @@ namespace locks
         friend class SimLockHandler;
     };
 
-} // namespace lock
+} // namespace locks

@@ 37,16 37,16 @@ namespace gui::option
 
     namespace window
     {
-        inline constexpr gui::Length option_left_margin  = 10;
-        inline constexpr gui::Length option_right_margin = 10;
-        inline constexpr gui::Length option_bottom_margin  = style::margins::big;
-        inline constexpr gui::Length option_right_min_size = 150;
+        inline constexpr gui::Length option_left_margin       = 10;
+        inline constexpr gui::Length option_right_margin      = 10;
+        inline constexpr gui::Length option_bottom_margin     = style::margins::big;
+        inline constexpr gui::Length option_right_min_size    = 150;
         inline constexpr gui::Length option_rightbig_min_size = 350;
-        inline constexpr uint32_t optionsListTopMargin   = 10U;
-        inline constexpr uint32_t optionsListX           = style::window::default_left_margin;
-        inline constexpr uint32_t optionsListY           = style::header::height + optionsListTopMargin;
-        inline constexpr uint32_t optionsListW           = style::window::default_body_width;
-        inline constexpr uint32_t optionsListH           = style::window::default_body_height;
+        inline constexpr uint32_t optionsListTopMargin        = 10U;
+        inline constexpr uint32_t optionsListX                = style::window::default_left_margin;
+        inline constexpr uint32_t optionsListY                = style::header::height + optionsListTopMargin;
+        inline constexpr uint32_t optionsListW                = style::window::default_body_width;
+        inline constexpr uint32_t optionsListH                = style::window::default_body_height;
     } // namespace window
 
 } // namespace gui::option

@@ 0,0 1,46 @@
+target_include_directories(apps-common
+
+	PRIVATE
+		"${CMAKE_CURRENT_LIST_DIR}"
+)
+
+target_sources(apps-common
+
+	PRIVATE
+		HomeModesWindow.cpp
+		Popups.cpp
+		PowerOffWindow.cpp
+		TetheringConfirmationPopup.cpp
+		TetheringNotificationPopup.cpp
+		TetheringPhoneModePopup.cpp
+		TetheringOffPopup.cpp
+		VolumeWindow.cpp
+		WindowWithTimer.cpp
+		lock-popups/PhoneLockedInfoWindow.cpp
+		lock-popups/PhoneLockedWindow.cpp
+		lock-popups/PhoneLockInputWindow.cpp
+		lock-popups/PhoneLockChangeInfoWindow.cpp
+		lock-popups/SimLockInputWindow.cpp
+		lock-popups/SimInfoWindow.cpp
+		lock-popups/SimNotReadyWindow.cpp
+		presenter/PowerOffPresenter.cpp
+
+	PRIVATE
+		HomeModesWindow.hpp
+		Popups.hpp
+		PowerOffWindow.hpp
+		TetheringConfirmationPopup.hpp
+		TetheringNotificationPopup.hpp
+		TetheringPhoneModePopup.hpp
+		VolumeWindow.hpp
+		WindowWithTimer.hpp
+		data/PopupData.hpp
+		lock-popups/PhoneLockedInfoWindow.hpp
+		lock-popups/PhoneLockedWindow.hpp
+		lock-popups/PhoneLockInputWindow.hpp
+		lock-popups/PhoneLockChangeInfoWindow.hpp
+		lock-popups/SimLockInputWindow.hpp
+		lock-popups/SimInfoWindow.hpp
+		lock-popups/SimNotReadyWindow.hpp
+		presenter/PowerOffPresenter.hpp
+)

@@ 5,7 5,7 @@
 
 #include <log/log.hpp>
 #include <messages/DialogMetadataMessage.hpp>
-#include <module-apps/Application.hpp>
+#include <apps-common/Application.hpp>
 #include <SystemManager/messages/TetheringStateRequest.hpp>
 #include <service-appmgr/Controller.hpp>
 

@@ 3,7 3,7 @@
 
 #pragma once
 
-#include "module-apps/widgets/BarGraph.hpp"
+#include "apps-common/widgets/BarGraph.hpp"
 #include "WindowWithTimer.hpp"
 
 #include <module-audio/Audio/AudioCommon.hpp>


@@ 13,7 13,7 @@
 
 namespace style::window::volume
 {
-    constexpr inline auto title_height = 33;
+    constexpr inline auto title_height    = 33;
     constexpr inline auto base_title_key  = "app_popup_volume_text";
     constexpr inline auto music_title_key = "app_popup_music_volume_text";
     constexpr inline auto call_title_key  = "app_popup_call_volume_text";

@@ 3,7 3,7 @@
 
 #pragma once
 
-#include <module-apps/Application.hpp>
+#include <apps-common/Application.hpp>
 
 namespace gui
 {

@@ 14,28 14,28 @@ namespace sys::phone_modes
 
 namespace style::window::modes
 {
-    constexpr inline auto top_offset    = 182;
+    constexpr inline auto top_offset        = 182;
     constexpr inline auto bottom_offset     = 235;
-    constexpr inline auto height        = style::window_height - top_offset - bottom_offset;
+    constexpr inline auto height            = style::window_height - top_offset - bottom_offset;
     constexpr inline auto width             = style::window_width;
     constexpr inline auto number_of_entries = 4;
     namespace connected
     {
         constexpr inline auto title_key = "home_modes_connected";
 
-    }     // namespace connected
+    } // namespace connected
 
     namespace notdisturb
     {
         constexpr inline auto title_key = "home_modes_notdisturb";
 
-    }     // namespace notdisturb
+    } // namespace notdisturb
 
     namespace offline
     {
-        constexpr inline auto title_key = "home_modes_offline";
+        constexpr inline auto title_key       = "home_modes_offline";
         constexpr inline auto description_key = "home_modes_message_only";
-    }     // namespace offline
+    } // namespace offline
 
     namespace image
     {


@@ 54,16 54,13 @@ namespace gui
 
     class ModeRow : public HBox
     {
-        Label *label = nullptr;
+        Label *label  = nullptr;
         ImageBox *img = nullptr;
 
       public:
         ModeRow(Item *parent = nullptr, uint32_t x = 0, uint32_t y = 0, uint32_t width = 0, uint32_t height = 0);
 
-        void addText(const std::string &text,
-                     const std::string &fontSize,
-                     uint32_t width,
-                     uint32_t height);
+        void addText(const std::string &text, const std::string &fontSize, uint32_t width, uint32_t height);
 
         void update(std::pair<std::string, const bool> &&params);
         void addImage(const std::string &imageName);


@@ 71,9 68,9 @@ namespace gui
 
     class ModesBox : public VBox
     {
-        ModeRow *connected  = nullptr;
-        ModeRow *notDisturb = nullptr;
-        ModeRow *offline    = nullptr;
+        ModeRow *connected   = nullptr;
+        ModeRow *notDisturb  = nullptr;
+        ModeRow *offline     = nullptr;
         ModeRow *messageOnly = nullptr;
 
         void addConnected();

@@ 3,10 3,10 @@
 
 #pragma once
 
-#include "module-apps/Application.hpp"
+#include <apps-common/Application.hpp>
 #include "AppWindow.hpp"
-#include "module-apps/widgets/BarGraph.hpp"
-#include "module-apps/widgets/BightnessBox.hpp"
+#include "apps-common/widgets/BarGraph.hpp"
+#include "apps-common/widgets/BightnessBox.hpp"
 #include <functional>
 
 namespace gui

@@ 1,47 0,0 @@
-
-include_directories( ${CMAKE_PROJECT_NAME}
-
-	PRIVATE
-		"${CMAKE_CURRENT_LIST_DIR}"
-)
-
-include_directories( ${PROJECT_NAME}
-
-	PRIVATE
-		"${CMAKE_CURRENT_LIST_DIR}"
-)
-
-target_sources( ${PROJECT_NAME}
-
-	PRIVATE
-		"${CMAKE_CURRENT_LIST_DIR}/handlers/PhoneLockHandler.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/handlers/PhoneLockSubject.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/handlers/SimLockHandler.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/handlers/SimLockSubject.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/handlers/LockPolicyHandler.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/windows/LockInputWindow.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/widgets/Lock.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/widgets/LockBoxConstantSize.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/widgets/LockBoxAlternatingSize.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/widgets/PhoneLockBox.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/widgets/SimLockBox.cpp"
-
-	PRIVATE
-		"${CMAKE_CURRENT_LIST_DIR}/data/LockData.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/data/LockStyle.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/data/PhoneLockMessages.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/data/SimLockMessages.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/handlers/PhoneLockHandler.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/handlers/PhoneLockSubject.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/handlers/LockPolicyHandler.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/handlers/SimLockHandler.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/handlers/SimLockSubject.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/windows/LockInputWindow.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/widgets/LockHash.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/widgets/Lock.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/widgets/LockBox.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/widgets/LockBoxConstantSize.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/widgets/LockBoxAlternatingSize.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/widgets/PhoneLockBox.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/widgets/SimLockBox.hpp"
-)

@@ 1,53 0,0 @@
-
-include_directories( ${CMAKE_PROJECT_NAME}
-
-	PRIVATE
-		"${CMAKE_CURRENT_LIST_DIR}"
-)
-
-include_directories( ${PROJECT_NAME}
-
-	PRIVATE
-		"${CMAKE_CURRENT_LIST_DIR}"
-)
-
-target_sources( ${PROJECT_NAME}
-
-	PRIVATE
-		"${CMAKE_CURRENT_LIST_DIR}/Popups.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/VolumeWindow.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/WindowWithTimer.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/HomeModesWindow.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/TetheringConfirmationPopup.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/TetheringNotificationPopup.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/TetheringPhoneModePopup.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/TetheringOffPopup.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/PowerOffWindow.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/presenter/PowerOffPresenter.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/lock-popups/PhoneLockedInfoWindow.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/lock-popups/PhoneLockedWindow.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/lock-popups/PhoneLockInputWindow.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/lock-popups/PhoneLockChangeInfoWindow.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/lock-popups/SimLockInputWindow.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/lock-popups/SimInfoWindow.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/lock-popups/SimNotReadyWindow.cpp"
-
-	PRIVATE
-		"${CMAKE_CURRENT_LIST_DIR}/Popups.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/VolumeWindow.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/WindowWithTimer.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/HomeModesWindow.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/TetheringConfirmationPopup.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/TetheringNotificationPopup.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/TetheringPhoneModePopup.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/PowerOffWindow.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/presenter/PowerOffPresenter.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/data/PopupData.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/lock-popups/PhoneLockedInfoWindow.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/lock-popups/PhoneLockedWindow.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/lock-popups/PhoneLockInputWindow.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/lock-popups/PhoneLockChangeInfoWindow.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/lock-popups/SimLockInputWindow.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/lock-popups/SimInfoWindow.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/lock-popups/SimNotReadyWindow.hpp"
-)

@@ 1,8 0,0 @@
-#set(BOARD_SOURCES 
-#	${CMAKE_CURRENT_SOURCE_DIR}/service-eink/board/linux/ServiceEink.cpp 
-#	CACHE INTERNAL "")
-
-#set(BOARD_DIR_INCLUDES  
-#	${CMAKE_CURRENT_SOURCE_DIR}/service-eink/board/linux
-#	${CMAKE_CURRENT_SOURCE_DIR}/service-eink/  
-#	CACHE INTERNAL "")>
\ No newline at end of file

@@ 1,8 0,0 @@
-#set(BOARD_SOURCES 
-#	${CMAKE_CURRENT_SOURCE_DIR}/service-eink/board/rt1051/ServiceEink.cpp 
-#	CACHE INTERNAL "")
-
-#set(BOARD_DIR_INCLUDES  
-#	${CMAKE_CURRENT_SOURCE_DIR}/service-eink/  
-#	${CMAKE_CURRENT_SOURCE_DIR}/service-eink/board/rt1051 
-#	CACHE INTERNAL "")

@@ 5,5 5,5 @@ add_catch2_executable(
         tests-main.cpp
         test-CallbackStorage.cpp
     LIBS
-        ${PROJECT_NAME}
+        module-apps
 )

@@ 41,7 41,6 @@ target_link_libraries(${PROJECT_NAME}
         module-sys
         module-utils
         module-gui
-        module-apps
         module-db
         module-cellular
         module-audio

@@ 1,5 1,4 @@
 project(service-antenna)
-message( "${PROJECT_NAME}  ${CMAKE_CURRENT_LIST_DIR}" )
 
 set(SOURCES
     ServiceAntenna.cpp

@@ 35,10 35,10 @@ target_link_libraries(${PROJECT_NAME}
         service-cellular
         service-db
         service-gui
-        module-apps
         module-audio
         json::json
     PUBLIC
+        apps-common
         time
 )
 

@@ 3,7 3,7 @@
 
 #include <service-appmgr/data/NotificationsChangedActionsParams.hpp>
 
-#include <module-apps/notifications/NotificationData.hpp>
+#include <apps-common/notifications/NotificationData.hpp>
 
 using namespace app::manager::actions;
 

@@ 2,7 2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include <service-appmgr/model/ApplicationHandle.hpp>
-#include <module-apps/ApplicationLauncher.hpp>
+#include <apps-common/ApplicationLauncher.hpp>
 
 namespace app::manager
 {

@@ 4,9 4,9 @@
 #include <service-appmgr/model/ApplicationManager.hpp>
 #include <service-appmgr/Controller.hpp>
 
-#include <module-apps/messages/AppMessage.hpp>
-#include <module-apps/popups/data/PhoneModeParams.hpp>
-#include <module-apps/popups/data/PopupRequestParams.hpp>
+#include <apps-common/messages/AppMessage.hpp>
+#include <apps-common/popups/data/PhoneModeParams.hpp>
+#include <apps-common/popups/data/PopupRequestParams.hpp>
 #include <Common.hpp>
 #include <Service/Message.hpp>
 #include <module-sys/Timers/TimerFactory.hpp>

@@ 2,7 2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include <service-appmgr/model/ApplicationsRegistry.hpp>
-#include <module-apps/ApplicationLauncher.hpp>
+#include <apps-common/ApplicationLauncher.hpp>
 
 namespace app::manager
 {

@@ 4,7 4,7 @@
 #pragma once
 
 #include "service-appmgr/Actions.hpp"
-#include <locks/handlers/LockPolicyHandler.hpp>
+#include <apps-common/locks/handlers/LockPolicyHandler.hpp>
 
 namespace app::manager
 {

@@ 5,7 5,7 @@
 
 #include <Service/Message.hpp>
 #include <MessageType.hpp>
-#include <module-apps/Application.hpp>
+#include <apps-common/Application.hpp>
 
 namespace app::manager
 {

@@ 3,7 3,7 @@
 
 #pragma once
 
-#include <module-apps/Application.hpp>
+#include <apps-common/Application.hpp>
 
 #include <memory>
 #include <string>

@@ 7,8 7,8 @@
 #include "ApplicationsRegistry.hpp"
 #include "ActionsRegistry.hpp"
 
-#include <module-apps/Application.hpp>
-#include <module-apps/ApplicationLauncher.hpp>
+#include <apps-common/Application.hpp>
+#include <apps-common/ApplicationLauncher.hpp>
 
 #include <bsp/keypad_backlight/keypad_backlight.hpp>
 #include <service-appmgr/messages/Message.hpp>


@@ 31,8 31,8 @@
 #include <service-eink/Common.hpp>
 
 #include <notifications/NotificationProvider.hpp>
-#include <locks/handlers/PhoneLockHandler.hpp>
-#include <locks/handlers/SimLockHandler.hpp>
+#include <apps-common/locks/handlers/PhoneLockHandler.hpp>
+#include <apps-common/locks/handlers/SimLockHandler.hpp>
 
 namespace app
 {

@@ 8,7 8,7 @@
 #include <MessageType.hpp>
 #include <service-appmgr/service-appmgr/messages/ActionRequest.hpp>
 #include <module-services/service-appmgr/service-appmgr/Actions.hpp>
-#include <module-apps/popups/data/PopupRequestParams.hpp>
+#include <apps-common/popups/data/PopupRequestParams.hpp>
 
 #include <Service/Message.hpp>
 

@@ 6,7 6,7 @@
 #include <service-appmgr/model/ApplicationManager.hpp>
 #include <service-appmgr/messages/PreventBlockingRequest.hpp>
 #include <service-desktop/service-desktop/ServiceDesktop.hpp>
-#include <module-apps/locks/data/PhoneLockMessages.hpp>
+#include <apps-common/locks/data/PhoneLockMessages.hpp>
 #include <json11.hpp>
 
 namespace parserFSM

@@ 41,7 41,7 @@
 #include <filesystem>
 #include <list>
 #include <ctime>
-#include <module-apps/messages/AppMessage.hpp>
+#include <apps-common/messages/AppMessage.hpp>
 #include <SystemManager/messages/CpuFrequencyMessage.hpp>
 #include <EventStore.hpp>
 #include <SystemManager/messages/PhoneModeRequest.hpp>

@@ 54,6 54,7 @@ target_sources(module-sys PRIVATE ${SOURCES} ${BOARD_SOURCES})
 
 target_link_libraries(module-sys
     PRIVATE
+        apps-common
         bus
         service-evtmgr
         messagetype

@@ 28,7 28,7 @@
 #include "DeviceManager.hpp"
 #include <chrono>
 #include <vector>
-#include <module-apps/Application.hpp>
+#include <apps-common/Application.hpp>
 
 namespace sys
 {

@@ 5,7 5,7 @@
 
 #include <module-sys/Service/Message.hpp>
 
-#include <module-apps/popups/data/PopupRequestParams.hpp>
+#include <apps-common/popups/data/PopupRequestParams.hpp>
 
 #include <service-appmgr/Actions.hpp>
 #include <service-appmgr/messages/ActionRequest.hpp>

@@ 4,7 4,6 @@
 #include "config.h"
 
 // applications
-#include <application-antenna/ApplicationAntenna.hpp>
 #include <application-call/ApplicationCall.hpp>
 #include <application-calllog/ApplicationCallLog.hpp>
 #include <application-desktop/ApplicationDesktop.hpp>


@@ 38,12 37,6 @@
 #include <service-fileindexer/ServiceFileIndexer.hpp>
 #include <service-desktop/ServiceDesktop.hpp>
 
-#if ENABLE_GSM == 1
-#include <service-fota/ServiceFota.hpp>
-#include <service-cellular/ServiceCellular.hpp>
-#include <service-antenna/ServiceAntenna.hpp>
-#endif
-
 #include <bsp/bsp.hpp>
 #include <Application.hpp>
 #include <ApplicationLauncher.hpp>


@@ 87,14 80,6 @@ int main()
     systemServices.emplace_back(sys::CreatorFor<service::ServiceFileIndexer>());
 #endif
     systemServices.emplace_back(sys::CreatorFor<ServiceDB>());
-#if ENABLE_GSM == 0
-    // For now disable permanently Service cellular when there is no GSM configured
-    LOG_INFO("ServiceCellular (GSM) - Disabled");
-#else
-    systemServices.emplace_back(sys::CreatorFor<ServiceAntenna>());
-    systemServices.emplace_back(sys::CreatorFor<ServiceCellular>());
-    systemServices.emplace_back(sys::CreatorFor<FotaService::Service>());
-#endif
     systemServices.emplace_back(sys::CreatorFor<ServiceAudio>());
     systemServices.emplace_back(sys::CreatorFor<ServiceBluetooth>());
     systemServices.emplace_back(sys::CreatorFor<ServiceLwIP>());

@@ 48,6 48,7 @@ set_target_properties(PurePhone
 
 target_link_libraries(PurePhone
     PRIVATE
+        application-antenna
         module-apps
         service-desktop
         service-bluetooth