From 053c06d7a9a9efb8364dc3917de77fe56c061fbc Mon Sep 17 00:00:00 2001
From: DariuszSabala <dariusz.sabala@mudita.com>
Date: Fri, 18 Jun 2021 15:53:59 +0200
Subject: [PATCH] [BH-390] Turned notes app into library

Turned application notes into separate library, specified
private and public include directories and dependencies,
removed application notes from Bell Hybrid target
---
 .../application-notes/ApplicationNotes.cpp    |  27 ++---
 module-apps/application-notes/CMakeLists.txt  | 111 ++++++++++--------
 .../application-notes}/ApplicationNotes.hpp   |   3 +-
 .../windows/NoteEditWindow.cpp                |   2 +-
 .../windows/NoteMainWindow.cpp                |   2 +-
 .../windows/NotePreviewWindow.cpp             |   2 +-
 .../windows/NotesOptions.hpp                  |   5 +-
 .../windows/SearchEngineWindow.cpp            |   2 +-
 .../windows/SearchResultsWindow.cpp           |   2 +-
 products/BellHybrid/BellHybridMain.cpp        |   1 -
 products/PurePhone/CMakeLists.txt             |   5 +-
 11 files changed, 87 insertions(+), 75 deletions(-)
 rename module-apps/application-notes/{ => include/application-notes}/ApplicationNotes.hpp (94%)

diff --git a/module-apps/application-notes/ApplicationNotes.cpp b/module-apps/application-notes/ApplicationNotes.cpp
index 7af17f8bc8811b2d3490269f3a85d1e4ad04b518..b29f2c0f80cc0b7f52bba06ac0ded8d08bb40509 100644
--- a/module-apps/application-notes/ApplicationNotes.cpp
+++ b/module-apps/application-notes/ApplicationNotes.cpp
@@ -1,23 +1,22 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "ApplicationNotes.hpp"
-
-#include "MessageType.hpp"
-#include "windows/NoteMainWindow.hpp"
-#include "windows/NotePreviewWindow.hpp"
-#include "windows/NoteEditWindow.hpp"
-#include "windows/SearchEngineWindow.hpp"
-#include "windows/SearchResultsWindow.hpp"
+#include <application-notes/ApplicationNotes.hpp>
+#include <presenter/NoteEditWindowPresenter.hpp>
+#include <presenter/NotePreviewWindowPresenter.hpp>
+#include <presenter/NotesMainWindowPresenter.hpp>
+#include <windows/NoteEditWindow.hpp>
+#include <windows/NoteMainWindow.hpp>
+#include <windows/NotePreviewWindow.hpp>
+#include <windows/SearchEngineWindow.hpp>
+#include <windows/SearchResultsWindow.hpp>
 
+#include <apps-common/windows/Dialog.hpp>
+#include <apps-common/windows/OptionWindow.hpp>
+#include <MessageType.hpp>
+#include <service-db/DBNotificationMessage.hpp>
 #include <service-db/QueryMessage.hpp>
 
-#include <module-apps/application-notes/presenter/NotesMainWindowPresenter.hpp>
-#include <module-apps/application-notes/presenter/NotePreviewWindowPresenter.hpp>
-#include <module-apps/application-notes/presenter/NoteEditWindowPresenter.hpp>
-#include <apps-common/windows/OptionWindow.hpp>
-#include <apps-common/windows/Dialog.hpp>
-#include <module-services/service-db/service-db/DBNotificationMessage.hpp>
 #include <utility>
 
 namespace app
diff --git a/module-apps/application-notes/CMakeLists.txt b/module-apps/application-notes/CMakeLists.txt
index 3ebd92d2699fff52b4bc5e83908866d5f63e929e..732e1c0d73d930d27c2834fb7aa48f5148fc0706 100644
--- a/module-apps/application-notes/CMakeLists.txt
+++ b/module-apps/application-notes/CMakeLists.txt
@@ -1,60 +1,73 @@
-include_directories( ${CMAKE_PROJECT_NAME}
-	PUBLIC
-		"${CMAKE_CURRENT_LIST_DIR}"
-)
+# Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+# For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-include_directories( ${PROJECT_NAME}
-	PUBLIC
-		"${CMAKE_CURRENT_LIST_DIR}"
-)
+add_library(application-notes STATIC)
 
