38 files changed, 167 insertions(+), 155 deletions(-)

M module-apps/Application.cpp
M module-apps/Application.hpp
M module-apps/CMakeLists.txt
M module-apps/UiCommonActions.cpp
M module-apps/application-call/windows/EmergencyCallWindow.cpp
M module-apps/application-calllog/windows/CallLogDetailsWindow.cpp
M module-apps/application-calllog/windows/CallLogMainWindow.cpp
M module-apps/application-clock/ApplicationClock.cpp
M module-apps/application-desktop/windows/PowerOffWindow.cpp
M module-apps/application-desktop/windows/Update.cpp
M module-apps/application-messages/windows/MessagesMainWindow.cpp
M module-apps/application-notes/windows/NotesEditWindow.cpp
M module-apps/application-notes/windows/NotesMainWindow.cpp
M module-apps/application-settings/windows/BtScanWindow.cpp
M module-apps/application-settings/windows/BtWindow.cpp
M module-apps/application-settings/windows/DateTimeWindow.cpp
M module-apps/application-settings/windows/UITestWindow.cpp
M module-apps/application-settings/windows/USSDWindow.cpp
M module-apps/application-special-input/widgets/SpecialInputTableWidget.cpp
M module-apps/windows/Dialog.cpp
M module-apps/windows/OptionWindow.cpp
M module-services/CMakeLists.txt
M module-services/service-antenna/ServiceAntenna.cpp
M module-services/service-appmgr/ApplicationManifest.cpp
M module-services/service-appmgr/CMakeLists.txt
M module-services/service-appmgr/Controller.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
R module-services/service-appmgr/{ => }/service-appmgr/Actions.hpp
R module-services/service-appmgr/{ => }/service-appmgr/ApplicationManifest.hpp
R module-services/service-appmgr/{ => }/service-appmgr/Controller.hpp
R module-services/service-appmgr/{messages => service-appmgr}/Message.hpp
R module-services/service-appmgr/{ => }/service-appmgr/model/ApplicationHandle.hpp
R module-services/service-appmgr/{ => }/service-appmgr/model/ApplicationManager.hpp
R module-services/service-appmgr/{ => }/service-appmgr/model/ApplicationsRegistry.hpp
M module-services/service-time/timeEvents/CalendarTimeEvents.cpp
M source/main.cpp

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

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


@@ 17,7 17,7 @@
 #include "gui/Common.hpp"                               // for ShowMode
 #include "projdefs.h"                                   // for pdMS_TO_TICKS
 #include "service-evtmgr/messages/EVMessages.hpp"       // for TorchStateMe...
-#include "module-services/service-appmgr/ApplicationManifest.hpp"
+#include <service-appmgr/ApplicationManifest.hpp>
 #include <list>                                         // for list
 #include <map>                                          // for allocator, map
 #include <memory>                                       // for make_shared

@@ 1,4 1,4 @@
-cmake_minimum_required(VERSION 3.14)
+cmake_minimum_required(VERSION 3.14)
 
 project(module-apps VERSION 1.0
         DESCRIPTION "Library with all applications.")


@@ 87,7 87,19 @@ include_directories( ../module-os )
 include_directories( ../module-bsp )
 include_directories( ../module-db )
 
-target_link_libraries(${PROJECT_NAME} PUBLIC module-bsp module-os module-sys module-utils module-gui module-services module-db ${TARGET_LIBRARIES} )
+target_link_libraries(${PROJECT_NAME}
+    PRIVATE
+        service-appmgr
+    PUBLIC
+        module-bsp
+        module-os
+        module-sys
+        module-utils
+        module-gui
+        module-services
+        module-db
+        ${TARGET_LIBRARIES}
+)
 
 # Board specific compilation definitions,options,include directories and features
 target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_CONFIG_DEFINITIONS})

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


@@ 11,8 11,8 @@
 #include "application-phonebook/data/PhonebookItemData.hpp"
 #include "application-special-input/ApplicationSpecialInput.hpp"
 
-#include "service-appmgr/Controller.hpp"
-#include "service-appmgr/messages/Message.hpp"
+#include <service-appmgr/Controller.hpp>
+#include <service-appmgr/Message.hpp>
 
 #include <i18/i18.hpp>
 #include <log/log.hpp>

@@ 1,9 1,9 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "../data/CallSwitchData.hpp"
 #include "../ApplicationCall.hpp"
-#include "module-services/service-appmgr/model/ApplicationManager.hpp"
+#include <service-appmgr/model/ApplicationManager.hpp>
 
 #include "i18/i18.hpp"
 #include "EmergencyCallWindow.hpp"

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


