19 files changed, 82 insertions(+), 48 deletions(-)

M module-apps/CMakeLists.txt
M module-apps/application-calculator/ApplicationCalculator.cpp
M module-apps/application-calculator/CMakeLists.txt
M module-apps/application-calculator/data/CalculatorInputProcessorText.cpp
M module-apps/application-calculator/data/CalculatorInputProcessorText.hpp
M module-apps/application-calculator/data/CalculatorUtility.cpp
M module-apps/application-calculator/data/CalculatorUtility.hpp
R module-apps/application-calculator/{ => include}/application-calculator/ApplicationCalculator.hpp
M module-apps/application-calculator/tests/CMakeLists.txt
M module-apps/application-calculator/tests/CalculatorInput_tests.cpp
M module-apps/application-calculator/tests/CalculatorUtility_tests.cpp
M module-apps/application-calculator/widgets/MathOperationsBox.cpp
M module-apps/application-calculator/widgets/MathOperationsBox.hpp
M module-apps/application-calculator/windows/CalculatorMainWindow.cpp
M module-apps/application-calculator/windows/CalculatorMainWindow.hpp
M module-apps/apps-common/CMakeLists.txt
M module-gui/gui/input/Profile.hpp
M products/BellHybrid/BellHybridMain.cpp
M products/PurePhone/CMakeLists.txt

@@ 10,6 10,7 @@ add_library(${PROJECT_NAME} STATIC)
 
 add_subdirectory(application-antenna)
 add_subdirectory(application-bell-main)
+add_subdirectory(application-calculator)
 add_subdirectory(application-music-player)
 add_subdirectory(application-phonebook)
 add_subdirectory(apps-common)


@@ 27,7 28,6 @@ set(APPLICATIONS
     calllog
     special-input
     meditation
-    calculator
     alarm-clock
 )
 

@@ 1,8 1,8 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "ApplicationCalculator.hpp"
-#include "windows/CalculatorMainWindow.hpp"
+#include <application-calculator/ApplicationCalculator.hpp>
+#include <windows/CalculatorMainWindow.hpp>
 #include <i18n/i18n.hpp>
 
 namespace app

@@ 1,23 1,54 @@
-target_sources( ${PROJECT_NAME}
-    PRIVATE
-        "${CMAKE_CURRENT_LIST_DIR}/ApplicationCalculator.cpp"
-        "${CMAKE_CURRENT_LIST_DIR}/windows/CalculatorMainWindow.cpp"
-        "${CMAKE_CURRENT_LIST_DIR}/widgets/MathOperationsBox.cpp"
-        "${CMAKE_CURRENT_LIST_DIR}/data/CalculatorUtility.cpp"
-        "${CMAKE_CURRENT_LIST_DIR}/data/CalculatorInputProcessor.cpp"
-        "${CMAKE_CURRENT_LIST_DIR}/data/CalculatorInputProcessorText.cpp"
+# Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+# For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+add_library(application-calculator STATIC)
 
+target_include_directories(application-calculator
+    PRIVATE
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
     PUBLIC
-        "${CMAKE_CURRENT_LIST_DIR}/ApplicationCalculator.hpp"
-        "${CMAKE_CURRENT_LIST_DIR}/widgets/CalculatorStyle.hpp"
-        )
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+)
+
+target_sources(application-calculator
+    PRIVATE
+        ApplicationCalculator.cpp
+        data/CalculatorInputProcessor.cpp
+        data/CalculatorInputProcessorText.cpp
+        data/CalculatorUtility.cpp
+        widgets/MathOperationsBox.cpp
+        windows/CalculatorMainWindow.cpp
+   PUBLIC
+        data/CalculatorInputProcessor.hpp
+        data/CalculatorInputProcessorText.hpp
+        data/CalculatorUtility.hpp
+        include/application-calculator/ApplicationCalculator.hpp
+        widgets/CalculatorStyle.hpp
+        widgets/MathOperationsBox.hpp
+        windows/CalculatorMainWindow.hpp
+        
+       
+)
+
+option(ENABLE_APP_CALCULATOR "Enable application calculator" ON)
+
+target_compile_definitions(application-calculator
+    INTERFACE
+        $<$<BOOL:${ENABLE_APP_CALCULATOR}>:ENABLE_APP_CALCULATOR>
+)
 
 if (${ENABLE_TESTS})
-    add_subdirectory( tests )
+    add_subdirectory(tests)
 endif()
 
