53 files changed, 108 insertions(+), 56 deletions(-)

M module-apps/Application.cpp
M module-apps/CMakeLists.txt
M module-apps/application-messages/CMakeLists.txt
M module-apps/application-messages/windows/OptionsMessages.cpp
M module-apps/application-notes/CMakeLists.txt
M module-apps/application-notes/windows/NotesOptions.cpp
M module-apps/application-settings-new/ApplicationSettings.hpp
M module-apps/application-settings-new/CMakeLists.txt
M module-apps/application-settings/ApplicationSettings.hpp
M module-apps/application-settings/CMakeLists.txt
M module-apps/locks/handlers/SimLockHandler.cpp
M module-bsp/CMakeLists.txt
M module-bsp/board/linux/battery-charger/battery_charger.cpp
M module-bsp/board/linux/cellular/linux_cellular.cpp
M module-bsp/board/rt1051/bsp/battery-charger/battery_charger.cpp
M module-bsp/board/rt1051/bsp/cellular/rt1051_cellular.cpp
M module-bsp/bsp/cellular/bsp_cellular.hpp
M module-cellular/CMakeLists.txt
M module-cellular/at/UrcCreg.hpp
M module-gui/CMakeLists.txt
M module-gui/gui/widgets/StatusBar.cpp
M module-gui/gui/widgets/status-bar/BatteryBase.hpp
M module-gui/gui/widgets/status-bar/NetworkAccessTechnology.hpp
M module-gui/gui/widgets/status-bar/PhoneMode.hpp
M module-gui/gui/widgets/status-bar/SIM.hpp
M module-gui/gui/widgets/status-bar/SignalStrengthBase.hpp
M module-gui/gui/widgets/status-bar/SignalStrengthText.cpp
M module-services/service-antenna/CMakeLists.txt
M module-services/service-antenna/ServiceAntenna.cpp
M module-services/service-cellular/CMakeLists.txt
M module-services/service-cellular/RequestFactory.cpp
M module-services/service-cellular/ServiceCellular.cpp
M module-services/service-cellular/service-cellular/SignalStrength.hpp
M module-services/service-cellular/src/SimCard.cpp
M module-services/service-desktop/CMakeLists.txt
M module-services/service-desktop/endpoints/deviceInfo/DeviceInfoEndpoint.cpp
M module-services/service-evtmgr/CMakeLists.txt
M module-services/service-evtmgr/EventManager.cpp
M module-services/service-evtmgr/WorkerEvent.cpp
M module-services/service-evtmgr/battery-level-check/BatteryLevelCheck.cpp
M module-services/service-evtmgr/vibra/Vibra.cpp
M module-sys/CMakeLists.txt
M module-sys/SystemManager/SystemManager.cpp
M module-utils/CMakeLists.txt
A module-utils/Clipboard/CMakeLists.txt
R module-utils/{common_data => Clipboard}/Clipboard.cpp
R module-utils/{common_data => Clipboard}/Clipboard.hpp
A module-utils/Clipboard/test/CMakeLists.txt
R module-utils/{ => Clipboard}/test/unittest_clipboard.cpp
A module-utils/EventStore/CMakeLists.txt
R module-utils/{common_data => EventStore}/EventStore.cpp
R module-utils/{common_data => EventStore}/EventStore.hpp
M module-utils/test/CMakeLists.txt

@@ 10,7 10,7 @@
 #include "StatusBar.hpp"
 #include "status-bar/Time.hpp"
 #include "Translator.hpp"                // for KeyInputSim...
-#include "common_data/EventStore.hpp"    // for Battery
+#include <EventStore.hpp>                // for Battery
 #include "common_data/RawKey.hpp"        // for RawKey, key...
 #include "gui/input/InputEvent.hpp"      // for InputEvent
 #include "log/debug.hpp"                 // for DEBUG_APPLI...