@@ 6,7 6,7 @@
 #include <functional>
 
 #include "OptionsWindow.hpp"
-#include "module-services/service-appmgr/model/ApplicationManager.hpp"
+#include <service-appmgr/model/ApplicationManager.hpp>
 
 #include "bsp/rtc/rtc.hpp"
 

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


@@ 7,7 7,7 @@
 #include "application-calllog/widgets/CalllogItem.hpp"
 
 #include <application-call/ApplicationCall.hpp>
-#include <module-services/service-appmgr/model/ApplicationManager.hpp>
+#include <service-appmgr/model/ApplicationManager.hpp>
 #include <service-db/messages/DBCalllogMessage.hpp>
 #include <i18/i18.hpp>
 #include <Label.hpp>

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


@@ 11,7 11,7 @@
 // module-services
 #include "service-evtmgr/EventManager.hpp"
 #include "service-evtmgr/messages/EVMessages.hpp"
-#include "module-services/service-appmgr/model/ApplicationManager.hpp"
+#include <service-appmgr/model/ApplicationManager.hpp>
 // MessageType
 #include "MessageType.hpp"
 // this module

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


@@ 13,7 13,7 @@
 #include "../ApplicationDesktop.hpp"
 
 // services
-#include "module-services/service-appmgr/model/ApplicationManager.hpp"
+#include <service-appmgr/model/ApplicationManager.hpp>
 
 #include "service-cellular/ServiceCellular.hpp"
 #include <Style.hpp>

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


@@ 13,7 13,7 @@
 #include "Update.hpp"
 #include "../ApplicationDesktop.hpp"
 // services
-#include "module-services/service-appmgr/model/ApplicationManager.hpp"
+#include <service-appmgr/model/ApplicationManager.hpp>
 
 #include "service-cellular/ServiceCellular.hpp"
 #include <Style.hpp>

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


@@ 9,7 9,7 @@
 #include "application-messages/widgets/ThreadItem.hpp"
 #include "application-messages/windows/SearchStart.hpp"
 
-#include <module-services/service-appmgr/model/ApplicationManager.hpp>
+#include <service-appmgr/model/ApplicationManager.hpp>
 #include <i18/i18.hpp>
 #include <service-db/api/DBServiceAPI.hpp>
 #include <application-phonebook/data/PhonebookItemData.hpp>

@@ 1,10 1,10 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include <memory>
 #include <functional>
 
-#include "module-services/service-appmgr/model/ApplicationManager.hpp"
+#include <service-appmgr/model/ApplicationManager.hpp>
 
 #include "bsp/rtc/rtc.hpp"
 

@@ 1,11 1,11 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include <memory>
 #include <functional>
 
 #include "InputEvent.hpp"
-#include "module-services/service-appmgr/model/ApplicationManager.hpp"
+#include <service-appmgr/model/ApplicationManager.hpp>
 
 #include "../ApplicationNotes.hpp"
 

@@ 1,10 1,10 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include <functional>
 #include <memory>
 
-#include "module-services/service-appmgr/model/ApplicationManager.hpp"
+#include <service-appmgr/model/ApplicationManager.hpp>
 
 #include "../ApplicationSettings.hpp"
 

@@ 1,10 1,10 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include <functional>
 #include <memory>
 
-#include "module-services/service-appmgr/model/ApplicationManager.hpp"
+#include <service-appmgr/model/ApplicationManager.hpp>
 
 #include "../ApplicationSettings.hpp"
 #include "../windows/BtScanWindow.hpp"

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


@@ 11,7 11,7 @@
 #include <functional>
 #include <memory>
 
-#include "module-services/service-appmgr/model/ApplicationManager.hpp"
+#include <service-appmgr/model/ApplicationManager.hpp>
 
 #include "../ApplicationSettings.hpp"
 #include "DateTimeWindow.hpp"

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


@@ 8,7 8,7 @@
 #include "i18/i18.hpp"
 #include "log/log.hpp"
 #include "messages/AppMessage.hpp"
-#include "module-services/service-appmgr/model/ApplicationManager.hpp"
+#include <service-appmgr/model/ApplicationManager.hpp>
 #include <GridLayout.hpp>
 #include <Style.hpp>
 #include <functional>

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


@@ 7,7 7,7 @@
 #include "Margins.hpp"
 #include "i18/i18.hpp"
 #include "messages/AppMessage.hpp"
