Merge develop into main (#339)

- Update ILI9341 driver to v2.0.1
- Lots of code cleanup for apps
- Refactor app "type" into "category" and added flags to the manifest (for show/hide statusbar and for hidden apps)
- Rename some ElfApp-related functionality and improved the way the static data was managed
- Rename "filebrowser" to "files"
- Added cstring functions to tt_init.cpp
- Minor fix in Boot app
- Updated external apps for SDK changes

Tactility/Source/app/AppInstall.cpp

@@ -216,7 +216,7 @@ bool install(const std::string& path) {
     addApp({
         .id = app_id_iterator->second,
         .name = app_name_entry->second,
-        .type = Type::User,
+        .category = Category::User,
         .location = Location::external(renamed_target_path)
     });
 

Tactility/Source/app/ElfApp.cpp

@@ -1,41 +1,22 @@
 #ifdef ESP_PLATFORM
 
-#include "Tactility/app/ElfApp.h"
-#include "Tactility/file/File.h"
-#include "Tactility/file/FileLock.h"
-#include "Tactility/service/loader/Loader.h"
-
+#include <Tactility/app/alertdialog/AlertDialog.h>
+#include <Tactility/app/ElfApp.h>
+#include <Tactility/file/File.h>
+#include <Tactility/file/FileLock.h>
 #include <Tactility/Log.h>
+#include <Tactility/service/loader/Loader.h>
 #include <Tactility/StringUtils.h>
 
-#include "esp_elf.h"
+#include <esp_elf.h>
 
 #include <string>
 #include <utility>
-#include <Tactility/app/alertdialog/AlertDialog.h>
 
 namespace tt::app {
 
 constexpr auto* TAG = "ElfApp";
 
-struct ElfManifest {
-    /** The user-readable name of the app. Used in UI. */
-    std::string name;
-    /** Optional icon. */
-    std::string icon;
-    CreateData _Nullable createData = nullptr;
-    DestroyData _Nullable destroyData = nullptr;
-    OnCreate _Nullable onCreate = nullptr;
-    OnDestroy _Nullable onDestroy = nullptr;
-    OnShow _Nullable onShow = nullptr;
-    OnHide _Nullable onHide = nullptr;
-    OnResult _Nullable onResult = nullptr;
-};
-
-static size_t elfManifestSetCount = 0;
-static ElfManifest elfManifest;
-static std::shared_ptr<Lock> elfManifestLock = std::make_shared<Mutex>();
-
 static std::string getErrorCodeString(int error_code) {
     switch (error_code) {
         case ENOMEM:
@@ -47,7 +28,30 @@ static std::string getErrorCodeString(int error_code) {
     }
 }
 
-class ElfApp : public App {
+class ElfApp final : public App {
+
+public:
+
+    struct Parameters {
+        CreateData _Nullable createData = nullptr;
+        DestroyData _Nullable destroyData = nullptr;
+        OnCreate _Nullable onCreate = nullptr;
+        OnDestroy _Nullable onDestroy = nullptr;
+        OnShow _Nullable onShow = nullptr;
+        OnHide _Nullable onHide = nullptr;
+        OnResult _Nullable onResult = nullptr;
+    };
+
+    static void setParameters(const Parameters& parameters) {
+        staticParameters = parameters;
+        staticParametersSetCount++;
+    }
+
+private:
+
+    static Parameters staticParameters;
+    static size_t staticParametersSetCount;
+    static std::shared_ptr<Lock> staticParametersLock;
 
     const std::string appPath;
     std::unique_ptr<uint8_t[]> elfFileData;
@@ -60,7 +64,7 @@ class ElfApp : public App {
         .entry = nullptr
     };
     bool shouldCleanupElf = false; // Whether we have to clean up the above "elf" object
-    std::unique_ptr<ElfManifest> manifest;
+    std::unique_ptr<Parameters> manifest;
     void* data = nullptr;
     std::string lastError = "";
 
@@ -128,10 +132,10 @@ public:
     void onCreate(AppContext& appContext) override {
         // Because we use global variables, we have to ensure that we are not starting 2 apps in parallel
         // We use a ScopedLock so we don't have to safeguard all branches
-        auto lock = elfManifestLock->asScopedLock();
+        auto lock = staticParametersLock->asScopedLock();
         lock.lock();
 
-        elfManifestSetCount = 0;
+        staticParametersSetCount = 0;
         if (!startElf()) {
             service::loader::stopApp();
             auto message = lastError.empty() ? "Application failed to start." : std::format("Application failed to start: {}", lastError);
@@ -139,13 +143,13 @@ public:
             return;
         }
 
-        if (elfManifestSetCount == 0) {
+        if (staticParametersSetCount == 0) {
             service::loader::stopApp();
             alertdialog::start("Error", "Application failed to start: application failed to register itself");
             return;
         }
 
-        manifest = std::make_unique<ElfManifest>(elfManifest);
+        manifest = std::make_unique<Parameters>(staticParameters);
         lock.unlock();
 
         if (manifest->createData != nullptr) {
@@ -192,9 +196,11 @@ public:
     }
 };
 
-void setElfAppManifest(
-    const char* name,
-    const char* _Nullable icon,
+ElfApp::Parameters ElfApp::staticParameters;
+size_t ElfApp::staticParametersSetCount = 0;
+std::shared_ptr<Lock> ElfApp::staticParametersLock = std::make_shared<Mutex>();
+
+void setElfAppParameters(
     CreateData _Nullable createData,
     DestroyData _Nullable destroyData,
     OnCreate _Nullable onCreate,
@@ -203,9 +209,7 @@ void setElfAppManifest(
     OnHide _Nullable onHide,
     OnResult _Nullable onResult
 ) {
-    elfManifest = ElfManifest {
-        .name = name ? name : "",
-        .icon = icon ? icon : "",
+    ElfApp::setParameters({
         .createData = createData,
         .destroyData = destroyData,
         .onCreate = onCreate,
@@ -213,8 +217,7 @@ void setElfAppManifest(
         .onShow = onShow,
         .onHide = onHide,
         .onResult = onResult
-    };
-    elfManifestSetCount++;
+    });
 }
 
 std::shared_ptr<App> createElfApp(const std::shared_ptr<AppManifest>& manifest) {

Tactility/Source/app/addgps/AddGps.cpp

@@ -175,7 +175,8 @@ extern const AppManifest manifest = {
     .id = "AddGps",
     .name = "Add GPS",
     .icon = LV_SYMBOL_GPS,
-    .type = Type::Hidden,
+    .category = Category::System,
+    .flags = AppManifest::Flags::Hidden,
     .createApp = create<AddGpsApp>
 };
 

Tactility/Source/app/alertdialog/AlertDialog.cpp

@@ -128,7 +128,8 @@ public:
 extern const AppManifest manifest = {
     .id = "AlertDialog",
     .name = "Alert Dialog",
-    .type = Type::Hidden,
+    .category = Category::System,
+    .flags = AppManifest::Flags::Hidden,
     .createApp = create<AlertDialogApp>
 };
 

Tactility/Source/app/applist/AppList.cpp

@@ -40,7 +40,9 @@ public:
         std::ranges::sort(manifests, SortAppManifestByName);
 
         for (const auto& manifest: manifests) {
-            if (manifest->type == Type::User || manifest->type == Type::System) {
+            bool is_valid_category = (manifest->category == Category::User) || (manifest->category == Category::System);
+            bool is_visible = (manifest->flags & AppManifest::Flags::Hidden) == 0u;
+            if (is_valid_category && is_visible) {
                 createAppWidget(manifest, list);
             }
         }
@@ -50,7 +52,8 @@ public:
 extern const AppManifest manifest = {
     .id = "AppList",
     .name = "Apps",
-    .type = Type::Hidden,
+    .category = Category::System,
+    .flags = AppManifest::Flags::Hidden,
     .createApp = create<AppListApp>,
 };
 

Tactility/Source/app/boot/Boot.cpp

@@ -124,7 +124,6 @@ class BootApp : public App {
         settings::BootSettings boot_properties;
         if (!settings::loadBootSettings(boot_properties) || boot_properties.launcherAppId.empty()) {
             TT_LOG_E(TAG, "Launcher not configured");
-            stop();
             return;
         }
 
@@ -164,7 +163,8 @@ public:
 extern const AppManifest manifest = {
     .id = "Boot",
     .name = "Boot",
-    .type = Type::Boot,
+    .category = Category::System,
+    .flags = AppManifest::Flags::HideStatusBar | AppManifest::Flags::Hidden,
     .createApp = create<BootApp>
 };
 

Tactility/Source/app/crashdiagnostics/CrashDiagnostics.cpp

@@ -118,7 +118,8 @@ public:
 extern const AppManifest manifest = {
     .id = "CrashDiagnostics",
     .name = "Crash Diagnostics",
-    .type = Type::Hidden,
+    .category = Category::System,
+    .flags = AppManifest::Flags::Hidden,
     .createApp = create<CrashDiagnosticsApp>
 };
 

Tactility/Source/app/development/Development.cpp

@@ -164,7 +164,7 @@ public:
 extern const AppManifest manifest = {
     .id = "Development",
     .name = "Development",
-    .type = Type::Settings,
+    .category = Category::Settings,
     .createApp = create<DevelopmentApp>
 };
 

Tactility/Source/app/display/Display.cpp

@@ -167,7 +167,7 @@ extern const AppManifest manifest = {
     .id = "Display",
     .name = "Display",
     .icon = TT_ASSETS_APP_ICON_DISPLAY_SETTINGS,
-    .type = Type::Settings,
+    .category = Category::Settings,
     .createApp = create<DisplayApp>
 };
 

Tactility/Source/app/files/FilesApp.cpp

@@ -1,24 +1,24 @@
-#include "Tactility/app/filebrowser/View.h"
-#include "Tactility/app/filebrowser/State.h"
-#include "Tactility/app/AppContext.h"
+#include <Tactility/app/files/View.h>
+#include <Tactility/app/files/State.h>
+#include <Tactility/app/AppContext.h>
 
 #include <Tactility/Assets.h>
 #include <Tactility/service/loader/Loader.h>
 
 #include <memory>
 
-namespace tt::app::filebrowser {
-
-constexpr auto* TAG = "FileBrowser";
+namespace tt::app::files {
 
 extern const AppManifest manifest;
 
-class FileBrowser : public App {
+class FilesApp final : public App {
+
     std::unique_ptr<View> view;
     std::shared_ptr<State> state;
 
 public:
-    FileBrowser() {
+
+    FilesApp() {
         state = std::make_shared<State>();
         view = std::make_unique<View>(state);
     }
@@ -36,8 +36,9 @@ extern const AppManifest manifest = {
     .id = "Files",
     .name = "Files",
     .icon = TT_ASSETS_APP_ICON_FILES,
-    .type = Type::Hidden,
-    .createApp = create<FileBrowser>
+    .category = Category::System,
+    .flags = AppManifest::Flags::Hidden,
+    .createApp = create<FilesApp>
 };
 
 void start() {

Tactility/Source/app/files/State.cpp

@@ -1,7 +1,8 @@
-#include "Tactility/app/filebrowser/State.h"
+#include <Tactility/app/files/State.h>
 
 #include <Tactility/file/File.h>
-#include "Tactility/hal/sdcard/SdCardDevice.h"
+#include <Tactility/file/FileLock.h>
+#include <Tactility/hal/sdcard/SdCardDevice.h>
 #include <Tactility/Log.h>
 #include <Tactility/MountPoints.h>
 #include <Tactility/kernel/Kernel.h>
@@ -10,11 +11,10 @@
 #include <unistd.h>
 #include <vector>
 #include <dirent.h>
-#include <Tactility/file/FileLock.h>
 
-namespace tt::app::filebrowser {
+namespace tt::app::files {
 
-constexpr auto* TAG = "FileBrowser";
+constexpr auto* TAG = "Files";
 
 State::State() {
     if (kernel::getPlatform() == kernel::PlatformSimulator) {

Tactility/Source/app/files/SupportedFiles.cpp

@@ -1,9 +1,9 @@
 #include <Tactility/StringUtils.h>
 #include <Tactility/TactilityCore.h>
 
-namespace tt::app::filebrowser {
+namespace tt::app::files {
 
-constexpr auto* TAG = "FileBrowser";
+constexpr auto* TAG = "Files";
 
 bool isSupportedAppFile(const std::string& filename) {
     return filename.ends_with(".app");

Tactility/Source/app/files/View.cpp

@@ -1,13 +1,13 @@
-#include "Tactility/app/filebrowser/View.h"
-#include "Tactility/app/filebrowser/SupportedFiles.h"
+#include <Tactility/app/files/View.h>
+#include <Tactility/app/files/SupportedFiles.h>
 
-#include "Tactility/app/alertdialog/AlertDialog.h"
-#include "Tactility/app/imageviewer/ImageViewer.h"
-#include "Tactility/app/inputdialog/InputDialog.h"
-#include "Tactility/app/notes/Notes.h"
-#include "Tactility/app/ElfApp.h"
-#include "Tactility/lvgl/Toolbar.h"
-#include "Tactility/lvgl/LvglSync.h"
+#include <Tactility/app/alertdialog/AlertDialog.h>
+#include <Tactility/app/imageviewer/ImageViewer.h>
+#include <Tactility/app/inputdialog/InputDialog.h>
+#include <Tactility/app/notes/Notes.h>
+#include <Tactility/app/ElfApp.h>
+#include <Tactility/lvgl/Toolbar.h>
+#include <Tactility/lvgl/LvglSync.h>
 
 #include <Tactility/Tactility.h>
 #include <Tactility/file/File.h>
@@ -19,17 +19,17 @@
 #include <Tactility/file/FileLock.h>
 
 #ifdef ESP_PLATFORM
-#include "Tactility/service/loader/Loader.h"
+#include <Tactility/service/loader/Loader.h>
 #endif
 
-namespace tt::app::filebrowser {
+namespace tt::app::files {
 
-constexpr auto* TAG = "FileBrowser";
+constexpr auto* TAG = "Files";
 
 // region Callbacks
 
 static void dirEntryListScrollBeginCallback(lv_event_t* event) {
-    auto* view = static_cast<View*>(lv_event_get_user_data(event));
+    auto* view = static_cast<files::View*>(lv_event_get_user_data(event));
     view->onDirEntryListScrollBegin();
 }
 

Tactility/Source/app/fileselection/FileSelection.cpp

@@ -59,7 +59,8 @@ extern const AppManifest manifest = {
     .id = "FileSelection",
     .name = "File Selection",
     .icon = TT_ASSETS_APP_ICON_FILES,
-    .type = Type::Hidden,
+    .category = Category::System,
+    .flags = AppManifest::Flags::Hidden,
     .createApp = create<FileSelection>
 };
 

Tactility/Source/app/gpio/Gpio.cpp

@@ -191,7 +191,7 @@ extern const AppManifest manifest = {
     .id = "Gpio",
     .name = "GPIO",
     .icon = TT_ASSETS_APP_ICON_GPIO,
-    .type = Type::System,
+    .category = Category::System,
     .createApp = create<GpioApp>
 };
 

Tactility/Source/app/gpssettings/GpsSettings.cpp

@@ -19,12 +19,12 @@ extern AppManifest manifest;
 
 namespace tt::app::gpssettings {
 
-constexpr const char* TAG = "GpsSettings";
-
 extern const AppManifest manifest;
 
 class GpsSettingsApp final : public App {
 
+    static constexpr auto* TAG = "GpsSettings";
+
     std::unique_ptr<Timer> timer;
     std::shared_ptr<GpsSettingsApp*> appReference = std::make_shared<GpsSettingsApp*>(this);
     lv_obj_t* statusWrapper = nullptr;
@@ -268,13 +268,13 @@ class GpsSettingsApp final : public App {
 public:
 
     GpsSettingsApp() {
-        timer = std::make_unique<Timer>(Timer::Type::Periodic, [this]() {
+        timer = std::make_unique<Timer>(Timer::Type::Periodic, [this] {
             updateViews();
         });
         service = service::gps::findGpsService();
     }
 
-    void onShow(AppContext& app, lv_obj_t* parent) final {
+    void onShow(AppContext& app, lv_obj_t* parent) override {
         lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
         lv_obj_set_style_pad_row(parent, 0, LV_STATE_DEFAULT);
 
@@ -337,7 +337,7 @@ public:
         updateViews();
     }
 
-    void onHide(AppContext& app) final {
+    void onHide(AppContext& app) override {
         service->getStatePubsub()->unsubscribe(serviceStateSubscription);
         serviceStateSubscription = nullptr;
     }
@@ -347,7 +347,7 @@ extern const AppManifest manifest = {
     .id = "GpsSettings",
     .name = "GPS",
     .icon = LV_SYMBOL_GPS,
-    .type = Type::Settings,
+    .category = Category::Settings,
     .createApp = create<GpsSettingsApp>
 };
 

Tactility/Source/app/i2cscanner/I2cScanner.cpp

@@ -1,13 +1,12 @@
-#include "Tactility/app/i2cscanner/I2cScannerPrivate.h"
-#include "Tactility/app/i2cscanner/I2cScannerThread.h"
-#include "Tactility/app/i2cscanner/I2cHelpers.h"
+#include <Tactility/app/i2cscanner/I2cScannerPrivate.h>
+#include <Tactility/app/i2cscanner/I2cHelpers.h>
 
-#include "Tactility/Preferences.h"
-#include "Tactility/app/AppContext.h"
-#include "Tactility/hal/i2c/I2cDevice.h"
-#include "Tactility/lvgl/LvglSync.h"
-#include "Tactility/lvgl/Toolbar.h"
-#include "Tactility/service/loader/Loader.h"
+#include <Tactility/Preferences.h>
+#include <Tactility/app/AppContext.h>
+#include <Tactility/hal/i2c/I2cDevice.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>
@@ -15,14 +14,14 @@
 
 #include <format>
 
-#define START_SCAN_TEXT "Scan"
-#define STOP_SCAN_TEXT "Stop scan"
-
 namespace tt::app::i2cscanner {
 
 extern const AppManifest manifest;
 
-class I2cScannerApp : public App {
+class I2cScannerApp final : public App {
+
+    static constexpr auto* START_SCAN_TEXT = "Scan";
+    static constexpr auto* STOP_SCAN_TEXT = "Stop scan";
 
     // Core
     Mutex mutex = Mutex(Mutex::Type::Recursive);
@@ -181,13 +180,6 @@ void I2cScannerApp::onPressScanCallback(lv_event_t* event) {
     }
 }
 
-void I2cScannerApp::onScanTimerCallback() {
-    auto app = optApp();
-    if (app != nullptr) {
-        app->onScanTimer();
-    }
-}
-
 // endregion Callbacks
 
 bool I2cScannerApp::getPort(i2c_port_t* outPort) {
@@ -285,8 +277,8 @@ void I2cScannerApp::startScanning() {
         lv_obj_clean(scanListWidget);
 
         scanState = ScanStateScanning;
-        scanTimer = std::make_unique<Timer>(Timer::Type::Once, []{
-            onScanTimerCallback();
+        scanTimer = std::make_unique<Timer>(Timer::Type::Once, [this]{
+            onScanTimer();
         });
         scanTimer->start(10);
         mutex.unlock();
@@ -414,7 +406,7 @@ extern const AppManifest manifest = {
     .id = "I2cScanner",
     .name = "I2C Scanner",
     .icon = TT_ASSETS_APP_ICON_I2C_SETTINGS,
-    .type = Type::System,
+    .category = Category::System,
     .createApp = create<I2cScannerApp>
 };
 

Tactility/Source/app/i2csettings/I2cSettings.cpp

@@ -96,7 +96,7 @@ extern const AppManifest manifest = {
     .id = "I2cSettings",
     .name = "I2C",
     .icon = TT_ASSETS_APP_ICON_I2C_SETTINGS,
-    .type = Type::Settings,
+    .category = Category::Settings,
     .createApp = create<I2cSettingsApp>
 };
 

Tactility/Source/app/imageviewer/ImageViewer.cpp

@@ -62,7 +62,8 @@ class ImageViewerApp : public App {
 extern const AppManifest manifest = {
     .id = "ImageViewer",
     .name = "Image Viewer",
-    .type = Type::Hidden,
+    .category = Category::System,
+    .flags = AppManifest::Flags::Hidden,
     .createApp = create<ImageViewerApp>
 };
 

Tactility/Source/app/inputdialog/InputDialog.cpp

@@ -120,7 +120,8 @@ public:
 extern const AppManifest manifest = {
     .id = "InputDialog",
     .name = "Input Dialog",
-    .type = Type::Hidden,
+    .category = Category::System,
+    .flags = AppManifest::Flags::Hidden,
     .createApp = create<InputDialogApp>
 };
 

Tactility/Source/app/launcher/Launcher.cpp

@@ -138,7 +138,7 @@ public:
 extern const AppManifest manifest = {
     .id = "Launcher",
     .name = "Launcher",
-    .type = Type::Launcher,
+    .category = Category::System,
     .createApp = create<LauncherApp>
 };
 

Tactility/Source/app/localesettings/LocaleSettings.cpp

@@ -165,7 +165,7 @@ extern const AppManifest manifest = {
     .id = "LocaleSettings",
     .name = "Region & Language",
     .icon = TT_ASSETS_APP_ICON_TIME_DATE_SETTINGS,
-    .type = Type::Settings,
+    .category = Category::Settings,
     .createApp = create<LocaleSettingsApp>
 };
 

Tactility/Source/app/log/Log.cpp

@@ -123,7 +123,7 @@ extern const AppManifest manifest = {
     .id = "Log",
     .name = "Log",
     .icon = LV_SYMBOL_LIST,
-    .type = Type::System,
+    .category = Category::System,
     .createApp = create<LogApp>
 };
 

Tactility/Source/app/power/Power.cpp

@@ -192,7 +192,7 @@ extern const AppManifest manifest = {
     .id = "Power",
     .name = "Power",
     .icon = TT_ASSETS_APP_ICON_POWER_SETTINGS,
-    .type = Type::Settings,
+    .category = Category::Settings,
     .createApp = create<PowerApp>
 };
 

Tactility/Source/app/screenshot/Screenshot.cpp

@@ -281,7 +281,7 @@ extern const AppManifest manifest = {
     .id = "Screenshot",
     .name = "Screenshot",
     .icon = LV_SYMBOL_IMAGE,
-    .type = Type::System,
+    .category = Category::System,
     .createApp = create<ScreenshotApp>
 };
 

Tactility/Source/app/selectiondialog/SelectionDialog.cpp

@@ -114,7 +114,8 @@ public:
 extern const AppManifest manifest = {
     .id = "SelectionDialog",
     .name = "Selection Dialog",
-    .type = Type::Hidden,
+    .category = Category::System,
+    .flags = AppManifest::Flags::Hidden,
     .createApp = create<SelectionDialogApp>
 };
 

Tactility/Source/app/serialconsole/SerialConsole.cpp

@@ -1,4 +1,4 @@
-#include "Tactility/app/serialconsole/ConnectView.h"
+#include "../../../Private/Tactility/app/serialconsole/ConnectView.h"
 #include "Tactility/app/serialconsole/ConsoleView.h"
 
 #include "Tactility/lvgl/Style.h"
@@ -88,7 +88,7 @@ extern const AppManifest manifest = {
     .id = "SerialConsole",
     .name = "Serial Console",
     .icon = LV_SYMBOL_LIST,
-    .type = Type::System,
+    .category = Category::System,
     .createApp = create<SerialConsoleApp>
 };
 

Tactility/Source/app/settings/Settings.cpp

@@ -38,7 +38,7 @@ class SettingsApp : public App {
         auto manifests = getApps();
         std::sort(manifests.begin(), manifests.end(), SortAppManifestByName);
         for (const auto& manifest: manifests) {
-            if (manifest->type == Type::Settings) {
+            if (manifest->category == Category::Settings) {
                 createWidget(manifest, list);
             }
         }
@@ -49,7 +49,8 @@ extern const AppManifest manifest = {
     .id = "Settings",
     .name = "Settings",
     .icon = TT_ASSETS_APP_ICON_SETTINGS,
-    .type = Type::Hidden,
+    .category = Category::System,
+    .flags = AppManifest::Flags::Hidden,
     .createApp = create<SettingsApp>
 };
 

Tactility/Source/app/systeminfo/SystemInfo.cpp

@@ -295,7 +295,7 @@ extern const AppManifest manifest = {
     .id = "SystemInfo",
     .name = "System Info",
     .icon = TT_ASSETS_APP_ICON_SYSTEM_INFO,
-    .type = Type::System,
+    .category = Category::System,
     .createApp = create<SystemInfoApp>
 };
 

Tactility/Source/app/timedatesettings/TimeDateSettings.cpp

@@ -60,7 +60,7 @@ extern const AppManifest manifest = {
     .id = "TimeDateSettings",
     .name = "Time & Date",
     .icon = TT_ASSETS_APP_ICON_TIME_DATE_SETTINGS,
-    .type = Type::Settings,
+    .category = Category::Settings,
     .createApp = create<TimeDateSettingsApp>
 };
 

Tactility/Source/app/timezone/TimeZone.cpp

@@ -1,9 +1,9 @@
-#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/loader/Loader.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/loader/Loader.h>
 
 #include <Tactility/MountPoints.h>
 #include <Tactility/StringUtils.h>
@@ -15,9 +15,8 @@
 namespace tt::app::timezone {
 
 constexpr auto* TAG = "TimeZone";
-
-#define RESULT_BUNDLE_CODE_INDEX "code"
-#define RESULT_BUNDLE_NAME_INDEX "name"
+constexpr auto* RESULT_BUNDLE_CODE_INDEX = "code";
+constexpr auto* RESULT_BUNDLE_NAME_INDEX = "name";
 
 extern const AppManifest manifest;
 
@@ -113,14 +112,6 @@ class TimeZoneApp final : public App {
         lv_obj_add_event_cb(btn, &onListItemSelectedCallback, LV_EVENT_SHORT_CLICKED, (void*)index);
     }
 
-    static void updateTimerCallback() {
-        auto appContext = getCurrentAppContext();
-        if (appContext != nullptr && appContext->getManifest().id == manifest.id) {
-            auto app = std::static_pointer_cast<TimeZoneApp>(appContext->getApp());
-            app->updateList();
-        }
-    }
-
     void readTimeZones(std::string filter) {
         auto path = std::string(file::MOUNT_POINT_SYSTEM) + "/timezones.csv";
         auto* file = fopen(path.c_str(), "rb");
@@ -228,14 +219,17 @@ public:
     }
 
     void onCreate(AppContext& app) override {
-        updateTimer = std::make_unique<Timer>(Timer::Type::Once, [] { updateTimerCallback(); });
+        updateTimer = std::make_unique<Timer>(Timer::Type::Once, [this] {
+            updateList();
+        });
     }
 };
 
 extern const AppManifest manifest = {
     .id = "TimeZone",
     .name = "Select timezone",
-    .type = Type::Hidden,
+    .category = Category::System,
+    .flags = AppManifest::Flags::Hidden,
     .createApp = create<TimeZoneApp>
 };
 

Tactility/Source/app/usbsettings/UsbSettings.cpp

@@ -45,7 +45,7 @@ extern const AppManifest manifest = {
     .id = "UsbSettings",
     .name = "USB",
     .icon = LV_SYMBOL_USB,
-    .type = Type::Settings,
+    .category = Category::Settings,
     .createApp = create<UsbSettingsApp>
 };
 

Tactility/Source/app/wifiapsettings/WifiApSettings.cpp

@@ -1,20 +1,18 @@
-#include "Tactility/app/wifiapsettings/WifiApSettings.h"
-
-#include "Tactility/app/App.h"
-#include "Tactility/app/AppContext.h"
-#include "Tactility/app/AppManifest.h"
-#include "Tactility/app/alertdialog/AlertDialog.h"
-#include "Tactility/lvgl/Style.h"
-#include "Tactility/lvgl/Toolbar.h"
-
+#include <Tactility/service/wifi/WifiApSettings.h>
+#include <Tactility/service/wifi/Wifi.h>
+#include <Tactility/app/App.h>
+#include <Tactility/app/AppContext.h>
+#include <Tactility/app/AppManifest.h>
+#include <Tactility/app/alertdialog/AlertDialog.h>
+#include <Tactility/lvgl/Style.h>
+#include <Tactility/lvgl/Toolbar.h>
 #include <Tactility/TactilityCore.h>
-#include <Tactility/service/wifi/WifiSettings.h>
 
 #include <lvgl.h>
 
 namespace tt::app::wifiapsettings {
 
-#define TAG "wifi_ap_settings"
+constexpr auto* TAG = "WifiApSettings";
 
 extern const AppManifest manifest;
 
@@ -146,7 +144,8 @@ extern const AppManifest manifest = {
     .id = "WifiApSettings",
     .name = "Wi-Fi AP Settings",
     .icon = LV_SYMBOL_WIFI,
-    .type = Type::Hidden,
+    .category = Category::System,
+    .flags = AppManifest::Flags::Hidden,
     .createApp = create<WifiApSettings>
 };
 

Tactility/Source/app/wificonnect/WifiConnect.cpp

@@ -97,7 +97,8 @@ extern const AppManifest manifest = {
     .id = "WifiConnect",
     .name = "Wi-Fi Connect",
     .icon = LV_SYMBOL_WIFI,
-    .type = Type::Hidden,
+    .category = Category::System,
+    .flags = AppManifest::Flags::Hidden,
     .createApp = create<WifiConnect>
 };
 

Tactility/Source/app/wifimanage/WifiManage.cpp

@@ -136,7 +136,7 @@ extern const AppManifest manifest = {
     .id = "WifiManage",
     .name = "Wi-Fi",
     .icon = LV_SYMBOL_WIFI,
-    .type = Type::Settings,
+    .category = Category::Settings,
     .createApp = create<WifiManage>
 };