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/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/App.h

@@ -1,95 +0,0 @@
-#pragma once
-
-#include "AppContext.h"
-#include "Bundle.h"
-#include <Mutex.h>
-#include <string>
-
-// Forward declarations
-typedef struct _lv_obj_t lv_obj_t;
-
-namespace tt::app {
-
-// Forward declarations
-class AppContext;
-enum class Result;
-
-class App {
-
-private:
-
-    Mutex mutex;
-
-    struct ResultHolder {
-        Result result;
-        std::unique_ptr<Bundle> resultData;
-
-        explicit ResultHolder(Result result) : result(result), resultData(nullptr) {}
-
-        ResultHolder(Result result, std::unique_ptr<Bundle> resultData) :
-            result(result),
-            resultData(std::move(resultData)) {}
-    };
-
-    std::unique_ptr<ResultHolder> resultHolder;
-
-public:
-
-    App() = default;
-    virtual ~App() = default;
-
-    virtual void onCreate(AppContext& appContext) {}
-    virtual void onDestroy(AppContext& appContext) {}
-    virtual void onShow(AppContext& appContext, lv_obj_t* parent) {}
-    virtual void onHide(AppContext& appContext) {}
-    virtual void onResult(AppContext& appContext, Result result, std::unique_ptr<Bundle> _Nullable resultData) {}
-
-    Mutex& getMutex() { return mutex; }
-
-    bool hasResult() const { return resultHolder != nullptr; }
-
-    void setResult(Result result, std::unique_ptr<Bundle> resultData = nullptr) {
-        auto lockable = getMutex().scoped();
-        lockable->lock(portMAX_DELAY);
-        resultHolder = std::make_unique<ResultHolder>(result, std::move(resultData));
-    }
-
-    /**
-     * Used by system to extract the result data when this application is finished.
-     * Note that this removes the data from the class!
-     */
-    bool moveResult(Result& outResult, std::unique_ptr<Bundle>& outBundle) {
-        auto lockable = getMutex().scoped();
-        lockable->lock(portMAX_DELAY);
-
-        if (resultHolder != nullptr) {
-            outResult = resultHolder->result;
-            outBundle = std::move(resultHolder->resultData);
-            resultHolder = nullptr;
-            return true;
-        } else {
-            return false;
-        }
-    }
-};
-
-template<typename T>
-std::shared_ptr<App> create() { return std::shared_ptr<T>(new T); }
-
-/**
- * @brief Start an app
- * @param[in] id application name or id
- * @param[in] parameters optional parameters to pass onto the application
- */
-void start(const std::string& id, std::shared_ptr<const Bundle> _Nullable parameters = nullptr);
-
-/** @brief Stop the currently showing app. Show the previous app if any app was still running. */
-void stop();
-
-/** @return the currently running app context (it is only ever null before the splash screen is shown) */
-std::shared_ptr<app::AppContext> _Nullable getCurrentAppContext();
-
-/** @return the currently running app (it is only ever null before the splash screen is shown) */
-std::shared_ptr<app::App> _Nullable getCurrentApp();
-
-}

Tactility/Source/app/AppContext.h