-#include "module-services/service-appmgr/model/ApplicationManager.hpp"
+#include <service-appmgr/model/ApplicationManager.hpp>
 #include <GridLayout.hpp>
 #include <Style.hpp>
 #include <functional>

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


@@ 7,7 7,7 @@
 #include "application-special-input/data/SpecialCharactersTableStyle.hpp"
 #include <cassert>
 #include <module-apps/application-special-input/ApplicationSpecialInput.hpp>
-#include <module-services/service-appmgr/Controller.hpp>
+#include <service-appmgr/Controller.hpp>
 
 #include "Style.hpp"
 #include "messages/AppMessage.hpp"

@@ 1,9 1,9 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "Dialog.hpp"
 #include "DialogMetadataMessage.hpp"
-#include "module-services/service-appmgr/model/ApplicationManager.hpp"
+#include <service-appmgr/model/ApplicationManager.hpp>
 #include <i18/i18.hpp>
 
 using namespace gui;

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


@@ 6,7 6,7 @@
 #include "Margins.hpp"
 #include "i18/i18.hpp"
 #include "log/log.hpp"
-#include "module-services/service-appmgr/model/ApplicationManager.hpp"
+#include <service-appmgr/model/ApplicationManager.hpp>
 #include <Style.hpp>
 #include <cassert>
 #include <functional>

@@ 1,4 1,4 @@
-cmake_minimum_required(VERSION 3.14)
+cmake_minimum_required(VERSION 3.14)
 
 project(module-services VERSION 1.0
         DESCRIPTION "Library with all services.")


