From c611e3c011c336ca55733ad96af698657df034c5 Mon Sep 17 00:00:00 2001
From: DariuszSabala <dariusz.sabala@mudita.com>
Date: Wed, 2 Jun 2021 12:13:46 +0200
Subject: [PATCH] [BH-376] Utils time turned to separate library

Turned module-utils/time folder content into separate library,
cleaned up CMake libs dependencies, fixed include paths
---
 module-apps/Application.cpp                   |  2 +-
 module-apps/CMakeLists.txt                    |  1 +
 module-apps/DOMResponder.cpp                  |  2 +-
 .../widgets/AlarmItem.cpp                     |  2 +-
 .../application-calendar/data/dateCommon.hpp  |  2 +-
 .../widgets/AllEventsItem.cpp                 |  4 +--
 .../widgets/DayEventsItem.cpp                 |  4 +--
 .../widgets/EventDetailDescriptionItem.cpp    |  2 +-
 .../application-calllog/CalllogModel.cpp      |  2 +-
 .../windows/CallLogDetailsWindow.cpp          |  2 +-
 .../application-notes/widgets/NotesItem.cpp   |  2 +-
 .../windows/NotePreviewWindow.cpp             |  2 +-
 .../models/DateAndTimeModel.cpp               |  2 +-
 .../windows/DateAndTimeMainWindow.cpp         |  2 +-
 .../windows/DateTimeWindow.cpp                |  2 +-
 module-apps/widgets/DateOrTimeListItem.hpp    |  2 +-
 module-apps/widgets/TimeWidget.hpp            |  2 +-
 module-bsp/CMakeLists.txt                     | 11 +++---
 module-bsp/board/rt1051/bsp/rtc/rtc.cpp       |  2 +-
 module-cellular/CMakeLists.txt                | 27 ++++++--------
 module-cellular/at/src/UrcCtze.cpp            |  2 +-
 module-gui/CMakeLists.txt                     |  1 +
 module-services/CMakeLists.txt                | 35 ++++++++++---------
 module-services/service-appmgr/CMakeLists.txt |  2 ++
 .../model/ApplicationManager.cpp              |  2 +-
 .../service-cellular/CMakeLists.txt           |  1 +
 .../service-evtmgr/EventManager.cpp           |  1 -
 module-services/service-gui/WorkerGUI.cpp     |  3 +-
 .../service-time/TimezoneHandler.cpp          |  2 +-
 module-utils/CMakeLists.txt                   |  6 ++--
 module-utils/ical/ParserICS.cpp               |  4 +--
 module-utils/test/CMakeLists.txt              | 11 ------
 module-utils/time/CMakeLists.txt              | 24 +++++++++++++
 module-utils/time/test/CMakeLists.txt         |  9 +++++
 .../test/unittest_TimeRangeParser.cpp         |  0
 .../time/{ => time}/DateAndTimeSettings.cpp   |  0
 .../time/{ => time}/DateAndTimeSettings.hpp   |  0
 module-utils/time/{ => time}/FromTillDate.hpp |  0
 module-utils/time/{ => time}/README.md        |  0
 module-utils/time/{ => time}/ScopedTime.hpp   |  0
 .../time/{ => time}/TimeRangeParser.cpp       |  0
 .../time/{ => time}/TimeRangeParser.hpp       |  0
 .../time/{ => time}/time_conversion.cpp       |  0
 .../time/{ => time}/time_conversion.hpp       |  0
 .../time/{ => time}/time_date_validation.cpp  |  0
 .../time/{ => time}/time_date_validation.hpp  |  0
 module-utils/time/{ => time}/time_locale.hpp  |  0
 .../time/{ => time}/time_syscalls.hpp         |  0
 48 files changed, 101 insertions(+), 79 deletions(-)
 create mode 100644 module-utils/time/CMakeLists.txt
 create mode 100644 module-utils/time/test/CMakeLists.txt
 rename module-utils/{ => time}/test/unittest_TimeRangeParser.cpp (100%)
 rename module-utils/time/{ => time}/DateAndTimeSettings.cpp (100%)
 rename module-utils/time/{ => time}/DateAndTimeSettings.hpp (100%)
 rename module-utils/time/{ => time}/FromTillDate.hpp (100%)
 rename module-utils/time/{ => time}/README.md (100%)
 rename module-utils/time/{ => time}/ScopedTime.hpp (100%)
 rename module-utils/time/{ => time}/TimeRangeParser.cpp (100%)
 rename module-utils/time/{ => time}/TimeRangeParser.hpp (100%)
 rename module-utils/time/{ => time}/time_conversion.cpp (100%)
 rename module-utils/time/{ => time}/time_conversion.hpp (100%)
 rename module-utils/time/{ => time}/time_date_validation.cpp (100%)
 rename module-utils/time/{ => time}/time_date_validation.hpp (100%)
 rename module-utils/time/{ => time}/time_locale.hpp (100%)
 rename module-utils/time/{ => time}/time_syscalls.hpp (100%)

