From 30c42fb67a90f3975bd4f6f707abe8b217a7a055 Mon Sep 17 00:00:00 2001 From: Lukasz Skrzypczak Date: Fri, 9 Jul 2021 01:12:51 -0700 Subject: [PATCH] [BH-377] Liberalize application special input Liberalize app SI --- module-apps/CMakeLists.txt | 2 +- .../ApplicationSpecialInput.cpp | 4 +- .../application-special-input/CMakeLists.txt | 55 +++++++++++++++---- .../ApplicationSpecialInput.hpp | 4 +- .../models/SpecialInputModel.cpp | 2 +- .../models/SpecialInputModel.hpp | 6 +- .../widgets/SpecialInputTableWidget.cpp | 15 +++-- .../widgets/SpecialInputTableWidget.hpp | 8 +-- .../windows/SpecialInputMainWindow.cpp | 6 +- .../windows/SpecialInputMainWindow.hpp | 17 +++--- module-services/service-appmgr/CMakeLists.txt | 1 + products/BellHybrid/BellHybridMain.cpp | 1 - products/PurePhone/CMakeLists.txt | 1 + 13 files changed, 78 insertions(+), 44 deletions(-) rename module-apps/application-special-input/{ => include/application-special-input}/ApplicationSpecialInput.hpp (96%) diff --git a/module-apps/CMakeLists.txt b/module-apps/CMakeLists.txt index 6ead03029c0cacfd8d21ec8577176191668d7e67..f2212cd5eeb14f52a61b9f6f9214ad9306bcd322 100644 --- a/module-apps/CMakeLists.txt +++ b/module-apps/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 ) diff --git a/module-apps/application-special-input/ApplicationSpecialInput.cpp b/module-apps/application-special-input/ApplicationSpecialInput.cpp index 5c643ab769d04251d5e2970cc4b69b59b24710d2..57e48245debe097cb177b4166dd71de2c1ad8fab 100644 --- a/module-apps/application-special-input/ApplicationSpecialInput.cpp +++ b/module-apps/application-special-input/ApplicationSpecialInput.cpp @@ -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 using namespace app; diff --git a/module-apps/application-special-input/CMakeLists.txt b/module-apps/application-special-input/CMakeLists.txt index 0d4a507aa35780c19af6c35d3070a03b15a424c3..284a2e6a521ee64aca4b176120d10e9f9128eb3a 100644 --- a/module-apps/application-special-input/CMakeLists.txt +++ b/module-apps/application-special-input/CMakeLists.txt @@ -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" + $ 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 + $ +) + +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 + $<$:ENABLE_APP_SPECIAL_INPUT> +) + +target_link_libraries(application-special-input + PRIVATE + apps-common + i18n + service-appmgr + utf8 + + PUBLIC + apps-common + module-gui + ) diff --git a/module-apps/application-special-input/ApplicationSpecialInput.hpp b/module-apps/application-special-input/include/application-special-input/ApplicationSpecialInput.hpp similarity index 96% rename from module-apps/application-special-input/ApplicationSpecialInput.hpp rename to module-apps/application-special-input/include/application-special-input/ApplicationSpecialInput.hpp index d20eb3ce51df0e7633989f5e5b32e9b62a9df8c4..b53393c6b7c89978822b22940394bae1e9ae0871 100644 --- a/module-apps/application-special-input/ApplicationSpecialInput.hpp +++ b/module-apps/application-special-input/include/application-special-input/ApplicationSpecialInput.hpp @@ -3,8 +3,8 @@ #pragma once -#include "Application.hpp" -#include "SwitchData.hpp" +#include +#include #include namespace app diff --git a/module-apps/application-special-input/models/SpecialInputModel.cpp b/module-apps/application-special-input/models/SpecialInputModel.cpp index ab26092e42ffca20191ace94637f0977e534bb9c..bcce7593eeaa5ff91b35bb9864795db048ba1f34 100644 --- a/module-apps/application-special-input/models/SpecialInputModel.cpp +++ b/module-apps/application-special-input/models/SpecialInputModel.cpp @@ -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 SpecialInputModel::SpecialInputModel(app::Application *app) : application(app) diff --git a/module-apps/application-special-input/models/SpecialInputModel.hpp b/module-apps/application-special-input/models/SpecialInputModel.hpp index f88416601a7b17e9f5da5ce315a114f938253c64..f158f78fe10ec1741055a1ee188f20f0ff0c1437 100644 --- a/module-apps/application-special-input/models/SpecialInputModel.hpp +++ b/module-apps/application-special-input/models/SpecialInputModel.hpp @@ -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 +#include #include diff --git a/module-apps/application-special-input/widgets/SpecialInputTableWidget.cpp b/module-apps/application-special-input/widgets/SpecialInputTableWidget.cpp index 1a38310336e0a4518530ffd9143ad83e0487ad40..ce7c968bd61ac72056c36a8ee479e464f7482d0b 100644 --- a/module-apps/application-special-input/widgets/SpecialInputTableWidget.cpp +++ b/module-apps/application-special-input/widgets/SpecialInputTableWidget.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 "SpecialInputTableWidget.hpp" +#include "ApplicationSpecialInput.hpp" +#include "SpecialCharactersTableStyle.hpp" +#include +#include +#include +#include #include #include -#include "module-apps/application-special-input/widgets/SpecialInputTableWidget.hpp" -#include "application-special-input/data/SpecialCharactersTableStyle.hpp" -#include -#include -#include - -#include "Style.hpp" -#include "messages/AppMessage.hpp" namespace gui { diff --git a/module-apps/application-special-input/widgets/SpecialInputTableWidget.hpp b/module-apps/application-special-input/widgets/SpecialInputTableWidget.hpp index 75b4ba1736ba96072390a6477a188d0c7deaecfa..e5e16810106ed18112685ada24cab817b435160f 100644 --- a/module-apps/application-special-input/widgets/SpecialInputTableWidget.hpp +++ b/module-apps/application-special-input/widgets/SpecialInputTableWidget.hpp @@ -3,14 +3,14 @@ #pragma once +#include "SpecialCharactersTableStyle.hpp" +#include "SpecialInputMainWindow.hpp" +#include #include #include #include #include -#include -#include -#include -#include +#include namespace gui { diff --git a/module-apps/application-special-input/windows/SpecialInputMainWindow.cpp b/module-apps/application-special-input/windows/SpecialInputMainWindow.cpp index 6c0ec7f782f3839fda7e369f8b8a9e02f2ecdce3..41c492e78f8b395aef98084ba03f7542e2886cf3 100644 --- a/module-apps/application-special-input/windows/SpecialInputMainWindow.cpp +++ b/module-apps/application-special-input/windows/SpecialInputMainWindow.cpp @@ -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 #include +#include #include using namespace gui; diff --git a/module-apps/application-special-input/windows/SpecialInputMainWindow.hpp b/module-apps/application-special-input/windows/SpecialInputMainWindow.hpp index befc6e65be12a48082da0a189c68650203bc6a32..03e045d71a8a6c75097693f7b1d46e167da5b9ba 100644 --- a/module-apps/application-special-input/windows/SpecialInputMainWindow.hpp +++ b/module-apps/application-special-input/windows/SpecialInputMainWindow.hpp @@ -3,17 +3,16 @@ #pragma once -#include -#include - -#include "AppWindow.hpp" -#include "gui/widgets/Image.hpp" -#include "gui/widgets/Label.hpp" -#include "gui/widgets/Window.hpp" +#include "SpecialInputModel.hpp" +#include +#include +#include +#include #include +#include #include -#include -#include +#include +#include namespace gui { diff --git a/module-services/service-appmgr/CMakeLists.txt b/module-services/service-appmgr/CMakeLists.txt index 7b7f870e8f234da306f06f21e8d803c0c80ca8f4..e0334e5286b9d441e938608d4f3ccf4a3b308f54 100644 --- a/module-services/service-appmgr/CMakeLists.txt +++ b/module-services/service-appmgr/CMakeLists.txt @@ -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 diff --git a/products/BellHybrid/BellHybridMain.cpp b/products/BellHybrid/BellHybridMain.cpp index 0981e140dcb156910bcb32ead68b8888090efbdd..56d9b6ffb7eb885d49d543f0178e3731ff949b6a 100644 --- a/products/BellHybrid/BellHybridMain.cpp +++ b/products/BellHybrid/BellHybridMain.cpp @@ -5,7 +5,6 @@ // applications #include -#include #include #include #include diff --git a/products/PurePhone/CMakeLists.txt b/products/PurePhone/CMakeLists.txt index 224f43225f06fc2ef002a2abccb4cf2ddd5ade29..341dd65877266fcc844523cbbf25c4a21c8b5a39 100644 --- a/products/PurePhone/CMakeLists.txt +++ b/products/PurePhone/CMakeLists.txt @@ -58,6 +58,7 @@ target_link_libraries(PurePhone application-music-player application-notes application-phonebook + application-special-input messagetype module-apps module-bsp