33 files changed, 240 insertions(+), 206 deletions(-)

M module-apps/CMakeLists.txt
M module-apps/application-desktop/widgets/DesktopInputWidget.cpp
M module-apps/application-messages/ApplicationMessages.cpp
M module-apps/application-messages/CMakeLists.txt
M module-apps/application-messages/data/MessagesStyle.hpp
R module-apps/application-messages/{ => include}/application-messages/ApplicationMessages.hpp
R module-apps/application-messages/{ => include}/application-messages/Constants.hpp
M module-apps/application-messages/models/SMSTemplateModel.cpp
M module-apps/application-messages/models/SMSThreadModel.cpp
M module-apps/application-messages/models/SMSThreadModel.hpp
M module-apps/application-messages/models/ThreadsModel.cpp
M module-apps/application-messages/models/ThreadsSearchResultsModel.cpp
M module-apps/application-messages/widgets/BaseThreadItem.cpp
M module-apps/application-messages/widgets/SMSInputWidget.cpp
M module-apps/application-messages/widgets/SMSOutputWidget.cpp
M module-apps/application-messages/widgets/ThreadItem.cpp
M module-apps/application-messages/widgets/ThreadItem.hpp
M module-apps/application-messages/windows/MessagesMainWindow.cpp
M module-apps/application-messages/windows/MessagesMainWindow.hpp
M module-apps/application-messages/windows/NewMessage.cpp
M module-apps/application-messages/windows/OptionsMessages.cpp
M module-apps/application-messages/windows/OptionsMessages.hpp
M module-apps/application-messages/windows/SMSTemplatesWindow.cpp
M module-apps/application-messages/windows/SMSTemplatesWindow.hpp
M module-apps/application-messages/windows/SMSThreadViewWindow.cpp
M module-apps/application-messages/windows/SMSThreadViewWindow.hpp
M module-apps/application-messages/windows/SearchResults.cpp
M module-apps/application-messages/windows/SearchResults.hpp
M module-apps/application-messages/windows/SearchStart.cpp
M module-apps/application-messages/windows/ThreadWindowOptions.cpp
M module-apps/application-messages/windows/ThreadWindowOptions.hpp
M products/BellHybrid/BellHybridMain.cpp
M products/PurePhone/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

@@ 3,7 3,6 @@
 
 #include "DesktopInputWidget.hpp"
 #include "AppWindow.hpp"
-#include "application-messages/data/MessagesStyle.hpp"
 #include <service-cellular/CellularServiceAPI.hpp>
 
 #include <Style.hpp>

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

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

@@ 3,6 3,10 @@
 
 #pragma once
 
+#include <gui/widgets/Style.hpp>
+
+#include <cstdint>
+
 namespace style
 {
     namespace messages

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ 50,6 50,7 @@ target_link_libraries(PurePhone
     PRIVATE
         application-antenna
         application-calculator
+        application-messages
         application-music-player
         application-phonebook
         application-notes