-target_sources( ${PROJECT_NAME}
+target_include_directories(application-notes
+    PRIVATE
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+    PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+)
 
+target_sources(application-notes
 	PRIVATE
-		"${CMAKE_CURRENT_LIST_DIR}/ApplicationNotes.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/model/NotesListModel.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/model/NotesSearchListModel.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/model/NotesRepository.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/presenter/NotesMainWindowPresenter.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/presenter/NotePreviewWindowPresenter.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/presenter/NoteEditWindowPresenter.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/presenter/SearchEngineWindowPresenter.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/presenter/NotesSearchResultPresenter.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/widgets/NotesItem.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/windows/NoteMainWindow.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/windows/NotePreviewWindow.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/windows/NoteEditWindow.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/windows/NotesOptions.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/windows/SearchEngineWindow.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/windows/SearchResultsWindow.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/data/NoteSwitchData.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/data/NotesFoundData.cpp"
+		ApplicationNotes.cpp
+		data/NotesFoundData.cpp
+		data/NoteSwitchData.cpp
+		model/NotesListModel.cpp
+		model/NotesRepository.cpp
+		model/NotesSearchListModel.cpp
+		presenter/NoteEditWindowPresenter.cpp
+		presenter/NotePreviewWindowPresenter.cpp
+		presenter/NotesMainWindowPresenter.cpp
+		presenter/NotesSearchResultPresenter.cpp
+		presenter/SearchEngineWindowPresenter.cpp
+		widgets/NotesItem.cpp
+		windows/NoteEditWindow.cpp
+		windows/NoteMainWindow.cpp
+		windows/NotePreviewWindow.cpp
+		windows/NotesOptions.cpp
+		windows/SearchEngineWindow.cpp
+		windows/SearchResultsWindow.cpp
+	PRIVATE
+		data/NotesFoundData.hpp
+		data/NoteSwitchData.hpp
+		model/NotesListModel.hpp
+		model/NotesRepository.hpp
+		model/NotesSearchListModel.hpp
+		presenter/NoteEditWindowPresenter.hpp
+		presenter/NotePreviewWindowPresenter.hpp
+		presenter/NotesMainWindowPresenter.hpp
+		presenter/NotesSearchResultPresenter.hpp
+		presenter/SearchEngineWindowPresenter.hpp
+		widgets/NotesItem.hpp
+		windows/NoteEditWindow.hpp
+		windows/NoteMainWindow.hpp
+		windows/NotePreviewWindow.hpp
+		windows/NotesOptions.hpp
+		windows/SearchEngineWindow.hpp
+		windows/SearchResultsWindow.hpp
 	PUBLIC
-		"${CMAKE_CURRENT_LIST_DIR}/ApplicationNotes.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/model/NotesListModel.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/model/NotesSearchListModel.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/model/NotesRepository.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/presenter/NotesMainWindowPresenter.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/presenter/NotePreviewWindowPresenter.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/presenter/NoteEditWindowPresenter.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/presenter/SearchEngineWindowPresenter.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/presenter/NotesSearchResultPresenter.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/widgets/NotesItem.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/windows/NoteMainWindow.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/windows/NotePreviewWindow.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/windows/NoteEditWindow.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/windows/SearchEngineWindow.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/windows/SearchResultsWindow.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/windows/NotesOptions.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/data/NoteSwitchData.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/data/NotesFoundData.hpp"
+		include/application-notes/ApplicationNotes.hpp
 )
-target_include_directories(${PROJECT_NAME}
-    PRIVATE
-        service-db
+
+
+option(ENABLE_APP_NOTES "Enable application notes" ON)
+
+target_compile_definitions(application-notes
+    INTERFACE
+        $<$<BOOL:${ENABLE_APP_NOTES}>:ENABLE_APP_NOTES>
 )
 
-target_link_libraries(${PROJECT_NAME}
+target_link_libraries(application-notes
 	PRIVATE
+		apps-common
 		clipboard
+		module-gui
+		module-db
+		service-db
+		log
+		time
+		i18n		
 )
diff --git a/module-apps/application-notes/ApplicationNotes.hpp b/module-apps/application-notes/include/application-notes/ApplicationNotes.hpp
similarity index 94%
rename from module-apps/application-notes/ApplicationNotes.hpp
rename to module-apps/application-notes/include/application-notes/ApplicationNotes.hpp
index d7b31f60f978b3f121fac27c710775829ee98611..e74d2e8d83869e904e0c47d90e66e03103eb5332 100644
--- a/module-apps/application-notes/ApplicationNotes.hpp
+++ b/module-apps/application-notes/include/application-notes/ApplicationNotes.hpp
@@ -3,8 +3,7 @@
 
 #pragma once
 
-#include "module-apps/application-notes/model/NotesListModel.hpp"
-#include "Application.hpp"
+#include <Application.hpp>
 
 namespace gui::name::window
 {
diff --git a/module-apps/application-notes/windows/NoteEditWindow.cpp b/module-apps/application-notes/windows/NoteEditWindow.cpp
index e29b0bdbf3a634e52ce0fd6cd14cf0a68e785f85..830526e06a65216d39f6534aa1f3d361e006f70b 100644
--- a/module-apps/application-notes/windows/NoteEditWindow.cpp
+++ b/module-apps/application-notes/windows/NoteEditWindow.cpp
@@ -7,7 +7,7 @@
 
 #include <Style.hpp>
 
-#include <module-apps/application-notes/ApplicationNotes.hpp>
+#include <application-notes/ApplicationNotes.hpp>
 #include <module-apps/application-notes/windows/NotesOptions.hpp>
 #include <module-apps/application-notes/data/NoteSwitchData.hpp>
 #include <module-apps/application-notes/style/NoteEditStyle.hpp>
diff --git a/module-apps/application-notes/windows/NoteMainWindow.cpp b/module-apps/application-notes/windows/NoteMainWindow.cpp
index 5856929c4a37c1904c8a92969a9137fdbe95df52..78ca6f7898d95f4f01d69fa0e2ed454384d9dd60 100644
--- a/module-apps/application-notes/windows/NoteMainWindow.cpp
+++ b/module-apps/application-notes/windows/NoteMainWindow.cpp
@@ -3,7 +3,7 @@
 
 #include "NoteMainWindow.hpp"
 
-#include <module-apps/application-notes/ApplicationNotes.hpp>
+#include <application-notes/ApplicationNotes.hpp>
 #include <module-apps/application-notes/data/NoteSwitchData.hpp>
 
 #include <InputEvent.hpp>
diff --git a/module-apps/application-notes/windows/NotePreviewWindow.cpp b/module-apps/application-notes/windows/NotePreviewWindow.cpp
index fde60f861c17b9e822bc25ead60f13bf5a834888..bc1ec303d22d0e904487f47ecdc6d69ef6510cc6 100644
--- a/module-apps/application-notes/windows/NotePreviewWindow.cpp
+++ b/module-apps/application-notes/windows/NotePreviewWindow.cpp
@@ -3,7 +3,7 @@
 
 #include "NotePreviewWindow.hpp"
 
-#include <module-apps/application-notes/ApplicationNotes.hpp>
+#include <application-notes/ApplicationNotes.hpp>
 #include <module-apps/application-notes/data/NoteSwitchData.hpp>
 #include <module-apps/application-notes/style/NotePreviewStyle.hpp>
 #include <module-apps/application-notes/windows/NotesOptions.hpp>
diff --git a/module-apps/application-notes/windows/NotesOptions.hpp b/module-apps/application-notes/windows/NotesOptions.hpp
index c5b7f7ea05da7a4d6c91fb4127398ce9c289ede6..5d81b1b3d0187b0adc0970522d4c872bb32c3b75 100644
--- a/module-apps/application-notes/windows/NotesOptions.hpp
+++ b/module-apps/application-notes/windows/NotesOptions.hpp
@@ -1,10 +1,11 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
 
-#include <module-apps/application-notes/ApplicationNotes.hpp>
+#include <application-notes/ApplicationNotes.hpp>
 #include <module-db/Interface/NotesRecord.hpp>
+#include <model/NotesRepository.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-notes/windows/SearchEngineWindow.cpp b/module-apps/application-notes/windows/SearchEngineWindow.cpp
index 1dbae228a0cbef57fc328cd532113ede33453f2a..399714c68621b2e04349a1d920be7d1bc7753e65 100644
--- a/module-apps/application-notes/windows/SearchEngineWindow.cpp
+++ b/module-apps/application-notes/windows/SearchEngineWindow.cpp
@@ -3,7 +3,7 @@
 
 #include "SearchEngineWindow.hpp"
 
-#include <module-apps/application-notes/ApplicationNotes.hpp>
+#include <application-notes/ApplicationNotes.hpp>
 #include <module-apps/application-notes/data/NotesFoundData.hpp>
 #include <apps-common/widgets/InputBox.hpp>
 
diff --git a/module-apps/application-notes/windows/SearchResultsWindow.cpp b/module-apps/application-notes/windows/SearchResultsWindow.cpp
index 54c41f4e672f786a7ec6960a00184998c98ac29a..fd01965a39aa6e04503e5f88bb618c5d039c2454 100644
--- a/module-apps/application-notes/windows/SearchResultsWindow.cpp
+++ b/module-apps/application-notes/windows/SearchResultsWindow.cpp
@@ -3,7 +3,7 @@
 
 #include "SearchResultsWindow.hpp"
 
-#include <module-apps/application-notes/ApplicationNotes.hpp>
+#include <application-notes/ApplicationNotes.hpp>
 #include <module-apps/application-notes/data/NotesFoundData.hpp>
 #include <module-apps/application-notes/style/NotesListStyle.hpp>
 #include <apps-common/windows/DialogMetadata.hpp>
diff --git a/products/BellHybrid/BellHybridMain.cpp b/products/BellHybrid/BellHybridMain.cpp
index f884015b8c2ea9b6132be452eb70535c71043ae0..3f23027305eaa20facc9e43364d8e8571c2df938 100644
--- a/products/BellHybrid/BellHybridMain.cpp
+++ b/products/BellHybrid/BellHybridMain.cpp
@@ -8,7 +8,6 @@
 #include <application-calllog/ApplicationCallLog.hpp>
 #include <application-desktop/ApplicationDesktop.hpp>
 #include <application-messages/ApplicationMessages.hpp>
-#include <application-notes/ApplicationNotes.hpp>
 #include <application-settings/ApplicationSettings.hpp>
 #include <application-settings-new/ApplicationSettings.hpp>
 #include <application-special-input/ApplicationSpecialInput.hpp>
diff --git a/products/PurePhone/CMakeLists.txt b/products/PurePhone/CMakeLists.txt
index 53e309a989941788d38d27df5f2e9cd45f08c21b..4983d02ec5c9a96b386a45604ec6d0b7f85cca76 100644
--- a/products/PurePhone/CMakeLists.txt
+++ b/products/PurePhone/CMakeLists.txt
@@ -52,12 +52,13 @@ target_link_libraries(PurePhone
         application-calculator
         application-music-player
         application-phonebook
+        application-notes
+        messagetype
         module-apps
-        service-desktop
         service-bluetooth
+        service-desktop
         service-lwip
         ${LWIP_LIBRARIES}
-        messagetype
         "$<$<STREQUAL:${PROJECT_TARGET},TARGET_Linux>:iosyscalls>"
         "$<$<STREQUAL:${PROJECT_TARGET},TARGET_RT1051>:CrashCatcher::CrashCatcher>"
         "$<$<STREQUAL:${PROJECT_TARGET},TARGET_RT1051>:CrashCatcherARM>"