From 88a9fdedf22428cbfe52f91c8352eae52438e7f1 Mon Sep 17 00:00:00 2001
From: Kuba <jakub.kleczkowski@mudita.com>
Date: Thu, 10 Jun 2021 14:41:18 +0200
Subject: [PATCH] [EGD-6883] Change time settings cleanup

Time related settings are handled by service time now.
utils DateAndTimeSettings replaced by static time service api.
---
 .../application-calendar/data/dateCommon.hpp  |  16 +--
 .../application-calllog/CalllogModel.cpp      |   1 -
 .../widgets/CalllogItem.cpp                   |   2 +-
 .../windows/CallLogDetailsWindow.cpp          |   5 +-
 .../windows/DesktopMainWindow.cpp             |   4 +-
 .../models/ThreadsSearchResultsModel.cpp      |   2 +-
 .../widgets/SMSOutputWidget.cpp               |   2 +-
 .../widgets/ThreadItem.cpp                    |   2 +-
 .../application-notes/widgets/NotesItem.cpp   |   2 +-
 .../windows/NotePreviewWindow.cpp             |   2 +-
 .../application-settings-new/CMakeLists.txt   |   2 +
 .../models/DateAndTimeModel.cpp               |   1 -
 .../models/FromTimeToTimeModel.cpp            |   1 -
 .../windows/DateAndTimeMainWindow.cpp         |  28 +++--
 module-apps/apps-common/Application.cpp       |   1 -
 .../popups/lock-popups/PhoneLockedWindow.cpp  |   4 +-
 .../apps-common/widgets/TimeWidget.cpp        |   2 +-
 module-apps/apps-common/windows/AppWindow.cpp |   1 -
 module-gui/gui/widgets/status-bar/Time.cpp    |   2 +-
 module-services/service-appmgr/Controller.cpp |  24 ----
 .../model/ApplicationManager.cpp              | 102 +---------------
 .../messages/DateAndTimeChangeRequest.hpp     |  45 -------
 .../service-appmgr/messages/Message.hpp       |   1 -
 .../model/ApplicationManager.hpp              |   4 -
 module-services/service-time/CMakeLists.txt   |   5 +
 module-services/service-time/ServiceTime.cpp  | 115 ++++++++++++++++--
 module-services/service-time/ServiceTime.hpp  |  14 +++
 .../service-time/api/CMakeLists.txt           |  14 +++
 .../service-time/api/TimeSettingsApi.cpp      |  34 ++++++
 .../service-time/api/TimeSettingsApi.hpp      |  35 ++++++
 .../service-time/internal/StaticData.cpp      |  55 +++++++++
 .../service-time/internal/StaticData.hpp      |  72 +++++++++++
 .../service-time/service-time/TimeManager.hpp |   2 +-
 .../service-time/service-time/TimeMessage.hpp |  73 ++++++++++-
 .../service-time/TimeSettings.hpp             |  19 +++
 module-utils/time/CMakeLists.txt              |   1 -
 .../time/test/mock/TimeSettingsMock.hpp       |  19 +++
 module-utils/time/test/unittest_time.cpp      |  19 +++
 .../time/time/DateAndTimeSettings.cpp         |  29 -----
 .../time/time/DateAndTimeSettings.hpp         |  45 -------
 module-utils/time/time/time_conversion.cpp    |   1 -
 .../time/time/time_conversion_factory.cpp     |  33 ++---
 .../time/time/time_conversion_factory.hpp     |  13 +-
 43 files changed, 533 insertions(+), 321 deletions(-)
 delete mode 100644 module-services/service-appmgr/service-appmgr/messages/DateAndTimeChangeRequest.hpp
 create mode 100644 module-services/service-time/api/CMakeLists.txt
 create mode 100644 module-services/service-time/api/TimeSettingsApi.cpp
 create mode 100644 module-services/service-time/api/TimeSettingsApi.hpp
 create mode 100644 module-services/service-time/internal/StaticData.cpp
 create mode 100644 module-services/service-time/internal/StaticData.hpp
 create mode 100644 module-services/service-time/service-time/TimeSettings.hpp
 create mode 100644 module-utils/time/test/mock/TimeSettingsMock.hpp
 delete mode 100644 module-utils/time/time/DateAndTimeSettings.cpp
 delete mode 100644 module-utils/time/time/DateAndTimeSettings.hpp

diff --git a/module-apps/application-calendar/data/dateCommon.hpp b/module-apps/application-calendar/data/dateCommon.hpp
index 7cbdcf77249ec71ccd729949d014b3cef02eacc5..4e8a6e440deefd1cb750a9a610c517cf2d752a1e 100644
--- a/module-apps/application-calendar/data/dateCommon.hpp
+++ b/module-apps/application-calendar/data/dateCommon.hpp
@@ -5,9 +5,10 @@
 #define DATECOMMON_H
 
 #include <date/date.h>
-#include <time/DateAndTimeSettings.hpp>
 #include <time/time_conversion_factory.hpp>
 #include <Utils.hpp>
+#include <service-time/api/TimeSettingsApi.hpp>
+
 #include <random>
 
 using Clock     = std::chrono::system_clock;
@@ -260,7 +261,7 @@ inline std::string TimePointToLocalizedDateString(const TimePoint &tp, const std
 {
     using namespace utils::time;
     auto time = TimePointToTimeT(tp);
-    auto timestamp = createTimestamp(TimestampType::Date, time);
+    auto timestamp = TimestampFactory().createTimestamp(TimestampType::Date, time);
     return timestamp->str(format);
 }
 
@@ -268,14 +269,15 @@ inline std::string TimePointToLocalizedTimeString(const TimePoint &tp, const std
 {
     using namespace utils::time;
     auto time = TimePointToTimeT(tp);
-    auto timestamp = createTimestamp(TimestampType::Time, time);
+
+    auto timestamp = TimestampFactory().createTimestamp(TimestampType::Time, time);
     return timestamp->str(format);
 }
 
 inline std::string TimePointToLocalizedHourMinString(const TimePoint &tp)
 {
-    return utils::dateAndTimeSettings.isTimeFormat12() ? TimePointToLocalizedTimeString(tp, "%I:%M")
-                                                       : TimePointToLocalizedTimeString(tp, "%H:%M");
+    return stm::api::isTimeFormat12h() ? TimePointToLocalizedTimeString(tp, "%I:%M")
+                                       : TimePointToLocalizedTimeString(tp, "%H:%M");
 }
 
 inline TimePoint TimePointFromString(const char *s1)
@@ -324,8 +326,8 @@ inline std::string TimePointToHourString12H(const TimePoint &tp)
 
 inline std::string TimePointToLocalizedHourString(const TimePoint &tp)
 {
-    return utils::dateAndTimeSettings.isTimeFormat12() ? TimePointToLocalizedTimeString(tp, "%I")
-                                                       : TimePointToLocalizedTimeString(tp, "%H");
+    return stm::api::isTimeFormat12h() ? TimePointToLocalizedTimeString(tp, "%I")
+                                       : TimePointToLocalizedTimeString(tp, "%H");
 }
 
 inline std::string TimePointToHourString24H(const TimePoint &tp)
diff --git a/module-apps/application-calllog/CalllogModel.cpp b/module-apps/application-calllog/CalllogModel.cpp
index 1790142884eb460b58d281397ce6bd35df9a75e0..a22bb2731a0b3f70c52900d2b261ba3b55a27481 100644
--- a/module-apps/application-calllog/CalllogModel.cpp
+++ b/module-apps/application-calllog/CalllogModel.cpp
@@ -8,7 +8,6 @@
 #include "data/CallLogInternals.hpp"
 #include "data/CallLogSwitchData.hpp"
 #include "widgets/CalllogItem.hpp"
-#include <time/DateAndTimeSettings.hpp>
 
 #include <service-appmgr/Controller.hpp>
 #include "application-call/data/CallSwitchData.hpp"
diff --git a/module-apps/application-calllog/widgets/CalllogItem.cpp b/module-apps/application-calllog/widgets/CalllogItem.cpp
index 24e209ade4c6cbfa8d522bb22223951e1fad139a..4afdfeb7843256428b68fd9c97e7dc6b5a95df30 100644
--- a/module-apps/application-calllog/widgets/CalllogItem.cpp
+++ b/module-apps/application-calllog/widgets/CalllogItem.cpp
@@ -75,7 +75,7 @@ namespace gui
         imageCallType[static_cast<uint32_t>(callType)]->setVisible(true);
 
         using namespace utils::time;
-        timestamp->setText(*createTimestamp(TimestampType::DateTime, call->date));
+        timestamp->setText(*TimestampFactory().createTimestamp(TimestampType::DateTime, call->date));
     }
 
 } /* namespace gui */
