From 3005b048247b095e9d6a63a654c1e8e2f01ed2e7 Mon Sep 17 00:00:00 2001
From: DariuszSabala <dariusz.sabala@mudita.com>
Date: Wed, 30 Jun 2021 10:40:20 +0200
Subject: [PATCH] [BH-386] Turned app messages into lib

Turned application messages into library, defined dependencies,
private and public sources, cleaned include paths, massive
cleaned headers
---
 module-apps/CMakeLists.txt                    |   3 +-
 .../widgets/DesktopInputWidget.cpp            |   1 -
 .../ApplicationMessages.cpp                   |  37 +++---
 .../application-messages/CMakeLists.txt       | 122 +++++++++++-------
 .../data/MessagesStyle.hpp                    |   4 +
 .../ApplicationMessages.hpp                   |   7 +-
 .../application-messages}/Constants.hpp       |   0
 .../models/SMSTemplateModel.cpp               |  11 +-
 .../models/SMSThreadModel.cpp                 |  18 +--
 .../models/SMSThreadModel.hpp                 |  13 +-
 .../models/ThreadsModel.cpp                   |  17 +--
 .../models/ThreadsSearchResultsModel.cpp      |  14 +-
 .../widgets/BaseThreadItem.cpp                |   4 +-
 .../widgets/SMSInputWidget.cpp                |  20 +--
 .../widgets/SMSOutputWidget.cpp               |  10 +-
 .../widgets/ThreadItem.cpp                    |   4 +-
 .../widgets/ThreadItem.hpp                    |   9 +-
 .../windows/MessagesMainWindow.cpp            |  30 ++---
 .../windows/MessagesMainWindow.hpp            |   4 +-
 .../windows/NewMessage.cpp                    |  19 ++-
 .../windows/OptionsMessages.cpp               |  14 +-
 .../windows/OptionsMessages.hpp               |   7 +-
 .../windows/SMSTemplatesWindow.cpp            |  11 +-
 .../windows/SMSTemplatesWindow.hpp            |   6 +-
 .../windows/SMSThreadViewWindow.cpp           |  21 ++-
 .../windows/SMSThreadViewWindow.hpp           |   6 +-
 .../windows/SearchResults.cpp                 |  11 +-
 .../windows/SearchResults.hpp                 |   7 +-
 .../windows/SearchStart.cpp                   |   4 +-
 .../windows/ThreadWindowOptions.cpp           |   3 +-
 .../windows/ThreadWindowOptions.hpp           |   7 +-
 products/BellHybrid/BellHybridMain.cpp        |   1 -
 products/PurePhone/CMakeLists.txt             |   1 +
 33 files changed, 240 insertions(+), 206 deletions(-)
 rename module-apps/application-messages/{ => include/application-messages}/ApplicationMessages.hpp (99%)
 rename module-apps/application-messages/{ => include/application-messages}/Constants.hpp (100%)

diff --git a/module-apps/CMakeLists.txt b/module-apps/CMakeLists.txt
index 545392c4fcd19e33d36bda5c775fc03ba453702b..37cfe805284895fce459c19684219ea841488af6 100644
--- a/module-apps/CMakeLists.txt
+++ b/module-apps/CMakeLists.txt
@@ -11,6 +11,7 @@ add_library(${PROJECT_NAME} STATIC)
 add_subdirectory(application-antenna)
 add_subdirectory(application-bell-main)
 add_subdirectory(application-calculator)
+add_subdirectory(application-messages)
 add_subdirectory(application-music-player)
 add_subdirectory(application-phonebook)
 add_subdirectory(apps-common)