-target_link_libraries(${PROJECT_NAME}
+target_link_libraries(application-calculator
+    PUBLIC
+        apps-common
     PRIVATE
-        service-evtmgr
+        i18n
+        Microsoft.GSL::GSL
+        module-gui
+        module-utils
         tinyexpr::tinyexpr
+        utf8
 )

@@ 2,10 2,9 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "CalculatorInputProcessorText.hpp"
-
 #include "CalculatorUtility.hpp"
-#include <gui/input/InputEvent.hpp>
-#include <gui/widgets/Text.hpp>
+#include <module-gui/gui/input/InputEvent.hpp>
+#include <module-gui/gui/widgets/Text.hpp>
 #include <i18n/i18n.hpp>
 #include <gsl/assert>
 

@@ 4,7 4,6 @@
 #pragma once
 
 #include "CalculatorInputProcessor.hpp"
-
 #include <gsl/pointers>
 
 namespace gui

@@ 1,12 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 "CalculatorInputProcessor.hpp"
 #include "CalculatorUtility.hpp"
-#include "application-calculator/data/CalculatorInputProcessor.hpp"
-#include "application-calculator/widgets/CalculatorStyle.hpp"
-#include <tinyexpr.h>
+#include <widgets/CalculatorStyle.hpp>
 #include <i18n/i18n.hpp>
-#include <Utils.hpp>
+#include <module-utils/Utils.hpp>
+#include <tinyexpr.h>
 #include <cmath>
 
 namespace calc

@@ 2,6 2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
+
 #include <string>
 
 namespace calc

@@ 3,7 3,7 @@
 
 #pragma once
 
-#include <Application.hpp>
+#include <apps-common/Application.hpp>
 
 namespace app
 {

@@ 6,14 6,16 @@ add_catch2_executable(
     NAME
         calculator
     SRCS
-        "${CMAKE_CURRENT_SOURCE_DIR}/tests-main.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/CalculatorInput_tests.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/CalculatorUtility_tests.cpp"
+        tests-main.cpp
+        CalculatorInput_tests.cpp
+        CalculatorUtility_tests.cpp
     LIBS
-        module-sys
+        application-calculator
         iosyscalls
-        module-apps
-        module-utils
+        module-gui
+        module-sys
     DEPS
         assets
 )
+
+target_include_directories(catch2-calculator PRIVATE $<TARGET_PROPERTY:application-calculator,INCLUDE_DIRECTORIES>)

@@ 1,10 1,10 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
+#include <data/CalculatorInputProcessorText.hpp>
 #include <catch2/catch.hpp>
-#include "application-calculator/data/CalculatorInputProcessorText.hpp"
-#include <gui/widgets/Text.hpp>
 #include <i18n/i18n.hpp>
+#include <module-gui/gui/widgets/Text.hpp>
 #include <cstring>
 
 SCENARIO("Input Processor tests")

@@ 1,9 1,9 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
+#include <data/CalculatorUtility.hpp>
+#include <data/CalculatorInputProcessor.hpp>
 #include <catch2/catch.hpp>
-#include "application-calculator/data/CalculatorUtility.hpp"
-#include "application-calculator/data/CalculatorInputProcessor.hpp"
 #include <i18n/i18n.hpp>
 #include <cstring>
 

@@ 1,10 1,10 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
+#include "CalculatorStyle.hpp"
 #include "MathOperationsBox.hpp"
-#include "application-calculator/widgets/CalculatorStyle.hpp"
-#include "application-calculator/data/CalculatorInputProcessor.hpp"
-#include <gui/widgets/Label.hpp>
+#include <data/CalculatorInputProcessor.hpp>
+#include <module-gui/gui/widgets/Label.hpp>
 #include <cassert>
 
 namespace gui

@@ 2,9 2,10 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
+
 #include <apps-common/Application.hpp>
-#include <module-gui/gui/widgets/Item.hpp>
 #include <module-gui/gui/widgets/GridLayout.hpp>
+#include <module-gui/gui/widgets/Item.hpp>
 
 namespace gui
 {

@@ 2,8 2,8 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "CalculatorMainWindow.hpp"
-#include "application-calculator/widgets/CalculatorStyle.hpp"
-#include "application-calculator/data/CalculatorInputProcessorText.hpp"
+#include <data/CalculatorInputProcessorText.hpp>
+#include <widgets/CalculatorStyle.hpp>
 
 namespace gui
 {

@@ 3,10 3,10 @@
 
 #pragma once
 
-#include "windows/AppWindow.hpp"
-#include "Application.hpp"
-#include "application-calculator/data/CalculatorInputProcessor.hpp"
-#include "application-calculator/widgets/MathOperationsBox.hpp"
+#include <data/CalculatorInputProcessor.hpp>
+#include <widgets/MathOperationsBox.hpp>
+#include <apps-common/Application.hpp>
+#include <apps-common/windows/AppWindow.hpp>
 #include <module-gui/gui/widgets/Text.hpp>
 
 namespace gui

@@ 51,7 51,6 @@ target_link_libraries(apps-common
         service-appmgr
         service-audio
         service-cellular
-        service-db
         service-evtmgr
         service-time
     PUBLIC

@@ 1,6 1,8 @@
 // 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 "InputEvent.hpp"
 #include <string>
 #include <cstdint>

@@ 15,7 15,6 @@
 #include <application-calendar/ApplicationCalendar.hpp>
 #include <application-music-player/ApplicationMusicPlayer.hpp>
 #include <application-meditation/ApplicationMeditation.hpp>
-#include <application-calculator/ApplicationCalculator.hpp>
 #include <application-alarm-clock/ApplicationAlarmClock.hpp>
 #include <application-onboarding/ApplicationOnBoarding.hpp>
 #include <application-bell-main/ApplicationBellMain.hpp>

@@ 49,6 49,7 @@ set_target_properties(PurePhone
 target_link_libraries(PurePhone
     PRIVATE
         application-antenna
+        application-calculator
         application-music-player
         application-phonebook
         module-apps