@@ 126,6 126,7 @@ target_link_libraries(${PROJECT_NAME}
         service-db
         service-evtmgr
         Microsoft.GSL::GSL
+        eventstore
     PUBLIC
         module-audio
         module-bsp

@@ 52,4 52,5 @@ target_sources( ${PROJECT_NAME}
 target_link_libraries(${PROJECT_NAME}
     PRIVATE
         service-db
+        clipboard
     )

@@ 5,7 5,7 @@
 #include "application-messages/data/SMSdata.hpp"
 #include "tools/Common.hpp"
 
-#include <common_data/Clipboard.hpp>
+#include <Clipboard.hpp>
 #include <Option.hpp>
 #include <Text.hpp>
 #include <i18n/i18n.hpp>

@@ 54,3 54,7 @@ target_include_directories(${PROJECT_NAME}
         service-db
 )
 
+target_link_libraries(${PROJECT_NAME}
+	PRIVATE
+		clipboard
+)

@@ 4,7 4,7 @@
 #include "NotesOptions.hpp"
 
 #include <Option.hpp>
-#include <common_data/Clipboard.hpp>
+#include <Clipboard.hpp>
 
 #include <module-apps/windows/DialogMetadata.hpp>
 #include <module-apps/messages/DialogMetadataMessage.hpp>

@@ 8,7 8,7 @@
 #include <bsp/common.hpp>
 #include <bsp/keypad_backlight/keypad_backlight.hpp>
 #include <module-services/service-evtmgr/screen-light-control/ScreenLightControl.hpp>
-#include <common_data/EventStore.hpp>
+#include <EventStore.hpp>
 
 namespace gui::window::name
 {

@@ 119,4 119,5 @@ add_dependencies(${PROJECT_NAME} version)
 target_link_libraries(${PROJECT_NAME}
     PUBLIC
         service-bluetooth
+        eventstore
 )

@@ 6,7 6,7 @@
 
 #include "Application.hpp"
 #include "bsp/common.hpp"
-#include <common_data/EventStore.hpp>
+#include <EventStore.hpp>
 
 namespace app
 {

@@ 45,4 45,6 @@ target_link_libraries(${PROJECT_NAME}
         service-bluetooth
         service-evtmgr
         service-fota
+    PUBLIC
+        eventstore
 )

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

@@ 91,6 91,7 @@ set_source_files_properties(${BOARD_SOURCE_FILES_PROPERTIES})
 target_link_libraries(${PROJECT_NAME}
     module-os
     service-bluetooth
+    eventstore
     ${TARGET_LIBRARIES}
 )
 

@@ 2,7 2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <module-utils/common_data/EventStore.hpp>
+#include <EventStore.hpp>
 
 #include "board.h"
 #include "bsp/battery-charger/battery_charger.hpp"

@@ 9,7 9,7 @@
 
 #include <log.hpp>
 #include "mutex.hpp"
-#include <common_data/EventStore.hpp>
+#include <EventStore.hpp>
 #include <errno.h>
 #include <fcntl.h>
 #include <map>

@@ 6,7 6,7 @@
 #include "fsl_common.h"
 
 #include "bsp/BoardDefinitions.hpp"
-#include "common_data/EventStore.hpp"
+#include <EventStore.hpp>
 #include "drivers/gpio/DriverGPIO.hpp"
 #include "drivers/i2c/DriverI2C.hpp"
 #include <purefs/filesystem_paths.hpp>

@@ 4,7 4,7 @@
 #include "rt1051_cellular.hpp"
 #include "fsl_cache.h"
 
-#include <common_data/EventStore.hpp>
+#include <EventStore.hpp>
 #include <task.h>
 #include <ticks.hpp>
 

@@ 9,7 9,7 @@
 #include <FreeRTOS.h>
 #include <FreeRTOS/include/queue.h>
 #include "drivers/lpuart/DriverLPUART.hpp"
-#include <common_data/EventStore.hpp>
+#include <EventStore.hpp>
 
 namespace bsp
 {

@@ 88,6 88,7 @@ target_link_libraries(${PROJECT_NAME}
     module-db
     module-bsp
     date::date
+    eventstore
     PRIVATE
     Microsoft.GSL::GSL
 )

@@ 1,11 1,11 @@
-// 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 "Urc.hpp"
 
-#include <common_data/EventStore.hpp>
+#include <EventStore.hpp>
 
 namespace at::urc
 {

@@ 22,9 22,10 @@ include(gui/dom/CMakeLists.txt)
 include_directories( ../module-utils )
 
 target_link_libraries(${PROJECT_NAME} 
-    PUBLIC 
+    PUBLIC
         module-utils 
         utf8
+        eventstore
         ${TARGET_LIBRARIES} 
     PRIVATE
         pugixml::pugixml

@@ 16,7 16,7 @@
 #include "status-bar/SIM.hpp"
 #include "status-bar/Time.hpp"
 #include "status-bar/Lock.hpp"
-#include "common_data/EventStore.hpp"
+#include <EventStore.hpp>
 
 namespace gui::status_bar
 {

@@ 5,7 5,7 @@
 
 #include "StatusBarWidgetBase.hpp"
 #include "BoxLayout.hpp"
-#include <common_data/EventStore.hpp>
+#include <EventStore.hpp>
 
 namespace gui::status_bar
 {

@@ 5,7 5,7 @@
 
 #include "StatusBarWidgetBase.hpp"
 #include <Label.hpp>
-#include <common_data/EventStore.hpp>
+#include <EventStore.hpp>
 
 namespace gui::status_bar
 {

@@ 5,7 5,8 @@
 
 #include "StatusBarWidgetBase.hpp"
 #include <Label.hpp>
-#include <common_data/EventStore.hpp>
+
+#include <EventStore.hpp>
 #include <gui/widgets/StatusBar.hpp>
 
 namespace gui::status_bar

@@ 5,7 5,7 @@
 
 #include "Image.hpp"
 #include "status-bar/StatusBarWidgetBase.hpp"
-#include <common_data/EventStore.hpp>
+#include <EventStore.hpp>
 
 namespace gui::status_bar
 {

@@ 5,7 5,7 @@
 
 #include "StatusBarWidgetBase.hpp"
 #include "BoxLayout.hpp"
-#include <common_data/EventStore.hpp>
+#include <EventStore.hpp>
 
 namespace gui::status_bar
 {

@@ 3,7 3,7 @@
 
 #include "SignalStrengthText.hpp"
 #include "Label.hpp"
-#include "common_data/EventStore.hpp"
+#include <EventStore.hpp>
 #include <Utils.hpp>
 #include "Style.hpp"
 

@@ 14,6 14,7 @@ target_link_libraries(${PROJECT_NAME}
         module-cellular
         module-utils
         service-cellular
+        eventstore
 )
 
 target_include_directories(${PROJECT_NAME}

@@ 9,8 9,10 @@
 #include <service-appmgr/model/ApplicationManager.hpp>
 
 #include <at/response.hpp>
-#include <common_data/EventStore.hpp>
+
 #include <log.hpp>
+#include <EventStore.hpp>
+
 #include <MessageType.hpp>
 #include <projdefs.h>
 #include <module-sys/Timers/TimerFactory.hpp>

@@ 56,6 56,7 @@ target_link_libraries(${PROJECT_NAME}
         service-evtmgr
     PUBLIC
         utf8
+        eventstore
     )
 
 if (${ENABLE_TESTS})

@@ 16,7 16,7 @@
 #include "service-cellular/requests/UssdRequest.hpp"
 #include "service-cellular/requests/RejectRequest.hpp"
 
-#include <common_data/EventStore.hpp>
+#include <EventStore.hpp>
 #include <cmd/QECCNUM.hpp>
 
 namespace cellular

@@ 52,7 52,7 @@
 #include <at/UrcCpin.hpp> // for Cpin
 #include <at/response.hpp>
 #include <bsp/cellular/bsp_cellular.hpp>
-#include <common_data/EventStore.hpp>
+#include <EventStore.hpp>
 #include <country.hpp>
 #include <log.hpp>
 #include <at/UrcFactory.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 <common_data/EventStore.hpp>
+#include <EventStore.hpp>
 
 #include <limits>
 class SignalStrength

@@ 3,7 3,7 @@
 
 #include "SimCard.hpp"
 
-#include <common_data/EventStore.hpp>
+#include <EventStore.hpp>
 #include <bsp/cellular/bsp_cellular.hpp>
 #include <modem/BaseChannel.hpp>
 #include <at/ATFactory.hpp>

@@ 65,6 65,7 @@ target_link_libraries(${PROJECT_NAME}
         Microsoft.GSL::GSL
     PUBLIC
         module-cellular
+        eventstore
 )
 
 if (${ENABLE_TESTS})

@@ 6,7 6,7 @@
 #include <endpoints/update/UpdateMuditaOS.hpp>
 #include <parser/MessageHandler.hpp>
 
-#include <common_data/EventStore.hpp>
+#include <EventStore.hpp>
 #include <json/json11.hpp>
 #include <source/version.hpp>
 #include <service-desktop/service-desktop/ServiceDesktop.hpp>

@@ 35,6 35,7 @@ target_link_libraries(${PROJECT_NAME}
         service-desktop
         sml::sml
         Microsoft.GSL::GSL
+        eventstore
 )
 
 if (${ENABLE_TESTS})

@@ 44,7 44,7 @@
 #include <ctime>
 #include <module-apps/messages/AppMessage.hpp>
 #include <SystemManager/messages/CpuFrequencyMessage.hpp>
-#include <common_data/EventStore.hpp>
+#include <EventStore.hpp>
 #include <SystemManager/messages/PhoneModeRequest.hpp>
 #include <vibra/Vibra.hpp>
 

@@ 21,6 21,8 @@
 #include <bsp/light_sensor/light_sensor.hpp>
 #include <bsp/vibrator/vibrator.hpp>
 #include <bsp/eink_frontlight/eink_frontlight.hpp>
+#include <EventStore.hpp>
+
 #include <common_data/RawKey.hpp>
 #include <headset.hpp>
 #include <log.hpp>

@@ 5,7 5,7 @@
 #include "service-evtmgr/BatteryMessages.hpp"
 #include "SystemManager/Constants.hpp"
 #include <agents/settings/SystemSettings.hpp>
-#include <common_data/EventStore.hpp>
+#include <EventStore.hpp>
 #include <Utils.hpp>
 
 #define BOOST_SML_CFG_DISABLE_MIN_SIZE // GCC10 fix

@@ 5,8 5,6 @@
 #include "SystemManager/Constants.hpp"
 #include <module-sys/Timers/TimerFactory.hpp>
 
-#include <common_data/EventStore.hpp>
-
 namespace vibra_handle
 {
     Vibra::Vibra(sys::Service *parent) : parent{parent}

@@ 60,6 60,7 @@ target_link_libraries(module-sys
         service-evtmgr
         messagetype
         magic_enum
+        eventstore
     PUBLIC
         module-os
     )

@@ 6,7 6,7 @@
 #include "DependencyGraph.hpp"
 #include "graph/TopologicalSort.hpp"
 
-#include <common_data/EventStore.hpp>
+#include <EventStore.hpp>
 #include "thread.hpp"
 #include "ticks.hpp"
 #include "critical.hpp"

@@ 12,12 12,13 @@ endif()
 
 module_is_test_entity()
 
+add_subdirectory(Clipboard)
+add_subdirectory(EventStore)
+
 set (SOURCES
         ${CMAKE_CURRENT_SOURCE_DIR}/i18n/i18n.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/json/json11.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/time/time_conversion.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/common_data/EventStore.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/common_data/Clipboard.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/ucs2/UCS2.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/time/time_date_validation.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/PhoneNumber.cpp


@@ 39,21 40,16 @@ include(segger/rtt/CMakeLists.txt)
 # add third party libs
 include(third-party/libphonenumber.cmake)
 
-# link against libphonenumber
-target_link_libraries (${PROJECT_NAME} PUBLIC ${LIBPHONENUMBER_TARGET})
-
-target_link_libraries(${PROJECT_NAME} PRIVATE crc32 )
-
-# link against tinyexpr
-target_link_libraries (${PROJECT_NAME} PUBLIC ${TINYEXPR_TARGET})
-
-target_link_libraries(${PROJECT_NAME} 
+target_link_libraries(${PROJECT_NAME}
 PUBLIC 
     board
     log
     magic_enum
     module-os 
     module-vfs
+    ${LIBPHONENUMBER_TARGET}
+PRIVATE
+    crc32
 )
 
 # Board specific compilation definitions,options,include directories and features

@@ 0,0 1,20 @@
+add_library(clipboard STATIC)
+target_sources(clipboard
+   PRIVATE
+      ${CMAKE_CURRENT_SOURCE_DIR}/Clipboard.hpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/Clipboard.cpp
+)
+
+target_include_directories(clipboard
+   PUBLIC
+     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)
+
+target_link_libraries(clipboard
+   PUBLIC
+       module-os
+)
+
+if (${ENABLE_TESTS})
+   add_subdirectory(test)
+endif()

@@ 0,0 1,9 @@
+# Clipboard tests
+add_catch2_executable(
+    NAME
+        utils-clipboard
+    SRCS
+        unittest_clipboard.cpp
+    LIBS
+        clipboard
+)

@@ 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
 
 #include <cstring>


@@ 10,7 10,7 @@
 
 #include <catch2/catch.hpp>
 
-#include "common_data/Clipboard.hpp"
+#include <Clipboard.hpp>
 
 TEST_CASE("Clipboard")
 {

@@ 0,0 1,17 @@
+add_library(eventstore STATIC)
+target_sources(eventstore
+   PRIVATE
+      ${CMAKE_CURRENT_SOURCE_DIR}/EventStore.hpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/EventStore.cpp
+)
+
+target_include_directories(eventstore
+   PUBLIC
+      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)
+
+target_link_libraries(eventstore
+   PRIVATE
+      module-os
+)
+

@@ 20,16 20,6 @@ add_catch2_executable(
         module-utils
 )
 
-# Clipboard tests
-add_catch2_executable(
-    NAME
-        utils-clipboard
-    SRCS
-        unittest_clipboard.cpp
-    LIBS
-        module-utils
-)
-
 # UCS2 tests
 add_catch2_executable(
     NAME