48 files changed, 101 insertions(+), 79 deletions(-)

M module-apps/Application.cpp
M module-apps/CMakeLists.txt
M module-apps/DOMResponder.cpp
M module-apps/application-alarm-clock/widgets/AlarmItem.cpp
M module-apps/application-calendar/data/dateCommon.hpp
M module-apps/application-calendar/widgets/AllEventsItem.cpp
M module-apps/application-calendar/widgets/DayEventsItem.cpp
M module-apps/application-calendar/widgets/EventDetailDescriptionItem.cpp
M module-apps/application-calllog/CalllogModel.cpp
M module-apps/application-calllog/windows/CallLogDetailsWindow.cpp
M module-apps/application-notes/widgets/NotesItem.cpp
M module-apps/application-notes/windows/NotePreviewWindow.cpp
M module-apps/application-settings-new/models/DateAndTimeModel.cpp
M module-apps/application-settings-new/windows/DateAndTimeMainWindow.cpp
M module-apps/application-settings/windows/DateTimeWindow.cpp
M module-apps/widgets/DateOrTimeListItem.hpp
M module-apps/widgets/TimeWidget.hpp
M module-bsp/CMakeLists.txt
M module-bsp/board/rt1051/bsp/rtc/rtc.cpp
M module-cellular/CMakeLists.txt
M module-cellular/at/src/UrcCtze.cpp
M module-gui/CMakeLists.txt
M module-services/CMakeLists.txt
M module-services/service-appmgr/CMakeLists.txt
M module-services/service-appmgr/model/ApplicationManager.cpp
M module-services/service-cellular/CMakeLists.txt
M module-services/service-evtmgr/EventManager.cpp
M module-services/service-gui/WorkerGUI.cpp
M module-services/service-time/TimezoneHandler.cpp
M module-utils/CMakeLists.txt
M module-utils/ical/ParserICS.cpp
M module-utils/test/CMakeLists.txt
A module-utils/time/CMakeLists.txt
A module-utils/time/test/CMakeLists.txt
R module-utils/{ => time}/test/unittest_TimeRangeParser.cpp
R module-utils/time/{ => }/time/DateAndTimeSettings.cpp
R module-utils/time/{ => }/time/DateAndTimeSettings.hpp
R module-utils/time/{ => }/time/FromTillDate.hpp
R module-utils/time/{ => }/time/README.md
R module-utils/time/{ => }/time/ScopedTime.hpp
R module-utils/time/{ => }/time/TimeRangeParser.cpp
R module-utils/time/{ => }/time/TimeRangeParser.hpp
R module-utils/time/{ => }/time/time_conversion.cpp
R module-utils/time/{ => }/time/time_conversion.hpp
R module-utils/time/{ => }/time/time_date_validation.cpp
R module-utils/time/{ => }/time/time_date_validation.hpp
R module-utils/time/{ => }/time/time_locale.hpp
R module-utils/time/{ => }/time/time_syscalls.hpp

@@ 37,7 37,7 @@
 #include <service-gui/Common.hpp>
 #include <module-utils/Utils.hpp>
 #include <service-db/agents/settings/SystemSettings.hpp>
-#include <module-utils/time/DateAndTimeSettings.hpp>
+#include <time/DateAndTimeSettings.hpp>
 #include <service-audio/AudioServiceAPI.hpp> // for GetOutputVolume
 
 #include <popups/VolumeWindow.hpp>

@@ 136,6 136,7 @@ target_link_libraries(${PROJECT_NAME}
         module-services
         module-sys
         module-utils
+        time
         utf8
         ${TARGET_LIBRARIES}
 )

@@ 7,7 7,7 @@
 #include <module-gui/gui/dom/Item2JsonSerializer.hpp>
 #include <memory>
 #include <Item.hpp>
-#include <module-utils/time/ScopedTime.hpp>
+#include <time/ScopedTime.hpp>
 #include <service-desktop/endpoints/developerMode/event/DomRequest.hpp>
 
 namespace app

@@ 6,7 6,7 @@
 #include "application-alarm-clock/data/AlarmsData.hpp"
 #include "application-calendar/data/dateCommon.hpp"
 #include <InputEvent.hpp>
