13 files changed, 78 insertions(+), 44 deletions(-)

M module-apps/CMakeLists.txt
M module-apps/application-special-input/ApplicationSpecialInput.cpp
M module-apps/application-special-input/CMakeLists.txt
R module-apps/application-special-input/{ => include}/application-special-input/ApplicationSpecialInput.hpp
M module-apps/application-special-input/models/SpecialInputModel.cpp
M module-apps/application-special-input/models/SpecialInputModel.hpp
M module-apps/application-special-input/widgets/SpecialInputTableWidget.cpp
M module-apps/application-special-input/widgets/SpecialInputTableWidget.hpp
M module-apps/application-special-input/windows/SpecialInputMainWindow.cpp
M module-apps/application-special-input/windows/SpecialInputMainWindow.hpp
M module-services/service-appmgr/CMakeLists.txt
M products/BellHybrid/BellHybridMain.cpp
M products/PurePhone/CMakeLists.txt

@@ 19,6 19,7 @@ add_subdirectory(application-music-player)
 add_subdirectory(application-notes)
 add_subdirectory(application-phonebook)
 add_subdirectory(application-calllog)
+add_subdirectory(application-special-input)
 add_subdirectory(apps-common)
 
 set(APPLICATIONS


@@ 26,7 27,6 @@ set(APPLICATIONS
     calendar
     settings
     onboarding
-    special-input
     alarm-clock
 )
 

@@ 2,8 2,8 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "ApplicationSpecialInput.hpp"
-#include "messages/AppMessage.hpp"
-#include "windows/SpecialInputMainWindow.hpp"
+#include "SpecialInputMainWindow.hpp"
+#include <messages/AppMessage.hpp>
 
 using namespace app;
 

@@ 1,12 1,47 @@
-target_sources(${PROJECT_NAME}
+add_library(application-special-input STATIC)
+
+target_include_directories(application-special-input
         PRIVATE
-        "${CMAKE_CURRENT_LIST_DIR}/windows/SpecialInputMainWindow.cpp"
-        "${CMAKE_CURRENT_LIST_DIR}/ApplicationSpecialInput.cpp"
-        "${CMAKE_CURRENT_LIST_DIR}/widgets/SpecialInputTableWidget.cpp"
-        "${CMAKE_CURRENT_LIST_DIR}/models/SpecialInputModel.cpp"
+                $<BUILD_INTERFACE:
+                        ${CMAKE_CURRENT_LIST_DIR}/data
+                        ${CMAKE_CURRENT_LIST_DIR}/include/application-special-input
+                        ${CMAKE_CURRENT_LIST_DIR}/models
+                        ${CMAKE_CURRENT_LIST_DIR}/widgets
+                        ${CMAKE_CURRENT_LIST_DIR}/windows
+                >
         PUBLIC
-        "${CMAKE_CURRENT_LIST_DIR}/ApplicationSpecialInput.hpp"
-        "${CMAKE_CURRENT_LIST_DIR}/widgets/SpecialInputTableWidget.hpp"
-        "${CMAKE_CURRENT_LIST_DIR}/windows/SpecialInputMainWindow.hpp"
-        "${CMAKE_CURRENT_LIST_DIR}/models/SpecialInputModel.hpp"
-        )>
\ No newline at end of file
+                $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
+)
+
+target_sources(application-special-input
+        PRIVATE
+                ApplicationSpecialInput.cpp
+                models/SpecialInputModel.cpp
+                models/SpecialInputModel.hpp
+                windows/SpecialInputMainWindow.cpp
+                windows/SpecialInputMainWindow.hpp
+                widgets/SpecialInputTableWidget.cpp
+                widgets/SpecialInputTableWidget.hpp
+
+        PUBLIC
+                include/application-special-input/ApplicationSpecialInput.hpp
+)
+
+option(ENABLE_APP_SPECIAL_INPUT "Enable application special-input" ON)
+
+target_compile_definitions(application-special-input
+        INTERFACE
+                $<$<BOOL:${ENABLE_APP_SPECIAL_INPUT}>:ENABLE_APP_SPECIAL_INPUT>
+)
+
+target_link_libraries(application-special-input
+    PRIVATE
+        apps-common
+        i18n
+        service-appmgr
+        utf8
+
+    PUBLIC
+        apps-common
+        module-gui
+    )

@@ 3,8 3,8 @@
 
 #pragma once
 
-#include "Application.hpp"
-#include "SwitchData.hpp"
+#include <Application.hpp>
+#include <SwitchData.hpp>
 #include <AppWindow.hpp>
 
 namespace app

@@ 2,7 2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "SpecialInputModel.hpp"
-#include "module-apps/application-special-input/widgets/SpecialInputTableWidget.hpp"
+#include "SpecialInputTableWidget.hpp"
 #include <ListView.hpp>
 
 SpecialInputModel::SpecialInputModel(app::Application *app) : application(app)

@@ 3,9 3,9 @@
 
 #pragma once
 
-#include "module-apps/application-special-input/data/SpecialCharactersTableStyle.hpp"
-#include "InternalModel.hpp"
-#include "Application.hpp"
+#include "SpecialCharactersTableStyle.hpp"
+#include <InternalModel.hpp>
+#include <Application.hpp>
 
 #include <ListItemProvider.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 "SpecialInputTableWidget.hpp"
+#include "ApplicationSpecialInput.hpp"
+#include "SpecialCharactersTableStyle.hpp"
+#include <service-appmgr/Controller.hpp>
+#include <messages/AppMessage.hpp>
+#include <Style.hpp>
+#include <cassert>
 #include <locale>
 #include <codecvt>
-#include "module-apps/application-special-input/widgets/SpecialInputTableWidget.hpp"
-#include "application-special-input/data/SpecialCharactersTableStyle.hpp"
-#include <cassert>
-#include <module-apps/application-special-input/ApplicationSpecialInput.hpp>
-#include <service-appmgr/Controller.hpp>
-
-#include "Style.hpp"
-#include "messages/AppMessage.hpp"
 
 namespace gui
 {

@@ 3,14 3,14 @@
 
 #pragma once
 
+#include "SpecialCharactersTableStyle.hpp"
+#include "SpecialInputMainWindow.hpp"
+#include <apps-common/Application.hpp>
 #include <ListItem.hpp>
 #include <Text.hpp>
 #include <TextFixedSize.hpp>
 #include <ImageBox.hpp>
-#include <module-gui/gui/widgets/GridLayout.hpp>
-#include <apps-common/Application.hpp>
-#include <module-apps/application-special-input/data/SpecialCharactersTableStyle.hpp>
-#include <module-apps/application-special-input/windows/SpecialInputMainWindow.hpp>
+#include <GridLayout.hpp>
 
 namespace gui
 {

@@ 2,10 2,10 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "SpecialInputMainWindow.hpp"
-#include "../ApplicationSpecialInput.hpp"
-#include "Style.hpp"
-#include "messages/AppMessage.hpp"
+#include "ApplicationSpecialInput.hpp"
+#include <messages/AppMessage.hpp>
 #include <i18n/i18n.hpp>
+#include <Style.hpp>
 #include <cassert>
 
 using namespace gui;

@@ 3,17 3,16 @@
 
 #pragma once
 
-#include <functional>
-#include <string>
-
-#include "AppWindow.hpp"
-#include "gui/widgets/Image.hpp"
-#include "gui/widgets/Label.hpp"
-#include "gui/widgets/Window.hpp"
+#include "SpecialInputModel.hpp"
+#include <gui/widgets/Image.hpp>
+#include <gui/widgets/Label.hpp>
+#include <gui/widgets/Window.hpp>
+#include <AppWindow.hpp>
 #include <GridLayout.hpp>
+#include <ListView.hpp>
 #include <memory>
-#include <module-gui/gui/widgets/ListView.hpp>
-#include <module-apps/application-special-input/models/SpecialInputModel.hpp>
+#include <functional>
+#include <string>
 
 namespace gui
 {

@@ 37,6 37,7 @@ add_library(${PROJECT_NAME} STATIC ${SOURCES})
 target_link_libraries(${PROJECT_NAME}
     PRIVATE
         application-desktop
+        application-special-input
         json::json
         module-audio
         service-cellular

@@ 5,7 5,6 @@
 
 // applications
 #include <application-settings/ApplicationSettings.hpp>
-#include <application-special-input/ApplicationSpecialInput.hpp>
 #include <application-calendar/ApplicationCalendar.hpp>
 #include <application-music-player/ApplicationMusicPlayer.hpp>
 #include <application-alarm-clock/ApplicationAlarmClock.hpp>

@@ 58,6 58,7 @@ target_link_libraries(PurePhone
         application-music-player
         application-notes
         application-phonebook
+        application-special-input
         messagetype
         module-apps
         module-bsp