@@ 32,8 32,9 @@ add_subdirectory( service-time )
 add_subdirectory( service-fileindexer )
 
 target_link_libraries(${PROJECT_NAME} PUBLIC
-    service-eink
     service-gui
+    service-eink
+    service-appmgr
     module-bsp
     module-os
     module-sys

@@ 1,8 1,8 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "ServiceAntenna.hpp"
-#include "module-services/service-appmgr/model/ApplicationManager.hpp"
+#include <service-appmgr/model/ApplicationManager.hpp>
 #include <common_data/EventStore.hpp>
 
 #include <at/response.hpp> // for parseCSQ, isRegistered, parseCREG, parseNetworkFrequency, parseQNWINFO

@@ 1,7 1,8 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "ApplicationManifest.hpp"
+#include "service-appmgr/Actions.hpp"
+#include "service-appmgr/ApplicationManifest.hpp"
 
 #include <algorithm>
 

@@ 1,29 1,23 @@
-include_directories(${CMAKE_PROJECT_NAME}
-	PUBLIC
-		"${CMAKE_CURRENT_LIST_DIR}"
-)
+project(service-appmgr)
+message( "${PROJECT_NAME}  ${CMAKE_CURRENT_LIST_DIR}" )
 
-include_directories(${PROJECT_NAME}
-	PUBLIC
-		"${CMAKE_CURRENT_LIST_DIR}"
-		"${CMAKE_CURRENT_LIST_DIR}/.."
+set(SOURCES
+    ApplicationManifest.cpp
+    Controller.cpp
+    model/ApplicationManager.cpp
+    model/ApplicationHandle.cpp
+    model/ApplicationsRegistry.cpp
 )
 
-message("${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}")
+add_library(${PROJECT_NAME} STATIC ${SOURCES})
+
+target_link_libraries(${PROJECT_NAME}
+    module-apps
+    module-audio
+)
 
-target_sources(${PROJECT_NAME}
-	PRIVATE
-		"${CMAKE_CURRENT_LIST_DIR}/ApplicationManifest.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/Controller.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/model/ApplicationManager.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/model/ApplicationHandle.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/model/ApplicationsRegistry.cpp"
-	PUBLIC
-		"${CMAKE_CURRENT_LIST_DIR}/Actions.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/ApplicationManifest.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/Controller.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/model/ApplicationManager.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/model/ApplicationHandle.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/model/ApplicationsRegistry.hpp"
+target_include_directories(${PROJECT_NAME}
+    PUBLIC
+        ${CMAKE_CURRENT_LIST_DIR}
 )
 

@@ 1,14 1,14 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "Controller.hpp"
+#include "service-appmgr/Controller.hpp"
 
-#include <utility> // for move
+#include "service-appmgr/model/ApplicationManager.hpp"
 
-#include "module-sys/Service/Bus.hpp" // for Bus
-#include "Service/Service.hpp"        // for Service
-#include "service-appmgr/model/ApplicationManager.hpp" // for ApplicationManager, ApplicationManager::ServiceName, ApplicationHandle, ApplicationHandle::Name
+#include <module-sys/Service/Bus.hpp>
+#include <Service/Service.hpp>
 
+#include <utility> // for move
 namespace app::manager
 {
     auto Controller::sendAction(sys::Service *sender, actions::ActionId actionId, actions::ActionParamsPtr &&data)

@@ 1,7 1,7 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "ApplicationHandle.hpp"
+#include <service-appmgr/model/ApplicationHandle.hpp>
 
 namespace app::manager
 {

@@ 1,31 1,31 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "ApplicationManager.hpp"
-
-#include <utility>   // for move
-#include <algorithm> // for find_if
-#include <limits>    // for numeric_limits
-
-#include "service-appmgr/Controller.hpp"                         // for Controller
-#include "application-call/ApplicationCall.hpp"                  // for name_call
-#include "application-special-input/ApplicationSpecialInput.hpp" // for special_input
-#include "Service/Message.hpp"             // for ResponseMessage, DataMessage (ptr only), Message_t
-#include "AppMessage.hpp"                  // for AppSwitchWindowMessage
-#include "Service/Timer.hpp"               // for Timer, Timer::Type, Timer::Type::SingleShot, ms
-#include "service-db/api/DBServiceAPI.hpp" // for DBServiceAPI
-#include "service-evtmgr/EventManager.hpp" // for EventManager
-#include <service-eink/ServiceEink.hpp>    // for ServiceEink
+#include <service-appmgr/model/ApplicationManager.hpp>
+#include <service-appmgr/Controller.hpp>
+
+#include <module-apps/messages/AppMessage.hpp>
+#include <Common.hpp>
+#include <Common/Common.hpp>
+#include <Service/Bus.hpp>
+#include <Service/Message.hpp>
+#include <Service/Timer.hpp>
+#include <SystemManager/SystemManager.hpp>
+#include <application-call/ApplicationCall.hpp>
+#include <application-special-input/ApplicationSpecialInput.hpp>
+#include <i18/i18.hpp>
+#include <log/log.hpp>
+#include <service-appmgr/Message.hpp>
+#include <service-db/api/DBServiceAPI.hpp>
+#include <service-evtmgr/EventManager.hpp>
+#include <service-gui/ServiceGUI.hpp>
 #include <service-eink/Common.hpp>
+#include <service-eink/ServiceEink.hpp>
 #include <service-gui/Common.hpp>
-#include "service-gui/ServiceGUI.hpp" // for ServiceGUI
-#include "log/log.hpp"                // for LOG_INFO, LOG_ERROR, LOG_WARN, LOG_DEBUG, LOG_FATAL
-#include "Common.hpp"                 // for ShowMode, ShowMode::GUI_SHOW_INIT
-#include "Common/Common.hpp" // for SettingsLanguage, SettingsLanguage::ENGLISH, SettingsLanguage::GERMAN, SettingsLanguage::POLISH, SettingsLanguage::SPANISH
-#include "Service/Bus.hpp"   // for Bus
-#include "SystemManager/SystemManager.hpp"     // for SystemManager
-#include "i18/i18.hpp"                         // for Lang, Lang::En, Lang::De, Lang::Pl, Lang::Sp, i18, localize
-#include "service-appmgr/messages/Message.hpp" // for APMCheckApp, APMSwitch, APMRegister, APMConfirmClose, APMConfirmSwitch, Action, APMAction, APMChangeLanguage, APMSwitchPrevApp, APMDelayedClose, APMClose, APMInitPowerSaveMode, APMPreventBlocking
+
+#include <algorithm>
+#include <limits>
+#include <utility>
 
 // Auto phone lock disabled for now till the times when it's debugged
 // #define AUTO_PHONE_LOCK_ENABLED

@@ 1,7 1,7 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "ApplicationsRegistry.hpp"
+#include <service-appmgr/model/ApplicationsRegistry.hpp>
 
 namespace app::manager
 {

@@ 1,14 1,14 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
 
+#include <module-gui/gui/SwitchData.hpp>
+
 #include <memory>
 #include <string>
 #include <vector>
 
-#include <module-gui/gui/SwitchData.hpp>
-
 namespace app::manager::actions
 {
     using ActionId     = int;

@@ 1,9 1,9 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
 
-#include "Actions.hpp"
+#include "service-appmgr/Actions.hpp"
 
 namespace app::manager
 {

@@ 1,17 1,19 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
 
-#include <memory> // for unique_ptr
-#include <string> // for string
-
 #include "Actions.hpp"
-#include "module-services/service-appmgr/model/ApplicationManager.hpp"
-#include "module-sys/Service/Service.hpp"
-#include "SwitchData.hpp"                         // for SwitchData
-#include "i18/i18.hpp"                            // for Lang
-#include "service-appmgr/messages/Message.hpp"    // for APMSwitchPrevApp, Action (ptr only)
+#include "Message.hpp"
+#include "model/ApplicationManager.hpp"
+
+#include <module-sys/Service/Service.hpp>
+#include <SwitchData.hpp>
+
+#include <i18/i18.hpp>
+
+#include <memory>
+#include <string>
 
 namespace sys
 {

@@ 1,16 1,17 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
 
-#include "Service/Message.hpp"
-#include "MessageType.hpp"
-#include "i18/i18.hpp"
+#include "Actions.hpp"
+#include "ApplicationManifest.hpp"
+
+#include <Service/Message.hpp>
+#include <MessageType.hpp>
+#include <i18/i18.hpp>
 
 #include <module-apps/Application.hpp>
 #include <module-gui/gui/SwitchData.hpp>
-#include <module-services/service-appmgr/Actions.hpp>
-#include <module-services/service-appmgr/ApplicationManifest.hpp>
 
 namespace app::manager
 {

@@ 1,13 1,13 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
 
-#include <string>
-#include <memory>
+#include <module-apps/Application.hpp>
+#include <module-apps/ApplicationLauncher.hpp>
 
-#include "Application.hpp"
-#include "ApplicationLauncher.hpp"
+#include <memory>
+#include <string>
 
 namespace app
 {

@@ 1,27 1,28 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
 
-#include <memory>      // for unique_ptr, allocator
-#include <string>      // for string
-#include <deque>       // for deque
-#include <string_view> // for string_view
-#include <vector>      // for vector
-
-#include "Application.hpp"         // for Application, Application::State
-#include "ApplicationLauncher.hpp" // for ApplicationLauncher
-#include "module-services/service-appmgr/messages/Message.hpp"
-#include "Service/Common.hpp"  // for ReturnCodes, ServicePowerMode
-#include "Service/Message.hpp" // for Message_t, DataMessage (ptr only), ResponseMessage (ptr only)
-#include "Service/Service.hpp" // for Service
-#include "Service/Timer.hpp"   // for Timer
-#include "SettingsRecord.hpp"  // for SettingsRecord
-#include "SwitchData.hpp"      // for SwitchData
-
 #include "ApplicationHandle.hpp"
 #include "ApplicationsRegistry.hpp"
 
+#include <module-apps/Application.hpp>
+#include <module-apps/ApplicationLauncher.hpp>
+
+#include <service-appmgr/Message.hpp>
+#include <Service/Common.hpp>
+#include <Service/Message.hpp>
+#include <Service/Service.hpp>
+#include <Service/Timer.hpp>
+#include <SettingsRecord.hpp>
+#include <SwitchData.hpp>
+
+#include <deque>
+#include <memory>
+#include <string>
+#include <string_view>
+#include <vector>
+
 namespace app
 {
     class ApplicationLauncher;

@@ 1,13 1,13 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
 
-#include <vector>
-#include <memory>
-
 #include "ApplicationHandle.hpp"
 
+#include <memory>
+#include <vector>
+
 namespace app::manager
 {
     using ApplicationsContainer = std::vector<std::unique_ptr<ApplicationHandle>>;

@@ 1,9 1,9 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "CalendarTimeEvents.hpp"
 
-#include <module-services/service-appmgr/Controller.hpp>                 // for Controller
+#include <service-appmgr/Controller.hpp>                                 // for Controller
 #include <module-services/service-db/api/DBServiceAPI.hpp>               // for DBServiceAPI
 #include <module-db/queries/calendar/QueryEventsSelectFirstUpcoming.hpp> // for SelectFirstUpcoming, SelectFirstUpcomingResult
 #include <module-gui/gui/SwitchData.hpp>                                 // for SwitchData

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


@@ 20,7 20,7 @@
 #include <application-calculator/ApplicationCalculator.hpp>
 
 // services
-#include <module-services/service-appmgr/model/ApplicationManager.hpp>
+#include <service-appmgr/model/ApplicationManager.hpp>
 #include <service-audio/ServiceAudio.hpp>
 #include <service-bluetooth/ServiceBluetooth.hpp>
 #include <service-db/ServiceDB.hpp>