From 606e0597e24c3141ea673db862c93d4c686d1327 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Jo=C5=84ski?= <pawel.jonski@mudita.com>
Date: Tue, 20 Jul 2021 12:06:24 +0200
Subject: [PATCH] [BH-380] Librarize application-calendar

Librarize application-calendar
---
 module-apps/CMakeLists.txt                    |  2 +-
 .../ApplicationCalendar.cpp                   |  4 +-
 .../application-calendar/CMakeLists.txt       | 73 +++++++++++++++----
 .../data/CalendarData.cpp                     |  4 +-
 .../ApplicationCalendar.hpp                   |  0
 .../data/CalendarData.hpp                     |  3 +-
 .../data/OptionParser.hpp                     |  0
 .../application-calendar}/data/dateCommon.hpp |  7 +-
 .../widgets/CalendarStyle.hpp                 |  4 +-
 .../models/MonthModel.cpp                     |  3 +-
 .../models/MonthModel.hpp                     |  3 +-
 .../application-calendar/widgets/DayLabel.cpp | 11 +--
 .../application-calendar/widgets/DayLabel.hpp |  5 +-
 .../application-calendar/widgets/MonthBox.cpp |  6 +-
 .../application-calendar/widgets/MonthBox.hpp |  6 +-
 .../windows/CalendarMainWindow.cpp            |  9 ++-
 .../windows/CalendarMainWindow.hpp            | 14 ++--
 .../windows/advanced/EinkModeWindow.cpp       |  1 +
 .../apps-common/widgets/TimeWidget.cpp        |  2 -
 module-db/CMakeLists.txt                      |  1 +
 module-db/Interface/AlarmsRecord.hpp          |  2 +-
 module-db/Tables/AlarmsTable.hpp              |  2 +-
 module-utils/CMakeLists.txt                   |  1 +
 module-utils/ical/ParserICS.hpp               |  2 +-
 .../time/test/unittest_TimeRangeParser.cpp    |  2 +-
 module-utils/time/time/TimeRangeParser.hpp    |  2 +-
 products/BellHybrid/BellHybridMain.cpp        |  1 -
 products/PurePhone/CMakeLists.txt             |  1 +
 28 files changed, 114 insertions(+), 57 deletions(-)
 rename module-apps/application-calendar/{ => include/application-calendar}/ApplicationCalendar.hpp (100%)
 rename module-apps/application-calendar/{ => include/application-calendar}/data/CalendarData.hpp (95%)
 rename module-apps/application-calendar/{ => include/application-calendar}/data/OptionParser.hpp (100%)
 rename module-apps/application-calendar/{ => include/application-calendar}/data/dateCommon.hpp (99%)
 rename module-apps/application-calendar/{ => include/application-calendar}/widgets/CalendarStyle.hpp (96%)

diff --git a/module-apps/CMakeLists.txt b/module-apps/CMakeLists.txt
index 81d9fa3e693089776de282377bbbe321c58c076c..3be28f9b9f83d465ef824eebb551322f0104559d 100644
--- a/module-apps/CMakeLists.txt
+++ b/module-apps/CMakeLists.txt
@@ -12,6 +12,7 @@ add_subdirectory(application-antenna)
 add_subdirectory(application-bell-main)
 add_subdirectory(application-bell-settings)
 add_subdirectory(application-calculator)
+add_subdirectory(application-calendar)
 add_subdirectory(application-call)
 add_subdirectory(application-desktop)
 add_subdirectory(application-meditation)
