15 files changed, 22 insertions(+), 19 deletions(-)

M module-apps/Application.cpp
M module-apps/application-settings/windows/ColorTestWindow.cpp
M module-services/service-appmgr/CMakeLists.txt
M module-services/service-appmgr/service-appmgr/model/ApplicationManager.hpp
M module-services/service-eink/ServiceEink.hpp
M module-services/service-gui/CMakeLists.txt
M module-services/service-gui/messages/DrawMessage.cpp
R module-services/service-gui/{service-guiName => service-gui/Common}.hpp
R module-services/service-gui/{ => }/service-gui/ServiceGUI.hpp
R module-services/service-gui/{ => }/service-gui/messages/ChangeColorScheme.hpp
R module-services/service-gui/{ => }/service-gui/messages/DrawMessage.hpp
R module-services/service-gui/{ => }/service-gui/messages/EinkInitialized.hpp
R module-services/service-gui/{ => }/service-gui/messages/GUIMessage.hpp
R module-services/service-gui/{ => }/service-gui/messages/RenderingFinished.hpp
M source/main.cpp

@@ 33,7 33,7 @@
 #include <iterator>    // for distance, next
 #include <type_traits> // for add_const<>...
 #include <WindowsFactory.hpp>
-#include <service-guiName.hpp>
+#include <service-gui/Common.hpp>
 #include <module-utils/Utils.hpp>
 #include <service-db/agents/settings/SystemSettings.hpp>
 #include <module-utils/time/DateAndTimeSettings.hpp>

@@ 4,9 4,9 @@
 #include <memory>
 
 #include <service-appmgr/Controller.hpp>
-#include <service-guiName.hpp>
+#include <service-gui/Common.hpp>
+#include <service-gui/messages/ChangeColorScheme.hpp>
 #include <Style.hpp>
-#include <ChangeColorScheme.hpp>
 
 #include "application-settings/ApplicationSettings.hpp"
 #include "application-settings/widgets/ColorTestListStyle.hpp"

@@ 35,6 35,7 @@ target_link_libraries(${PROJECT_NAME}
     PRIVATE
         service-cellular
         service-db
+        service-gui
         module-apps
         module-audio
 )

@@ 27,7 27,7 @@
 
 #include <service-db/DBServiceName.hpp>
 #include <service-db/Settings.hpp>
-#include <service-guiName.hpp>
+#include <service-gui/Common.hpp>
 #include <service-eink/Common.hpp>
 
 #include <notifications/NotificationProvider.hpp>

@@ 12,7 12,7 @@
 #include "EinkDisplay.hpp"
 
 #include <service-db/DBServiceName.hpp>
-#include <service-guiName.hpp>
+#include <service-gui/Common.hpp>
 
 #include <chrono>
 #include <cstdint>

@@ 10,18 10,19 @@ target_sources(service-gui
         WorkerGUI.cpp
         messages/DrawMessage.cpp
     INTERFACE
-        service-guiName.hpp
+        service-gui/Common.hpp
+        service-gui/ServiceGUI.hpp
+        service-gui/messages/ChangeColorScheme.hpp
+        service-gui/messages/DrawMessage.hpp
+        service-gui/messages/EinkInitialized.hpp
+        service-gui/messages/GUIMessage.hpp
+        service-gui/messages/RenderingFinished.hpp
+    PRIVATE
         ContextPool.hpp
         DrawCommandsQueue.hpp
         RenderCache.hpp
-        ServiceGUI.hpp
         SynchronizationMechanism.hpp
         WorkerGUI.hpp
-        messages/ChangeColorScheme.hpp
-        messages/DrawMessage.hpp
-        messages/EinkInitialized.hpp
-        messages/GUIMessage.hpp
-        messages/RenderingFinished.hpp
 )
 
 


@@ 34,7 35,8 @@ target_link_libraries(service-gui
 target_include_directories(service-gui
     PUBLIC
         ${CMAKE_CURRENT_LIST_DIR}
-        ${CMAKE_CURRENT_LIST_DIR}/messages
+    PRIVATE
+        service-gui
 )
 
 if (${ENABLE_TESTS})

@@ 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
 
-#include "DrawMessage.hpp"
-#include "GUIMessage.hpp"
+#include <messages/DrawMessage.hpp>
+#include <messages/GUIMessage.hpp>
 #include <Common.hpp>
 #include <DrawCommand.hpp>
 

@@ 7,7 7,7 @@
 #include "DrawCommandsQueue.hpp"
 #include "RenderCache.hpp"
 #include "messages/RenderingFinished.hpp"
-#include "service-guiName.hpp"
+#include "Common.hpp"
 
 #include <Service/Common.hpp>
 #include <Service/Message.hpp>

@@ 31,8 31,8 @@
 #include <service-lwip/ServiceLwIP.hpp>
 #include <service-time/ServiceTime.hpp>
 #include <Service/ServiceCreator.hpp>
-#include <module-services/service-gui/ServiceGUI.hpp>
-#include <service-guiName.hpp>
+#include <service-gui/ServiceGUI.hpp>
+#include <service-gui/Common.hpp>
 #include <module-services/service-eink/ServiceEink.hpp>
 #include <service-fileindexer/Constants.hpp>
 #include <service-fileindexer/ServiceFileIndexer.hpp>