@@ -1,101 +0,0 @@
-#pragma once
-
-#include "Bundle.h"
-#include <memory>
-
-namespace tt::app {
-
-// Forward declarations
-class App;
-class Paths;
-struct AppManifest;
-enum class Result;
-
-typedef union {
-    struct {
-        bool showStatusbar : 1;
-    };
-    unsigned char flags;
-} Flags;
-
-/**
- * The public representation of an application instance.
- * @warning Do not store references or pointers to these! You can retrieve them via the service registry.
- */
-class AppContext {
-
-protected:
-
-    virtual ~AppContext() = default;
-
-public:
-
-    virtual const AppManifest& getManifest() const = 0;
-    virtual std::shared_ptr<const Bundle> getParameters() const = 0;
-    virtual std::unique_ptr<Paths> getPaths() const = 0;
-
-    virtual std::shared_ptr<App> getApp() const = 0;
-};
-
-class Paths {
-
-public:
-
-    Paths() = default;
-    virtual ~Paths() = default;
-
-    /**
-     * Returns the directory path for the data location for an app.
-     * The data directory is intended to survive OS upgrades.
-     * The path will not end with a "/".
-     */
-    virtual std::string getDataDirectory() const = 0;
-
-    /**
-     * @see getDataDirectory(), but with LVGL prefix.
-     */
-    virtual std::string getDataDirectoryLvgl() const = 0;
-
-    /**
-     * Returns the full path for an entry inside the data location for an app.
-     * The data directory is intended to survive OS upgrades.
-     * Configuration data should be stored here.
-     * @param[in] childPath the path without a "/" prefix
-     */
-    virtual std::string getDataPath(const std::string& childPath) const = 0;
-
-    /**
-     * @see getDataPath(), but with LVGL prefix.
-     */
-    virtual std::string getDataPathLvgl(const std::string& childPath) const = 0;
-
-    /**
-     * Returns the directory path for the system location for an app.
-     * The system directory is not intended to survive OS upgrades.
-     * You should not store configuration data here.
-     * The path will not end with a "/".
-     * This is mainly used for core apps (system/boot/settings type).
-     */
-    virtual std::string getSystemDirectory() const = 0;
-
-    /**
-     * @see getSystemDirectory(), but with LVGL prefix.
-     */
-    virtual std::string getSystemDirectoryLvgl() const = 0;
-
-    /**
-     * Returns the full path for an entry inside the system location for an app.
-     * The data directory is not intended to survive OS upgrades.
-     * You should not store configuration data here.
-     * This is mainly used for core apps (system/boot/settings type).
-     * @param[in] childPath the path without a "/" prefix
-     */
-    virtual std::string getSystemPath(const std::string& childPath) const = 0;
-
-    /**
-     * @see getSystemPath(), but with LVGL prefix.
-     */
-    virtual std::string getSystemPathLvgl(const std::string& childPath) const = 0;
-};
-
-}

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/AppManifest.h

@@ -1,86 +0,0 @@
-#pragma once
-
-#include "CoreDefines.h"
-#include "ManifestRegistry.h"
-#include <Bundle.h>
-#include <string>
-
-// Forward declarations
-typedef struct _lv_obj_t lv_obj_t;
-
-namespace tt::app {
-
-class App;
-class AppContext;
-
-/** Application types */
-enum class Type {
-    /** Boot screen, shown before desktop is launched. */
-    Boot,
-    /** A launcher app sits at the root of the app stack after the boot splash is finished */
-    Launcher,
-    /** Apps that generally aren't started from the desktop (e.g. image viewer) */
-    Hidden,
-    /** Standard apps, provided by the system. */
-    System,
-    /** The apps that are launched/shown by the Settings app. The Settings app itself is of type AppTypeSystem. */
-    Settings,
-    /** User-provided apps. */
-    User
-};
-
-/** Result status code for application result callback. */
-enum class Result {
-    Ok = 0U,
-    Cancelled = 1U,
-    Error = 2U
-};
-
-class Location {
-
-private:
-
-    std::string path;
-    Location() = default;
-    explicit Location(const std::string& path) : path(path) {}
-
-public:
-
-    static Location internal() { return {}; }
-
-    static Location external(const std::string& path) {
-        return Location(path);
-    }
-
-    bool isInternal() const { return path.empty(); }
-    bool isExternal() const { return !path.empty(); }
-    const std::string& getPath() const { return path; }
-};
-
-typedef std::shared_ptr<App>(*CreateApp)();
-
-struct AppManifest {
-    /** The identifier by which the app is launched by the system and other apps. */
-    std::string id = {};
-
-    /** The user-readable name of the app. Used in UI. */
-    std::string name = {};
-
-    /** Optional icon. */
-    std::string icon = {};
-
-    /** App type affects launch behaviour. */
-    Type type = Type::User;
-
-    /** Where the app is located */
-    Location location = Location::internal();
-
-    /** Create the instance of the app */
-    CreateApp createApp = nullptr;
-};
-
-struct {
-    bool operator()(const std::shared_ptr<AppManifest>& left, const std::shared_ptr<AppManifest>& right) const { return left->name < right->name; }
-} SortAppManifestByName;
-
-} // namespace

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/ElfApp.h