@@ -24,7 +25,6 @@ set(APPLICATIONS
     call
     notes
     onboarding
-    messages
     calllog
     special-input
     meditation
@@ -70,6 +70,7 @@ endif()
 
 target_link_libraries(${PROJECT_NAME}
     PRIVATE
+        application-messages
         apps-common
         date::date
         eventstore
diff --git a/module-apps/application-desktop/widgets/DesktopInputWidget.cpp b/module-apps/application-desktop/widgets/DesktopInputWidget.cpp
index 2b94af06e3838f7c02edc6f562d16a3800ac297d..bc41ca78373a68160a0137f9baf8977519e03aab 100644
--- a/module-apps/application-desktop/widgets/DesktopInputWidget.cpp
+++ b/module-apps/application-desktop/widgets/DesktopInputWidget.cpp
@@ -3,7 +3,6 @@
 
 #include "DesktopInputWidget.hpp"
 #include "AppWindow.hpp"
-#include "application-messages/data/MessagesStyle.hpp"
 #include <service-cellular/CellularServiceAPI.hpp>
 
 #include <Style.hpp>
diff --git a/module-apps/application-messages/ApplicationMessages.cpp b/module-apps/application-messages/ApplicationMessages.cpp
index d2d295f41a62b6e19ecc14189f125ce5ebc8f9ea..ca3862e5b600010e83420a97366627995899f14e 100644
--- a/module-apps/application-messages/ApplicationMessages.cpp
+++ b/module-apps/application-messages/ApplicationMessages.cpp
@@ -2,37 +2,34 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "ApplicationMessages.hpp"
+#include "MessagesMainWindow.hpp"
+#include "NewMessage.hpp"
+#include "OptionsMessages.hpp"
+#include "SearchResults.hpp"
+#include "SearchStart.hpp"
+#include "SMSTemplatesWindow.hpp"
+#include "SMSTextToSearch.hpp"
+#include "SMSThreadViewWindow.hpp"
 
-#include "DialogMetadata.hpp"
-#include "DialogMetadataMessage.hpp"
-#include "OptionsWindow.hpp"
-#include "application-messages/data/SMSTextToSearch.hpp"
-#include "windows/MessagesMainWindow.hpp"
-#include "windows/NewMessage.hpp"
-#include "windows/OptionsMessages.hpp"
-#include "windows/SMSThreadViewWindow.hpp"
-#include "windows/SearchStart.hpp"
-#include "windows/SMSTemplatesWindow.hpp"
-#include "windows/SearchResults.hpp"
-
-#include <MessageType.hpp>
 #include <Dialog.hpp>
+#include <DialogMetadata.hpp>
+#include <DialogMetadataMessage.hpp>
 #include <i18n/i18n.hpp>
 #include <memory>
-#include <service-db/DBServiceAPI.hpp>
-#include <service-db/DBNotificationMessage.hpp>
-#include <service-db/QueryMessage.hpp>
-#include <OptionWindow.hpp>
-
+#include <messages/OptionsWindow.hpp>
+#include <MessageType.hpp>
 #include <module-db/queries/messages/sms/QuerySMSAdd.hpp>
 #include <module-db/queries/messages/sms/QuerySMSRemove.hpp>
 #include <module-db/queries/messages/sms/QuerySMSUpdate.hpp>
 #include <module-db/queries/messages/threads/QueryThreadGetByID.hpp>
 #include <module-db/queries/messages/threads/QueryThreadRemove.hpp>
 #include <module-db/queries/phonebook/QueryContactGetByID.hpp>
-
+#include <OptionsWindow.hpp>
+#include <OptionWindow.hpp>
 #include <service-cellular/CellularMessage.hpp>
-#include <messages/OptionsWindow.hpp>
+#include <service-db/DBNotificationMessage.hpp>
+#include <service-db/DBServiceAPI.hpp>
+#include <service-db/QueryMessage.hpp>
 
 #include <cassert>
 #include <ctime>
diff --git a/module-apps/application-messages/CMakeLists.txt b/module-apps/application-messages/CMakeLists.txt
index 1b7e15a222473fe4da369708e4d7bc96ad4f6f0f..0a5f98f8b1117c28dbc448c87f2c174316d83f66 100644
--- a/module-apps/application-messages/CMakeLists.txt
+++ b/module-apps/application-messages/CMakeLists.txt
@@ -1,56 +1,90 @@
-include_directories( ${CMAKE_PROJECT_NAME}
+# Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+# For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-    PUBLIC
-        "${CMAKE_CURRENT_LIST_DIR}"
-)
-
-include_directories( ${PROJECT_NAME}
+add_library(application-messages STATIC)
 
+target_include_directories(application-messages
+    PRIVATE
+        $<BUILD_INTERFACE:
+            ${CMAKE_CURRENT_SOURCE_DIR}/data
+            ${CMAKE_CURRENT_SOURCE_DIR}/include/application-messages
+            ${CMAKE_CURRENT_SOURCE_DIR}/models
+            ${CMAKE_CURRENT_SOURCE_DIR}/widgets
+            ${CMAKE_CURRENT_SOURCE_DIR}/windows
+        >
     PUBLIC
-        "${CMAKE_CURRENT_LIST_DIR}"
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
 )
 
-target_sources( ${PROJECT_NAME}
-
+target_sources(application-messages
     PRIVATE
-        "ApplicationMessages.cpp"
-        "widgets/ThreadItem.cpp"
-        "models/SMSTemplateModel.cpp"
-        "widgets/SMSTemplateItem.cpp"
-        "widgets/SMSInputWidget.cpp"
-        "widgets/SMSOutputWidget.cpp"
-        "widgets/SearchResultsItem.cpp"
-        "widgets/BaseThreadItem.cpp"
-
-        "models/BaseThreadsRecordModel.cpp"
-        "models/ThreadsModel.cpp"
-        "models/ThreadsSearchResultsModel.cpp"
-        "models/SMSThreadModel.cpp"
-        
-        "windows/MessagesMainWindow.cpp"
-        "windows/SMSThreadViewWindow.cpp"
-        "windows/NewMessage.cpp"
-        "windows/ThreadWindowOptions.cpp"
-        "windows/OptionsMessages.cpp"
-        "windows/SearchStart.cpp"
-        "windows/SMSTemplatesWindow.cpp"
-        "windows/SearchResults.cpp"
+        ApplicationMessages.cpp
+        data/MessagesStyle.hpp
+        data/SMSdata.hpp
+        data/SMSTextToSearch.cpp
+        data/SMSTextToSearch.hpp
+        models/BaseThreadsRecordModel.cpp
+        models/BaseThreadsRecordModel.hpp
+        models/SMSTemplateModel.cpp
+        models/SMSTemplateModel.hpp
+        models/SMSThreadModel.cpp
+        models/SMSThreadModel.hpp
+        models/ThreadsModel.cpp
+        models/ThreadsModel.hpp
+        models/ThreadsSearchResultsModel.cpp
+        models/ThreadsSearchResultsModel.hpp
+        widgets/BaseThreadItem.cpp
+        widgets/BaseThreadItem.hpp
+        widgets/SearchResultsItem.cpp
+        widgets/SearchResultsItem.hpp
+        widgets/SMSInputWidget.cpp
+        widgets/SMSInputWidget.hpp
+        widgets/SMSOutputWidget.cpp
+        widgets/SMSOutputWidget.hpp
+        widgets/SMSTemplateItem.cpp
+        widgets/SMSTemplateItem.hpp
+        widgets/ThreadItem.cpp
+        widgets/ThreadItem.hpp
+        windows/MessagesMainWindow.cpp
+        windows/MessagesMainWindow.hpp
+        windows/NewMessage.cpp
+        windows/NewMessage.hpp
+        windows/OptionsMessages.cpp
+        windows/OptionsMessages.hpp
+        windows/SearchResults.cpp
+        windows/SearchResults.hpp
+        windows/SearchStart.cpp
+        windows/SearchStart.hpp
+        windows/SMSTemplatesWindow.cpp
+        windows/SMSTemplatesWindow.hpp
+        windows/SMSThreadViewWindow.cpp
+        windows/SMSThreadViewWindow.hpp
+        windows/ThreadWindowOptions.cpp
+        windows/ThreadWindowOptions.hpp
+    PUBLIC
+        include/application-messages/ApplicationMessages.hpp
+        include/application-messages/Constants.hpp
+)
 
-        "data/SMSTextToSearch.cpp"
+option(ENABLE_APP_MESSAGES "Enable application messages" ON)
 
-    PUBLIC
-        "ApplicationMessages.hpp"
-        "Constants.hpp"
-        "data/MessagesStyle.hpp"
-        "models/ThreadsModel.hpp"
-        "models/SMSThreadModel.hpp"
-        "widgets/ThreadItem.hpp"
-        "widgets/SMSInputWidget.hpp"
-        "widgets/SMSOutputWidget.hpp"
+target_compile_definitions(application-messages
+    INTERFACE
+        $<$<BOOL:${ENABLE_APP_MESSAGES}>:ENABLE_APP_MESSAGES>
 )
 
-target_link_libraries(${PROJECT_NAME}
+target_link_libraries(application-messages
     PRIVATE
-        service-db
         clipboard
-    )
+        i18n
+        log
+        module-gui
+        service-appmgr
+        service-cellular
+        service-db
+        time
+    PUBLIC
+        apps-common
+        module-db
+        module-utils
+)
diff --git a/module-apps/application-messages/data/MessagesStyle.hpp b/module-apps/application-messages/data/MessagesStyle.hpp
index 9d8051fc3c6a86e1d367b1238e20979db954bc59..f22008f070e61a0425d285bfe9dd424476ef9a99 100644
--- a/module-apps/application-messages/data/MessagesStyle.hpp
+++ b/module-apps/application-messages/data/MessagesStyle.hpp
@@ -3,6 +3,10 @@
 
 #pragma once
 
+#include <gui/widgets/Style.hpp>
+
+#include <cstdint>
+
 namespace style
 {
     namespace messages
diff --git a/module-apps/application-messages/ApplicationMessages.hpp b/module-apps/application-messages/include/application-messages/ApplicationMessages.hpp
similarity index 99%
rename from module-apps/application-messages/ApplicationMessages.hpp
rename to module-apps/application-messages/include/application-messages/ApplicationMessages.hpp
index 6e172067886d5cc8f9d965f5fc10cc73affe6802..33811ce496702eded2dd450866d4408fd6188597 100644
--- a/module-apps/application-messages/ApplicationMessages.hpp
+++ b/module-apps/application-messages/include/application-messages/ApplicationMessages.hpp
@@ -3,12 +3,13 @@
 
 #pragma once
 
+#include "Constants.hpp"
+
 #include <Application.hpp>
-#include <Interface/ThreadRecord.hpp>
-#include <Interface/SMSTemplateRecord.hpp>
 #include <Interface/SMSRecord.hpp>
+#include <Interface/SMSTemplateRecord.hpp>
+#include <Interface/ThreadRecord.hpp>
 #include <PhoneNumber.hpp>
-#include "Constants.hpp"
 
 namespace gui
 {
diff --git a/module-apps/application-messages/Constants.hpp b/module-apps/application-messages/include/application-messages/Constants.hpp
similarity index 100%
rename from module-apps/application-messages/Constants.hpp
rename to module-apps/application-messages/include/application-messages/Constants.hpp
diff --git a/module-apps/application-messages/models/SMSTemplateModel.cpp b/module-apps/application-messages/models/SMSTemplateModel.cpp
index f85ad421fcd5bc56364b15809f1d7a0b99e731d1..cd75dcd0feaf50d8a3343f15245e806106307861 100644
--- a/module-apps/application-messages/models/SMSTemplateModel.cpp
+++ b/module-apps/application-messages/models/SMSTemplateModel.cpp
@@ -1,12 +1,13 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
+#include "ApplicationMessages.hpp"
+#include "SMSTemplateItem.hpp"
 #include "SMSTemplateModel.hpp"
-#include "ListView.hpp"
-#include "application-messages/widgets/SMSTemplateItem.hpp"
-#include "application-messages/ApplicationMessages.hpp"
-#include <service-db/DBServiceAPI.hpp>
+
+#include <ListView.hpp>
 #include <module-db/queries/messages/templates/QuerySMSTemplateGetForList.hpp>
+#include <service-db/DBServiceAPI.hpp>
 
 SMSTemplateModel::SMSTemplateModel(app::Application *app) : DatabaseModel(app), app::AsyncCallbackReceiver{app}
 {}
diff --git a/module-apps/application-messages/models/SMSThreadModel.cpp b/module-apps/application-messages/models/SMSThreadModel.cpp
index 4761df0118aa41023565fbb87b822288c2012e06..7add92aa2144c879bf75f97afb8d813106636502 100644
--- a/module-apps/application-messages/models/SMSThreadModel.cpp
+++ b/module-apps/application-messages/models/SMSThreadModel.cpp
@@ -1,16 +1,16 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <service-db/QueryMessage.hpp>
-#include <service-db/DBServiceAPI.hpp>
+#include "ApplicationMessages.hpp"
+#include "MessagesStyle.hpp"
+#include "SMSOutputWidget.hpp"
+#include "SMSThreadModel.hpp"
+
+#include <ListView.hpp>
 #include <module-db/queries/messages/sms/QuerySMSGetCountByThreadID.hpp>
 #include <module-db/queries/messages/sms/QuerySMSGetForList.hpp>
-
-#include <application-messages/widgets/SMSOutputWidget.hpp>
-#include <module-apps/application-messages/ApplicationMessages.hpp>
-#include "application-messages/data/MessagesStyle.hpp"
-#include "SMSThreadModel.hpp"
-#include "ListView.hpp"
+#include <service-db/DBServiceAPI.hpp>
+#include <service-db/QueryMessage.hpp>
 
 SMSThreadModel::SMSThreadModel(app::Application *app) : DatabaseModel(app), app::AsyncCallbackReceiver{app}
 {
diff --git a/module-apps/application-messages/models/SMSThreadModel.hpp b/module-apps/application-messages/models/SMSThreadModel.hpp
index 9c1abf9757300af7c3ee450e886a8c08cc80f615..14847ae7422588680206d111600e141d1f7a011f 100644
--- a/module-apps/application-messages/models/SMSThreadModel.hpp
+++ b/module-apps/application-messages/models/SMSThreadModel.hpp
@@ -1,13 +1,14 @@
-// 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 "DatabaseModel.hpp"
-#include "Application.hpp"
-#include "ListItemProvider.hpp"
-#include "Interface/SMSRecord.hpp"
-#include <application-messages/widgets/SMSInputWidget.hpp>
+#include "SMSInputWidget.hpp"
+
+#include <DatabaseModel.hpp>
+#include <Application.hpp>
+#include <ListItemProvider.hpp>
+#include <Interface/SMSRecord.hpp>
 
 class SMSThreadModel : public app::DatabaseModel<SMSRecord>,
                        public gui::ListItemProvider,
diff --git a/module-apps/application-messages/models/ThreadsModel.cpp b/module-apps/application-messages/models/ThreadsModel.cpp
index 358bb85d3ee0107acb855035fbcbb98f57d9ad04..446c1fbcb1dca3d5afe255760c86ae370e0ed76d 100644
--- a/module-apps/application-messages/models/ThreadsModel.cpp
+++ b/module-apps/application-messages/models/ThreadsModel.cpp
@@ -1,18 +1,19 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
+#include "MessagesStyle.hpp"
+#include "SMSdata.hpp"
+#include "ThreadItem.hpp"
 #include "ThreadsModel.hpp"
-#include "InputEvent.hpp"
-#include "OptionWindow.hpp"
-#include "OptionsWindow.hpp"
-#include "ListView.hpp"
-#include "application-messages/data/SMSdata.hpp"
-#include "application-messages/data/MessagesStyle.hpp"
-#include "application-messages/widgets/ThreadItem.hpp"
-#include "application-messages/windows/ThreadWindowOptions.hpp"
+#include "ThreadWindowOptions.hpp"
+
+#include <InputEvent.hpp>
+#include <ListView.hpp>
 #include <log.hpp>
 #include <module-db/queries/messages/threads/QueryThreadsGet.hpp>
 #include <module-db/queries/messages/threads/QueryThreadsGetForList.hpp>
+#include <OptionsWindow.hpp>
+#include <OptionWindow.hpp>
 #include <service-db/DBServiceAPI.hpp>
 
 ThreadsModel::ThreadsModel(app::Application *app) : BaseThreadsRecordModel(app), app::AsyncCallbackReceiver{app}
diff --git a/module-apps/application-messages/models/ThreadsSearchResultsModel.cpp b/module-apps/application-messages/models/ThreadsSearchResultsModel.cpp
index b99fff166708215359ce8956b58022e29745b7a5..726ef018acba885bf65ff4b1284880f181fd586b 100644
--- a/module-apps/application-messages/models/ThreadsSearchResultsModel.cpp
+++ b/module-apps/application-messages/models/ThreadsSearchResultsModel.cpp
@@ -1,15 +1,15 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
+#include "ApplicationMessages.hpp"
+#include "MessagesStyle.hpp"
+#include "SearchResultsItem.hpp"
 #include "ThreadsSearchResultsModel.hpp"
-#include "ListView.hpp"
-#include <time/time_conversion_factory.hpp>
-#include "application-messages/widgets/SearchResultsItem.hpp"
 
-#include <service-db/DBServiceAPI.hpp>
+#include <ListView.hpp>
 #include <module-db/queries/messages/threads/QueryThreadsSearchForList.hpp>
-#include <module-apps/application-messages/ApplicationMessages.hpp>
-#include "application-messages/data/MessagesStyle.hpp"
+#include <service-db/DBServiceAPI.hpp>
+#include <time/time_conversion_factory.hpp>
 
 namespace gui::model
 {
diff --git a/module-apps/application-messages/widgets/BaseThreadItem.cpp b/module-apps/application-messages/widgets/BaseThreadItem.cpp
index 61bbdcf479b24e8a6aa85f5cf209f338b6566afd..45c16e100a1b67c5690d0f2a4a90a0435e59ef44 100644
--- a/module-apps/application-messages/widgets/BaseThreadItem.cpp
+++ b/module-apps/application-messages/widgets/BaseThreadItem.cpp
@@ -1,8 +1,8 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "BaseThreadItem.hpp"
-#include "application-messages/data/MessagesStyle.hpp"
+#include "MessagesStyle.hpp"
 
 namespace gui
 {
diff --git a/module-apps/application-messages/widgets/SMSInputWidget.cpp b/module-apps/application-messages/widgets/SMSInputWidget.cpp
index 0a1c6182ab180f018a8502a040f04787ab87248a..3519393ec720d52545659c02622efccd75026bcc 100644
--- a/module-apps/application-messages/widgets/SMSInputWidget.cpp
+++ b/module-apps/application-messages/widgets/SMSInputWidget.cpp
@@ -1,19 +1,19 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "SMSInputWidget.hpp"
-#include "AppWindow.hpp"
-#include "application-messages/data/MessagesStyle.hpp"
-#include <module-apps/application-messages/ApplicationMessages.hpp>
-#include <service-cellular/service-cellular/MessageConstants.hpp>
+#include "ApplicationMessages.hpp"
+#include "MessagesStyle.hpp"
 
-#include <Style.hpp>
-#include <i18n/i18n.hpp>
+#include <AppWindow.hpp>
 #include <Font.hpp>
-#include <utility>
-#include <algorithm>
+#include <i18n/i18n.hpp>
+#include <service-cellular/service-cellular/MessageConstants.hpp>
+#include <SMSInputWidget.hpp>
+#include <Style.hpp>
+#include <TextParse.hpp>
 
-#include "TextParse.hpp"
+#include <algorithm>
+#include <utility>
 
 namespace gui
 {
diff --git a/module-apps/application-messages/widgets/SMSOutputWidget.cpp b/module-apps/application-messages/widgets/SMSOutputWidget.cpp
index dd0150d0147475331131f24dead0a582294c910a..77ece91ef62134eca9867711a42b6c01e48ae06b 100644
--- a/module-apps/application-messages/widgets/SMSOutputWidget.cpp
+++ b/module-apps/application-messages/widgets/SMSOutputWidget.cpp
@@ -1,15 +1,15 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <application-messages/ApplicationMessages.hpp>
-#include "application-messages/windows/OptionsMessages.hpp"
-#include <OptionWindow.hpp>
+#include "ApplicationMessages.hpp"
+#include "MessagesStyle.hpp"
+#include "OptionsMessages.hpp"
 #include "SMSOutputWidget.hpp"
-#include "application-messages/data/MessagesStyle.hpp"
 
+#include <OptionsWindow.hpp>
+#include <OptionWindow.hpp>
 #include <Style.hpp>
 #include <time/time_conversion_factory.hpp>
-#include <OptionsWindow.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-messages/widgets/ThreadItem.cpp b/module-apps/application-messages/widgets/ThreadItem.cpp
index 15eeb159f3efc0de9fa82dac45f60e3726b43513..ae1313a2db4ee2f325a526222f6e3ac0e9b8fc9f 100644
--- a/module-apps/application-messages/widgets/ThreadItem.cpp
+++ b/module-apps/application-messages/widgets/ThreadItem.cpp
@@ -1,11 +1,11 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
+#include "MessagesStyle.hpp"
 #include "ThreadItem.hpp"
-#include <time/time_conversion_factory.hpp>
 
 #include <Style.hpp>
-#include "application-messages/data/MessagesStyle.hpp"
+#include <time/time_conversion_factory.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-messages/widgets/ThreadItem.hpp b/module-apps/application-messages/widgets/ThreadItem.hpp
index 59992463b8f00e2ae9c4818d4427297d8950f265..043bb84bcd29710863b8d3ece41c9f0936d4b086 100644
--- a/module-apps/application-messages/widgets/ThreadItem.hpp
+++ b/module-apps/application-messages/widgets/ThreadItem.hpp
@@ -1,11 +1,12 @@
-// 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 "BaseThreadItem.hpp"
-#include "ContactRecord.hpp"
-#include "application-messages/models/ThreadsModel.hpp"
+#include "ThreadsModel.hpp"
+
+#include <BaseThreadItem.hpp>
+#include <ContactRecord.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-messages/windows/MessagesMainWindow.cpp b/module-apps/application-messages/windows/MessagesMainWindow.cpp
index 6eca7ca782cfd6a0c6c73759ac0424d3ae816101..c82dcf8fe1bcbeb6183a8caa5533befc9d3b0f11 100644
--- a/module-apps/application-messages/windows/MessagesMainWindow.cpp
+++ b/module-apps/application-messages/windows/MessagesMainWindow.cpp
@@ -1,31 +1,27 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
+#include "ApplicationMessages.hpp"
 #include "MessagesMainWindow.hpp"
+#include "MessagesStyle.hpp"
+#include "SearchStart.hpp"
+#include "SMSdata.hpp"
+#include "ThreadItem.hpp"
 
-#include "application-messages/ApplicationMessages.hpp"
-#include "application-messages/data/MessagesStyle.hpp"
-#include "application-messages/data/SMSdata.hpp"
-#include "application-messages/widgets/ThreadItem.hpp"
-#include "application-messages/windows/SearchStart.hpp"
-
-#include <service-db/DBServiceAPI.hpp>
-#include <service-db/DBNotificationMessage.hpp>
-
-#include <service-appmgr/model/ApplicationManager.hpp>
-#include <i18n/i18n.hpp>
 #include <application-phonebook/data/PhonebookItemData.hpp>
-#include <Style.hpp>
-#include <log.hpp>
-
 #include <header/AddElementAction.hpp>
 #include <header/SearchAction.hpp>
-
-#include <module-db/queries/notifications/QueryNotificationsClear.hpp>
+#include <i18n/i18n.hpp>
+#include <log.hpp>
 #include <module-db/queries/messages/threads/QueryThreadGetByContactID.hpp>
+#include <module-db/queries/notifications/QueryNotificationsClear.hpp>
+#include <service-appmgr/model/ApplicationManager.hpp>
+#include <service-db/DBNotificationMessage.hpp>
+#include <service-db/DBServiceAPI.hpp>
+#include <Style.hpp>
 
-#include <memory>
 #include <cassert>
+#include <memory>
 
 namespace gui
 {
diff --git a/module-apps/application-messages/windows/MessagesMainWindow.hpp b/module-apps/application-messages/windows/MessagesMainWindow.hpp
index f278927957e0375faad15224d1226c66fd04f50d..36bb324db54985eec6f67db3be8491ee427d9315 100644
--- a/module-apps/application-messages/windows/MessagesMainWindow.hpp
+++ b/module-apps/application-messages/windows/MessagesMainWindow.hpp
@@ -3,14 +3,14 @@
 
 #pragma once
 
-#include "application-messages/models/ThreadsModel.hpp"
+#include "ThreadsModel.hpp"
 
 #include <AppWindow.hpp>
+#include <gui/widgets/Icon.hpp>
 #include <Image.hpp>
 #include <Label.hpp>
 #include <ListView.hpp>
 #include <Text.hpp>
-#include <gui/widgets/Icon.hpp>
 
 #include <functional>
 #include <string>
diff --git a/module-apps/application-messages/windows/NewMessage.cpp b/module-apps/application-messages/windows/NewMessage.cpp
index 75281a4ef99ecf014eca14bed5c9c3f3a7c916b1..2ded3f8acb33d6df67640a2750749af84774ecdf 100644
--- a/module-apps/application-messages/windows/NewMessage.cpp
+++ b/module-apps/application-messages/windows/NewMessage.cpp
@@ -1,24 +1,21 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
+#include "ApplicationMessages.hpp"
+#include "MessagesStyle.hpp"
 #include "NewMessage.hpp"
-
-#include "application-messages/ApplicationMessages.hpp"
-#include "application-messages/data/SMSdata.hpp"
-#include "application-messages/data/MessagesStyle.hpp"
+#include "SMSdata.hpp"
 
 #include <application-phonebook/windows/PhonebookSearchResults.hpp>
-#include <service-appmgr/Controller.hpp>
-#include <service-db/DBServiceAPI.hpp>
-#include <i18n/i18n.hpp>
 #include <BoxLayout.hpp>
-#include <Text.hpp>
-
+#include <i18n/i18n.hpp>
+#include <module-db/queries/messages/sms/QuerySMSGetLastByThreadID.hpp>
 #include <module-db/queries/messages/threads/QueryThreadGetByContactID.hpp>
 #include <module-db/queries/messages/threads/QueryThreadGetByNumber.hpp>
-#include <module-db/queries/messages/sms/QuerySMSGetLastByThreadID.hpp>
-
+#include <service-appmgr/Controller.hpp>
 #include <service-cellular/service-cellular/MessageConstants.hpp>
+#include <service-db/DBServiceAPI.hpp>
+#include <Text.hpp>
 
 #include <cassert>
 
diff --git a/module-apps/application-messages/windows/OptionsMessages.cpp b/module-apps/application-messages/windows/OptionsMessages.cpp
index 9ba11625806da657072f32d3264bcd6d06e91b96..5906fc9e3fdcd7b29f08ac7b696454a2dd934cbc 100644
--- a/module-apps/application-messages/windows/OptionsMessages.cpp
+++ b/module-apps/application-messages/windows/OptionsMessages.cpp
@@ -1,19 +1,19 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "OptionsMessages.hpp"
-#include "application-messages/data/SMSdata.hpp"
-#include "tools/Common.hpp"
+#include "SMSdata.hpp"
 
+#include <apps-common/options/type/OptionCall.hpp>
+#include <apps-common/options/type/OptionContact.hpp>
 #include <Clipboard.hpp>
+#include <i18n/i18n.hpp>
+#include <module-services/service-db/service-db/DBServiceAPI.hpp>
 #include <Option.hpp>
+#include <OptionsMessages.hpp>
 #include <Text.hpp>
-#include <i18n/i18n.hpp>
+#include <tools/Common.hpp>
 
 #include <memory>
-#include <module-services/service-db/service-db/DBServiceAPI.hpp>
-#include <apps-common/options/type/OptionCall.hpp>
-#include <apps-common/options/type/OptionContact.hpp>
 
 std::list<gui::Option> smsWindowOptions(app::ApplicationMessages *app, const SMSRecord &record)
 {
diff --git a/module-apps/application-messages/windows/OptionsMessages.hpp b/module-apps/application-messages/windows/OptionsMessages.hpp
index 89048f32de867fa241689ac5778a559da48ceb71..c918e8c5fbda48c410910c83bb6ea7b6aaf7e860 100644
--- a/module-apps/application-messages/windows/OptionsMessages.hpp
+++ b/module-apps/application-messages/windows/OptionsMessages.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 "../ApplicationMessages.hpp"
-#include "Interface/SMSRecord.hpp"
+#include "ApplicationMessages.hpp"
+
+#include <Interface/SMSRecord.hpp>
 #include <Option.hpp>
 
 std::list<gui::Option> smsWindowOptions(app::ApplicationMessages *app, const SMSRecord &record);
diff --git a/module-apps/application-messages/windows/SMSTemplatesWindow.cpp b/module-apps/application-messages/windows/SMSTemplatesWindow.cpp
index 83b174bc03d4cb4d8a5f17741fefe16c3dc44475..bfd5c7f17c41a69ae9621450fcc9930b2b3fb3df 100644
--- a/module-apps/application-messages/windows/SMSTemplatesWindow.cpp
+++ b/module-apps/application-messages/windows/SMSTemplatesWindow.cpp
@@ -1,16 +1,15 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
+#include "ApplicationMessages.hpp"
+#include "MessagesStyle.hpp"
+#include "SMSTemplateItem.hpp"
 #include "SMSTemplatesWindow.hpp"
 
-#include "application-messages/ApplicationMessages.hpp"
-#include "application-messages/widgets/SMSTemplateItem.hpp"
-#include "application-messages/data/MessagesStyle.hpp"
-
-#include <service-appmgr/Controller.hpp>
 #include <i18n/i18n.hpp>
-#include <Style.hpp>
 #include <log.hpp>
+#include <service-appmgr/Controller.hpp>
+#include <Style.hpp>
 
 #include <cassert>
 #include <memory>
diff --git a/module-apps/application-messages/windows/SMSTemplatesWindow.hpp b/module-apps/application-messages/windows/SMSTemplatesWindow.hpp
index 1c76473147a1461699ababd228366e8b37e7ea94..40fef66e75d9112f659d6b2002157bfbbacb7c35 100644
--- a/module-apps/application-messages/windows/SMSTemplatesWindow.hpp
+++ b/module-apps/application-messages/windows/SMSTemplatesWindow.hpp
@@ -3,15 +3,15 @@
 
 #pragma once
 
-#include "application-messages/models/SMSTemplateModel.hpp"
-#include "application-messages/data/SMSdata.hpp"
+#include "SMSdata.hpp"
+#include "SMSTemplateModel.hpp"
 
 #include <AppWindow.hpp>
 #include <gui/widgets/Label.hpp>
 #include <gui/widgets/ListView.hpp>
 
-#include <string>
 #include <functional>
+#include <string>
 
 namespace gui
 {
diff --git a/module-apps/application-messages/windows/SMSThreadViewWindow.cpp b/module-apps/application-messages/windows/SMSThreadViewWindow.cpp
index 464b4377854587d484aa54f6a1eafd284fcafbb6..be2910c922b41ef7cdb4af42ab024c28cfe7d8e6 100644
--- a/module-apps/application-messages/windows/SMSThreadViewWindow.cpp
+++ b/module-apps/application-messages/windows/SMSThreadViewWindow.cpp
@@ -1,22 +1,19 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
+#include "ApplicationMessages.hpp"
+#include "MessagesStyle.hpp"
+#include "SMSdata.hpp"
 #include "SMSThreadViewWindow.hpp"
 
-#include "application-messages/ApplicationMessages.hpp"
-#include "application-messages/data/SMSdata.hpp"
-#include "application-messages/data/MessagesStyle.hpp"
-
-#include "OptionsMessages.hpp"
-#include "Service/Message.hpp"
-
-#include <TextBubble.hpp>
-#include <service-db/DBServiceAPI.hpp>
-#include <service-db/DBNotificationMessage.hpp>
-#include <module-db/queries/phonebook/QueryContactGetByID.hpp>
-
 #include <log.hpp>
+#include <module-db/queries/phonebook/QueryContactGetByID.hpp>
+#include <OptionsMessages.hpp>
+#include <service-db/DBNotificationMessage.hpp>
+#include <service-db/DBServiceAPI.hpp>
+#include <Service/Message.hpp>
 #include <Style.hpp>
+#include <TextBubble.hpp>
 
 #include <cassert>
 
diff --git a/module-apps/application-messages/windows/SMSThreadViewWindow.hpp b/module-apps/application-messages/windows/SMSThreadViewWindow.hpp
index b02fc18a9f59ff8d303ed57da46b98331aa533fa..fb1570a92074ff02a6471f755ecc56bc29bcd453 100644
--- a/module-apps/application-messages/windows/SMSThreadViewWindow.hpp
+++ b/module-apps/application-messages/windows/SMSThreadViewWindow.hpp
@@ -1,11 +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 <AppWindow.hpp>
-#include <module-apps/application-messages/models/SMSThreadModel.hpp>
+#include "SMSThreadModel.hpp"
 
+#include <AppWindow.hpp>
 #include <ListView.hpp>
 #include <PhoneNumber.hpp>
 
diff --git a/module-apps/application-messages/windows/SearchResults.cpp b/module-apps/application-messages/windows/SearchResults.cpp
index aadd44baeeeac8fcf1653a388e6ed723663a34f7..63e67fd887016d9965456ba6aca436af75d08e49 100644
--- a/module-apps/application-messages/windows/SearchResults.cpp
+++ b/module-apps/application-messages/windows/SearchResults.cpp
@@ -1,16 +1,15 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
+#include "ApplicationMessages.hpp"
+#include "MessagesStyle.hpp"
 #include "SearchResults.hpp"
+#include "SMSTextToSearch.hpp"
 #include "ThreadRecord.hpp"
-#include <application-messages/data/SMSTextToSearch.hpp>
-#include <application-messages/ApplicationMessages.hpp>
-#include "module-apps/application-messages/data/MessagesStyle.hpp"
-#include "queries/messages/threads/QueryThreadsSearchForList.hpp"
-
-#include <service-db/QueryMessage.hpp>
 
 #include <i18n/i18n.hpp>
+#include <queries/messages/threads/QueryThreadsSearchForList.hpp>
+#include <service-db/QueryMessage.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-messages/windows/SearchResults.hpp b/module-apps/application-messages/windows/SearchResults.hpp
index aceb27ab8a933f1adc480066d886c597f6f7a4e5..7bf818fc40196ed6e5451ff296ce6fa63615b8a1 100644
--- a/module-apps/application-messages/windows/SearchResults.hpp
+++ b/module-apps/application-messages/windows/SearchResults.hpp
@@ -1,11 +1,12 @@
-// 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 "AppWindow.hpp"
+#include "ThreadsSearchResultsModel.hpp"
+
+#include <AppWindow.hpp>
 #include <ListView.hpp>
-#include "application-messages/models/ThreadsSearchResultsModel.hpp"
 
 namespace gui
 {
diff --git a/module-apps/application-messages/windows/SearchStart.cpp b/module-apps/application-messages/windows/SearchStart.cpp
index a9741ef3f4a5ab894b8ca57eafb42e7e5649a6f6..568d93f1d9f3dd4fcdb021cf6c60ef9789f80728 100644
--- a/module-apps/application-messages/windows/SearchStart.cpp
+++ b/module-apps/application-messages/windows/SearchStart.cpp
@@ -1,10 +1,12 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
+#include "ApplicationMessages.hpp"
 #include "SearchStart.hpp"
-#include "../ApplicationMessages.hpp"
+
 #include <i18n/i18n.hpp>
 #include <widgets/InputBox.hpp>
+
 #include <cassert>
 
 namespace gui
diff --git a/module-apps/application-messages/windows/ThreadWindowOptions.cpp b/module-apps/application-messages/windows/ThreadWindowOptions.cpp
index f8f7ac4bb9c92417df732a8d6d93ab834995057e..a1a8327fd1cddad4564169c9ed5ccf7a74b3ca96 100644
--- a/module-apps/application-messages/windows/ThreadWindowOptions.cpp
+++ b/module-apps/application-messages/windows/ThreadWindowOptions.cpp
@@ -2,12 +2,13 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "ThreadWindowOptions.hpp"
+
 #include <i18n/i18n.hpp>
 #include <log.hpp>
-#include <OptionWindow.hpp>
 #include <module-services/service-db/service-db/DBServiceAPI.hpp>
 #include <OptionCall.hpp>
 #include <OptionContact.hpp>
+#include <OptionWindow.hpp>
 
 /// below just for apps names...
 
diff --git a/module-apps/application-messages/windows/ThreadWindowOptions.hpp b/module-apps/application-messages/windows/ThreadWindowOptions.hpp
index 001a3f2516fa2441dd7ec49402f478be778b8a86..19f17a7a1e236699f428ac0506c2beff1b910a0b 100644
--- a/module-apps/application-messages/windows/ThreadWindowOptions.hpp
+++ b/module-apps/application-messages/windows/ThreadWindowOptions.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 "../ApplicationMessages.hpp"
-#include "Interface/ThreadRecord.hpp"
+#include "ApplicationMessages.hpp"
+
+#include <Interface/ThreadRecord.hpp>
 
 namespace gui
 {
diff --git a/products/BellHybrid/BellHybridMain.cpp b/products/BellHybrid/BellHybridMain.cpp
index 3f23027305eaa20facc9e43364d8e8571c2df938..7e720f434c664f056d301d1722107a97850803f3 100644
--- a/products/BellHybrid/BellHybridMain.cpp
+++ b/products/BellHybrid/BellHybridMain.cpp
@@ -7,7 +7,6 @@
 #include <application-call/ApplicationCall.hpp>
 #include <application-calllog/ApplicationCallLog.hpp>
 #include <application-desktop/ApplicationDesktop.hpp>
-#include <application-messages/ApplicationMessages.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 4983d02ec5c9a96b386a45604ec6d0b7f85cca76..5d3d9833243f362a5d0b4a2bdda3c31c6cb63163 100644
--- a/products/PurePhone/CMakeLists.txt
+++ b/products/PurePhone/CMakeLists.txt
@@ -50,6 +50,7 @@ target_link_libraries(PurePhone
     PRIVATE
         application-antenna
         application-calculator
+        application-messages
         application-music-player
         application-phonebook
         application-notes