Project restructuring (fixes macOS builds) (#198)

- Create `Include/` folder for all main projects
- Fix some issues here and there (found while moving things)
- All includes are now in `Tactility/` subfolder and must be included with that prefix. This fixes issues with clashing POSIX headers (e.g. `<semaphore.h>` versus Tactility's `Semaphore.h`)

Tactility/CMakeLists.txt

@@ -8,25 +8,21 @@ if (DEFINED ENV{ESP_IDF_VERSION})
 
     idf_component_register(
         SRCS ${SOURCE_FILES}
-        INCLUDE_DIRS "Source/"
+        INCLUDE_DIRS "Include/"
         PRIV_INCLUDE_DIRS "Private/"
         REQUIRES TactilityHeadless lvgl driver elf_loader lv_screenshot QRCode
     )
 
-    add_definitions(-DESP_PLATFORM)
-
     if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
         target_compile_options(${COMPONENT_LIB} PUBLIC -Wno-unused-variable)
     endif()
 else()
     file(GLOB_RECURSE SOURCES "Source/*.c*")
-    file(GLOB_RECURSE HEADERS "Source/*.h*")
 
     add_library(Tactility OBJECT)
 
     target_sources(Tactility
         PRIVATE ${SOURCES}
-        PUBLIC ${HEADERS}
     )
 
     include_directories(
@@ -34,11 +30,12 @@ else()
     )
 
     target_include_directories(Tactility
-        PUBLIC Source/
+        PUBLIC Include/
     )
 
     add_definitions(-D_Nullable=)
     add_definitions(-D_Nonnull=)
+
     target_link_libraries(Tactility
         PUBLIC TactilityHeadless
         PUBLIC lvgl

Tactility/Include/Tactility/Tactility.h

@@ -1,9 +1,10 @@
 #pragma once
 
-#include "app/AppManifest.h"
-#include "hal/Configuration.h"
-#include "service/ServiceManifest.h"
-#include "TactilityConfig.h"
+#include "Tactility/app/AppManifest.h"
+
+#include <Tactility/hal/Configuration.h>
+#include <Tactility/service/ServiceManifest.h>
+#include <Tactility/TactilityConfig.h>
 
 namespace tt {
 

Tactility/Include/Tactility/TactilityConfig.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #ifdef ESP_PLATFORM
-#include "sdkconfig.h"
+#include <sdkconfig.h>
 #endif
 
 #define TT_CONFIG_FORCE_ONSCREEN_KEYBOARD false // for development/debug purposes

Tactility/Include/Tactility/app/App.h

@@ -1,8 +1,10 @@
 #pragma once
 
-#include "AppContext.h"
-#include "Bundle.h"
-#include <Mutex.h>
+#include "Tactility/app/AppContext.h"
+
+#include <Tactility/Bundle.h>
+#include <Tactility/Mutex.h>
+
 #include <string>
 
 // Forward declarations

Tactility/Include/Tactility/app/AppContext.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Bundle.h"
+#include <Tactility/Bundle.h>
 #include <memory>
 
 namespace tt::app {

Tactility/Include/Tactility/app/AppManifest.h

@@ -1,8 +1,10 @@
 #pragma once
 
-#include "CoreDefines.h"
-#include "ManifestRegistry.h"
-#include <Bundle.h>
+#include "Tactility/app/ManifestRegistry.h"
+
+#include <Tactility/CoreDefines.h>
+#include <Tactility/Bundle.h>
+
 #include <string>
 
 // Forward declarations

Tactility/Include/Tactility/app/alertdialog/AlertDialog.h

@@ -1,8 +1,9 @@
 #pragma once
 
+#include <Tactility/Bundle.h>
+
 #include <string>
 #include <vector>
-#include "Bundle.h"
 
 /**
  * Start the app by its ID and provide:

Tactility/Include/Tactility/app/files/Files.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "View.h"
-#include "State.h"
+#include "app/files/View.h"
+#include "app/files/State.h"
 #include "app/AppManifest.h"
 
 #include <lvgl.h>

Tactility/Include/Tactility/app/inputdialog/InputDialog.h

@@ -1,8 +1,9 @@
 #pragma once
 
+#include <Tactility/Bundle.h>
+
 #include <string>
 #include <vector>
-#include "Bundle.h"
 
 /**
  * Start the app by its ID and provide:

Tactility/Include/Tactility/app/selectiondialog/SelectionDialog.h

@@ -1,8 +1,9 @@
 #pragma once
 
+#include <Tactility/Bundle.h>
+
 #include <string>
 #include <vector>
-#include "Bundle.h"
 
 /**
  * Start the app by its ID and provide:

Tactility/Include/Tactility/app/wifimanage/WifiManage.h

@@ -0,0 +1,7 @@
+#pragma once
+
+namespace tt::app::wifimanage {
+
+void start();
+
+} // namespace

Tactility/Include/Tactility/lvgl/LvglDisplay.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "hal/Display.h"
+#include <Tactility/hal/Display.h>
 
 namespace tt::lvgl {
     hal::Display* getDisplay();

Tactility/Include/Tactility/lvgl/LvglKeypad.h

@@ -3,7 +3,7 @@
  */
 #pragma once
 
-#include "lvgl.h"
+#include <lvgl.h>
 
 namespace tt::lvgl {
 

Tactility/Include/Tactility/lvgl/LvglSync.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Lockable.h"
+#include <Tactility/Lockable.h>
 
 #include <memory>
 

Tactility/Include/Tactility/lvgl/Statusbar.h

@@ -1,7 +1,8 @@
 #pragma once
 
-#include "lvgl.h"
-#include "app/AppContext.h"
+#include "Tactility/app/AppContext.h"
+
+#include <lvgl.h>
 
 namespace tt::lvgl {
 

Tactility/Include/Tactility/lvgl/Toolbar.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "lvgl.h"
-#include "app/AppContext.h"
+#include "../app/AppContext.h"
 
 namespace tt::lvgl {
 

Tactility/Include/Tactility/service/gui/Gui.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "app/AppInstance.h"
-#include "app/AppContext.h"
+#include "Tactility/app/AppInstance.h"
+#include "Tactility/app/AppContext.h"
 
 namespace tt::service::gui {
 

Tactility/Include/Tactility/service/loader/Loader.h

@@ -1,9 +1,11 @@
 #pragma once
 
-#include "Bundle.h"
-#include "PubSub.h"
-#include "app/AppManifest.h"
-#include "service/ServiceManifest.h"
+#include "Tactility/app/AppManifest.h"
+
+#include <Tactility/Bundle.h>
+#include <Tactility/PubSub.h>
+#include <Tactility/service/ServiceManifest.h>
+
 #include <memory>
 
 namespace tt::service::loader {

Tactility/Private/Tactility/app/AppInstance.h

@@ -1,10 +1,12 @@
 #pragma once
 
-#include "Bundle.h"
-#include "Mutex.h"
-#include "app/AppContext.h"
-#include "app/AppManifest.h"
-#include "app/ElfApp.h"
+#include "Tactility/app/AppContext.h"
+#include "Tactility/app/AppManifest.h"
+#include "Tactility/app/ElfApp.h"
+
+#include <Tactility/Bundle.h>
+#include <Tactility/Mutex.h>
+
 #include <memory>
 #include <utility>
 

Tactility/Private/Tactility/app/AppInstancePaths.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "app/AppInstance.h"
+#include "Tactility/app/AppInstance.h"
 
 namespace tt::app {
 

Tactility/Private/Tactility/app/files/State.h

@@ -1,9 +1,10 @@
 #pragma once
 
+#include <Tactility/Mutex.h>
+
 #include <string>
 #include <vector>
 #include <dirent.h>
-#include "Mutex.h"
 
 namespace tt::app::files {
 

Tactility/Private/Tactility/app/files/View.h

@@ -2,7 +2,8 @@
 
 #include "./State.h"
 
-#include "app/AppManifest.h"
+#include "Tactility/app/AppManifest.h"
+
 #include <lvgl.h>
 #include <memory>
 

Tactility/Private/Tactility/app/i2cscanner/I2cScanner.h

@@ -4,7 +4,7 @@
 #include <Mutex.h>
 #include <Thread.h>
 #include "lvgl.h"
-#include "hal/i2c/I2c.h"
+#include <Tactility/hal/i2c/I2c.h>
 #include "Timer.h"
 #include <memory>
 

Tactility/Private/Tactility/app/i2cscanner/I2cScannerPrivate.h

@@ -1,11 +1,12 @@
 #pragma once
 
-#include <TactilityCore.h>
-#include <Mutex.h>
-#include <Thread.h>
-#include "lvgl.h"
-#include "hal/i2c/I2c.h"
-#include "Timer.h"
+#include <Tactility/hal/i2c/I2c.h>
+#include <Tactility/Mutex.h>
+#include <Tactility/TactilityCore.h>
+#include <Tactility/Thread.h>
+#include <Tactility/Timer.h>
+
+#include <lvgl.h>
 #include <memory>
 
 namespace tt::app::i2cscanner {

Tactility/Private/Tactility/app/timezone/TimeZone.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Bundle.h"
+#include <Tactility/Bundle.h>
 
 namespace tt::app::timezone {
 

Tactility/Private/Tactility/app/wifiapsettings/WifiApSettings.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "Bundle.h"
-#include "Mutex.h"
-#include "service/wifi/Wifi.h"
+#include <Tactility/Bundle.h>
+#include <Tactility/Mutex.h>
+#include <Tactility/service/wifi/Wifi.h>
 
 namespace tt::app::wifiapsettings {
 

Tactility/Private/Tactility/app/wificonnect/Bindings.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "service/wifi/WifiSettings.h"
+#include "Tactility/service/wifi/WifiSettings.h"
 
 namespace tt::app::wificonnect {
 

Tactility/Private/Tactility/app/wificonnect/State.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "Mutex.h"
-#include "service/wifi/Wifi.h"
-#include "service/wifi/WifiSettings.h"
+#include <Tactility/Mutex.h>
+#include <Tactility/service/wifi/Wifi.h>
+#include <Tactility/service/wifi/WifiSettings.h>
 
 namespace tt::app::wificonnect {
 

Tactility/Private/Tactility/app/wificonnect/View.h

@@ -1,10 +1,11 @@
 #pragma once
 
-#include "Bindings.h"
-#include "State.h"
+#include "./Bindings.h"
+#include "./State.h"
 
-#include "app/AppContext.h"
-#include "lvgl.h"
+#include "Tactility/app/AppContext.h"
+
+#include <lvgl.h>
 
 namespace tt::app::wificonnect {
 

Tactility/Private/Tactility/app/wificonnect/WifiConnect.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "app/App.h"
-#include "app/wificonnect/Bindings.h"
-#include "app/wificonnect/State.h"
-#include "app/wificonnect/View.h"
+#include "Tactility/app/App.h"
+#include "Tactility/app/wificonnect/Bindings.h"
+#include "Tactility/app/wificonnect/State.h"
+#include "Tactility/app/wificonnect/View.h"
 
-#include "Mutex.h"
-#include "service/wifi/Wifi.h"
+#include <Tactility/Mutex.h>
+#include <Tactility/service/wifi/Wifi.h>
 
 namespace tt::app::wificonnect {
 
@@ -43,7 +43,13 @@ public:
     void requestViewUpdate();
 };
 
+/**
+ * Start the app with optional pre-filled fields.
+ */
+void start(const std::string& ssid = "", const std::string& password = "");
+
 bool optSsidParameter(const std::shared_ptr<const Bundle>& bundle, std::string& ssid);
+
 bool optPasswordParameter(const std::shared_ptr<const Bundle>& bundle, std::string& password);
 
 } // namespace

Tactility/Private/Tactility/app/wifimanage/State.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "service/wifi/Wifi.h"
-#include "Mutex.h"
+#include <Tactility/service/wifi/Wifi.h>
+#include <Tactility/Mutex.h>
 
 namespace tt::app::wifimanage {
 

Tactility/Private/Tactility/app/wifimanage/View.h

@@ -1,9 +1,11 @@
 #pragma once
 
-#include "app/AppContext.h"
 #include "./Bindings.h"
 #include "./State.h"
-#include "lvgl.h"
+
+#include "Tactility/app/AppContext.h"
+
+#include <lvgl.h>
 
 namespace tt::app::wifimanage {
 

Tactility/Private/Tactility/app/wifimanage/WifiManagePrivate.h

@@ -1,10 +1,13 @@
 #pragma once
 
-#include "app/App.h"
-#include "Mutex.h"
 #include "./View.h"
 #include "./State.h"
-#include "service/wifi/Wifi.h"
+
+#include "Tactility/app/App.h"
+
+#include <Tactility/PubSub.h>
+#include <Tactility/Mutex.h>
+#include <Tactility/service/wifi/Wifi.h>
 
 namespace tt::app::wifimanage {
 

Tactility/Private/Tactility/lvgl/Init_i.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "hal/Configuration.h"
+#include <Tactility/hal/Configuration.h>
 
 namespace tt::lvgl {
 

Tactility/Private/Tactility/service/gui/Gui_i.h

@@ -1,10 +1,12 @@
 #pragma once
 
-#include "MessageQueue.h"
-#include "Mutex.h"
-#include "PubSub.h"
-#include "service/gui/Gui.h"
+#include <Tactility/MessageQueue.h>
+#include <Tactility/Mutex.h>
+#include <Tactility/PubSub.h>
+#include <Tactility/service/gui/Gui.h>
+
 #include <cstdio>
+
 #include <lvgl.h>
 
 namespace tt::service::gui {

Tactility/Private/Tactility/service/loader/Loader_i.h

@@ -1,14 +1,16 @@
 #pragma once
 
-#include "EventFlag.h"
-#include "MessageQueue.h"
-#include "PubSub.h"
-#include "RtosCompatSemaphore.h"
-#include "Thread.h"
-#include "app/AppInstance.h"
-#include "app/AppManifest.h"
-#include "service/loader/Loader.h"
-#include <DispatcherThread.h>
+#include "Tactility/app/AppInstance.h"
+#include "Tactility/app/AppManifest.h"
+#include "Tactility/service/loader/Loader.h"
+
+#include <Tactility/DispatcherThread.h>
+#include <Tactility/EventFlag.h>
+#include <Tactility/MessageQueue.h>
+#include <Tactility/PubSub.h>
+#include <Tactility/RtosCompatSemaphore.h>
+#include <Tactility/Thread.h>
+
 #include <stack>
 #include <utility>
 

Tactility/Private/Tactility/service/screenshot/Screenshot.h

@@ -1,13 +1,13 @@
 #pragma once
 
-#include "TactilityConfig.h"
+#include "Tactility/TactilityConfig.h"
 
 #if TT_FEATURE_SCREENSHOT_ENABLED
 
-#include "Mutex.h"
 #include "ScreenshotTask.h"
-#include "service/Service.h"
-#include <cstdint>
+
+#include <Tactility/Mutex.h>
+#include <Tactility/service/Service.h>
 
 namespace tt::service::screenshot {
 

Tactility/Private/Tactility/service/screenshot/ScreenshotTask.h

@@ -1,12 +1,11 @@
-#include "TactilityConfig.h"
+#include "Tactility/TactilityConfig.h"
 
 #if TT_FEATURE_SCREENSHOT_ENABLED
 
 #pragma once
 
-#include <cstdint>
-#include <Thread.h>
-#include <Mutex.h>
+#include <Tactility/Thread.h>
+#include <Tactility/Mutex.h>
 
 namespace tt::service::screenshot {
 

Tactility/Source/Tactility.cpp

@@ -1,10 +1,12 @@
-#include "Tactility.h"
+#include "Tactility/Tactility.h"
 
-#include "app/ManifestRegistry.h"
-#include "service/ServiceRegistry.h"
-#include "service/loader/Loader.h"
-#include "TactilityHeadless.h"
-#include "lvgl/Init_i.h"
+#include "Tactility/app/ManifestRegistry.h"
+#include "Tactility/lvgl/Init_i.h"
+#include "Tactility/service/ServiceManifest.h"
+
+#include <Tactility/TactilityHeadless.h>
+#include <Tactility/service/ServiceRegistry.h>
+#include <Tactility/service/loader/Loader.h>
 
 namespace tt {
 

Tactility/Source/app/App.cpp

@@ -1,5 +1,6 @@
-#include "App.h"
-#include "service/loader/Loader.h"
+#include "Tactility/app/App.h"
+
+#include <Tactility/service/loader/Loader.h>
 
 namespace tt::app {
 

Tactility/Source/app/AppInstance.cpp

@@ -1,5 +1,5 @@
-#include "app/AppInstance.h"
-#include "app/AppInstancePaths.h"
+#include "Tactility/app/AppInstance.h"
+#include "Tactility/app/AppInstancePaths.h"
 
 namespace tt::app {
 

Tactility/Source/app/AppInstancePaths.cpp

@@ -1,5 +1,6 @@
-#include "app/AppInstancePaths.h"
-#include "Partitions.h"
+#include "Tactility/app/AppInstancePaths.h"
+
+#include <Tactility/Partitions.h>
 
 #define LVGL_PATH_PREFIX std::string("A:/")
 #ifdef ESP_PLATFORM

Tactility/Source/app/ElfApp.cpp

@@ -1,12 +1,13 @@
 #ifdef ESP_PLATFORM
 
-#include "ElfApp.h"
-#include "Log.h"
-#include "StringUtils.h"
-#include "TactilityCore.h"
+#include "Tactility/app/ElfApp.h"
+#include "Tactility/file/File.h"
+#include "Tactility/service/loader/Loader.h"
+
+#include <Tactility/Log.h>
+#include <Tactility/StringUtils.h>
+
 #include "esp_elf.h"
-#include "file/File.h"
-#include "service/loader/Loader.h"
 
 #include <string>
 #include <utility>

Tactility/Source/app/ManifestRegistry.cpp

@@ -1,6 +1,8 @@
-#include "ManifestRegistry.h"
-#include "Mutex.h"
-#include "AppManifest.h"
+#include "Tactility/app/ManifestRegistry.h"
+#include "Tactility/app/AppManifest.h"
+
+#include <Tactility/Mutex.h>
+
 #include <unordered_map>
 
 #define TAG "app"

Tactility/Source/app/alertdialog/AlertDialog.cpp

@@ -1,9 +1,12 @@
-#include "AlertDialog.h"
-#include "lvgl.h"
-#include "lvgl/Toolbar.h"
-#include "service/loader/Loader.h"
-#include <StringUtils.h>
-#include <TactilityCore.h>
+#include "Tactility/app/alertdialog/AlertDialog.h"
+
+#include "Tactility/lvgl/Toolbar.h"
+#include "Tactility/service/loader/Loader.h"
+
+#include <Tactility/StringUtils.h>
+#include <Tactility/TactilityCore.h>
+
+#include <lvgl.h>
 
 namespace tt::app::alertdialog {
 

Tactility/Source/app/applist/AppList.cpp

@@ -1,10 +1,12 @@
-#include "app/ManifestRegistry.h"
-#include "Assets.h"
-#include "Check.h"
-#include "lvgl.h"
+#include "Tactility/app/ManifestRegistry.h"
+#include "Tactility/service/loader/Loader.h"
+#include "Tactility/lvgl/Toolbar.h"
+
+#include <Tactility/Assets.h>
+#include <Tactility/Check.h>
+
+#include <lvgl.h>
 #include <algorithm>
-#include "service/loader/Loader.h"
-#include "lvgl/Toolbar.h"
 
 namespace tt::app::applist {
 

Tactility/Source/app/boot/Boot.cpp

@@ -1,21 +1,22 @@
-#include "TactilityCore.h"
+#include "Tactility/TactilityCore.h"
 
-#include "app/AppContext.h"
-#include "app/display/DisplaySettings.h"
-#include "app/launcher/Launcher.h"
-#include "hal/Display.h"
-#include "service/loader/Loader.h"
-#include "lvgl/Style.h"
+#include "Tactility/app/AppContext.h"
+#include "Tactility/app/display/DisplaySettings.h"
+#include "Tactility/app/launcher/Launcher.h"
+#include "Tactility/service/loader/Loader.h"
+#include "Tactility/lvgl/Style.h"
 
-#include "lvgl.h"
-#include "Tactility.h"
-#include "hal/usb/Usb.h"
-#include "kernel/SystemEvents.h"
+#include <Tactility/Tactility.h>
+#include <Tactility/hal/Display.h>
+#include <Tactility/hal/usb/Usb.h>
+#include <Tactility/kernel/SystemEvents.h>
+
+#include <lvgl.h>
 
 #ifdef ESP_PLATFORM
-#include "kernel/PanicHandler.h"
-#include "sdkconfig.h"
-#include "app/crashdiagnostics/CrashDiagnostics.h"
+#include "Tactility/app/crashdiagnostics/CrashDiagnostics.h"
+#include <Tactility/kernel/PanicHandler.h>
+#include <sdkconfig.h>
 #else
 #define CONFIG_TT_SPLASH_DURATION 0
 #endif

Tactility/Source/app/crashdiagnostics/CrashDiagnostics.cpp

@@ -1,12 +1,13 @@
 #ifdef ESP_PLATFORM
 
-#include "app/crashdiagnostics/QrHelpers.h"
-#include "app/crashdiagnostics/QrUrl.h"
-#include "app/launcher/Launcher.h"
-#include "lvgl.h"
-#include "lvgl/Statusbar.h"
-#include "qrcode.h"
-#include "service/loader/Loader.h"
+#include "Tactility/app/crashdiagnostics/QrHelpers.h"
+#include "Tactility/app/crashdiagnostics/QrUrl.h"
+#include "Tactility/app/launcher/Launcher.h"
+#include "Tactility/lvgl/Statusbar.h"
+#include "Tactility/service/loader/Loader.h"
+
+#include <lvgl.h>
+#include <qrcode.h>
 
 #define TAG "crash_diagnostics"
 

Tactility/Source/app/crashdiagnostics/QrHelpers.cpp

@@ -1,4 +1,5 @@
-#include "app/crashdiagnostics/QrHelpers.h"
+#include "Tactility/app/crashdiagnostics/QrHelpers.h"
+
 #include <cstdint>
 
 /**

Tactility/Source/app/crashdiagnostics/QrUrl.cpp

@@ -1,9 +1,8 @@
 #ifdef ESP_PLATFORM
 
-#include "app/crashdiagnostics/QrUrl.h"
+#include "Tactility/app/crashdiagnostics/QrUrl.h"
 
-#include "kernel/PanicHandler.h"
-#include "Log.h"
+#include <Tactility/kernel/PanicHandler.h>
 
 #include <sstream>
 #include <esp_cpu_utils.h>

Tactility/Source/app/display/Display.cpp

@@ -1,10 +1,12 @@
-#include "app/AppContext.h"
-#include "Assets.h"
-#include "DisplaySettings.h"
-#include "Tactility.h"
-#include "lvgl/Toolbar.h"
-#include "lvgl.h"
-#include "hal/Display.h"
+#include "Tactility/app/display/DisplaySettings.h"
+
+#include "Tactility/hal/Display.h"
+#include "Tactility/lvgl/Toolbar.h"
+
+#include <Tactility/Assets.h>
+#include <Tactility/Tactility.h>
+
+#include <lvgl.h>
 
 namespace tt::app::display {
 
@@ -13,7 +15,6 @@ namespace tt::app::display {
 static bool backlight_duty_set = false;
 static uint8_t backlight_duty = 255;
 
-static bool gamma_set = false;
 static uint8_t gamma = 255;
 
 #define ROTATION_DEFAULT 0
@@ -49,7 +50,6 @@ static void onGammaSliderEvent(lv_event_t* event) {
         int32_t slider_value = lv_slider_get_value(slider);
 
         gamma = (uint8_t)slider_value;
-        gamma_set = true;
 
         hal_display->setGammaCurve(gamma);
     }

Tactility/Source/app/display/DisplaySettings.cpp

@@ -1,5 +1,6 @@
-#include "DisplaySettings.h"
-#include "Preferences.h"
+#include "Tactility/app/display/DisplaySettings.h"
+
+#include <Tactility/Preferences.h>
 
 namespace tt::app::display {
 

Tactility/Source/app/files/FileUtils.cpp

@@ -1,8 +1,9 @@
-#include "app/files/FileUtils.h"
+#include "Tactility/app/files/FileUtils.h"
+
+#include <Tactility/StringUtils.h>
+#include <Tactility/TactilityCore.h>
 
-#include "TactilityCore.h"
 #include <cstring>
-#include <StringUtils.h>
 
 namespace tt::app::files {
 

Tactility/Source/app/files/Files.cpp

@@ -1,9 +1,9 @@
-#include "app/files/View.h"
-#include "app/files/State.h"
+#include "Tactility/app/files/View.h"
+#include "Tactility/app/files/State.h"
+#include "Tactility/app/AppContext.h"
 
-#include "app/AppContext.h"
-#include "Assets.h"
-#include "service/loader/Loader.h"
+#include <Tactility/Assets.h>
+#include <Tactility/service/loader/Loader.h>
 
 #include <memory>
 

Tactility/Source/app/files/State.cpp

@@ -1,11 +1,11 @@
-#include "app/files/State.h"
-#include "app/files/FileUtils.h"
+#include "Tactility/app/files/State.h"
+#include "Tactility/app/files/FileUtils.h"
 
-#include "Log.h"
-#include "Partitions.h"
-#include "TactilityHeadless.h"
-#include "hal/SdCard.h"
-#include "kernel/Kernel.h"
+#include <Tactility/Log.h>
+#include <Tactility/Partitions.h>
+#include <Tactility/TactilityHeadless.h>
+#include <Tactility/hal/SdCard.h>
+#include <Tactility/kernel/Kernel.h>
 
 #include <unistd.h>
 

Tactility/Source/app/files/View.cpp

@@ -1,20 +1,22 @@
-#include "app/files/FileUtils.h"
-#include "app/files/View.h"
+#include "Tactility/app/files/FileUtils.h"
+#include "Tactility/app/files/View.h"
+
+#include "Tactility/app/alertdialog/AlertDialog.h"
+#include "Tactility/app/imageviewer/ImageViewer.h"
+#include "Tactility/app/inputdialog/InputDialog.h"
+#include "Tactility/app/textviewer/TextViewer.h"
+#include "Tactility/app/ElfApp.h"
+#include "Tactility/lvgl/Toolbar.h"
+#include "Tactility/lvgl/LvglSync.h"
+
+#include <Tactility/Tactility.h>
+#include <Tactility/StringUtils.h>
 
-#include "app/alertdialog/AlertDialog.h"
-#include "app/imageviewer/ImageViewer.h"
-#include "app/inputdialog/InputDialog.h"
-#include "app/textviewer/TextViewer.h"
-#include "app/ElfApp.h"
-#include "lvgl/Toolbar.h"
-#include "lvgl/LvglSync.h"
-#include "Tactility.h"
-#include "StringUtils.h"
 #include <cstring>
 #include <unistd.h>
 
 #ifdef ESP_PLATFORM
-#include "service/loader/Loader.h"
+#include "Tactility/service/loader/Loader.h"
 #endif
 
 #define TAG "files_app"

Tactility/Source/app/gpio/Gpio.cpp

@@ -1,11 +1,11 @@
-#include "Mutex.h"
-#include "Thread.h"
-#include "service/loader/Loader.h"
-#include "lvgl/Toolbar.h"
+#include "Tactility/service/loader/Loader.h"
+#include "Tactility/lvgl/Toolbar.h"
 
-#include "GpioHal.h"
-#include "lvgl/LvglSync.h"
-#include "Timer.h"
+#include <Tactility/app/gpio/GpioHal.h>
+#include <Tactility/lvgl/LvglSync.h>
+#include <Tactility/Mutex.h>
+#include <Tactility/Thread.h>
+#include <Tactility/Timer.h>
 
 namespace tt::app::gpio {
 

Tactility/Source/app/i2cscanner/I2cHelpers.cpp

@@ -1,6 +1,8 @@
-#include "app/i2cscanner/I2cHelpers.h"
-#include "Tactility.h"
-#include "StringUtils.h"
+#include "Tactility/app/i2cscanner/I2cHelpers.h"
+
+#include <Tactility/Tactility.h>
+#include <Tactility/StringUtils.h>
+
 #include <iomanip>
 #include <vector>
 #include <sstream>

Tactility/Source/app/i2cscanner/I2cScanner.cpp

@@ -1,13 +1,15 @@
-#include "app/i2cscanner/I2cScannerPrivate.h"
-#include "app/i2cscanner/I2cScannerThread.h"
-#include "app/i2cscanner/I2cHelpers.h"
+#include "Tactility/app/i2cscanner/I2cScannerPrivate.h"
+#include "Tactility/app/i2cscanner/I2cScannerThread.h"
+#include "Tactility/app/i2cscanner/I2cHelpers.h"
 
-#include "Assets.h"
-#include "Tactility.h"
-#include "app/AppContext.h"
-#include "lvgl/LvglSync.h"
-#include "lvgl/Toolbar.h"
-#include "service/loader/Loader.h"
+#include "Tactility/app/AppContext.h"
+#include "Tactility/lvgl/LvglSync.h"
+#include "Tactility/lvgl/Toolbar.h"
+#include "Tactility/service/loader/Loader.h"
+
+#include <Tactility/Assets.h>
+#include <Tactility/Tactility.h>
+#include <Tactility/Timer.h>
 
 #define START_SCAN_TEXT "Scan"
 #define STOP_SCAN_TEXT "Stop scan"

Tactility/Source/app/i2csettings/I2cSettings.cpp

@@ -1,9 +1,11 @@
-#include "Assets.h"
-#include "hal/i2c/I2c.h"
-#include "Tactility.h"
-#include "lvgl/Style.h"
-#include "lvgl/Toolbar.h"
-#include "lvgl.h"
+#include "Tactility/lvgl/Style.h"
+#include "Tactility/lvgl/Toolbar.h"
+
+#include <Tactility/Assets.h>
+#include <Tactility/hal/i2c/I2c.h>
+#include <Tactility/Tactility.h>
+
+#include <lvgl.h>
 
 namespace tt::app::i2csettings {
 

Tactility/Source/app/imageviewer/ImageViewer.cpp

@@ -1,9 +1,11 @@
-#include <TactilityCore.h>
-#include "lvgl.h"
-#include "lvgl/Style.h"
-#include "lvgl/Toolbar.h"
-#include "StringUtils.h"
-#include "service/loader/Loader.h"
+#include "Tactility/lvgl/Style.h"
+#include "Tactility/lvgl/Toolbar.h"
+#include "Tactility/service/loader/Loader.h"
+
+#include <Tactility/TactilityCore.h>
+#include <Tactility/StringUtils.h>
+
+#include <lvgl.h>
 
 namespace tt::app::imageviewer {
 

Tactility/Source/app/inputdialog/InputDialog.cpp

@@ -1,10 +1,12 @@
-#include "InputDialog.h"
-#include "lvgl.h"
-#include "lvgl/Toolbar.h"
-#include "service/loader/Loader.h"
-#include "service/gui/Gui.h"
-#include <StringUtils.h>
-#include <TactilityCore.h>
+#include "Tactility/app/inputdialog/InputDialog.h"
+
+#include "Tactility/lvgl/Toolbar.h"
+#include "Tactility/service/loader/Loader.h"
+#include "Tactility/service/gui/Gui.h"
+
+#include <Tactility/TactilityCore.h>
+
+#include <lvgl.h>
 
 namespace tt::app::inputdialog {
 

Tactility/Source/app/launcher/Launcher.cpp

@@ -1,9 +1,11 @@
-#include "Check.h"
-#include "Tactility.h"
-#include "app/AppContext.h"
-#include "app/ManifestRegistry.h"
-#include "lvgl.h"
-#include "service/loader/Loader.h"
+#include "Tactility/app/AppContext.h"
+#include "Tactility/app/ManifestRegistry.h"
+#include "Tactility/service/loader/Loader.h"
+
+#include <Tactility/Check.h>
+#include <Tactility/Tactility.h>
+
+#include <lvgl.h>
 
 #define TAG "launcher"
 

Tactility/Source/app/log/Log.cpp

@@ -1,14 +1,15 @@
-#include "lvgl.h"
-#include "lvgl/Style.h"
-#include "lvgl/Toolbar.h"
-#include "app/selectiondialog/SelectionDialog.h"
-#include "service/loader/Loader.h"
-#include "lvgl/LvglSync.h"
+#include "Tactility/app/selectiondialog/SelectionDialog.h"
+#include "Tactility/lvgl/Style.h"
+#include "Tactility/lvgl/Toolbar.h"
+#include "Tactility/lvgl/LvglSync.h"
+#include "Tactility/service/loader/Loader.h"
 
 #include <sstream>
 #include <vector>
 #include <ranges>
 
+#include <lvgl.h>
+
 #define TAG "text_viewer"
 
 namespace tt::app::log {

Tactility/Source/app/power/Power.cpp

@@ -1,12 +1,14 @@
-#include "app/AppContext.h"
-#include "Assets.h"
-#include "lvgl.h"
-#include "Tactility.h"
-#include "Timer.h"
-#include "lvgl/LvglSync.h"
-#include "lvgl/Style.h"
-#include "lvgl/Toolbar.h"
-#include "service/loader/Loader.h"
+#include "Tactility/app/AppContext.h"
+#include "Tactility/lvgl/LvglSync.h"
+#include "Tactility/lvgl/Style.h"
+#include "Tactility/lvgl/Toolbar.h"
+#include "Tactility/service/loader/Loader.h"
+
+#include <Tactility/Assets.h>
+#include <Tactility/Tactility.h>
+#include <Tactility/Timer.h>
+
+#include <lvgl.h>
 
 namespace tt::app::power {
 

Tactility/Source/app/screenshot/Screenshot.cpp

@@ -1,17 +1,19 @@
-#include "TactilityConfig.h"
-#include <Timer.h>
-#include <kernel/Kernel.h>
+#include "Tactility/TactilityConfig.h"
+
+#include <Tactility/Timer.h>
+#include <Tactility/kernel/Kernel.h>
 
 #if TT_FEATURE_SCREENSHOT_ENABLED
 
-#include "TactilityHeadless.h"
-#include "app/App.h"
-#include "app/AppManifest.h"
-#include "lvgl/LvglSync.h"
-#include "lvgl/Toolbar.h"
-#include "service/gui/Gui.h"
-#include "service/loader/Loader.h"
-#include "service/screenshot/Screenshot.h"
+#include "Tactility/app/App.h"
+#include "Tactility/app/AppManifest.h"
+#include "Tactility/lvgl/LvglSync.h"
+#include "Tactility/lvgl/Toolbar.h"
+#include "Tactility/service/gui/Gui.h"
+#include "Tactility/service/loader/Loader.h"
+#include "Tactility/service/screenshot/Screenshot.h"
+
+#include <Tactility/TactilityHeadless.h>
 
 #define TAG "screenshot"
 

Tactility/Source/app/selectiondialog/SelectionDialog.cpp

@@ -1,9 +1,12 @@
-#include "SelectionDialog.h"
-#include "lvgl.h"
-#include "lvgl/Toolbar.h"
-#include "service/loader/Loader.h"
-#include <StringUtils.h>
-#include <TactilityCore.h>
+#include "Tactility/app/selectiondialog/SelectionDialog.h"
+
+#include "Tactility/lvgl/Toolbar.h"
+#include "Tactility/service/loader/Loader.h"
+
+#include <Tactility/StringUtils.h>
+#include <Tactility/TactilityCore.h>
+
+#include <lvgl.h>
 
 namespace tt::app::selectiondialog {
 

Tactility/Source/app/settings/Settings.cpp

@@ -1,9 +1,11 @@
-#include "app/ManifestRegistry.h"
-#include "Assets.h"
-#include "Check.h"
-#include "service/loader/Loader.h"
-#include "lvgl/Toolbar.h"
-#include "lvgl.h"
+#include "Tactility/app/ManifestRegistry.h"
+#include "Tactility/lvgl/Toolbar.h"
+#include "Tactility/service/loader/Loader.h"
+
+#include <Tactility/Assets.h>
+#include <Tactility/Check.h>
+#include <lvgl.h>
+
 #include <algorithm>
 
 namespace tt::app::settings {

Tactility/Source/app/systeminfo/SystemInfo.cpp

@@ -1,7 +1,9 @@
-#include "Assets.h"
-#include "lvgl.h"
-#include "Tactility.h"
-#include "lvgl/Toolbar.h"
+#include "Tactility/lvgl/Toolbar.h"
+
+#include <Tactility/Assets.h>
+#include <Tactility/Tactility.h>
+
+#include <lvgl.h>
 
 namespace tt::app::systeminfo {
 

Tactility/Source/app/textviewer/TextViewer.cpp

@@ -1,10 +1,11 @@
-#include <TactilityCore.h>
-#include "TextViewer.h"
-#include "lvgl.h"
-#include "lvgl/LabelUtils.h"
-#include "lvgl/Style.h"
-#include "lvgl/Toolbar.h"
-#include "service/loader/Loader.h"
+#include "Tactility/lvgl/LabelUtils.h"
+#include "Tactility/lvgl/Style.h"
+#include "Tactility/lvgl/Toolbar.h"
+#include "Tactility/service/loader/Loader.h"
+
+#include <Tactility/TactilityCore.h>
+
+#include <lvgl.h>
 
 #define TAG "text_viewer"
 #define TEXT_VIEWER_FILE_ARGUMENT "file"

Tactility/Source/app/timedatesettings/TimeDateSettings.cpp

@@ -1,11 +1,11 @@
-#include <StringUtils.h>
-#include "lvgl.h"
-#include "lvgl/Toolbar.h"
-#include "service/loader/Loader.h"
-#include "app/timezone/TimeZone.h"
-#include "Assets.h"
-#include "time/Time.h"
-#include "lvgl/LvglSync.h"
+#include "Tactility/app/timezone/TimeZone.h"
+#include "Tactility/lvgl/Toolbar.h"
+#include "Tactility/service/loader/Loader.h"
+#include "Tactility/lvgl/LvglSync.h"
+
+#include <Tactility/Assets.h>
+#include <Tactility/time/Time.h>
+#include <lvgl.h>
 
 #define TAG "text_viewer"
 

Tactility/Source/app/timezone/TimeZone.cpp

@@ -1,16 +1,17 @@
-#include "TimeZone.h"
-#include "app/AppManifest.h"
-#include "app/AppContext.h"
-#include "service/loader/Loader.h"
-#include "lvgl.h"
-#include "lvgl/Toolbar.h"
-#include "Partitions.h"
-#include "TactilityHeadless.h"
-#include "lvgl/LvglSync.h"
-#include "service/gui/Gui.h"
+#include "Tactility/app/AppContext.h"
+#include "Tactility/app/AppManifest.h"
+#include "Tactility/app/timezone/TimeZone.h"
+#include "Tactility/lvgl/Toolbar.h"
+#include "Tactility/lvgl/LvglSync.h"
+#include "Tactility/service/gui/Gui.h"
+#include "Tactility/service/loader/Loader.h"
+
+#include <Tactility/Partitions.h>
+#include <Tactility/StringUtils.h>
+#include <Tactility/Timer.h>
+
+#include <lvgl.h>
 #include <memory>
-#include <StringUtils.h>
-#include <Timer.h>
 
 namespace tt::app::timezone {
 

Tactility/Source/app/usbsettings/UsbSettings.cpp

@@ -1,9 +1,11 @@
-#include "CoreDefines.h"
-#include "app/App.h"
-#include "app/AppManifest.h"
-#include "hal/usb/Usb.h"
-#include "lvgl.h"
-#include "lvgl/Toolbar.h"
+#include "Tactility/app/App.h"
+#include "Tactility/app/AppManifest.h"
+#include "Tactility/lvgl/Toolbar.h"
+
+#include <Tactility/CoreDefines.h>
+#include <Tactility/hal/usb/Usb.h>
+
+#include <lvgl.h>
 
 #define TAG "usb_settings"
 

Tactility/Source/app/wifiapsettings/WifiApSettings.cpp

@@ -1,12 +1,15 @@
-#include "WifiApSettings.h"
-#include "TactilityCore.h"
-#include "app/AppContext.h"
-#include "app/alertdialog/AlertDialog.h"
-#include "lvgl.h"
-#include "lvgl/Style.h"
-#include "lvgl/Toolbar.h"
-#include "service/loader/Loader.h"
-#include "service/wifi/WifiSettings.h"
+#include "Tactility/app/wifiapsettings/WifiApSettings.h"
+
+#include "Tactility/app/AppContext.h"
+#include "Tactility/app/alertdialog/AlertDialog.h"
+#include "Tactility/lvgl/Style.h"
+#include "Tactility/lvgl/Toolbar.h"
+#include "Tactility/service/loader/Loader.h"
+
+#include <Tactility/TactilityCore.h>
+#include <Tactility/service/wifi/WifiSettings.h>
+
+#include <lvgl.h>
 
 namespace tt::app::wifiapsettings {
 

Tactility/Source/app/wificonnect/State.cpp

@@ -1,4 +1,5 @@
-#include "app/wificonnect/State.h"
+#include "Tactility/app/wificonnect/State.h"
+
 #include <cstring>
 
 namespace tt::app::wificonnect {

Tactility/Source/app/wificonnect/View.cpp

@@ -1,14 +1,15 @@
-#include "app/wificonnect/View.h"
-#include "app/wificonnect/WifiConnectPrivate.h"
-#include "WifiConnect.h"
+#include "Tactility/app/wificonnect/View.h"
+#include "Tactility/app/wificonnect/WifiConnect.h"
 
-#include "lvgl.h"
-#include "service/gui/Gui.h"
-#include "service/wifi/WifiSettings.h"
-#include "lvgl/Style.h"
-#include "lvgl/Toolbar.h"
-#include "lvgl/Spinner.h"
-#include <TactilityCore.h>
+#include "Tactility/lvgl/Style.h"
+#include "Tactility/lvgl/Toolbar.h"
+#include "Tactility/lvgl/Spinner.h"
+#include "Tactility/service/gui/Gui.h"
+
+#include <Tactility/TactilityCore.h>
+#include <Tactility/service/wifi/WifiSettings.h>
+
+#include <lvgl.h>
 #include <cstring>
 
 namespace tt::app::wificonnect {

Tactility/Source/app/wificonnect/WifiConnect.cpp

@@ -1,10 +1,9 @@
-#include "app/wificonnect/WifiConnectPrivate.h"
+#include "Tactility/app/wificonnect/WifiConnect.h"
 
-#include "app/AppContext.h"
-#include "TactilityCore.h"
-#include "service/loader/Loader.h"
-#include "service/wifi/Wifi.h"
-#include "lvgl/LvglSync.h"
+#include "Tactility/app/AppContext.h"
+#include "Tactility/service/loader/Loader.h"
+#include "Tactility/service/wifi/Wifi.h"
+#include "Tactility/lvgl/LvglSync.h"
 
 namespace tt::app::wificonnect {
 

Tactility/Source/app/wificonnect/WifiConnect.h

@@ -1,12 +0,0 @@
-#pragma once
-
-#include <string>
-
-namespace tt::app::wificonnect {
-
-/**
- * Start the app with optional pre-filled fields.
- */
-void start(const std::string& ssid = "", const std::string& password = "");
-
-} // namespace

Tactility/Source/app/wifimanage/State.cpp

@@ -1,4 +1,4 @@
-#include "app/wifimanage/WifiManagePrivate.h"
+#include "Tactility/app/wifimanage/WifiManagePrivate.h"
 
 namespace tt::app::wifimanage {
 

Tactility/Source/app/wifimanage/View.cpp

@@ -1,11 +1,12 @@
-#include "app/wifimanage/View.h"
-#include "app/wifimanage/WifiManagePrivate.h"
+#include "Tactility/app/wifimanage/View.h"
+#include "Tactility/app/wifimanage/WifiManagePrivate.h"
 
-#include "Log.h"
-#include "service/wifi/Wifi.h"
-#include "lvgl/Style.h"
-#include "lvgl/Toolbar.h"
-#include "lvgl/Spinner.h"
+#include "Tactility/lvgl/Style.h"
+#include "Tactility/lvgl/Toolbar.h"
+#include "Tactility/lvgl/Spinner.h"
+
+#include <Tactility/Log.h>
+#include <Tactility/service/wifi/Wifi.h>
 
 #include <string>
 #include <set>

Tactility/Source/app/wifimanage/WifiManage.cpp

@@ -1,14 +1,12 @@
-#include "app/wifimanage/WifiManagePrivate.h"
-#include "app/wifimanage/View.h"
-#include "app/wifimanage/State.h"
+#include "Tactility/app/wifimanage/WifiManagePrivate.h"
+#include "Tactility/app/wifimanage/View.h"
 
-#include "app/AppContext.h"
-#include "app/wifiapsettings/WifiApSettings.h"
-#include "TactilityCore.h"
-#include "service/loader/Loader.h"
-#include "service/wifi/WifiSettings.h"
-#include "lvgl/LvglSync.h"
-#include "app/wificonnect/WifiConnect.h"
+#include "Tactility/app/AppContext.h"
+#include "Tactility/app/wifiapsettings/WifiApSettings.h"
+#include "Tactility/service/loader/Loader.h"
+#include "Tactility/service/wifi/WifiSettings.h"
+#include "Tactility/lvgl/LvglSync.h"
+#include "Tactility/app/wificonnect/WifiConnect.h"
 
 namespace tt::app::wifimanage {
 

Tactility/Source/app/wifimanage/WifiManage.h

@@ -1,12 +0,0 @@
-#pragma once
-
-#include "Mutex.h"
-#include "app/wifimanage/View.h"
-#include "app/wifimanage/State.h"
-#include "service/wifi/Wifi.h"
-
-namespace tt::app::wifimanage {
-
-void start();
-
-} // namespace