@@ -25,7 +26,6 @@ add_subdirectory(apps-common)
 
 set(APPLICATIONS
     clock
-    calendar
     settings
     onboarding
     alarm-clock
diff --git a/module-apps/application-calendar/ApplicationCalendar.cpp b/module-apps/application-calendar/ApplicationCalendar.cpp
index 23f1c1811ddadb52d902e8669e126d9cdf62873b..bda4ebba1d69544ab9d0046dae832d215052dd23 100644
--- a/module-apps/application-calendar/ApplicationCalendar.cpp
+++ b/module-apps/application-calendar/ApplicationCalendar.cpp
@@ -1,8 +1,8 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "ApplicationCalendar.hpp"
-#include <application-calendar/windows/CalendarMainWindow.hpp>
+#include <application-calendar/ApplicationCalendar.hpp>
+#include <windows/CalendarMainWindow.hpp>
 
 namespace app
 {
diff --git a/module-apps/application-calendar/CMakeLists.txt b/module-apps/application-calendar/CMakeLists.txt
index da09081b6ef314ab240301631c4738d7dfa6edb5..5e5a357dc2751d701225192e6879273691eb7b63 100644
--- a/module-apps/application-calendar/CMakeLists.txt
+++ b/module-apps/application-calendar/CMakeLists.txt
@@ -1,20 +1,63 @@
-target_sources( ${PROJECT_NAME}
+# Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+# For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+add_library(application-calendar STATIC)
+
+target_include_directories(application-calendar
+	PRIVATE
+		$<BUILD_INTERFACE:
+			${CMAKE_CURRENT_SOURCE_DIR}
+			data
+			include/
+			models
+			widgets
+			windows
+		>
+	PUBLIC
+		$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+)
+
+target_sources(application-calendar
+
+	PRIVATE
+		ApplicationCalendar.cpp
+		data/CalendarData.cpp
+		models/MonthModel.cpp
+		widgets/DayLabel.cpp
+		widgets/MonthBox.cpp
+		windows/CalendarMainWindow.cpp
 
 	PRIVATE
-		"${CMAKE_CURRENT_LIST_DIR}/ApplicationCalendar.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/data/CalendarData.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/models/MonthModel.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/windows/CalendarMainWindow.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/widgets/DayLabel.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/widgets/MonthBox.cpp"
+		models/MonthModel.hpp
+		widgets/DayLabel.hpp
+		widgets/MonthBox.hpp
+		windows/CalendarMainWindow.hpp
+		
 	PUBLIC
-		"${CMAKE_CURRENT_LIST_DIR}/ApplicationCalendar.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/models/MonthModel.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/data/OptionParser.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/data/CalendarData.hpp"
+		include/application-calendar/ApplicationCalendar.hpp
+		include/application-calendar/data/CalendarData.hpp
+		include/application-calendar/data/dateCommon.hpp
+		include/application-calendar/data/OptionParser.hpp
 )
 
-target_link_libraries(${PROJECT_NAME}
-    PUBLIC
-        service-db
-    )
+option(ENABLE_APP_CALENDAR "Enable application calendar" ON)
+
+target_compile_definitions(application-calendar
+	INTERFACE
+		$<$<BOOL:${ENABLE_APP_CALENDAR}>:ENABLE_APP_CALENDAR>
+)
+
+target_link_libraries(application-calendar
+	PUBLIC
+		apps-common
+		date::date
+		module-gui
+		module-sys
+		module-utils
+		time-constants
+
+	PRIVATE
+		service-appmgr
+		service-db
+		service-time
+)
diff --git a/module-apps/application-calendar/data/CalendarData.cpp b/module-apps/application-calendar/data/CalendarData.cpp
index 0f8a2019f5ae362bcb5aed7b787bd9229bd7bdf6..059335d667b391fdfcca7863dcc14d627872da6e 100644
--- a/module-apps/application-calendar/data/CalendarData.cpp
+++ b/module-apps/application-calendar/data/CalendarData.cpp
@@ -1,8 +1,8 @@
 // Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "CalendarData.hpp"
-#include "dateCommon.hpp"
+#include <application-calendar/data/CalendarData.hpp>
+#include <application-calendar/data/dateCommon.hpp>
 
 WeekDaysRepeatData::WeekDaysRepeatData()
 {
diff --git a/module-apps/application-calendar/ApplicationCalendar.hpp b/module-apps/application-calendar/include/application-calendar/ApplicationCalendar.hpp
similarity index 100%
rename from module-apps/application-calendar/ApplicationCalendar.hpp
rename to module-apps/application-calendar/include/application-calendar/ApplicationCalendar.hpp
diff --git a/module-apps/application-calendar/data/CalendarData.hpp b/module-apps/application-calendar/include/application-calendar/data/CalendarData.hpp
similarity index 95%
rename from module-apps/application-calendar/data/CalendarData.hpp
rename to module-apps/application-calendar/include/application-calendar/data/CalendarData.hpp
index 7afe70d1de098bd165a1ccfd630329160a61c186..9b555868f08cace080836ba9f48b67236867d807 100644
--- a/module-apps/application-calendar/data/CalendarData.hpp
+++ b/module-apps/application-calendar/include/application-calendar/data/CalendarData.hpp
@@ -4,8 +4,9 @@
 #pragma once
 
 #include "dateCommon.hpp"
+#include <application-calendar/widgets/CalendarStyle.hpp>
+
 #include <module-gui/gui/SwitchData.hpp>
-#include "application-calendar/widgets/CalendarStyle.hpp"
 
 enum class EventAction
 {
diff --git a/module-apps/application-calendar/data/OptionParser.hpp b/module-apps/application-calendar/include/application-calendar/data/OptionParser.hpp
similarity index 100%
rename from module-apps/application-calendar/data/OptionParser.hpp
rename to module-apps/application-calendar/include/application-calendar/data/OptionParser.hpp
diff --git a/module-apps/application-calendar/data/dateCommon.hpp b/module-apps/application-calendar/include/application-calendar/data/dateCommon.hpp
similarity index 99%
rename from module-apps/application-calendar/data/dateCommon.hpp
rename to module-apps/application-calendar/include/application-calendar/data/dateCommon.hpp
index 4e8a6e440deefd1cb750a9a610c517cf2d752a1e..bbb262f1ef3a242ba0c6919afe587511b26414bb 100644
--- a/module-apps/application-calendar/data/dateCommon.hpp
+++ b/module-apps/application-calendar/include/application-calendar/data/dateCommon.hpp
@@ -4,11 +4,12 @@
 #ifndef DATECOMMON_H
 #define DATECOMMON_H
 
-#include <date/date.h>
 #include <time/time_conversion_factory.hpp>
-#include <Utils.hpp>
+#include <module-utils/Utils.hpp>
 #include <service-time/api/TimeSettingsApi.hpp>
 
+#include <date/date.h>
+
 #include <random>
 
 using Clock     = std::chrono::system_clock;
@@ -260,7 +261,7 @@ inline std::string TimePointToString(const TimePoint &tp, date::years years)
 inline std::string TimePointToLocalizedDateString(const TimePoint &tp, const std::string format = "")
 {
     using namespace utils::time;
-    auto time = TimePointToTimeT(tp);
+    auto time      = TimePointToTimeT(tp);
     auto timestamp = TimestampFactory().createTimestamp(TimestampType::Date, time);
     return timestamp->str(format);
 }
diff --git a/module-apps/application-calendar/widgets/CalendarStyle.hpp b/module-apps/application-calendar/include/application-calendar/widgets/CalendarStyle.hpp
similarity index 96%
rename from module-apps/application-calendar/widgets/CalendarStyle.hpp
rename to module-apps/application-calendar/include/application-calendar/widgets/CalendarStyle.hpp
index 57730f42809fefc96e093ea35efc0a15f8392798..15e7f20463f5d306dcbb0bf304f9c2beff5c6c3f 100644
--- a/module-apps/application-calendar/widgets/CalendarStyle.hpp
+++ b/module-apps/application-calendar/include/application-calendar/widgets/CalendarStyle.hpp
@@ -2,7 +2,9 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
-#include <Style.hpp>
+
+#include <gui/widgets/Style.hpp>
+
 #include <string>
 
 namespace style::window::calendar
diff --git a/module-apps/application-calendar/models/MonthModel.cpp b/module-apps/application-calendar/models/MonthModel.cpp
index 89f448eb0feeee135ef36ac592cdf95d906a89a1..19fb890a003f0d5ff859e2ed1cb477f2ee280687 100644
--- a/module-apps/application-calendar/models/MonthModel.cpp
+++ b/module-apps/application-calendar/models/MonthModel.cpp
@@ -2,8 +2,9 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "MonthModel.hpp"
-#include <time/time_locale.hpp>
+
 #include <time/time_constants.hpp>
+#include <time/time_locale.hpp>
 
 MonthModel::MonthModel(date::year_month_day yearMonthDay)
 {
diff --git a/module-apps/application-calendar/models/MonthModel.hpp b/module-apps/application-calendar/models/MonthModel.hpp
index 07d9144974af9c802e028bb7c71465b57601627c..f8f60a4a4c314e5b466a946878b7e667a2c19f8a 100644
--- a/module-apps/application-calendar/models/MonthModel.hpp
+++ b/module-apps/application-calendar/models/MonthModel.hpp
@@ -3,7 +3,8 @@
 
 #pragma once
 
-#include <module-apps/application-calendar/data/dateCommon.hpp>
+#include <application-calendar/data/dateCommon.hpp>
+
 #include <string>
 #include <vector>
 
diff --git a/module-apps/application-calendar/widgets/DayLabel.cpp b/module-apps/application-calendar/widgets/DayLabel.cpp
index 6a1f5c5d75513c86e5cb66d9e6dad868d7e5de34..249586fb7f090c7a36df8018286f436a7ace8492 100644
--- a/module-apps/application-calendar/widgets/DayLabel.cpp
+++ b/module-apps/application-calendar/widgets/DayLabel.cpp
@@ -2,12 +2,13 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "DayLabel.hpp"
-#include "application-calendar/ApplicationCalendar.hpp"
-#include "application-calendar/widgets/CalendarStyle.hpp"
-#include "application-calendar/widgets/MonthBox.hpp"
-#include "application-calendar/data/CalendarData.hpp"
+#include "MonthBox.hpp"
+#include <application-calendar/ApplicationCalendar.hpp>
+#include <application-calendar/data/CalendarData.hpp>
+#include <application-calendar/widgets/CalendarStyle.hpp>
+
+#include <gui/widgets/Image.hpp>
 #include <time/time_conversion.hpp>
-#include <Image.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-calendar/widgets/DayLabel.hpp b/module-apps/application-calendar/widgets/DayLabel.hpp
index eb69c863342f93fab7489f613c61e1bb436a4316..fb76a0112501329c62358ecc81ea291deb2ff342 100644
--- a/module-apps/application-calendar/widgets/DayLabel.hpp
+++ b/module-apps/application-calendar/widgets/DayLabel.hpp
@@ -2,8 +2,9 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
-#include "Application.hpp"
-#include <BoxLayout.hpp>
+
+#include <apps-common/Application.hpp>
+#include <gui/widgets/BoxLayout.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-calendar/widgets/MonthBox.cpp b/module-apps/application-calendar/widgets/MonthBox.cpp
index 53d5b884d3ba5d4a4315bbc6cafe515d14dac5c9..4741fb7e4e6dd6749ff930a87b645b22c151d21e 100644
--- a/module-apps/application-calendar/widgets/MonthBox.cpp
+++ b/module-apps/application-calendar/widgets/MonthBox.cpp
@@ -1,10 +1,10 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
+#include "DayLabel.hpp"
 #include "MonthBox.hpp"
-#include "application-calendar/widgets/CalendarStyle.hpp"
-#include "application-calendar/windows/CalendarMainWindow.hpp"
-#include "application-calendar/widgets/DayLabel.hpp"
+#include <application-calendar/widgets/CalendarStyle.hpp>
+#include <windows/CalendarMainWindow.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-calendar/widgets/MonthBox.hpp b/module-apps/application-calendar/widgets/MonthBox.hpp
index b8ff9d17c705062a0a16fd157d7129a8c0928e1b..dd7002317b3fc767f23afcabb98074c24f982ffa 100644
--- a/module-apps/application-calendar/widgets/MonthBox.hpp
+++ b/module-apps/application-calendar/widgets/MonthBox.hpp
@@ -2,9 +2,11 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
-#include "Application.hpp"
+
+#include <models/MonthModel.hpp>
+
+#include <apps-common/Application.hpp>
 #include <gui/widgets/GridLayout.hpp>
-#include "application-calendar/models/MonthModel.hpp"
 
 namespace gui
 {
diff --git a/module-apps/application-calendar/windows/CalendarMainWindow.cpp b/module-apps/application-calendar/windows/CalendarMainWindow.cpp
index 218ea6b23ce1d8d2b5066096f64f613e52ada015..b5c5a894fa683b42e8a3aa5eb0f346404ed6f6de 100644
--- a/module-apps/application-calendar/windows/CalendarMainWindow.cpp
+++ b/module-apps/application-calendar/windows/CalendarMainWindow.cpp
@@ -2,11 +2,12 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "CalendarMainWindow.hpp"
-#include "application-calendar/ApplicationCalendar.hpp"
-#include "application-calendar/models/MonthModel.hpp"
-#include "application-calendar/widgets/CalendarStyle.hpp"
+
+#include <application-calendar/ApplicationCalendar.hpp>
+#include <application-calendar/widgets/CalendarStyle.hpp>
+
+#include <gui/input/InputEvent.hpp>
 #include <time/time_conversion.hpp>
-#include <InputEvent.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-calendar/windows/CalendarMainWindow.hpp b/module-apps/application-calendar/windows/CalendarMainWindow.hpp
index 1cf24a5376c7dd3b189d16faae3edd7f2da6a2ba..cdf3a591b922ef5db126e455e90f12f71b3d0fb6 100644
--- a/module-apps/application-calendar/windows/CalendarMainWindow.hpp
+++ b/module-apps/application-calendar/windows/CalendarMainWindow.hpp
@@ -3,13 +3,15 @@
 
 #pragma once
 
-#include "windows/AppWindow.hpp"
-#include "Application.hpp"
-#include "application-calendar/ApplicationCalendar.hpp"
-#include "application-calendar/models/MonthModel.hpp"
-#include "application-calendar/widgets/DayLabel.hpp"
-#include "application-calendar/widgets/MonthBox.hpp"
+#include <application-calendar/ApplicationCalendar.hpp>
+#include <models/MonthModel.hpp>
+#include <widgets/DayLabel.hpp>
+#include <widgets/MonthBox.hpp>
+
+#include <apps-common/Application.hpp>
+#include <apps-common/windows/AppWindow.hpp>
 #include <gui/widgets/GridLayout.hpp>
+
 #include <map>
 #include <vector>
 #include <string>
diff --git a/module-apps/application-settings/windows/advanced/EinkModeWindow.cpp b/module-apps/application-settings/windows/advanced/EinkModeWindow.cpp
index e2f42a8603708cf2099390970d0745810c7616e8..e51725f08cd87cf643f85c84ad58823030d55a80 100644
--- a/module-apps/application-settings/windows/advanced/EinkModeWindow.cpp
+++ b/module-apps/application-settings/windows/advanced/EinkModeWindow.cpp
@@ -5,6 +5,7 @@
 
 #include <application-settings/windows/WindowNames.hpp>
 #include <messages/EinkModeMessage.hpp>
+#include <service-eink/Common.hpp>
 #include <Application.hpp>
 #include <i18n/i18n.hpp>
 #include <service-eink/Common.hpp>
diff --git a/module-apps/apps-common/widgets/TimeWidget.cpp b/module-apps/apps-common/widgets/TimeWidget.cpp
index c65d7fac4247f6db357293dd74b8cc1046a52f33..51e035a7f706fd6adb88d3cb35cae05c588eb6a2 100644
--- a/module-apps/apps-common/widgets/TimeWidget.cpp
+++ b/module-apps/apps-common/widgets/TimeWidget.cpp
@@ -2,13 +2,11 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "TimeWidget.hpp"
-#include "application-calendar/widgets/CalendarStyle.hpp"
 #include <ListView.hpp>
 #include <Style.hpp>
 #include <time/time_conversion.hpp>
 #include <time/time_date_validation.hpp>
 #include "DateAndTimeStyle.hpp"
-#include <module-apps/application-calendar/data/dateCommon.hpp>
 #include <time/TimeZone.hpp>
 
 namespace gui
diff --git a/module-db/CMakeLists.txt b/module-db/CMakeLists.txt
index da6b76119171bd35f7f4388cef81ebb335508f01..3460f930c972228f723c0eaa106991e6f0b107ea 100644
--- a/module-db/CMakeLists.txt
+++ b/module-db/CMakeLists.txt
@@ -169,6 +169,7 @@ target_link_libraries(${PROJECT_NAME}
         module-vfs
         utf8
     PRIVATE
+        application-calendar
         Microsoft.GSL::GSL
 )
 
diff --git a/module-db/Interface/AlarmsRecord.hpp b/module-db/Interface/AlarmsRecord.hpp
index 879e59f63e8b97d77ecdd694d942671157ea7dab..d2e77afeb9416cb169dc5bab55d47fb808345474 100644
--- a/module-db/Interface/AlarmsRecord.hpp
+++ b/module-db/Interface/AlarmsRecord.hpp
@@ -6,7 +6,7 @@
 #include "Record.hpp"
 #include "module-db/Databases/AlarmsDB.hpp"
 #include "module-db/Common/Common.hpp"
-#include <module-apps/application-calendar/data/dateCommon.hpp>
+#include <application-calendar/data/dateCommon.hpp>
 #include <utf8/UTF8.hpp>
 #include <stdint.h>
 
diff --git a/module-db/Tables/AlarmsTable.hpp b/module-db/Tables/AlarmsTable.hpp
index 9b5b50182cb4c82e2adaea59ade29d5e466e29f1..9685d51347e1c9e59ec3a93bf82063b6a9c45ed3 100644
--- a/module-db/Tables/AlarmsTable.hpp
+++ b/module-db/Tables/AlarmsTable.hpp
@@ -7,7 +7,7 @@
 #include "Database/Database.hpp"
 #include "Record.hpp"
 #include "Table.hpp"
-#include <module-apps/application-calendar/data/dateCommon.hpp>
+#include <application-calendar/data/dateCommon.hpp>
 #include <utf8/UTF8.hpp>
 
 struct AlarmsRecord;
diff --git a/module-utils/CMakeLists.txt b/module-utils/CMakeLists.txt
index fb8b8d6bd957d537f804486080eabef7b3a3c381..0fe171265a4a61aed3dc677ed3d0c9a1086d103e 100644
--- a/module-utils/CMakeLists.txt
+++ b/module-utils/CMakeLists.txt
@@ -21,6 +21,7 @@ add_library(${PROJECT_NAME} STATIC ${SOURCES})
 
 target_link_libraries(${PROJECT_NAME}
 PUBLIC
+    application-calendar
     board
     libphonenumber::libphonenumber
     log
diff --git a/module-utils/ical/ParserICS.hpp b/module-utils/ical/ParserICS.hpp
index 3d485fe3590e3af3e4907a032670d8246e54026e..09a39ed78b4a5754abf0b1fcc8b76be440b9e3e3 100644
--- a/module-utils/ical/ParserICS.hpp
+++ b/module-utils/ical/ParserICS.hpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
-#include <module-apps/application-calendar/data/dateCommon.hpp>
+#include <application-calendar/data/dateCommon.hpp>
 #include <json11.hpp>
 #include <memory>
 
diff --git a/module-utils/time/test/unittest_TimeRangeParser.cpp b/module-utils/time/test/unittest_TimeRangeParser.cpp
index 5c9dff74c7e00fa9f822e55d42499c8be47abfef..f3a91aa0bacec0020a664a45df6a9051da663d3e 100644
--- a/module-utils/time/test/unittest_TimeRangeParser.cpp
+++ b/module-utils/time/test/unittest_TimeRangeParser.cpp
@@ -4,7 +4,7 @@
 #define CATCH_CONFIG_MAIN
 #include <catch2/catch.hpp>
 #include "time/TimeRangeParser.hpp"
-#include <module-apps/application-calendar/data/dateCommon.hpp>
+#include <application-calendar/data/dateCommon.hpp>
 
 #include <cstdint>
 #include <cstring>
diff --git a/module-utils/time/time/TimeRangeParser.hpp b/module-utils/time/time/TimeRangeParser.hpp
index 9a24aa247be1cf7f915a1d3c17540c4ea8ddd36f..1e01d72123e3e72c97665c1f3cad5576013f40f3 100644
--- a/module-utils/time/time/TimeRangeParser.hpp
+++ b/module-utils/time/time/TimeRangeParser.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 #include "Utils.hpp"
-#include <module-apps/application-calendar/data/dateCommon.hpp>
+#include <application-calendar/data/dateCommon.hpp>
 
 namespace utils::time
 {
diff --git a/products/BellHybrid/BellHybridMain.cpp b/products/BellHybrid/BellHybridMain.cpp
index a43d96a62dfde4754e118ac87e8d7c93687079b9..2bfe542d37c02ec646f4f6d4fe4b0bd591b8c686 100644
--- a/products/BellHybrid/BellHybridMain.cpp
+++ b/products/BellHybrid/BellHybridMain.cpp
@@ -6,7 +6,6 @@
 
 // applications
 #include <application-settings/ApplicationSettings.hpp>
-#include <application-calendar/ApplicationCalendar.hpp>
 #include <application-music-player/ApplicationMusicPlayer.hpp>
 #include <application-alarm-clock/ApplicationAlarmClock.hpp>
 #include <application-onboarding/ApplicationOnBoarding.hpp>
diff --git a/products/PurePhone/CMakeLists.txt b/products/PurePhone/CMakeLists.txt
index f35ef374cf93ba3578871358b32fc5bb6b957e03..9cd423086721ef1845284efd22b58e0103ab548e 100644
--- a/products/PurePhone/CMakeLists.txt
+++ b/products/PurePhone/CMakeLists.txt
@@ -52,6 +52,7 @@ target_link_libraries(PurePhone
         application-antenna
         application-calculator
         application-calllog
+        application-calendar
         application-call
         application-desktop
         application-meditation