diff --git a/module-apps/Application.cpp b/module-apps/Application.cpp
index 9adcc0ec836115ec18591d3c625531b0fd078600..d7fe39b1ca6562f16649e6a811d72cc8cec46c3f 100644
--- a/module-apps/Application.cpp
+++ b/module-apps/Application.cpp
@@ -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>
diff --git a/module-apps/CMakeLists.txt b/module-apps/CMakeLists.txt
index f0c4f34f1d19951c53ccce225eac8e4e6894e1a2..77d88f366a7da90f7cb4ef7c47528eeb881a1e51 100644
--- a/module-apps/CMakeLists.txt
+++ b/module-apps/CMakeLists.txt
@@ -136,6 +136,7 @@ target_link_libraries(${PROJECT_NAME}
         module-services
         module-sys
         module-utils
+        time
         utf8
         ${TARGET_LIBRARIES}
 )
diff --git a/module-apps/DOMResponder.cpp b/module-apps/DOMResponder.cpp
index afd7da526c0aac2d2fcf8b3502243989065d3d80..13aafbb67812c582ab77efe5b5455cdf4909eb58 100644
--- a/module-apps/DOMResponder.cpp
+++ b/module-apps/DOMResponder.cpp
@@ -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
diff --git a/module-apps/application-alarm-clock/widgets/AlarmItem.cpp b/module-apps/application-alarm-clock/widgets/AlarmItem.cpp
index 8a2ecb72f197e31b304287ad1eac24b3bd1e067a..79edd5c143503ded89626d62b7b8233ae680ef77 100644
--- a/module-apps/application-alarm-clock/widgets/AlarmItem.cpp
+++ b/module-apps/application-alarm-clock/widgets/AlarmItem.cpp
@@ -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
 {
diff --git a/module-apps/application-calendar/data/dateCommon.hpp b/module-apps/application-calendar/data/dateCommon.hpp
index 76caefa608596667435bb05a818404678ea4a120..f8c65420299a18c29a158f76148b411a0b06dd15 100644
--- a/module-apps/application-calendar/data/dateCommon.hpp
+++ b/module-apps/application-calendar/data/dateCommon.hpp
@@ -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>
diff --git a/module-apps/application-calendar/widgets/AllEventsItem.cpp b/module-apps/application-calendar/widgets/AllEventsItem.cpp
index 5134819abe56ef3e60552eb281c6bfb876dd4824..1d3cd09283be90bb8d6ba46906fa12579a3139bc 100644
--- a/module-apps/application-calendar/widgets/AllEventsItem.cpp
+++ b/module-apps/application-calendar/widgets/AllEventsItem.cpp
@@ -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
 {
diff --git a/module-apps/application-calendar/widgets/DayEventsItem.cpp b/module-apps/application-calendar/widgets/DayEventsItem.cpp
index 2ab342d0b025876fdd3a494c02b2b3d618418f45..cef369aec2df01c7769c17c85e95abbee39d5507 100644
--- a/module-apps/application-calendar/widgets/DayEventsItem.cpp
+++ b/module-apps/application-calendar/widgets/DayEventsItem.cpp
@@ -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
 {
diff --git a/module-apps/application-calendar/widgets/EventDetailDescriptionItem.cpp b/module-apps/application-calendar/widgets/EventDetailDescriptionItem.cpp
index a7abb777c6ce883862e23dd7c982911ba5082d48..37210f6c6f440e6da04be32e11003293bfdec31a 100644
--- a/module-apps/application-calendar/widgets/EventDetailDescriptionItem.cpp
+++ b/module-apps/application-calendar/widgets/EventDetailDescriptionItem.cpp
@@ -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
 {
diff --git a/module-apps/application-calllog/CalllogModel.cpp b/module-apps/application-calllog/CalllogModel.cpp
index c198c8b6ae79c054c4aa1cb550e289b55353172f..dd3460ede2fb29d05c96b919df884d0f6eeee60d 100644
--- a/module-apps/application-calllog/CalllogModel.cpp
+++ b/module-apps/application-calllog/CalllogModel.cpp
@@ -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"
diff --git a/module-apps/application-calllog/windows/CallLogDetailsWindow.cpp b/module-apps/application-calllog/windows/CallLogDetailsWindow.cpp
index a87b77ae5d2c46f3a31a01b106e7a9276dfe0b4e..f668ff2ab4d22b3f7dc9ada7b9943c89d309dc06 100644
--- a/module-apps/application-calllog/windows/CallLogDetailsWindow.cpp
+++ b/module-apps/application-calllog/windows/CallLogDetailsWindow.cpp
@@ -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>
 
diff --git a/module-apps/application-notes/widgets/NotesItem.cpp b/module-apps/application-notes/widgets/NotesItem.cpp
index 6375c1596c4144e53bd3a0b07379ee4fc73d61b2..5e6ab9db2dd2deba578b30f05bba48b0e94b8c60 100644
--- a/module-apps/application-notes/widgets/NotesItem.cpp
+++ b/module-apps/application-notes/widgets/NotesItem.cpp
@@ -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
 {
diff --git a/module-apps/application-notes/windows/NotePreviewWindow.cpp b/module-apps/application-notes/windows/NotePreviewWindow.cpp
index bb670af01499decdb5ae67a0b43050b6593f62b2..c324367713cc5fbc5390e0f93416f2d409632d2e 100644
--- a/module-apps/application-notes/windows/NotePreviewWindow.cpp
+++ b/module-apps/application-notes/windows/NotePreviewWindow.cpp
@@ -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>
 
diff --git a/module-apps/application-settings-new/models/DateAndTimeModel.cpp b/module-apps/application-settings-new/models/DateAndTimeModel.cpp
index 90c7e290b02f1a93142633e005f16c244e4a91d9..57c2f8c63701eca9913f9062216e72452c6927c5 100644
--- a/module-apps/application-settings-new/models/DateAndTimeModel.cpp
+++ b/module-apps/application-settings-new/models/DateAndTimeModel.cpp
@@ -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)
 {}
diff --git a/module-apps/application-settings-new/windows/DateAndTimeMainWindow.cpp b/module-apps/application-settings-new/windows/DateAndTimeMainWindow.cpp
index e9a51605a739a5cb067095f32b220b988458d04b..e0fba6c9106f511f1b9bcd238b7923d302e65a59 100644
--- a/module-apps/application-settings-new/windows/DateAndTimeMainWindow.cpp
+++ b/module-apps/application-settings-new/windows/DateAndTimeMainWindow.cpp
@@ -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"
 
diff --git a/module-apps/application-settings/windows/DateTimeWindow.cpp b/module-apps/application-settings/windows/DateTimeWindow.cpp
index 295c76d535bd09a115e0b2197739d5b7a91c26cd..fd6bd92b67687308cd817b408b21cc8787c8ffc4 100644
--- a/module-apps/application-settings/windows/DateTimeWindow.cpp
+++ b/module-apps/application-settings/windows/DateTimeWindow.cpp
@@ -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>
 
diff --git a/module-apps/widgets/DateOrTimeListItem.hpp b/module-apps/widgets/DateOrTimeListItem.hpp
index aefdcecebd1ecf0ee1f72b85a041f8d6d410056b..60a075dc282cfd644a00c29cf7c523b17458325a 100644
--- a/module-apps/widgets/DateOrTimeListItem.hpp
+++ b/module-apps/widgets/DateOrTimeListItem.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
diff --git a/module-apps/widgets/TimeWidget.hpp b/module-apps/widgets/TimeWidget.hpp
index 6eecadd6618a07d0be7179d161130a5d38ad141f..5d980376d7f45838176baa325e6047d31901f872 100644
--- a/module-apps/widgets/TimeWidget.hpp
+++ b/module-apps/widgets/TimeWidget.hpp
@@ -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
 {
diff --git a/module-bsp/CMakeLists.txt b/module-bsp/CMakeLists.txt
index da29b29f478ff42cdd57d5ddf54404a71599642f..8652c4dc96e12f37065e59fd478387cdc45ece71 100644
--- a/module-bsp/CMakeLists.txt
+++ b/module-bsp/CMakeLists.txt
@@ -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})
diff --git a/module-bsp/board/rt1051/bsp/rtc/rtc.cpp b/module-bsp/board/rt1051/bsp/rtc/rtc.cpp
index 95e926eae03d78340ca8341f28e24e7e463b0ec9..6f54272cfe3da20214115b3c435e66286dfdf010 100644
--- a/module-bsp/board/rt1051/bsp/rtc/rtc.cpp
+++ b/module-bsp/board/rt1051/bsp/rtc/rtc.cpp
@@ -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
diff --git a/module-cellular/CMakeLists.txt b/module-cellular/CMakeLists.txt
index 72e531c12dcca31c5bcd6b799518fab979e752f5..c7950b5a33ea84d9a8584a4584b4658bd5e6a919 100644
--- a/module-cellular/CMakeLists.txt
+++ b/module-cellular/CMakeLists.txt
@@ -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
 )
diff --git a/module-cellular/at/src/UrcCtze.cpp b/module-cellular/at/src/UrcCtze.cpp
index e79387ad682da452024e6b3b0d77af9e081781f2..90c5f1f7a063e0f6d719cfd5a4221c2b4d88237f 100644
--- a/module-cellular/at/src/UrcCtze.cpp
+++ b/module-cellular/at/src/UrcCtze.cpp
@@ -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>
 
diff --git a/module-gui/CMakeLists.txt b/module-gui/CMakeLists.txt
index cac125fe6c344abf9384b3ecf70ef3dae36fa90a..a4aa8df36e55e84f4df6494b1cd090ccbebd54a6 100644
--- a/module-gui/CMakeLists.txt
+++ b/module-gui/CMakeLists.txt
@@ -27,6 +27,7 @@ target_link_libraries(${PROJECT_NAME}
         utf8
         eventstore
         ${TARGET_LIBRARIES} 
+        time
     PRIVATE
         pugixml::pugixml
         Microsoft.GSL::GSL
diff --git a/module-services/CMakeLists.txt b/module-services/CMakeLists.txt
index 624a1d9a609aa68b769ffaed6b7b7e2347e721c4..a80ced09d9bfa09ea3cee17af53a51041e46dadf 100644
--- a/module-services/CMakeLists.txt
+++ b/module-services/CMakeLists.txt
@@ -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
diff --git a/module-services/service-appmgr/CMakeLists.txt b/module-services/service-appmgr/CMakeLists.txt
index 0e08a9ea52163d45fa16140b9db563f742cfdfae..87d42d187f742fb573dac144b9136448332fdd5f 100644
--- a/module-services/service-appmgr/CMakeLists.txt
+++ b/module-services/service-appmgr/CMakeLists.txt
@@ -37,6 +37,8 @@ target_link_libraries(${PROJECT_NAME}
         service-gui
         module-apps
         module-audio
+    PUBLIC
+        time
 )
 
 target_include_directories(${PROJECT_NAME}
diff --git a/module-services/service-appmgr/model/ApplicationManager.cpp b/module-services/service-appmgr/model/ApplicationManager.cpp
index 1aa43295347d82e172eaa103b61ef87abab24afe..dfaa4269dc49d6fb7bfd60a77ea51b6b991aa228 100644
--- a/module-services/service-appmgr/model/ApplicationManager.cpp
+++ b/module-services/service-appmgr/model/ApplicationManager.cpp
@@ -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>
diff --git a/module-services/service-cellular/CMakeLists.txt b/module-services/service-cellular/CMakeLists.txt
index 5d89d628dcd2972c6fe60a80c681f9767b8d25c2..4463ce5aae03dcce63f66b7aba9e84015f5e4a52 100644
--- a/module-services/service-cellular/CMakeLists.txt
+++ b/module-services/service-cellular/CMakeLists.txt
@@ -55,6 +55,7 @@ target_link_libraries(${PROJECT_NAME}
         service-audio
         service-evtmgr
     PUBLIC
+        time
         utf8
         eventstore
     )
diff --git a/module-services/service-evtmgr/EventManager.cpp b/module-services/service-evtmgr/EventManager.cpp
index d08c8bb056b324369a23dc7dcd8dc55d03113c2c..7c6ce26afb8c63cee8f71c76e118862e8ef1155f 100644
--- a/module-services/service-evtmgr/EventManager.cpp
+++ b/module-services/service-evtmgr/EventManager.cpp
@@ -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>
diff --git a/module-services/service-gui/WorkerGUI.cpp b/module-services/service-gui/WorkerGUI.cpp
index 8ca6d12d86982746b88f32de766e1b6cb5451bbe..cd6b26b428d47d246555eb12eb8b12e7d6932195 100644
--- a/module-services/service-gui/WorkerGUI.cpp
+++ b/module-services/service-gui/WorkerGUI.cpp
@@ -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
diff --git a/module-services/service-time/TimezoneHandler.cpp b/module-services/service-time/TimezoneHandler.cpp
index 2e997b0da8a458269159eee69765c68091d26c6f..22125a76d4f044e8bfe411fa307ef2daa056bfed 100644
--- a/module-services/service-time/TimezoneHandler.cpp
+++ b/module-services/service-time/TimezoneHandler.cpp
@@ -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
diff --git a/module-utils/CMakeLists.txt b/module-utils/CMakeLists.txt
index 456cd38e22d3b73662cd5c18c01fc675e5d3fda2..354ea60af3d06caafa87ecba53c9c0c185ff27d4 100644
--- a/module-utils/CMakeLists.txt
+++ b/module-utils/CMakeLists.txt
@@ -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)
diff --git a/module-utils/ical/ParserICS.cpp b/module-utils/ical/ParserICS.cpp
index 54bfe3d1361dbf10276826adedf45d721bfad23c..8b01d24276f931589d79909a35a32a20e634c994 100644
--- a/module-utils/ical/ParserICS.cpp
+++ b/module-utils/ical/ParserICS.cpp
@@ -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
 {
diff --git a/module-utils/test/CMakeLists.txt b/module-utils/test/CMakeLists.txt
index 350cdc88dad0991e86d35619546bbfa94983963c..63cd287c544f42a61c6239da1b9a811911033a37 100644
--- a/module-utils/test/CMakeLists.txt
+++ b/module-utils/test/CMakeLists.txt
@@ -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
diff --git a/module-utils/time/CMakeLists.txt b/module-utils/time/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..5f1c75acdc5f37be4ffaca4d8f61241f2d4aaf07
--- /dev/null
+++ b/module-utils/time/CMakeLists.txt
@@ -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()
diff --git a/module-utils/time/test/CMakeLists.txt b/module-utils/time/test/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..027b6da6c8b25c3680854b764571dc9357e95b6b
--- /dev/null
+++ b/module-utils/time/test/CMakeLists.txt
@@ -0,0 +1,9 @@
+add_catch2_executable(
+    NAME
+        utils-time_display
+    SRCS
+        unittest_TimeRangeParser.cpp
+    LIBS
+        module-utils
+        time
+)
diff --git a/module-utils/test/unittest_TimeRangeParser.cpp b/module-utils/time/test/unittest_TimeRangeParser.cpp
similarity index 100%
rename from module-utils/test/unittest_TimeRangeParser.cpp
rename to module-utils/time/test/unittest_TimeRangeParser.cpp
diff --git a/module-utils/time/DateAndTimeSettings.cpp b/module-utils/time/time/DateAndTimeSettings.cpp
similarity index 100%
rename from module-utils/time/DateAndTimeSettings.cpp
rename to module-utils/time/time/DateAndTimeSettings.cpp
diff --git a/module-utils/time/DateAndTimeSettings.hpp b/module-utils/time/time/DateAndTimeSettings.hpp
similarity index 100%
rename from module-utils/time/DateAndTimeSettings.hpp
rename to module-utils/time/time/DateAndTimeSettings.hpp
diff --git a/module-utils/time/FromTillDate.hpp b/module-utils/time/time/FromTillDate.hpp
similarity index 100%
rename from module-utils/time/FromTillDate.hpp
rename to module-utils/time/time/FromTillDate.hpp
diff --git a/module-utils/time/README.md b/module-utils/time/time/README.md
similarity index 100%
rename from module-utils/time/README.md
rename to module-utils/time/time/README.md
diff --git a/module-utils/time/ScopedTime.hpp b/module-utils/time/time/ScopedTime.hpp
similarity index 100%
rename from module-utils/time/ScopedTime.hpp
rename to module-utils/time/time/ScopedTime.hpp
diff --git a/module-utils/time/TimeRangeParser.cpp b/module-utils/time/time/TimeRangeParser.cpp
similarity index 100%
rename from module-utils/time/TimeRangeParser.cpp
rename to module-utils/time/time/TimeRangeParser.cpp
diff --git a/module-utils/time/TimeRangeParser.hpp b/module-utils/time/time/TimeRangeParser.hpp
similarity index 100%
rename from module-utils/time/TimeRangeParser.hpp
rename to module-utils/time/time/TimeRangeParser.hpp
diff --git a/module-utils/time/time_conversion.cpp b/module-utils/time/time/time_conversion.cpp
similarity index 100%
rename from module-utils/time/time_conversion.cpp
rename to module-utils/time/time/time_conversion.cpp
diff --git a/module-utils/time/time_conversion.hpp b/module-utils/time/time/time_conversion.hpp
similarity index 100%
rename from module-utils/time/time_conversion.hpp
rename to module-utils/time/time/time_conversion.hpp
diff --git a/module-utils/time/time_date_validation.cpp b/module-utils/time/time/time_date_validation.cpp
similarity index 100%
rename from module-utils/time/time_date_validation.cpp
rename to module-utils/time/time/time_date_validation.cpp
diff --git a/module-utils/time/time_date_validation.hpp b/module-utils/time/time/time_date_validation.hpp
similarity index 100%
rename from module-utils/time/time_date_validation.hpp
rename to module-utils/time/time/time_date_validation.hpp
diff --git a/module-utils/time/time_locale.hpp b/module-utils/time/time/time_locale.hpp
similarity index 100%
rename from module-utils/time/time_locale.hpp
rename to module-utils/time/time/time_locale.hpp
diff --git a/module-utils/time/time_syscalls.hpp b/module-utils/time/time/time_syscalls.hpp
similarity index 100%
rename from module-utils/time/time_syscalls.hpp
rename to module-utils/time/time/time_syscalls.hpp