diff --git a/module-apps/application-calllog/windows/CallLogDetailsWindow.cpp b/module-apps/application-calllog/windows/CallLogDetailsWindow.cpp
index 60ccc91a4e0f5f56b1d78b196173c4c0a4dab59c..0e2f6a8166f00df9dd8986a05297e5be2ad1b87d 100644
--- a/module-apps/application-calllog/windows/CallLogDetailsWindow.cpp
+++ b/module-apps/application-calllog/windows/CallLogDetailsWindow.cpp
@@ -11,7 +11,6 @@
 #include <application-calllog/data/CallLogInternals.hpp>
 #include <application-calllog/data/CallLogSwitchData.hpp>
 #include <application-calllog/windows/CallLogOptionsWindow.hpp>
-#include <time/DateAndTimeSettings.hpp>
 #include <widgets/TextWithIconsWidget.hpp>
 #include <widgets/ActiveIconFactory.hpp>
 
@@ -197,8 +196,8 @@ namespace gui
     {
         Expects(dateDay != nullptr && dateDate != nullptr);
         using namespace utils::time;
-        auto date = createTimestamp(TimestampType::Date, record.date);
-        auto time = createTimestamp(TimestampType::Time, record.date);
+        auto date = TimestampFactory().createTimestamp(TimestampType::Date, record.date);
+        auto time = TimestampFactory().createTimestamp(TimestampType::Time, record.date);
 
         dateDay->setText(date->day() + ",");
 
diff --git a/module-apps/application-desktop/windows/DesktopMainWindow.cpp b/module-apps/application-desktop/windows/DesktopMainWindow.cpp
index a52a1a57cc36eea38a37031f2c2e2ec0ea93a647..370e7ea82ae041117701db6f88fef53175fbb765 100644
--- a/module-apps/application-desktop/windows/DesktopMainWindow.cpp
+++ b/module-apps/application-desktop/windows/DesktopMainWindow.cpp
@@ -243,8 +243,8 @@ namespace gui
     {
         using namespace utils::time;
         auto ret       = AppWindow::updateTime();
-        auto clock     = createTimestamp(TimestampType::Clock, std::time(nullptr));
-        auto date      = createTimestamp(TimestampType::DateText, std::time(nullptr));
+        auto clock     = TimestampFactory().createTimestamp(TimestampType::Clock, std::time(nullptr));
+        auto date      = TimestampFactory().createTimestamp(TimestampType::DateText, std::time(nullptr));
         if (time != nullptr) {
             time->setText(clock->str());
         }
diff --git a/module-apps/application-messages/models/ThreadsSearchResultsModel.cpp b/module-apps/application-messages/models/ThreadsSearchResultsModel.cpp
index 9f26a6d9acbadc5d1245f0ed34e316c0beea773f..b99fff166708215359ce8956b58022e29745b7a5 100644
--- a/module-apps/application-messages/models/ThreadsSearchResultsModel.cpp
+++ b/module-apps/application-messages/models/ThreadsSearchResultsModel.cpp
@@ -35,7 +35,7 @@ namespace gui::model
         {
             using namespace utils::time;
             ret->setContact(threadStruct->contact->getFormattedName());
-            ret->setTimestamp(*createTimestamp(TimestampType::DateTime, threadStruct->thread->date));
+            ret->setTimestamp(*TimestampFactory().createTimestamp(TimestampType::DateTime, threadStruct->thread->date));
             // The only thing that differs with ThreadModel actually - here show what was found
             ret->setPreview(threadStruct->thread->snippet);
         }
diff --git a/module-apps/application-messages/widgets/SMSOutputWidget.cpp b/module-apps/application-messages/widgets/SMSOutputWidget.cpp
index 79496829216f07481bdc42d8cfbb56e90a93d415..dd0150d0147475331131f24dead0a582294c910a 100644
--- a/module-apps/application-messages/widgets/SMSOutputWidget.cpp
+++ b/module-apps/application-messages/widgets/SMSOutputWidget.cpp
@@ -128,7 +128,7 @@ namespace gui
         timeLabel->activeItem = false;
         timeLabel->setFont(style::window::font::verysmall);
         using namespace utils::time;
-        timeLabel->setText(*createTimestamp(TimestampType::Time, timestamp));
+        timeLabel->setText(*TimestampFactory().createTimestamp(TimestampType::Time, timestamp));
         timeLabel->setVisible(false);
         timeLabel->setAlignment(gui::Alignment(gui::Alignment::Horizontal::Center, gui::Alignment::Vertical::Center));
         timeLabel->setEdges(RectangleEdge::None);
diff --git a/module-apps/application-messages/widgets/ThreadItem.cpp b/module-apps/application-messages/widgets/ThreadItem.cpp
index 81a12d6680ff657d35b32ff31c5edd89e85e1111..15eeb159f3efc0de9fa82dac45f60e3726b43513 100644
--- a/module-apps/application-messages/widgets/ThreadItem.cpp
+++ b/module-apps/application-messages/widgets/ThreadItem.cpp
@@ -51,7 +51,7 @@ namespace gui
 
         setContactName(getNumberImportance());
         using namespace utils::time;
-        timestamp->setText(*createTimestamp(TimestampType::DateTime, threadStruct->thread->date));
+        timestamp->setText(*TimestampFactory().createTimestamp(TimestampType::DateTime, threadStruct->thread->date));
         setPreview();
     }
 
diff --git a/module-apps/application-notes/widgets/NotesItem.cpp b/module-apps/application-notes/widgets/NotesItem.cpp
index 5d770c8d4e8c38a80433b0d109e650f96b0379bb..8f921caca43976d67098aead29b6d1b82fe059e2 100644
--- a/module-apps/application-notes/widgets/NotesItem.cpp
+++ b/module-apps/application-notes/widgets/NotesItem.cpp
@@ -57,7 +57,7 @@ namespace gui
     void NotesItem::setDateText(std::uint32_t timestamp)
     {
         using namespace utils::time;
-        auto dt = createTimestamp(TimestampType::DateTime, timestamp);
+        auto dt = TimestampFactory().createTimestamp(TimestampType::DateTime, timestamp);
         date->setText(*dt);
     }
 
diff --git a/module-apps/application-notes/windows/NotePreviewWindow.cpp b/module-apps/application-notes/windows/NotePreviewWindow.cpp
index b217734909ae09d9a30bcdc51e342ea717c562f4..fde60f861c17b9e822bc25ead60f13bf5a834888 100644
--- a/module-apps/application-notes/windows/NotePreviewWindow.cpp
+++ b/module-apps/application-notes/windows/NotePreviewWindow.cpp
@@ -94,7 +94,7 @@ namespace app::notes
     void NotePreviewWindow::setEditDateText(std::uint32_t timestamp)
     {
         using namespace utils::time;
-        auto dateTime = createTimestamp(TimestampType::DateTime, timestamp);
+        auto dateTime = TimestampFactory().createTimestamp(TimestampType::DateTime, timestamp);
         auto dt       = dynamic_cast<DateTime *>(dateTime.get());
         if (dt == nullptr) {
             return;
diff --git a/module-apps/application-settings-new/CMakeLists.txt b/module-apps/application-settings-new/CMakeLists.txt
index 29b3f59aec3a910c12eeafbbfb0f96417d0b2297..bafeb20ff5f45f3135d6a85027464f0f4640a852 100644
--- a/module-apps/application-settings-new/CMakeLists.txt
+++ b/module-apps/application-settings-new/CMakeLists.txt
@@ -120,4 +120,6 @@ target_link_libraries(${PROJECT_NAME}
     PUBLIC
         service-bluetooth
         eventstore
+    PRIVATE
+        service-time-api
 )
diff --git a/module-apps/application-settings-new/models/DateAndTimeModel.cpp b/module-apps/application-settings-new/models/DateAndTimeModel.cpp
index efe904471d44c7c7e4f02cab5f451a5edacac232..b6325da0bae0dc74691180fb18f8841a42d4163e 100644
--- a/module-apps/application-settings-new/models/DateAndTimeModel.cpp
+++ b/module-apps/application-settings-new/models/DateAndTimeModel.cpp
@@ -6,7 +6,6 @@
 #include "DateAndTimeModel.hpp"
 #include <ListView.hpp>
 #include <apps-common/widgets/DateAndTimeStyle.hpp>
-#include <time/DateAndTimeSettings.hpp>
 
 DateAndTimeModel::DateAndTimeModel(app::Application *application) : app(application)
 {}
diff --git a/module-apps/application-settings-new/models/FromTimeToTimeModel.cpp b/module-apps/application-settings-new/models/FromTimeToTimeModel.cpp
index 1225977cb1b4ad55ea41c5558f072271fccbc28c..c50b6d3b6f5b4462c958f78c5faa35122ad80a1b 100644
--- a/module-apps/application-settings-new/models/FromTimeToTimeModel.cpp
+++ b/module-apps/application-settings-new/models/FromTimeToTimeModel.cpp
@@ -5,7 +5,6 @@
 #include <application-settings-new/widgets/SettingsDateItem.hpp>
 #include <application-settings-new/widgets/SettingsTimeItem.hpp>
 #include <ListView.hpp>
-#include <time/DateAndTimeSettings.hpp>
 #include <widgets/DateAndTimeStyle.hpp>
 
 FromTimeToTimeModel::FromTimeToTimeModel(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 e0fba6c9106f511f1b9bcd238b7923d302e65a59..e1d7c3d2e13fcb0123a9534d8dc29e332e7eb01f 100644
--- a/module-apps/application-settings-new/windows/DateAndTimeMainWindow.cpp
+++ b/module-apps/application-settings-new/windows/DateAndTimeMainWindow.cpp
@@ -4,9 +4,10 @@
 #include "application-settings-new/ApplicationSettings.hpp"
 #include "DateAndTimeMainWindow.hpp"
 #include "module-apps/application-desktop/windows/Names.hpp"
-#include <time/DateAndTimeSettings.hpp>
 #include "OptionSetting.hpp"
-#include "service-appmgr/Controller.hpp"
+#include <service-time/service-time/TimeMessage.hpp>
+#include <service-time/Constants.hpp>
+#include <service-time/api/TimeSettingsApi.hpp>
 
 namespace gui
 {
@@ -14,10 +15,11 @@ namespace gui
         : BaseSettingsWindow(app, std::move(name))
     {
         setTitle(utils::translate("app_settings_date_and_time"));
-        automaticDateAndTimeIsOn = utils::dateAndTimeSettings.isAutomaticDateAndTimeOn();
-        automaticTimeZoneIsOn    = utils::dateAndTimeSettings.isAutomaticTimeZoneOn();
-        timeFormat               = utils::dateAndTimeSettings.getTimeFormat();
-        dateFormat               = utils::dateAndTimeSettings.getDateFormat();
+
+        automaticDateAndTimeIsOn = stm::api::isAutomaticDateAndTime();
+        automaticTimeZoneIsOn    = stm::api::isAutomaticTimezone();
+        timeFormat               = stm::api::timeFormat();
+        dateFormat               = stm::api::dateFormat();
         changeDateAndTimeWindow  = window::name::change_date_and_time;
     }
 
@@ -47,7 +49,9 @@ namespace gui
             utils::translate("app_settings_date_and_time_automatic_date_and_time"),
             [=](Item &item) {
                 automaticDateAndTimeIsOn = !automaticDateAndTimeIsOn;
-                app::manager::Controller::changeAutomaticDateAndTimeIsOn(application, automaticDateAndTimeIsOn);
+                application->bus.sendUnicast(
+                    std::make_shared<stm::message::SetAutomaticDateAndTimeRequest>(automaticDateAndTimeIsOn),
+                    service::name::service_time);
                 refreshOptionsList();
                 return true;
             },
@@ -65,7 +69,9 @@ namespace gui
             utils::translate("app_settings_date_and_time_automatic_time_zone"),
             [=](Item &item) {
                 automaticTimeZoneIsOn = !automaticTimeZoneIsOn;
-                app::manager::Controller::changeAutomaticTimeZoneIsOn(application, automaticTimeZoneIsOn);
+                application->bus.sendUnicast(
+                    std::make_shared<stm::message::SetAutomaticTimezoneRequest>(automaticDateAndTimeIsOn),
+                    service::name::service_time);
                 refreshOptionsList();
                 return true;
             },
@@ -85,7 +91,8 @@ namespace gui
                 timeFormat = (timeFormat == utils::time::Locale::TimeFormat::FormatTime12H)
                                  ? utils::time::Locale::TimeFormat::FormatTime24H
                                  : utils::time::Locale::TimeFormat::FormatTime12H;
-                app::manager::Controller::changeTimeFormat(application, timeFormat);
+                application->bus.sendUnicast(std::make_shared<stm::message::SetTimeFormatRequest>(timeFormat),
+                                             service::name::service_time);
                 refreshOptionsList();
                 return true;
             },
@@ -98,7 +105,8 @@ namespace gui
                 dateFormat = (dateFormat == utils::time::Locale::DateFormat::DD_MM_YYYY)
                                  ? utils::time::Locale::DateFormat::MM_DD_YYYY
                                  : utils::time::Locale::DateFormat::DD_MM_YYYY;
-                app::manager::Controller::changeDateFormat(application, dateFormat);
+                application->bus.sendUnicast(std::make_shared<stm::message::SetDateFormatRequest>(dateFormat),
+                                             service::name::service_time);
                 refreshOptionsList();
                 return true;
             },
diff --git a/module-apps/apps-common/Application.cpp b/module-apps/apps-common/Application.cpp
index 678cb9645fd253b7f69d555b50cb3c4f1f8a84a6..28e1ab7044451201d6145220c96acef01b5afb09 100644
--- a/module-apps/apps-common/Application.cpp
+++ b/module-apps/apps-common/Application.cpp
@@ -37,7 +37,6 @@
 #include <service-gui/Common.hpp>
 #include <module-utils/Utils.hpp>
 #include <service-db/agents/settings/SystemSettings.hpp>
-#include <time/DateAndTimeSettings.hpp>
 #include <service-audio/AudioServiceAPI.hpp> // for GetOutputVolume
 
 #include <popups/VolumeWindow.hpp>
diff --git a/module-apps/apps-common/popups/lock-popups/PhoneLockedWindow.cpp b/module-apps/apps-common/popups/lock-popups/PhoneLockedWindow.cpp
index 8301401dd185d15837ef118f0e777ae30dafc48d..f0e869059a9fd89dad8c160475a4116e44694bbb 100644
--- a/module-apps/apps-common/popups/lock-popups/PhoneLockedWindow.cpp
+++ b/module-apps/apps-common/popups/lock-popups/PhoneLockedWindow.cpp
@@ -147,8 +147,8 @@ namespace gui
     {
         using namespace utils::time;
         auto ret       = AppWindow::updateTime();
-        auto clock     = createTimestamp(TimestampType::Clock, std::time(nullptr));
-        auto date      = createTimestamp(TimestampType::DateText, std::time(nullptr));
+        auto clock     = TimestampFactory().createTimestamp(TimestampType::Clock, std::time(nullptr));
+        auto date      = TimestampFactory().createTimestamp(TimestampType::DateText, std::time(nullptr));
         if (time != nullptr) {
             time->setText(clock->str());
         }
diff --git a/module-apps/apps-common/widgets/TimeWidget.cpp b/module-apps/apps-common/widgets/TimeWidget.cpp
index 1c30c596f21c0b04f4fb95725ba171196fe6676d..a0b7af7e38053d346a5ae00e904b79a994613dee 100644
--- a/module-apps/apps-common/widgets/TimeWidget.cpp
+++ b/module-apps/apps-common/widgets/TimeWidget.cpp
@@ -19,7 +19,7 @@ namespace gui
                            Type type,
                            std::function<void(const UTF8 &text)> bottomBarTemporaryMode,
                            std::function<void()> bottomBarRestoreFromTemporaryMode)
-        : VBox(parent), mode24H{!utils::dateAndTimeSettings.isTimeFormat12()}, type{type},
+        : VBox(parent), mode24H{!stm::api::isTimeFormat12h()}, type{type},
           bottomBarTemporaryMode(std::move(bottomBarTemporaryMode)),
           bottomBarRestoreFromTemporaryMode(std::move(bottomBarRestoreFromTemporaryMode))
     {
diff --git a/module-apps/apps-common/windows/AppWindow.cpp b/module-apps/apps-common/windows/AppWindow.cpp
index 335abbcee33cad726886db844a3d95e45c632294..5ac6015b20c765ea9ff42453ba5ef2706ae0645e 100644
--- a/module-apps/apps-common/windows/AppWindow.cpp
+++ b/module-apps/apps-common/windows/AppWindow.cpp
@@ -10,7 +10,6 @@
 #include <i18n/i18n.hpp>
 #include <service-appmgr/Controller.hpp>
 #include <service-audio/AudioServiceAPI.hpp>
-#include <time/DateAndTimeSettings.hpp>
 
 using namespace style::header;
 
diff --git a/module-gui/gui/widgets/status-bar/Time.cpp b/module-gui/gui/widgets/status-bar/Time.cpp
index 2366e384eea819b4bc30915f719f15ab25ec0347..299762c81bde76a361aea79c9c95482f702f8c42 100644
--- a/module-gui/gui/widgets/status-bar/Time.cpp
+++ b/module-gui/gui/widgets/status-bar/Time.cpp
@@ -16,7 +16,7 @@ namespace gui::status_bar
         setFont(style::status_bar::time::font);
         setAlignment(gui::Alignment(gui::Alignment::Horizontal::Center, gui::Alignment::Vertical::Bottom));
         using namespace utils::time;
-        time = createTimestamp(TimestampType::Clock, std::time(nullptr));
+        time = TimestampFactory().createTimestamp(TimestampType::Clock, std::time(nullptr));
         update();
     }
 
diff --git a/module-services/service-appmgr/Controller.cpp b/module-services/service-appmgr/Controller.cpp
index 26d049b449c6ee30f58b67ef482c49827de2395a..d38258f15e44b53bbb4ff45ae9686cf5a189964d 100644
--- a/module-services/service-appmgr/Controller.cpp
+++ b/module-services/service-appmgr/Controller.cpp
@@ -84,30 +84,6 @@ namespace app::manager
         return sender->bus.sendUnicast(msg, ApplicationManager::ServiceName);
     }
 
-    auto Controller::changeAutomaticDateAndTimeIsOn(sys::Service *sender, bool isOn) -> bool
-    {
-        auto msg = std::make_shared<app::manager::AutomaticDateAndTimeIsOnChangeRequest>(isOn);
-        return sender->bus.sendUnicast(std::move(msg), ApplicationManager::ServiceName);
-    }
-
-    auto Controller::changeAutomaticTimeZoneIsOn(sys::Service *sender, bool isOn) -> bool
-    {
-        auto msg = std::make_shared<app::manager::AutomaticTimeZoneIsOnChangeRequest>(isOn);
-        return sender->bus.sendUnicast(std::move(msg), ApplicationManager::ServiceName);
-    }
-
-    auto Controller::changeTimeFormat(sys::Service *sender, utils::time::Locale::TimeFormat timeFormat) -> bool
-    {
-        auto msg = std::make_shared<app::manager::TimeFormatChangeRequest>(timeFormat);
-        return sender->bus.sendUnicast(std::move(msg), ApplicationManager::ServiceName);
-    }
-
-    auto Controller::changeDateFormat(sys::Service *sender, utils::time::Locale::DateFormat dateFormat) -> bool
-    {
-        auto msg = std::make_shared<app::manager::DateFormatChangeRequest>(dateFormat);
-        return sender->bus.sendUnicast(std::move(msg), ApplicationManager::ServiceName);
-    }
-
     auto Controller::preventBlockingDevice(sys::Service *sender) -> bool
     {
         auto msg = std::make_shared<app::manager::PreventBlockingRequest>(sender->GetName());
diff --git a/module-services/service-appmgr/model/ApplicationManager.cpp b/module-services/service-appmgr/model/ApplicationManager.cpp
index c2e93654696963c4a03b6687bca128a08a104535..036d9a6243b6e5a789720066a1f1dc7eec658668 100644
--- a/module-services/service-appmgr/model/ApplicationManager.cpp
+++ b/module-services/service-appmgr/model/ApplicationManager.cpp
@@ -20,7 +20,7 @@
 #include <application-onboarding/ApplicationOnBoarding.hpp>
 #include <application-onboarding/data/OnBoardingMessages.hpp>
 #include <i18n/i18n.hpp>
-#include <log.hpp>
+#include <log/log.hpp>
 #include <service-appmgr/messages/Message.hpp>
 #include <service-evtmgr/EventManager.hpp>
 #include <service-evtmgr/EVMessages.hpp>
@@ -35,7 +35,6 @@
 #include <limits>
 #include <utility>
 #include <module-utils/Utils.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>
@@ -174,33 +173,6 @@ namespace app::manager
             settings::SystemProperties::autoLockTimeInSec,
             [this](std::string value) { lockTimeChanged(std::move(value)); },
             settings::SettingsScope::Global);
-        settings->registerValueChange(
-            ::settings::SystemProperties::automaticDateAndTimeIsOn,
-            [this](std::string value) {
-                utils::dateAndTimeSettings.setAutomaticDateAndTimeOn(utils::getNumericValue<bool>(value));
-            },
-            ::settings::SettingsScope::Global);
-        settings->registerValueChange(
-            ::settings::SystemProperties::automaticTimeZoneIsOn,
-            [this](std::string value) {
-                utils::dateAndTimeSettings.setAutomaticTimeZoneOn(utils::getNumericValue<bool>(value));
-            },
-            ::settings::SettingsScope::Global);
-        settings->registerValueChange(
-            ::settings::SystemProperties::timeFormat,
-            [this](std::string value) {
-                utils::dateAndTimeSettings.setTimeFormat(
-                    static_cast<utils::time::Locale::TimeFormat>(utils::getNumericValue<unsigned int>(value)));
-            },
-            ::settings::SettingsScope::Global);
-        settings->registerValueChange(
-            ::settings::SystemProperties::dateFormat,
-            [this](std::string value) {
-                utils::dateAndTimeSettings.setDateFormat(
-                    static_cast<utils::time::Locale::DateFormat>(utils::getNumericValue<unsigned int>(value)));
-            },
-            ::settings::SettingsScope::Global);
-
         settings->registerValueChange(
             ::settings::KeypadLight::state,
             [this](const std::string &value) {
@@ -355,26 +327,6 @@ namespace app::manager
             handleInputLanguageChange(msg);
             return sys::msgHandled();
         });
-        connect(typeid(AutomaticDateAndTimeIsOnChangeRequest), [this](sys::Message *request) {
-            auto msg = static_cast<AutomaticDateAndTimeIsOnChangeRequest *>(request);
-            handleAutomaticDateAndTimeChange(msg);
-            return sys::msgHandled();
-        });
-        connect(typeid(AutomaticTimeZoneIsOnChangeRequest), [this](sys::Message *request) {
-            auto msg = static_cast<AutomaticTimeZoneIsOnChangeRequest *>(request);
-            handleAutomaticTimeZoneChange(msg);
-            return sys::msgHandled();
-        });
-        connect(typeid(TimeFormatChangeRequest), [this](sys::Message *request) {
-            auto msg = static_cast<TimeFormatChangeRequest *>(request);
-            handleTimeFormatChange(msg);
-            return sys::msgHandled();
-        });
-        connect(typeid(DateFormatChangeRequest), [this](sys::Message *request) {
-            auto msg = static_cast<DateFormatChangeRequest *>(request);
-            handleDateFormatChange(msg);
-            return sys::msgHandled();
-        });
         connect(typeid(ShutdownRequest), [this](sys::Message *) {
             closeApplications();
             return std::make_shared<sys::ResponseMessage>();
@@ -1053,58 +1005,6 @@ namespace app::manager
         return true;
     }
 
-    auto ApplicationManager::handleAutomaticDateAndTimeChange(AutomaticDateAndTimeIsOnChangeRequest *msg) -> bool
-    {
-        if (utils::dateAndTimeSettings.isAutomaticDateAndTimeOn() == msg->isOn) {
-            LOG_WARN("The selected value is already set. Ignore.");
-            return false;
-        }
-        settings->setValue(settings::SystemProperties::automaticDateAndTimeIsOn,
-                           std::to_string(msg->isOn),
-                           settings::SettingsScope::Global);
-        utils::dateAndTimeSettings.setAutomaticDateAndTimeOn(msg->isOn);
-        return true;
-    }
-
-    auto ApplicationManager::handleAutomaticTimeZoneChange(AutomaticTimeZoneIsOnChangeRequest *msg) -> bool
-    {
-        if (utils::dateAndTimeSettings.isAutomaticTimeZoneOn() == msg->isOn) {
-            LOG_WARN("The selected value is already set. Ignore.");
-            return false;
-        }
-        settings->setValue(settings::SystemProperties::automaticTimeZoneIsOn,
-                           std::to_string(msg->isOn),
-                           settings::SettingsScope::Global);
-        utils::dateAndTimeSettings.setAutomaticTimeZoneOn(msg->isOn);
-        return true;
-    }
-
-    auto ApplicationManager::handleTimeFormatChange(TimeFormatChangeRequest *msg) -> bool
-    {
-        if (utils::dateAndTimeSettings.getTimeFormat() == msg->timeFormat) {
-            LOG_WARN("The selected value is already set. Ignore.");
-            return false;
-        }
-        settings->setValue(settings::SystemProperties::timeFormat,
-                           std::to_string(static_cast<unsigned>(msg->timeFormat)),
-                           settings::SettingsScope::Global);
-        utils::dateAndTimeSettings.setTimeFormat(msg->timeFormat);
-        return true;
-    }
-
-    auto ApplicationManager::handleDateFormatChange(DateFormatChangeRequest *msg) -> bool
-    {
-        if (utils::dateAndTimeSettings.getDateFormat() == msg->dateFormat) {
-            LOG_WARN("The selected value is already set. Ignore.");
-            return false;
-        }
-        settings->setValue(settings::SystemProperties::dateFormat,
-                           std::to_string(static_cast<unsigned>(msg->dateFormat)),
-                           settings::SettingsScope::Global);
-        utils::dateAndTimeSettings.setDateFormat(msg->dateFormat);
-        return true;
-    }
-
     auto ApplicationManager::handleSetOsUpdateVersionChange(SetOsUpdateVersion *msg) -> bool
     {
         LOG_DEBUG("[ApplicationManager::handleSetOsUpdateVersionChange] value ....");
diff --git a/module-services/service-appmgr/service-appmgr/messages/DateAndTimeChangeRequest.hpp b/module-services/service-appmgr/service-appmgr/messages/DateAndTimeChangeRequest.hpp
deleted file mode 100644
index 3f6ee385fb130fc3573334db004b709fa6c534e4..0000000000000000000000000000000000000000
--- a/module-services/service-appmgr/service-appmgr/messages/DateAndTimeChangeRequest.hpp
+++ /dev/null
@@ -1,45 +0,0 @@
-// 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 "BaseMessage.hpp"
-#include <time/time_locale.hpp>
-
-namespace app::manager
-{
-    class DateAndTimeChangeRequest : public sys::DataMessage
-    {};
-
-    class AutomaticDateAndTimeIsOnChangeRequest : public DateAndTimeChangeRequest
-    {
-      public:
-        AutomaticDateAndTimeIsOnChangeRequest(bool isOn) : isOn(isOn)
-        {}
-        bool isOn;
-    };
-
-    class AutomaticTimeZoneIsOnChangeRequest : public DateAndTimeChangeRequest
-    {
-      public:
-        AutomaticTimeZoneIsOnChangeRequest(bool isOn) : isOn(isOn)
-        {}
-        bool isOn;
-    };
-
-    class TimeFormatChangeRequest : public DateAndTimeChangeRequest
-    {
-      public:
-        TimeFormatChangeRequest(utils::time::Locale::TimeFormat timeFormat) : timeFormat(timeFormat)
-        {}
-        utils::time::Locale::TimeFormat timeFormat;
-    };
-
-    class DateFormatChangeRequest : public DateAndTimeChangeRequest
-    {
-      public:
-        DateFormatChangeRequest(utils::time::Locale::DateFormat dateFormat) : dateFormat(dateFormat)
-        {}
-        utils::time::Locale::DateFormat dateFormat;
-    };
-} // namespace app::manager
diff --git a/module-services/service-appmgr/service-appmgr/messages/Message.hpp b/module-services/service-appmgr/service-appmgr/messages/Message.hpp
index 844dbcb3d6dd4b079c17b8d46e243d672789c209..ba9ed06cb8fd52802bb3730b059ecc6d1c2f4ee4 100644
--- a/module-services/service-appmgr/service-appmgr/messages/Message.hpp
+++ b/module-services/service-appmgr/service-appmgr/messages/Message.hpp
@@ -19,6 +19,5 @@
 #include "ShutdownRequest.hpp"
 #include "GetCurrentDisplayLanguageRequest.hpp"
 #include "GetCurrentDisplayLanguageResponse.hpp"
-#include "DateAndTimeChangeRequest.hpp"
 #include "UpdateInProgress.hpp"
 #include "SetOsUpdateVersion.hpp"
diff --git a/module-services/service-appmgr/service-appmgr/model/ApplicationManager.hpp b/module-services/service-appmgr/service-appmgr/model/ApplicationManager.hpp
index 938db4a934366d2e3f7d3a5e2a8be339333d4ef9..39c760179076813eba0819c065c7178d53f48b99 100644
--- a/module-services/service-appmgr/service-appmgr/model/ApplicationManager.hpp
+++ b/module-services/service-appmgr/service-appmgr/model/ApplicationManager.hpp
@@ -142,10 +142,6 @@ namespace app::manager
         auto handleInitApplication(ApplicationInitialised *msg) -> bool;
         auto handleDisplayLanguageChange(DisplayLanguageChangeRequest *msg) -> bool;
         auto handleInputLanguageChange(InputLanguageChangeRequest *msg) -> bool;
-        auto handleAutomaticDateAndTimeChange(AutomaticDateAndTimeIsOnChangeRequest *msg) -> bool;
-        auto handleAutomaticTimeZoneChange(AutomaticTimeZoneIsOnChangeRequest *msg) -> bool;
-        auto handleTimeFormatChange(TimeFormatChangeRequest *msg) -> bool;
-        auto handleDateFormatChange(DateFormatChangeRequest *msg) -> bool;
         auto handleSetOsUpdateVersionChange(SetOsUpdateVersion *msg) -> bool;
         auto handleDBResponse(db::QueryResponse *msg) -> bool;
         auto handlePowerSavingModeInit() -> bool;
diff --git a/module-services/service-time/CMakeLists.txt b/module-services/service-time/CMakeLists.txt
index ac25d63d7a181cc4ecdba096cdb1fec6344ca35d..31712aa9350acf2be610f97bada5eeba5cd95ebd 100644
--- a/module-services/service-time/CMakeLists.txt
+++ b/module-services/service-time/CMakeLists.txt
@@ -8,6 +8,7 @@ set(SOURCES
     TimezoneHandler.cpp
     timeEvents/TimeEvents.cpp
     timeEvents/CalendarTimeEvents.cpp
+    internal/StaticData.cpp
 )
 
 add_library(${PROJECT_NAME} STATIC ${SOURCES})
@@ -19,10 +20,14 @@ target_include_directories(${PROJECT_NAME}
 
 target_link_libraries(${PROJECT_NAME}
     PRIVATE
+        time
+        service-time-api
         module-sys
         module-apps
 )
 
+add_subdirectory(api)
+
 if (${ENABLE_TESTS})
     add_subdirectory(tests)
 endif ()
diff --git a/module-services/service-time/ServiceTime.cpp b/module-services/service-time/ServiceTime.cpp
index 10e55076d0f4da9508601a90fb2b7cb561aebc8b..b14c70da9b91aa7d30981bddd9ef1bf93cc4b18a 100644
--- a/module-services/service-time/ServiceTime.cpp
+++ b/module-services/service-time/ServiceTime.cpp
@@ -5,6 +5,8 @@
 #include "service-time/CalendarTimeEvents.hpp"
 #include "service-time/TimeMessage.hpp"
 #include "service-time/RTCCommand.hpp"
+#include <service-time/internal/StaticData.hpp>
+#include <service-time/TimeSettings.hpp>
 
 #include <BaseInterface.hpp>
 #include <Common/Query.hpp>
@@ -14,7 +16,10 @@
 #include <service-db/DBNotificationMessage.hpp>
 #include <service-db/QueryMessage.hpp>
 #include <service-cellular/service-cellular/CellularMessage.hpp>
+#include <service-cellular/service-cellular/ServiceCellular.hpp>
+#include <module-utils/Utils.hpp>
 #include <time/time_constants.hpp>
+#include <time/time_conversion_factory.hpp>
 
 #include <memory>
 #include <utility>
@@ -37,6 +42,13 @@ namespace stm
 
     sys::ReturnCodes ServiceTime::InitHandler()
     {
+        settings = std::make_unique<settings::Settings>();
+        settings->init(::service::ServiceProxy(shared_from_this()));
+
+        initStaticData();
+        static TimeSettings timeSettings;
+        utils::time::TimestampFactory().init(&timeSettings);
+
         registerMessageHandlers();
 
         return sys::ReturnCodes::Success;
@@ -124,16 +136,105 @@ namespace stm
     {
         connect(typeid(CellularTimeNotificationMessage), [&](sys::Message *request) -> sys::MessagePointer {
             auto message = static_cast<CellularTimeNotificationMessage *>(request);
-            timeManager->handleCellularTimeUpdate(
-                message->getTime().value(),
-                std::chrono::minutes{message->getTimeZoneOffset().value() / utils::time::secondsInMinute});
+            if (stm::api::isAutomaticDateAndTime()) {
+                timeManager->handleCellularTimeUpdate(
+                    message->getTime().value(),
+                    std::chrono::minutes{message->getTimeZoneOffset().value() / utils::time::secondsInMinute});
+            }
             return std::make_shared<sys::ResponseMessage>();
         });
 
-        connect(typeid(stm::message::TimeChangeRequestMessage), [&](sys::Message *request) -> sys::MessagePointer {
-            auto message = static_cast<stm::message::TimeChangeRequestMessage *>(request);
-            timeManager->handleTimeChangeRequest(message->getTime());
-            return std::make_shared<sys::ResponseMessage>();
+        connect(typeid(stm::message::SetAutomaticDateAndTimeRequest),
+                [&](sys::Message *request) -> sys::MessagePointer {
+                    return handleSetAutomaticDateAndTimeRequest(request);
+                });
+
+        connect(typeid(stm::message::SetAutomaticTimezoneRequest), [&](sys::Message *request) -> sys::MessagePointer {
+            return handleSetAutomaticTimezoneRequest(request);
         });
+
+        connect(typeid(stm::message::SetTimeFormatRequest),
+                [&](sys::Message *request) -> sys::MessagePointer { return handleSetTimeFormatRequest(request); });
+
+        connect(typeid(stm::message::SetDateFormatRequest),
+                [&](sys::Message *request) -> sys::MessagePointer { return handleSetDateFormatRequest(request); });
+    }
+    auto ServiceTime::handleSetAutomaticDateAndTimeRequest(sys::Message *request)
+        -> std::shared_ptr<sys::ResponseMessage>
+    {
+        auto message = static_cast<stm::message::SetAutomaticDateAndTimeRequest *>(request);
+        if (stm::api::isAutomaticDateAndTime() == message->getValue()) {
+            LOG_WARN("The selected value is already set. Ignore.");
+            return std::shared_ptr<sys::ResponseMessage>();
+        }
+        settings->setValue(settings::SystemProperties::automaticDateAndTimeIsOn,
+                           std::to_string(message->getValue()),
+                           settings::SettingsScope::AppLocal);
+        stm::internal::StaticData::get().setAutomaticDateAndTime(message->getValue());
+
+        bus.sendUnicast(std::make_shared<stm::message::AutomaticDateAndTimeChangedMessage>(message->getValue()),
+                        ServiceCellular::serviceName);
+        return std::shared_ptr<sys::ResponseMessage>();
+    }
+
+    auto ServiceTime::handleSetAutomaticTimezoneRequest(sys::Message *request) -> std::shared_ptr<sys::ResponseMessage>
+    {
+        auto message = static_cast<stm::message::SetAutomaticTimezoneRequest *>(request);
+        if (stm::api::isAutomaticTimezone() == message->getValue()) {
+            LOG_WARN("The selected value is already set. Ignore.");
+            return std::shared_ptr<sys::ResponseMessage>();
+        }
+        settings->setValue(settings::SystemProperties::automaticTimeZoneIsOn,
+                           std::to_string(message->getValue()),
+                           settings::SettingsScope::AppLocal);
+        stm::internal::StaticData::get().setAutomaticTimezoneOn(message->getValue());
+        return std::shared_ptr<sys::ResponseMessage>();
     }
+
+    auto ServiceTime::handleSetTimeFormatRequest(sys::Message *request) -> std::shared_ptr<sys::ResponseMessage>
+    {
+        auto message = static_cast<stm::message::SetTimeFormatRequest *>(request);
+        if (stm::api::timeFormat() == message->getTimeFormat()) {
+            LOG_WARN("The selected value is already set. Ignore.");
+            return std::shared_ptr<sys::ResponseMessage>();
+        }
+        settings->setValue(settings::SystemProperties::timeFormat,
+                           std::to_string(static_cast<unsigned>(message->getTimeFormat())),
+                           settings::SettingsScope::AppLocal);
+        stm::internal::StaticData::get().setTimeFormat(message->getTimeFormat());
+        return std::shared_ptr<sys::ResponseMessage>();
+    }
+
+    auto ServiceTime::handleSetDateFormatRequest(sys::Message *request) -> std::shared_ptr<sys::ResponseMessage>
+    {
+        auto message = static_cast<stm::message::SetDateFormatRequest *>(request);
+        if (stm::api::dateFormat() == message->getDateFormat()) {
+            LOG_WARN("The selected value is already set. Ignore.");
+            return std::shared_ptr<sys::ResponseMessage>();
+        }
+        settings->setValue(settings::SystemProperties::dateFormat,
+                           std::to_string(static_cast<unsigned>(message->getDateFormat())),
+                           settings::SettingsScope::AppLocal);
+        stm::internal::StaticData::get().setDateFormat(message->getDateFormat());
+        return std::shared_ptr<sys::ResponseMessage>();
+    }
+
+    void ServiceTime::initStaticData()
+    {
+        stm::internal::StaticData::get().setAutomaticDateAndTime(utils::getNumericValue<bool>(settings->getValue(
+            ::settings::SystemProperties::automaticDateAndTimeIsOn, settings::SettingsScope::AppLocal)));
+        stm::internal::StaticData::get().setAutomaticTimezoneOn(utils::getNumericValue<bool>(settings->getValue(
+            ::settings::SystemProperties::automaticTimeZoneIsOn, settings::SettingsScope::AppLocal)));
+        auto dateFormat = magic_enum::enum_cast<utils::time::Locale::DateFormat>(utils::getNumericValue<unsigned int>(
+            settings->getValue(::settings::SystemProperties::dateFormat, settings::SettingsScope::AppLocal)));
+        if (dateFormat != std::nullopt) {
+            stm::internal::StaticData::get().setDateFormat(dateFormat.value());
+        }
+        auto timeFormat = magic_enum::enum_cast<utils::time::Locale::TimeFormat>(utils::getNumericValue<unsigned int>(
+            settings->getValue(::settings::SystemProperties::timeFormat, settings::SettingsScope::AppLocal)));
+        if (timeFormat != std::nullopt) {
+            stm::internal::StaticData::get().setTimeFormat(timeFormat.value());
+        }
+    }
+
 } /* namespace stm */
diff --git a/module-services/service-time/ServiceTime.hpp b/module-services/service-time/ServiceTime.hpp
index de6692e085bf7023abe34bfb39190fff11b664e0..15c88bbe13364e635eebc2d53db3a0128e329507 100644
--- a/module-services/service-time/ServiceTime.hpp
+++ b/module-services/service-time/ServiceTime.hpp
@@ -20,6 +20,11 @@
 #include <functional>
 #include <string> // for allocator, string
 
+namespace settings
+{
+    class Settings;
+}
+
 namespace stm
 {
     class ServiceTime : public sys::Service
@@ -29,7 +34,16 @@ namespace stm
         CalendarTimeEvents calendarEvents;
 
         std::unique_ptr<TimeManager> timeManager;
+
+        std::unique_ptr<settings::Settings> settings;
+
         void registerMessageHandlers();
+        auto handleSetAutomaticDateAndTimeRequest(sys::Message *request) -> std::shared_ptr<sys::ResponseMessage>;
+        auto handleSetAutomaticTimezoneRequest(sys::Message *request) -> std::shared_ptr<sys::ResponseMessage>;
+        auto handleSetTimeFormatRequest(sys::Message *request) -> std::shared_ptr<sys::ResponseMessage>;
+        auto handleSetDateFormatRequest(sys::Message *request) -> std::shared_ptr<sys::ResponseMessage>;
+
+        void initStaticData();
 
       public:
         ServiceTime();
diff --git a/module-services/service-time/api/CMakeLists.txt b/module-services/service-time/api/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..d1c6c4b7fc7e6e9dfe775d11d085c223135fcf7b
--- /dev/null
+++ b/module-services/service-time/api/CMakeLists.txt
@@ -0,0 +1,14 @@
+add_library(service-time-api STATIC)
+
+target_sources(service-time-api
+        PRIVATE
+        TimeSettingsApi.cpp
+        PUBLIC
+        TimeSettingsApi.hpp
+        )
+
+target_link_libraries(service-time-api
+        PRIVATE
+        time
+        service-time
+        )
diff --git a/module-services/service-time/api/TimeSettingsApi.cpp b/module-services/service-time/api/TimeSettingsApi.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..9469b68c0215edb086679a7a53342746eb530bd1
--- /dev/null
+++ b/module-services/service-time/api/TimeSettingsApi.cpp
@@ -0,0 +1,34 @@
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#include "TimeSettingsApi.hpp"
+#include <internal/StaticData.hpp>
+
+#include <time/time_locale.hpp>
+
+namespace stm::api
+{
+    bool isAutomaticDateAndTime()
+    {
+        return stm::internal::StaticData::get().getAutomaticDateAndTime();
+    }
+
+    bool isAutomaticTimezone()
+    {
+        return stm::internal::StaticData::get().getAutomaticTimezone();
+    }
+
+    utils::time::Locale::DateFormat dateFormat()
+    {
+        return stm::internal::StaticData::get().getDateFormat();
+    }
+
+    utils::time::Locale::TimeFormat timeFormat()
+    {
+        return stm::internal::StaticData::get().getTimeFormat();
+    }
+    bool isTimeFormat12h()
+    {
+        return stm::internal::StaticData::get().getTimeFormat() == utils::time::Locale::TimeFormat::FormatTime12H;
+    }
+} // namespace stm::api
\ No newline at end of file
diff --git a/module-services/service-time/api/TimeSettingsApi.hpp b/module-services/service-time/api/TimeSettingsApi.hpp
new file mode 100644
index 0000000000000000000000000000000000000000..d75caf93597c312cd10ca4947a620d41790bab80
--- /dev/null
+++ b/module-services/service-time/api/TimeSettingsApi.hpp
@@ -0,0 +1,35 @@
+// 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 <time/time_locale.hpp>
+
+namespace stm::api
+{
+    /**
+     * Gets value corresponded to current Automatic Date and Time setting stored in DB
+     * @return actual setting value
+     */
+    bool isAutomaticDateAndTime();
+    /**
+     * Gets value corresponded to current Automatic Timezone stored in DB
+     * @return actual setting value
+     */
+    bool isAutomaticTimezone();
+    /**
+     * Gets value corresponded to current Time format stored in DB
+     * @return actual setting value
+     */
+    utils::time::Locale::DateFormat dateFormat();
+    /**
+     * Gets value corresponded to current Date format setting stored in DB
+     * @return actual setting value
+     */
+    utils::time::Locale::TimeFormat timeFormat();
+    /**
+     *It checks if there is 12h time format set
+     * @return true when 12h format is set, false when 24h format is set
+     */
+    bool isTimeFormat12h();
+} // namespace stm::api
diff --git a/module-services/service-time/internal/StaticData.cpp b/module-services/service-time/internal/StaticData.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..68cfe0042601f82483b3bc1c07b1571b526b9c31
--- /dev/null
+++ b/module-services/service-time/internal/StaticData.cpp
@@ -0,0 +1,55 @@
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#include "StaticData.hpp"
+
+namespace stm::internal
+{
+
+    StaticData &StaticData::get()
+    {
+        static StaticData instance;
+        return instance;
+    }
+
+    void StaticData::setAutomaticDateAndTime(bool value)
+    {
+        isAutomaticDateAndTimeOn = value;
+    }
+
+    bool StaticData::getAutomaticDateAndTime() const noexcept
+    {
+        return isAutomaticDateAndTimeOn;
+    }
+
+    void StaticData::setAutomaticTimezoneOn(bool value)
+    {
+        isAutomaticTimezoneOn = value;
+    }
+
+    bool StaticData::getAutomaticTimezone() const noexcept
+    {
+        return isAutomaticTimezoneOn;
+    }
+
+    void StaticData::setDateFormat(utils::time::Locale::DateFormat format)
+    {
+        dateFormat = format;
+    }
+
+    utils::time::Locale::DateFormat StaticData::getDateFormat() const noexcept
+    {
+        return dateFormat;
+    }
+
+    void StaticData::setTimeFormat(utils::time::Locale::TimeFormat format)
+    {
+        timeFormat = format;
+    }
+
+    utils::time::Locale::TimeFormat StaticData::getTimeFormat() const noexcept
+    {
+        return timeFormat;
+    }
+
+} // namespace stm::internal
\ No newline at end of file
diff --git a/module-services/service-time/internal/StaticData.hpp b/module-services/service-time/internal/StaticData.hpp
new file mode 100644
index 0000000000000000000000000000000000000000..e450064fa46843f7e3128ef601a133cec98ae94e
--- /dev/null
+++ b/module-services/service-time/internal/StaticData.hpp
@@ -0,0 +1,72 @@
+// 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 <module-utils/time/time/time_locale.hpp>
+
+namespace stm::internal
+{
+    /**
+     * @brief Static settings data
+     */
+    class StaticData
+    {
+      private:
+        bool isAutomaticDateAndTimeOn              = false;
+        bool isAutomaticTimezoneOn                 = false;
+        utils::time::Locale::DateFormat dateFormat = utils::time::Locale::DateFormat::DD_MM_YYYY;
+        utils::time::Locale::TimeFormat timeFormat = utils::time::Locale::TimeFormat::FormatTime12H;
+
+        StaticData() = default;
+
+      public:
+        StaticData(const StaticData &) = delete;
+        StaticData &operator=(const StaticData &) = delete;
+        /**
+         * Gets instance of static data object
+         * @return instance of data object
+         */
+        static StaticData &get();
+        /**
+         * Sets value corresponded to current Automatic Date and Time setting
+         * @param value new setting value
+         */
+        void setAutomaticDateAndTime(bool value);
+        /**
+         * Gets value corresponded to current Automatic Date and Time setting
+         * @return actual setting value
+         */
+        [[nodiscard]] bool getAutomaticDateAndTime() const noexcept;
+        /**
+         * ASets value corresponded to current Automatic Timezone setting
+         * @param value new setting value
+         */
+        void setAutomaticTimezoneOn(bool value);
+        /**
+         * Gets value corresponded to current Automatic Timezone setting
+         * @return actual setting value
+         */
+        [[nodiscard]] bool getAutomaticTimezone() const noexcept;
+        /**
+         * Sets value corresponded to current Date format setting
+         * @param format new setting value
+         */
+        void setDateFormat(utils::time::Locale::DateFormat format);
+        /**
+         * Gets value corresponded to current Date format setting
+         * @return actual setting value
+         */
+        [[nodiscard]] utils::time::Locale::DateFormat getDateFormat() const noexcept;
+        /**
+         * Sets value corresponded to current Time format setting
+         * @param format new setting value
+         */
+        void setTimeFormat(utils::time::Locale::TimeFormat format);
+        /**
+         * Gets value corresponded to current Time format setting
+         * @return actual setting value
+         */
+        [[nodiscard]] utils::time::Locale::TimeFormat getTimeFormat() const noexcept;
+    };
+} // namespace stm::internal
\ No newline at end of file
diff --git a/module-services/service-time/service-time/TimeManager.hpp b/module-services/service-time/service-time/TimeManager.hpp
index 2044390f8448b35cd1af6d40bc625892fa538a4e..c1af71effd212f43dd33948186087306e0940408 100644
--- a/module-services/service-time/service-time/TimeManager.hpp
+++ b/module-services/service-time/service-time/TimeManager.hpp
@@ -28,7 +28,7 @@ class TimeManager
     /**
      * Handles time change request.
      * @param time UTC time to set
-     */
+     * **/
     void handleTimeChangeRequest(const time_t &time);
 
   private:
diff --git a/module-services/service-time/service-time/TimeMessage.hpp b/module-services/service-time/service-time/TimeMessage.hpp
index 435f503906fb6f4d86899f0fa18c1eaa28549b66..d5cb86cec2df94e6c803e6f12222eb043b31ab10 100644
--- a/module-services/service-time/service-time/TimeMessage.hpp
+++ b/module-services/service-time/service-time/TimeMessage.hpp
@@ -4,7 +4,8 @@
 #pragma once
 
 #include <MessageType.hpp>
-#include <Service/Message.hpp>
+#include <module-sys/Service/Message.hpp>
+#include <time/time_locale.hpp>
 
 class TimeMessage : public sys::DataMessage
 {
@@ -111,4 +112,74 @@ namespace stm::message
       private:
         time_t time;
     };
+
+    class SetAutomaticDateAndTimeRequest : public sys::DataMessage
+    {
+      public:
+        explicit SetAutomaticDateAndTimeRequest(const bool value)
+            : sys::DataMessage(MessageType::MessageTypeUninitialized), value(value){};
+        auto getValue() const -> bool
+        {
+            return value;
+        }
+
+      private:
+        bool value;
+    };
+
+    class AutomaticDateAndTimeChangedMessage : public sys::DataMessage
+    {
+      public:
+        explicit AutomaticDateAndTimeChangedMessage(const bool value)
+            : sys::DataMessage(MessageType::MessageTypeUninitialized), value(value){};
+        auto getValue() const -> bool
+        {
+            return value;
+        }
+
+      private:
+        bool value;
+    };
+
+    class SetAutomaticTimezoneRequest : public sys::DataMessage
+    {
+      public:
+        explicit SetAutomaticTimezoneRequest(const bool value)
+            : sys::DataMessage(MessageType::MessageTypeUninitialized), value(value){};
+        auto getValue() const -> bool
+        {
+            return value;
+        }
+
+      private:
+        bool value;
+    };
+
+    class SetTimeFormatRequest : public sys::DataMessage
+    {
+      public:
+        explicit SetTimeFormatRequest(const utils::time::Locale::TimeFormat timeFormat)
+            : sys::DataMessage(MessageType::MessageTypeUninitialized), timeFormat(timeFormat){};
+        auto getTimeFormat() const -> utils::time::Locale::TimeFormat
+        {
+            return timeFormat;
+        };
+
+      private:
+        utils::time::Locale::TimeFormat timeFormat;
+    };
+
+    class SetDateFormatRequest : public sys::DataMessage
+    {
+      public:
+        explicit SetDateFormatRequest(const utils::time::Locale::DateFormat dateFormat)
+            : sys::DataMessage(MessageType::MessageTypeUninitialized), dateFormat(dateFormat){};
+        auto getDateFormat() const -> utils::time::Locale::DateFormat
+        {
+            return dateFormat;
+        };
+
+      private:
+        utils::time::Locale::DateFormat dateFormat;
+    };
 } // namespace stm::message
diff --git a/module-services/service-time/service-time/TimeSettings.hpp b/module-services/service-time/service-time/TimeSettings.hpp
new file mode 100644
index 0000000000000000000000000000000000000000..fcd2e6f1fd4968fc6374e30d744d255ed3f30d05
--- /dev/null
+++ b/module-services/service-time/service-time/TimeSettings.hpp
@@ -0,0 +1,19 @@
+// 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 <time/time_conversion.hpp>
+
+class TimeSettings : public utils::time::TimeSettingsInterface
+{
+  public:
+    bool isTimeFormat12h() const final
+    {
+        return stm::api::timeFormat() == utils::time::Locale::TimeFormat::FormatTime12H;
+    }
+    bool isDateFormatDDMM() const final
+    {
+        return stm::api::dateFormat() == utils::time::Locale::DateFormat::DD_MM_YYYY;
+    }
+};
diff --git a/module-utils/time/CMakeLists.txt b/module-utils/time/CMakeLists.txt
index d20f3676f956f170e030b71bf6249c7165c720fa..ef8e4687568b0dbd23d45d52e56a53015d9994d3 100644
--- a/module-utils/time/CMakeLists.txt
+++ b/module-utils/time/CMakeLists.txt
@@ -13,7 +13,6 @@ module_is_test_entity(time)
 
 target_sources(time
     PRIVATE
-        time/DateAndTimeSettings.cpp
         time/time_conversion.cpp
         time/time_date_validation.cpp
         time/TimeRangeParser.cpp
diff --git a/module-utils/time/test/mock/TimeSettingsMock.hpp b/module-utils/time/test/mock/TimeSettingsMock.hpp
new file mode 100644
index 0000000000000000000000000000000000000000..c46ece2bc5a237c164e7171b5d2111d612f6e251
--- /dev/null
+++ b/module-utils/time/test/mock/TimeSettingsMock.hpp
@@ -0,0 +1,19 @@
+// 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 "time/time_conversion.hpp"
+
+class BaseTimeSettings : public utils::time::TimeSettingsInterface
+{
+  public:
+    virtual bool isTimeFormat12h() const
+    {
+        return true;
+    };
+    virtual bool isDateFormatDDMM() const
+    {
+        return true;
+    };
+};
\ No newline at end of file
diff --git a/module-utils/time/test/unittest_time.cpp b/module-utils/time/test/unittest_time.cpp
index 876d3f18ff3772cb7b0660f37bd9e6633b986829..65a6c02efbdda1bd232233f32bcbc723a0867241 100644
--- a/module-utils/time/test/unittest_time.cpp
+++ b/module-utils/time/test/unittest_time.cpp
@@ -10,6 +10,8 @@
 
 #include "time/time_conversion.hpp"
 #include "time/time_locale.hpp"
+#include "time/time_conversion_factory.hpp"
+#include "mock/TimeSettingsMock.hpp"
 
 #define CATCH_CONFIG_MAIN // This tells Catch to provide a main() - only do this in one cpp file
 
@@ -681,3 +683,20 @@ TEST_CASE("Duration - display")
         REQUIRE(duration.str(Duration::DisplayedFormat::FixedH0M0S) == "48:03:04");
     }
 }
+TEST_CASE("Timestamp factory")
+{
+    SECTION("No setting provided")
+    {
+        auto timestamp = utils::time::TimestampFactory().createTimestamp(utils::time::TimestampType::Clock);
+
+        REQUIRE(typeid(*(timestamp.get())).name() == typeid(utils::time::Timestamp).name());
+    }
+    SECTION("Settings provided")
+    {
+        auto factory = utils::time::TimestampFactory();
+        factory.init(new BaseTimeSettings);
+        auto timestamp = factory.createTimestamp(utils::time::TimestampType::Clock);
+
+        REQUIRE(typeid(*(timestamp.get())).name() == typeid(utils::time::Clock).name());
+    }
+}
diff --git a/module-utils/time/time/DateAndTimeSettings.cpp b/module-utils/time/time/DateAndTimeSettings.cpp
deleted file mode 100644
index 28747cda5bb59806735151486e156ae8d7e9fbe9..0000000000000000000000000000000000000000
--- a/module-utils/time/time/DateAndTimeSettings.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
-// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-
-#include "DateAndTimeSettings.hpp"
-
-namespace utils
-{
-    DateAndTimeSettings dateAndTimeSettings;
-
-    void DateAndTimeSettings::setAutomaticDateAndTimeOn(bool value)
-    {
-        automaticDateAndTimeIsOn = value;
-    }
-
-    void DateAndTimeSettings::setAutomaticTimeZoneOn(bool value)
-    {
-        automaticTimeZoneIsOn = value;
-    }
-
-    void DateAndTimeSettings::setTimeFormat(time::Locale::TimeFormat format)
-    {
-        timeFormat = format;
-    }
-
-    void DateAndTimeSettings::setDateFormat(time::Locale::DateFormat format)
-    {
-        dateFormat = format;
-    }
-} // namespace utils
diff --git a/module-utils/time/time/DateAndTimeSettings.hpp b/module-utils/time/time/DateAndTimeSettings.hpp
deleted file mode 100644
index 00f51d77ebcc2e0a840d4817cdfded546651cc3d..0000000000000000000000000000000000000000
--- a/module-utils/time/time/DateAndTimeSettings.hpp
+++ /dev/null
@@ -1,45 +0,0 @@
-// 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 <time/time_locale.hpp>
-
-namespace utils
-{
-    class DateAndTimeSettings
-    {
-      public:
-        [[nodiscard]] auto isAutomaticDateAndTimeOn() const noexcept -> bool
-        {
-            return automaticDateAndTimeIsOn;
-        }
-        [[nodiscard]] auto isAutomaticTimeZoneOn() const noexcept -> bool
-        {
-            return automaticTimeZoneIsOn;
-        }
-        [[nodiscard]] auto getTimeFormat() const noexcept -> time::Locale::TimeFormat
-        {
-            return timeFormat;
-        }
-        [[nodiscard]] auto getDateFormat() const noexcept -> time::Locale::DateFormat
-        {
-            return dateFormat;
-        }
-        [[nodiscard]] bool isTimeFormat12() const noexcept
-        {
-            return timeFormat == utils::time::Locale::TimeFormat::FormatTime12H;
-        }
-        void setAutomaticDateAndTimeOn(bool value);
-        void setAutomaticTimeZoneOn(bool value);
-        void setTimeFormat(time::Locale::TimeFormat format);
-        void setDateFormat(time::Locale::DateFormat format);
-
-      private:
-        bool automaticDateAndTimeIsOn       = false;
-        bool automaticTimeZoneIsOn          = false;
-        time::Locale::TimeFormat timeFormat = time::Locale::defaultTimeFormat;
-        time::Locale::DateFormat dateFormat = time::Locale::defaultDateFormat;
-    };
-    extern DateAndTimeSettings dateAndTimeSettings;
-} // namespace utils
diff --git a/module-utils/time/time/time_conversion.cpp b/module-utils/time/time/time_conversion.cpp
index 173761fb28680551891b784f79bd199234fd6c4d..ea83c10f55bb3974499015aeca9098399d6aa344 100644
--- a/module-utils/time/time/time_conversion.cpp
+++ b/module-utils/time/time/time_conversion.cpp
@@ -17,7 +17,6 @@
 #include "i18n/i18n.hpp"
 
 #include "time_locale.hpp"
-#include "DateAndTimeSettings.hpp"
 #include <Utils.hpp>
 #include <time/time_constants.hpp>
 
diff --git a/module-utils/time/time/time_conversion_factory.cpp b/module-utils/time/time/time_conversion_factory.cpp
index f757a2358dca1a48c3ef9cfee045d3a0c7212506..abee16a5f5dddf4e55ecc25ccda1875b02c1b19f 100644
--- a/module-utils/time/time/time_conversion_factory.cpp
+++ b/module-utils/time/time/time_conversion_factory.cpp
@@ -3,43 +3,30 @@
 
 #include "time_conversion_factory.hpp"
 #include "time_conversion.hpp"
-#include "DateAndTimeSettings.hpp"
 
 namespace utils::time
 {
+    TimeSettingsInterface *TimestampFactory::timeSettings = nullptr;
 
-    namespace
+    std::unique_ptr<Timestamp> TimestampFactory::createTimestamp(TimestampType type, time_t time)
     {
-        class TimeSettings : public TimeSettingsInterface
-        {
-            bool isTimeFormat12h() const final
-            {
-                return utils::dateAndTimeSettings.getTimeFormat() == Locale::TimeFormat::FormatTime12H;
-            }
-            bool isDateFormatDDMM() const final
-            {
-                return utils::dateAndTimeSettings.getDateFormat() == Locale::DateFormat::DD_MM_YYYY;
-            }
-        };
-    } // namespace
-
-    std::unique_ptr<Timestamp> createTimestamp(TimestampType type, time_t time)
-    {
-        static TimeSettings timeSettings;
+        if (timeSettings == nullptr) {
+            return std::make_unique<Timestamp>(time);
+        }
 
         switch (type) {
         case TimestampType::Timestamp:
             return std::make_unique<Timestamp>(time);
         case TimestampType::Date:
-            return std::make_unique<Date>(timeSettings, time);
+            return std::make_unique<Date>(*timeSettings, time);
         case TimestampType::DateText:
-            return std::make_unique<DateText>(timeSettings, time);
+            return std::make_unique<DateText>(*timeSettings, time);
         case TimestampType::Time:
-            return std::make_unique<Time>(timeSettings, time);
+            return std::make_unique<Time>(*timeSettings, time);
         case TimestampType::DateTime:
-            return std::make_unique<DateTime>(timeSettings, time);
+            return std::make_unique<DateTime>(*timeSettings, time);
         case TimestampType::Clock:
-            return std::make_unique<Clock>(timeSettings, time);
+            return std::make_unique<Clock>(*timeSettings, time);
         }
 
         return std::make_unique<Timestamp>(time);
diff --git a/module-utils/time/time/time_conversion_factory.hpp b/module-utils/time/time/time_conversion_factory.hpp
index cd2626f362c2e1367f52faf4334548a907ca7097..8414ed0c46845e7a71f58b01c9bbc7ed8a0a19dc 100644
--- a/module-utils/time/time/time_conversion_factory.hpp
+++ b/module-utils/time/time/time_conversion_factory.hpp
@@ -18,6 +18,17 @@ namespace utils::time
         Date,      /// date
         DateText,  /// date in textual represnatation
     };
+    class TimestampFactory
+    {
+      private:
+        static TimeSettingsInterface *timeSettings;
 
-    std::unique_ptr<Timestamp> createTimestamp(TimestampType type, time_t time = 0);
+      public:
+        TimestampFactory() = default;
+        void init(TimeSettingsInterface *settings)
+        {
+            timeSettings = settings;
+        }
+        std::unique_ptr<Timestamp> createTimestamp(TimestampType type, time_t time = 0);
+    };
 } // namespace utils::time