-#include <module-utils/time/time_conversion.hpp>
+#include <time/time_conversion.hpp>
 
 namespace gui
 {

@@ 5,7 5,7 @@
 #define DATECOMMON_H
 
 #include <date/date.h>
-#include <module-utils/time/DateAndTimeSettings.hpp>
+#include <time/DateAndTimeSettings.hpp>
 #include <time/time_conversion.hpp>
 #include <Utils.hpp>
 #include <random>

@@ 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 "AllEventsItem.hpp"


@@ 7,7 7,7 @@
 #include <Style.hpp>
 #include <gui/widgets/Label.hpp>
 #include <time/time_conversion.hpp>
-#include <module-utils/time/TimeRangeParser.hpp>
+#include <time/TimeRangeParser.hpp>
 
 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
 
 #include "DayEventsItem.hpp"


@@ 6,7 6,7 @@
 #include <ListView.hpp>
 #include <gui/widgets/Label.hpp>
 #include <Style.hpp>
-#include <module-utils/time/TimeRangeParser.hpp>
+#include <time/TimeRangeParser.hpp>
 
 namespace gui
 {

@@ 6,7 6,7 @@
 #include <Style.hpp>
 #include <time/time_conversion.hpp>
 #include <date/date.h>
-#include <module-utils/time/TimeRangeParser.hpp>
+#include <time/TimeRangeParser.hpp>
 
 namespace gui
 {

@@ 8,7 8,7 @@
 #include "data/CallLogInternals.hpp"
 #include "data/CallLogSwitchData.hpp"
 #include "widgets/CalllogItem.hpp"
-#include <module-utils/time/DateAndTimeSettings.hpp>
+#include <time/DateAndTimeSettings.hpp>
 
 #include <service-appmgr/Controller.hpp>
 #include "application-call/data/CallSwitchData.hpp"

@@ 11,7 11,7 @@
 #include <application-calllog/data/CallLogInternals.hpp>
 #include <application-calllog/data/CallLogSwitchData.hpp>
 #include <application-calllog/windows/CallLogOptionsWindow.hpp>
-#include <module-utils/time/DateAndTimeSettings.hpp>
+#include <time/DateAndTimeSettings.hpp>
 #include <widgets/TextWithIconsWidget.hpp>
 #include <widgets/ActiveIconFactory.hpp>
 

@@ 6,7 6,7 @@
 #include <Style.hpp>
 #include <module-apps/application-notes/style/NotesListStyle.hpp>
 
-#include <module-utils/time/time_conversion.hpp>
+#include <time/time_conversion.hpp>
 
 namespace gui
 {

@@ 10,7 10,7 @@
 #include <module-apps/messages/OptionsWindow.hpp>
 
 #include <i18n/i18n.hpp>
-#include <module-utils/time/time_conversion.hpp>
+#include <time/time_conversion.hpp>
 
 #include <Style.hpp>
 

@@ 6,7 6,7 @@
 #include "DateAndTimeModel.hpp"
 #include <ListView.hpp>
 #include <module-apps/widgets/DateAndTimeStyle.hpp>
-#include <module-utils/time/DateAndTimeSettings.hpp>
+#include <time/DateAndTimeSettings.hpp>
 
 DateAndTimeModel::DateAndTimeModel(app::Application *application) : app(application)
 {}

@@ 4,7 4,7 @@
 #include "application-settings-new/ApplicationSettings.hpp"
 #include "DateAndTimeMainWindow.hpp"
 #include "module-apps/application-desktop/windows/Names.hpp"
-#include <module-utils/time/DateAndTimeSettings.hpp>
+#include <time/DateAndTimeSettings.hpp>
 #include "OptionSetting.hpp"
 #include "service-appmgr/Controller.hpp"
 

@@ 26,7 26,7 @@
 #include <Style.hpp>
 #include <widgets/BoxLayout.hpp>
 
-#include <module-utils/time/DateAndTimeSettings.hpp>
+#include <time/DateAndTimeSettings.hpp>
 #include <module-utils/Utils.hpp>
 #include <module-services/service-db/agents/settings/SystemSettings.hpp>
 

@@ 3,7 3,7 @@
 
 #pragma once
 
-#include <module-utils/time/FromTillDate.hpp>
+#include <time/FromTillDate.hpp>
 #include <module-gui/gui/widgets/ListItem.hpp>
 
 namespace gui

@@ 7,7 7,7 @@
 #include <Text.hpp>
 #include <BoxLayout.hpp>
 #include "widgets/DateWidget.hpp"
-#include <module-utils/time/FromTillDate.hpp>
+#include <time/FromTillDate.hpp>
 
 namespace gui
 {

@@ 89,10 89,13 @@ target_include_directories(${PROJECT_NAME}
 set_source_files_properties(${BOARD_SOURCE_FILES_PROPERTIES})
 
 target_link_libraries(${PROJECT_NAME}
-    module-os
-    service-bluetooth
-    eventstore
-    ${TARGET_LIBRARIES}
+    PUBLIC
+        eventstore
+        module-os
+        service-bluetooth
+        ${TARGET_LIBRARIES}
+    PRIVATE
+        time
 )
 
 if (${ENABLE_TESTS})

@@ 5,7 5,7 @@
 #include <fsl_snvs_hp.h>
 #include <fsl_snvs_lp.h>
 #include <module-os/RTOSWrapper/include/ticks.hpp>
-#include <module-utils/time/time_conversion.hpp>
+#include <time/time_conversion.hpp>
 #include <time.h>
 
 namespace

@@ 60,16 60,8 @@ target_compile_options(${PROJECT_NAME} PUBLIC ${TARGET_COMPILE_OPTIONS})
 target_link_options(${PROJECT_NAME} PUBLIC ${TARGET_LINK_OPTIONS})
 
 
-target_compile_definitions(${PROJECT_NAME}
-
-        PUBLIC
-
-)
-
 target_include_directories(${PROJECT_NAME}
-
-        PUBLIC
-
+    PUBLIC
         ${CMAKE_CURRENT_SOURCE_DIR}
         ${CMAKE_CURRENT_SOURCE_DIR}/at/
         ${CMAKE_SOURCE_DIR}/module-services


@@ 78,17 70,18 @@ target_include_directories(${PROJECT_NAME}
 
 target_link_libraries(${PROJECT_NAME}
     PUBLIC
+    date::date
+    eventstore
+    module-bsp
+    module-db
+    module-services
+    module-sys
+    module-utils
+    module-vfs
     service-cellular
     service-eink
     service-fota
-    module-utils
-    module-vfs
-    module-services
-    module-sys
-    module-db
-    module-bsp
-    date::date
-    eventstore
+    time
     PRIVATE
     Microsoft.GSL::GSL
 )

@@ 3,7 3,7 @@
 
 #include "../UrcCtze.hpp"
 #include <log/debug.hpp>
-#include <module-utils/time/time_conversion.hpp>
+#include <time/time_conversion.hpp>
 
 #include <date/date.h>
 

@@ 27,6 27,7 @@ target_link_libraries(${PROJECT_NAME}
         utf8
         eventstore
         ${TARGET_LIBRARIES} 
+        time
     PRIVATE
         pugixml::pugixml
         Microsoft.GSL::GSL

@@ 33,22 33,25 @@ add_subdirectory( service-antenna )
 add_subdirectory( service-time )
 add_subdirectory( service-fileindexer )
 
-target_link_libraries(${PROJECT_NAME} PUBLIC
-    service-gui
-    service-eink
-    service-appmgr
-    module-bsp
-    module-os
-    module-sys
-    module-utils
-    module-gui
-    module-apps
-    module-db
-    module-cellular
-    module-audio
-    service-fileindexer
-    service-antenna
-    ${TARGET_LIBRARIES}
+target_link_libraries(${PROJECT_NAME} 
+    PUBLIC
+        service-gui
+        service-eink
+        service-appmgr
+        module-bsp
+        module-os
+        module-sys
+        module-utils
+        module-gui
+        module-apps
+        module-db
+        module-cellular
+        module-audio
+        service-fileindexer
+        service-antenna
+        ${TARGET_LIBRARIES}
+    PRIVATE
+        time
 )
 
 # Board specific compilation definitions,options,include directories and features

@@ 37,6 37,8 @@ target_link_libraries(${PROJECT_NAME}
         service-gui
         module-apps
         module-audio
+    PUBLIC
+        time
 )
 
 target_include_directories(${PROJECT_NAME}

@@ 35,7 35,7 @@
 #include <limits>
 #include <utility>
 #include <module-utils/Utils.hpp>
-#include <module-utils/time/DateAndTimeSettings.hpp>
+#include <time/DateAndTimeSettings.hpp>
 #include <module-services/service-db/agents/settings/SystemSettings.hpp>
 #include <service-appmgr/messages/DOMRequest.hpp>
 #include <service-appmgr/messages/GetAllNotificationsRequest.hpp>

@@ 55,6 55,7 @@ target_link_libraries(${PROJECT_NAME}
         service-audio
         service-evtmgr
     PUBLIC
+        time
         utf8
         eventstore
     )

@@ 27,7 27,6 @@
 #include <common_data/RawKey.hpp>
 #include <log.hpp>
 #include <Logger.hpp>
-#include <module-utils/time/time_conversion.hpp>
 #include <service-appmgr/Controller.hpp>
 #include <service-audio/AudioMessage.hpp>
 #include <service-audio/AudioServiceAPI.hpp>

@@ 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 "WorkerGUI.hpp"


@@ 10,7 10,6 @@
 #include <service-gui/ServiceGUI.hpp>
 
 #include <memory>
-#include <module-utils/time/ScopedTime.hpp>
 #include "messages/RenderingFinished.hpp"
 
 namespace service::gui

@@ 2,7 2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "service-time/TimezoneHandler.hpp"
-#include <module-utils/time/time_conversion.hpp>
+#include <time/time_conversion.hpp>
 #include <iomanip>
 
 auto TimezoneHandler::getTimezone() -> std::string const

@@ 18,16 18,12 @@ 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}/ucs2/UCS2.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/time/time_date_validation.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/PhoneNumber.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/PhoneNumber.hpp
         ${CMAKE_CURRENT_SOURCE_DIR}/NumberHolderMatcher.hpp
         ${CMAKE_CURRENT_SOURCE_DIR}/country.hpp
         ${CMAKE_CURRENT_SOURCE_DIR}/ical/ParserICS.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/time/TimeRangeParser.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/time/DateAndTimeSettings.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/Utils.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/circular_buffer/StringCircularBuffer.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/generators/RandomStringGenerator.cpp


@@ 50,6 46,7 @@ PUBLIC
     ${LIBPHONENUMBER_TARGET}
 PRIVATE
     crc32
+    time
 )
 
 # Board specific compilation definitions,options,include directories and features


@@ 78,4 75,5 @@ endif()
 add_subdirectory(board)
 add_subdirectory(bootconfig)
 add_subdirectory(log)
+add_subdirectory(time)
 add_subdirectory(utf8)

@@ 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
 
 #include "ParserICS.hpp"
 #include <cmath>
-#include <module-utils/time/time_date_validation.hpp>
+#include <time/time_date_validation.hpp>
 
 namespace ical
 {

@@ 96,17 96,6 @@ add_catch2_executable(
 #        module-utils
 #)
 
-#  time display tests
-add_catch2_executable(
-    NAME
-        utils-time_display
-    SRCS
-        unittest_TimeRangeParser.cpp
-    LIBS
-        module-utils
-        module-db
-)
-
 #  i18n language change tests
 add_catch2_executable(
     NAME

@@ 0,0 1,24 @@
+add_library(time)
+
+module_is_test_entity(time)
+
+target_sources(time
+    PRIVATE
+        time/DateAndTimeSettings.cpp
+        time/time_conversion.cpp
+        time/time_date_validation.cpp
+        time/TimeRangeParser.cpp
+)
+
+target_include_directories(time PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
+
+target_link_libraries(time 
+    PRIVATE 
+        log
+        module-utils
+        utf8
+)
+
+if (${ENABLE_TESTS})
+    add_subdirectory(test)
+endif()

@@ 0,0 1,9 @@
+add_catch2_executable(
+    NAME
+        utils-time_display
+    SRCS
+        unittest_TimeRangeParser.cpp
+    LIBS
+        module-utils
+        time
+)