@@ -1,42 +0,0 @@
-#pragma once
-
-#include "AppManifest.h"
-
-#ifdef ESP_PLATFORM
-
-namespace tt::app {
-
-typedef void* (*CreateData)();
-typedef void (*DestroyData)(void* data);
-typedef void (*OnCreate)(void* appContext, void* _Nullable data);
-typedef void (*OnDestroy)(void* appContext, void* _Nullable data);
-typedef void (*OnShow)(void* appContext, void* _Nullable data, lv_obj_t* parent);
-typedef void (*OnHide)(void* appContext, void* _Nullable data);
-typedef void (*OnResult)(void* appContext, void* _Nullable data, Result result, Bundle* resultData);
-
-void setElfAppManifest(
-    const char* name,
-    const char* _Nullable icon,
-    CreateData _Nullable createData,
-    DestroyData _Nullable destroyData,
-    OnCreate _Nullable onCreate,
-    OnDestroy _Nullable onDestroy,
-    OnShow _Nullable onShow,
-    OnHide _Nullable onHide,
-    OnResult _Nullable onResult
-);
-
-/**
- * @return the app ID based on the executable's file path.
- */
-std::string getElfAppId(const std::string& filePath);
-
-/**
- * @return true when registration was done, false when app was already registered
- */
-bool registerElfApp(const std::string& filePath);
-
-std::shared_ptr<App> createElfApp(const std::shared_ptr<AppManifest>& manifest);
-
-}
-#endif // ESP_PLATFORM

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/ManifestRegistry.h

@@ -1,23 +0,0 @@
-#pragma once
-
-#include "App.h"
-#include <string>
-#include <vector>
-
-namespace tt::app {
-
-struct AppManifest;
-
-/** Register an application with its manifest */
-void addApp(const AppManifest& manifest);
-
-/** Find an application manifest by its id
- * @param[in] id the manifest id
- * @return the application manifest if it was found
- */
-_Nullable std::shared_ptr<AppManifest> findAppById(const std::string& id);
-
-/** @return a list of all registered apps. This includes user and system apps. */
-std::vector<std::shared_ptr<AppManifest>> getApps();
-
-} // namespace

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/alertdialog/AlertDialog.h

@@ -1,29 +0,0 @@
-#pragma once
-
-#include <string>
-#include <vector>
-#include "Bundle.h"
-
-/**
- * Start the app by its ID and provide:
- *  - a title
- *  - a text
- *  - 0, 1 or more buttons
- */
-namespace tt::app::alertdialog {
-
-    /**
-     * Show a dialog with the provided title, message and 0, 1 or more buttons.
-     * @param[in] title the title to show in the toolbar
-     * @param[in] message the message to display
-     * @param[in] buttonLabels the buttons to show
-     */
-    void start(const std::string& title, const std::string& message, const std::vector<std::string>& buttonLabels);
-
-    /**
-     * Get the index of the button that the user selected.
-     *
-     * @return a value greater than 0 when a selection was done, or -1 when the app was closed clicking one of the selection buttons.
-     */
-    int32_t getResultIndex(const Bundle& bundle);
-}

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/CrashDiagnostics.h

@@ -1,11 +0,0 @@
-#pragma once
-
-#ifdef ESP_PLATFORM
-
-namespace tt::app::crashdiagnostics {
-
-void start();
-
-}
-
-#endif

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/display/DisplaySettings.h

