28 files changed, 114 insertions(+), 57 deletions(-)

M module-apps/CMakeLists.txt
M module-apps/application-calendar/ApplicationCalendar.cpp
M module-apps/application-calendar/CMakeLists.txt
M module-apps/application-calendar/data/CalendarData.cpp
R module-apps/application-calendar/{ => include}/application-calendar/ApplicationCalendar.hpp
R module-apps/application-calendar/{ => include}/application-calendar/data/CalendarData.hpp
R module-apps/application-calendar/{ => include}/application-calendar/data/OptionParser.hpp
R module-apps/application-calendar/{ => include}/application-calendar/data/dateCommon.hpp
R module-apps/application-calendar/{ => include}/application-calendar/widgets/CalendarStyle.hpp
M module-apps/application-calendar/models/MonthModel.cpp
M module-apps/application-calendar/models/MonthModel.hpp
M module-apps/application-calendar/widgets/DayLabel.cpp
M module-apps/application-calendar/widgets/DayLabel.hpp
M module-apps/application-calendar/widgets/MonthBox.cpp
M module-apps/application-calendar/widgets/MonthBox.hpp
M module-apps/application-calendar/windows/CalendarMainWindow.cpp
M module-apps/application-calendar/windows/CalendarMainWindow.hpp
M module-apps/application-settings/windows/advanced/EinkModeWindow.cpp
M module-apps/apps-common/widgets/TimeWidget.cpp
M module-db/CMakeLists.txt
M module-db/Interface/AlarmsRecord.hpp
M module-db/Tables/AlarmsTable.hpp
M module-utils/CMakeLists.txt
M module-utils/ical/ParserICS.hpp
M module-utils/time/test/unittest_TimeRangeParser.cpp
M module-utils/time/time/TimeRangeParser.hpp
M products/BellHybrid/BellHybridMain.cpp
M products/PurePhone/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

@@ 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
 {

@@ 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
+)

@@ 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()
 {

@@ 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
 {

@@ 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);
 }

@@ 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

@@ 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)
 {

@@ 3,7 3,8 @@
 
 #pragma once
 
-#include <module-apps/application-calendar/data/dateCommon.hpp>
+#include <application-calendar/data/dateCommon.hpp>
+
 #include <string>
 #include <vector>
 

@@ 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
 {

@@ 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
 {

@@ 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
 {

@@ 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
 {

@@ 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
 {

@@ 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>

@@ 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>

@@ 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

@@ 169,6 169,7 @@ target_link_libraries(${PROJECT_NAME}
         module-vfs
         utf8
     PRIVATE
+        application-calendar
         Microsoft.GSL::GSL
 )
 

@@ 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>
 

@@ 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;

@@ 21,6 21,7 @@ add_library(${PROJECT_NAME} STATIC ${SOURCES})
 
 target_link_libraries(${PROJECT_NAME}
 PUBLIC
+    application-calendar
     board
     libphonenumber::libphonenumber
     log

@@ 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>
 

@@ 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>

@@ 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
 {

@@ 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>

@@ 52,6 52,7 @@ target_link_libraries(PurePhone
         application-antenna
         application-calculator
         application-calllog
+        application-calendar
         application-call
         application-desktop
         application-meditation