@@ -1,12 +0,0 @@
-#pragma once
-
-#include <src/display/lv_display.h>
-
-namespace tt::app::display {
-
-void setBacklightDuty(uint8_t value);
-uint8_t getBacklightDuty();
-void setRotation(lv_display_rotation_t rotation);
-lv_display_rotation_t getRotation();
-
-} // namespace

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/Files.h

@@ -1,15 +0,0 @@
-#pragma once
-
-#include "View.h"
-#include "State.h"
-#include "app/AppManifest.h"
-
-#include <lvgl.h>
-#include <dirent.h>
-#include <memory>
-
-namespace tt::app::files {
-
-void start();
-
-} // namespace

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/gpio/GpioHal.h

@@ -1,13 +0,0 @@
-#pragma once
-
-#ifdef ESP_PLATFORM
-#include "driver/gpio.h"
-#define GPIO_NUM_MIN GPIO_NUM_0
-#else
-#define GPIO_NUM_MIN 0
-#define GPIO_NUM_MAX 50
-#endif
-
-#ifndef ESP_PLATFORM
-int gpio_get_level(int gpio_num);
-#endif

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/i2cscanner/I2cScanner.h

@@ -1,15 +0,0 @@
-#pragma once
-
-#include <TactilityCore.h>
-#include <Mutex.h>
-#include <Thread.h>
-#include "lvgl.h"
-#include "hal/i2c/I2c.h"
-#include "Timer.h"
-#include <memory>
-
-namespace tt::app::i2cscanner {
-
-void start();
-
-}

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/imageviewer/ImageViewer.h

@@ -1,7 +0,0 @@
-#pragma once
-
-namespace tt::app::imageviewer {
-
-void start(const std::string& file);
-
-};

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/inputdialog/InputDialog.h

@@ -1,20 +0,0 @@
-#pragma once
-
-#include <string>
-#include <vector>
-#include "Bundle.h"
-
-/**
- * Start the app by its ID and provide:
- *  - a title
- *  - a text
- */
-namespace tt::app::inputdialog {
-
-void start(const std::string& title, const std::string& message, const std::string& prefilled = "");
-
-/**
- * @return the text that was in the field when OK was pressed, or otherwise empty string
- */
-std::string getResult(const Bundle& bundle);
-}

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/launcher/Launcher.h

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

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/selectiondialog/SelectionDialog.h

@@ -1,25 +0,0 @@
-#pragma once
-
-#include <string>
-#include <vector>
-#include "Bundle.h"
-
-/**
- * Start the app by its ID and provide:
- *  - an optional title
- *  - 2 or more items
- *
- *  If you provide 0 items, the app will auto-close.
- *  If you provide 1 item, the app will auto-close with result index 0
- */
-namespace tt::app::selectiondialog {
-
-    void start(const std::string& title, const std::vector<std::string>& items);
-
-    /**
-     * Get the index of the item that the user selected.
-     *
-     * @return a value greater than 0 when a selection was done, or -1 when the app was closed without selecting an item.
-     */
-    int32_t getResultIndex(const Bundle& bundle);
-}

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/textviewer/TextViewer.h

@@ -1,7 +0,0 @@
-#pragma once
-
-namespace tt::app::textviewer {
-
-void start(const std::string& 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/timedatesettings/TimeDateSettings.h

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

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/timezone/TimeZone.h

@@ -1,12 +0,0 @@
-#pragma once
-
-#include "Bundle.h"
-
-namespace tt::app::timezone {
-
-void start();
-
-std::string getResultName(const Bundle& bundle);
-std::string getResultCode(const Bundle& bundle);
-
-}

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/wifiapsettings/WifiApSettings.h

@@ -1,11 +0,0 @@
-#pragma once
-
-#include "Bundle.h"
-#include "Mutex.h"
-#include "service/wifi/Wifi.h"
-
-namespace tt::app::wifiapsettings {
-
-void start(const std::string& ssid);
-
-} // namespace

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