Make namespaces more consistent (#92)

AppEsp32/Source/HelloWorld/HelloWorld.cpp

@@ -1,5 +1,5 @@
 #include "lvgl.h"
-#include "ui/Toolbar.h"
+#include "lvgl/Toolbar.h"
 
 static void app_show(tt::app::App app, lv_obj_t* parent) {
     lv_obj_t* toolbar = tt::lvgl::toolbar_create(parent, app);

AppSim/Source/HelloWorld/hello_world.cpp

@@ -1,4 +1,4 @@
-#include "ui/Toolbar.h"
+#include "lvgl/Toolbar.h"
 
 static void app_show(tt::app::App app, lv_obj_t* parent) {
     lv_obj_t* toolbar = tt::lvgl::toolbar_create(parent, app);

AppSim/Source/lvgl_hal.cpp

@@ -1,5 +1,5 @@
 #include "lvgl.h"
-#include "ui/LvglKeypad.h"
+#include "lvgl/LvglKeypad.h"
 
 lv_display_t* lvgl_hal_init() {
     static lv_display_t* display = NULL;

AppSim/Source/lvgl_task.cpp

@@ -5,7 +5,7 @@
 #include "lvgl_hal.h"
 #include "TactilityCore.h"
 #include "Thread.h"
-#include "ui/LvglSync.h"
+#include "lvgl/LvglSync.h"
 
 #include "Mutex.h"
 

Boards/LilygoTdeck/keyboard.cpp

@@ -2,7 +2,7 @@
 #include "config.h"
 #include "lvgl.h"
 #include "TactilityCore.h"
-#include "ui/LvglKeypad.h"
+#include "lvgl/LvglKeypad.h"
 #include "hal/i2c/I2c.h"
 #include <driver/i2c.h>
 

Boards/LilygoTdeck/lvgl.cpp

@@ -1,6 +1,6 @@
 #include "Log.h"
 #include "Thread.h"
-#include "ui/LvglSync.h"
+#include "lvgl/LvglSync.h"
 #include "config.h"
 #include "display.h"
 #include "esp_lvgl_port.h"

Boards/LilygoTdeck/sdcard.cpp

@@ -5,7 +5,7 @@
 
 #include "esp_vfs_fat.h"
 #include "sdmmc_cmd.h"
-#include "ui/LvglSync.h"
+#include "lvgl/LvglSync.h"
 
 #define TAG "tdeck_sdcard"
 

Boards/M5stackShared/Source/Lvgl.cpp

@@ -1,7 +1,7 @@
 #include "esp_lvgl_port.h"
 #include "Log.h"
 #include "Thread.h"
-#include "ui/LvglSync.h"
+#include "lvgl/LvglSync.h"
 
 #define TAG "cores3_lvgl"
 

Boards/WaveshareS3Touch/lvgl.cpp

@@ -2,7 +2,7 @@
 
 #include "display_i.h"
 #include "touch_i.h"
-#include "ui/LvglSync.h"
+#include "lvgl/LvglSync.h"
 
 bool ws3t_init_lvgl() {
     tt::lvgl::syncSet(&ws3t_display_lock, &ws3t_display_unlock);

Boards/YellowBoard/lvgl.cpp

@@ -1,6 +1,6 @@
 #include "esp_lvgl_port.h"
 #include "Log.h"
-#include "ui/LvglSync.h"
+#include "lvgl/LvglSync.h"
 #include "Thread.h"
 
 #define TAG "twodotfour_lvgl"

Tactility/Private/lvgl/Init_i.h

@@ -0,0 +1,9 @@
+#pragma once
+
+#include "hal/Configuration.h"
+
+namespace tt::lvgl {
+
+void init(const hal::Configuration* config);
+
+} // namespace

Tactility/Private/ui/LvglInit_i.h

@@ -1,9 +0,0 @@
-#pragma once
-
-#include "hal/Configuration.h"
-
-namespace tt::ui {
-
-void initLvgl(const hal::Configuration* config);
-
-} // namespace

Tactility/Source/Tactility.cpp

@@ -4,13 +4,13 @@
 #include "service/ServiceRegistry.h"
 #include "service/loader/Loader.h"
 #include "TactilityHeadless.h"
-#include "ui/LvglInit_i.h"
+#include "lvgl/Init_i.h"
 
 namespace tt {
 
 #define TAG "tactility"
 
-static const Configuration* config_instance = NULL;
+static const Configuration* config_instance = nullptr;
 
 // region Default services
 
@@ -38,16 +38,16 @@ namespace app {
     namespace desktop { extern const Manifest manifest; }
     namespace files { extern const Manifest manifest; }
     namespace gpio { extern const Manifest manifest; }
-    namespace image_viewer { extern const Manifest manifest; }
+    namespace imageviewer { extern const Manifest manifest; }
     namespace screenshot { extern const Manifest manifest; }
     namespace settings { extern const Manifest manifest; }
-    namespace settings::display { extern const Manifest manifest; }
-    namespace settings::i2c { extern const Manifest manifest; }
-    namespace settings::power { extern const Manifest manifest; }
-    namespace system_info { extern const Manifest manifest; }
-    namespace text_viewer { extern const Manifest manifest; }
-    namespace wifi_connect { extern const Manifest manifest; }
-    namespace wifi_manage { extern const Manifest manifest; }
+    namespace display { extern const Manifest manifest; }
+    namespace i2csettings { extern const Manifest manifest; }
+    namespace power { extern const Manifest manifest; }
+    namespace systeminfo { extern const Manifest manifest; }
+    namespace textviewer { extern const Manifest manifest; }
+    namespace wificonnect { extern const Manifest manifest; }
+    namespace wifimanage { extern const Manifest manifest; }
 }
 
 #ifndef ESP_PLATFORM
@@ -56,16 +56,16 @@ extern const app::Manifest screenshot_app;
 
 static const std::vector<const app::Manifest*> system_apps = {
     &app::desktop::manifest,
+    &app::display::manifest,
     &app::files::manifest,
     &app::gpio::manifest,
-    &app::image_viewer::manifest,
+    &app::i2csettings::manifest,
+    &app::imageviewer::manifest,
     &app::settings::manifest,
-    &app::settings::display::manifest,
-    &app::settings::i2c::manifest,
-    &app::system_info::manifest,
-    &app::text_viewer::manifest,
-    &app::wifi_connect::manifest,
-    &app::wifi_manage::manifest,
+    &app::systeminfo::manifest,
+    &app::textviewer::manifest,
+    &app::wificonnect::manifest,
+    &app::wifimanage::manifest,
 #ifndef ESP_PLATFORM
     &app::screenshot::manifest, // Screenshots don't work yet on ESP32
 #endif
@@ -80,7 +80,7 @@ static void register_system_apps() {
     }
 
     if (getConfiguration()->hardware->power != nullptr) {
-        app_manifest_registry_add(&app::settings::power::manifest);
+        app_manifest_registry_add(&app::power::manifest);
     }
 }
 
@@ -127,7 +127,7 @@ void init(const Configuration* config) {
 
     initHeadless(*config->hardware);
 
-    ui::initLvgl(config->hardware);
+    lvgl::init(config->hardware);
 
     app::app_manifest_registry_init();
 

Tactility/Source/app/display/Display.cpp

@@ -2,11 +2,10 @@
 #include "Assets.h"
 #include "DisplayPreferences.h"
 #include "Tactility.h"
-#include "ui/Style.h"
-#include "ui/Toolbar.h"
+#include "lvgl/Toolbar.h"
 #include "lvgl.h"
 
-namespace tt::app::settings::display {
+namespace tt::app::display {
 
 #define TAG "display"
 

Tactility/Source/app/display/DisplayPreferences.cpp

@@ -1,7 +1,7 @@
 #include "DisplayPreferences.h"
 #include "Preferences.h"
 
-namespace tt::app::settings::display {
+namespace tt::app::display {
 
 tt::Preferences preferences("display");
 

Tactility/Source/app/display/DisplayPreferences.h

@@ -3,7 +3,7 @@
 #include <cstdint>
 #include <src/display/lv_display.h>
 
-namespace tt::app::settings::display {
+namespace tt::app::display {
 
 void preferences_set_backlight_duty(uint8_t value);
 uint8_t preferences_get_backlight_duty();

Tactility/Source/app/files/Files.cpp

@@ -5,11 +5,11 @@
 #include "Check.h"
 #include "FileUtils.h"
 #include "StringUtils.h"
-#include "app/ImageViewer/ImageViewer.h"
-#include "app/TextViewer/TextViewer.h"
+#include "app/imageviewer/ImageViewer.h"
+#include "app/textviewer/TextViewer.h"
 #include "lvgl.h"
 #include "service/loader/Loader.h"
-#include "ui/Toolbar.h"
+#include "lvgl/Toolbar.h"
 #include <dirent.h>
 #include <unistd.h>
 

Tactility/Source/app/gpio/Gpio.cpp

@@ -2,10 +2,10 @@
 #include "Thread.h"
 #include "Tactility.h"
 #include "service/loader/Loader.h"
-#include "ui/Toolbar.h"
+#include "lvgl/Toolbar.h"
 
 #include "GpioHal.h"
-#include "ui/LvglSync.h"
+#include "lvgl/LvglSync.h"
 
 namespace tt::app::gpio {
 

Tactility/Source/app/i2csettings/I2cSettings.cpp

@@ -1,11 +1,11 @@
 #include "Assets.h"
 #include "hal/i2c/I2c.h"
 #include "Tactility.h"
-#include "ui/Style.h"
-#include "ui/Toolbar.h"
+#include "lvgl/Style.h"
+#include "lvgl/Toolbar.h"
 #include "lvgl.h"
 
-namespace tt::app::settings::i2c {
+namespace tt::app::i2csettings {
 
 static void on_switch_toggle(lv_event_t* event) {
     lv_event_code_t code = lv_event_get_code(event);

Tactility/Source/app/imageviewer/ImageViewer.cpp

@@ -1,10 +1,10 @@
 #include "ImageViewer.h"
 #include "Log.h"
 #include "lvgl.h"
-#include "ui/Style.h"
-#include "ui/Toolbar.h"
+#include "lvgl/Style.h"
+#include "lvgl/Toolbar.h"
 
-namespace tt::app::image_viewer {
+namespace tt::app::imageviewer {
 
 #define TAG "image_viewer"
 

Tactility/Source/app/power/Power.cpp

@@ -3,11 +3,11 @@
 #include "lvgl.h"
 #include "Tactility.h"
 #include "Timer.h"
-#include "ui/LvglSync.h"
-#include "ui/Style.h"
-#include "ui/Toolbar.h"
+#include "lvgl/LvglSync.h"
+#include "lvgl/Style.h"
+#include "lvgl/Toolbar.h"
 
-namespace tt::app::settings::power {
+namespace tt::app::power {
 
 #define TAG "power"
 

Tactility/Source/app/screenshot/ScreenshotUi.cpp

@@ -4,7 +4,7 @@
 #include "hal/sdcard/Sdcard.h"
 #include "service/gui/Gui.h"
 #include "service/screenshot/Screenshot.h"
-#include "ui/Toolbar.h"
+#include "lvgl/Toolbar.h"
 
 namespace tt::app::screenshot {
 

Tactility/Source/app/settings/Settings.cpp

@@ -2,7 +2,7 @@
 #include "Assets.h"
 #include "Check.h"
 #include "service/loader/Loader.h"
-#include "ui/Toolbar.h"
+#include "lvgl/Toolbar.h"
 #include "lvgl.h"
 #include <algorithm>
 

Tactility/Source/app/systeminfo/SystemInfo.cpp

@@ -1,9 +1,9 @@
 #include "Assets.h"
 #include "lvgl.h"
 #include "Tactility.h"
-#include "ui/Toolbar.h"
+#include "lvgl/Toolbar.h"
 
-namespace tt::app::system_info {
+namespace tt::app::systeminfo {
 
 static size_t get_heap_free() {
 #ifdef ESP_PLATFORM

Tactility/Source/app/textviewer/TextViewer.cpp

@@ -1,13 +1,13 @@
 #include "Log.h"
 #include "TextViewer.h"
 #include "lvgl.h"
-#include "ui/LabelUtils.h"
-#include "ui/Style.h"
-#include "ui/Toolbar.h"
+#include "lvgl/LabelUtils.h"
+#include "lvgl/Style.h"
+#include "lvgl/Toolbar.h"
 
 #define TAG "text_viewer"
 
-namespace tt::app::text_viewer {
+namespace tt::app::textviewer {
 
 static void on_show(App app, lv_obj_t* parent) {
     lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);

Tactility/Source/app/wificonnect/WifiConnect.cpp

@@ -5,9 +5,9 @@
 #include "WifiConnectStateUpdating.h"
 #include "service/loader/Loader.h"
 #include "service/wifi/Wifi.h"
-#include "ui/LvglSync.h"
+#include "lvgl/LvglSync.h"
 
-namespace tt::app::wifi_connect {
+namespace tt::app::wificonnect {
 
 #define TAG "wifi_connect"
 

Tactility/Source/app/wificonnect/WifiConnect.h

@@ -6,7 +6,7 @@
 #include "WifiConnectView.h"
 #include "service/wifi/Wifi.h"
 
-namespace tt::app::wifi_connect {
+namespace tt::app::wificonnect {
 
 typedef struct {
     PubSubSubscription* wifi_subscription;

Tactility/Source/app/wificonnect/WifiConnectBindings.h

@@ -2,7 +2,7 @@
 
 #include "service/wifi/WifiSettings.h"
 
-namespace tt::app::wifi_connect {
+namespace tt::app::wificonnect {
 
 typedef void (*OnConnectSsid)(const service::wifi::settings::WifiApSettings* settings, bool store, void* context);
 

Tactility/Source/app/wificonnect/WifiConnectState.h

@@ -3,7 +3,7 @@
 #include "service/wifi/Wifi.h"
 #include "service/wifi/WifiSettings.h"
 
-namespace tt::app::wifi_connect {
+namespace tt::app::wificonnect {
 
 /**
  * View's state

Tactility/Source/app/wificonnect/WifiConnectStateUpdating.cpp

@@ -1,6 +1,6 @@
 #include "WifiConnectStateUpdating.h"
 
-namespace tt::app::wifi_connect {
+namespace tt::app::wificonnect {
 
 void state_set_radio_error(WifiConnect* wifi, bool error) {
     lock(wifi);

Tactility/Source/app/wificonnect/WifiConnectStateUpdating.h

@@ -2,7 +2,7 @@
 
 #include "WifiConnect.h"
 
-namespace tt::app::wifi_connect {
+namespace tt::app::wificonnect {
 
 void state_set_radio_error(WifiConnect* wifi, bool error);
 void state_set_ap_settings(WifiConnect* wifi, const service::wifi::settings::WifiApSettings* settings);

Tactility/Source/app/wificonnect/WifiConnectView.cpp

@@ -8,10 +8,10 @@
 #include "lvgl.h"
 #include "service/gui/Gui.h"
 #include "service/wifi/WifiSettings.h"
-#include "ui/Style.h"
-#include "ui/Toolbar.h"
+#include "lvgl/Style.h"
+#include "lvgl/Toolbar.h"
 
-namespace tt::app::wifi_connect {
+namespace tt::app::wificonnect {
 
 #define TAG "wifi_connect"
 

Tactility/Source/app/wificonnect/WifiConnectView.h

@@ -5,7 +5,7 @@
 #include "WifiConnectState.h"
 #include "lvgl.h"
 
-namespace tt::app::wifi_connect {
+namespace tt::app::wificonnect {
 
 typedef struct {
     lv_obj_t* ssid_textarea;

Tactility/Source/app/wifimanage/WifiManage.cpp

@@ -1,15 +1,15 @@
 #include "WifiManage.h"
 
 #include "app/App.h"
-#include "app/WifiConnect/WifiConnectBundle.h"
+#include "app/wificonnect/WifiConnectBundle.h"
 #include "TactilityCore.h"
 #include "service/loader/Loader.h"
 #include "service/wifi/WifiSettings.h"
-#include "ui/LvglSync.h"
+#include "lvgl/LvglSync.h"
 #include "WifiManageStateUpdating.h"
 #include "WifiManageView.h"
 
-namespace tt::app::wifi_manage {
+namespace tt::app::wifimanage {
 
 #define TAG "wifi_manage"
 

Tactility/Source/app/wifimanage/WifiManage.h

@@ -4,7 +4,7 @@
 #include "WifiManageView.h"
 #include "service/wifi/Wifi.h"
 
-namespace tt::app::wifi_manage {
+namespace tt::app::wifimanage {
 
 typedef struct {
     PubSubSubscription* wifi_subscription;

Tactility/Source/app/wifimanage/WifiManageBindings.h

@@ -1,6 +1,6 @@
 #pragma once
 
-namespace tt::app::wifi_manage {
+namespace tt::app::wifimanage {
 
 typedef void (*OnWifiToggled)(bool enable);
 typedef void (*OnConnectSsid)(const char* ssid);

Tactility/Source/app/wifimanage/WifiManageState.h

@@ -2,7 +2,7 @@
 
 #include "service/wifi/Wifi.h"
 
-namespace tt::app::wifi_manage {
+namespace tt::app::wifimanage {
 
 #define WIFI_SCAN_AP_RECORD_COUNT 16
 

Tactility/Source/app/wifimanage/WifiManageStateUpdating.cpp

@@ -1,6 +1,6 @@
 #include "WifiManage.h"
 
-namespace tt::app::wifi_manage {
+namespace tt::app::wifimanage {
 
 void state_set_scanning(WifiManage* wifi, bool is_scanning) {
     lock(wifi);

Tactility/Source/app/wifimanage/WifiManageStateUpdating.h

@@ -2,7 +2,7 @@
 
 #include "WifiManage.h"
 
-namespace tt::app::wifi_manage {
+namespace tt::app::wifimanage {
 
 void state_set_scanning(WifiManage* wifi, bool is_scanning);
 void state_set_radio_state(WifiManage* wifi, service::wifi::WifiRadioState state);

Tactility/Source/app/wifimanage/WifiManageView.cpp

@@ -4,10 +4,10 @@
 #include "WifiManageState.h"
 #include "service/statusbar/Statusbar.h"
 #include "service/wifi/Wifi.h"
-#include "ui/Style.h"
-#include "ui/Toolbar.h"
+#include "lvgl/Style.h"
+#include "lvgl/Toolbar.h"
 
-namespace tt::app::wifi_manage {
+namespace tt::app::wifimanage {
 
 #define TAG "wifi_main_view"
 #define SPINNER_HEIGHT 40

Tactility/Source/app/wifimanage/WifiManageView.h

@@ -5,7 +5,7 @@
 #include "WifiManageState.h"
 #include "lvgl.h"
 
-namespace tt::app::wifi_manage {
+namespace tt::app::wifimanage {
 
 typedef struct {
     lv_obj_t* root;

Tactility/Source/lvgl/Init.cpp

@@ -1,17 +1,17 @@
-#include "app/Display/DisplayPreferences.h"
+#include "app/display/DisplayPreferences.h"
 #include "lvgl.h"
 #include "hal/Configuration.h"
 
-namespace tt::ui {
+namespace tt::lvgl {
 
-void initLvgl(const hal::Configuration* config) {
+void init(const hal::Configuration* config) {
     hal::SetBacklightDuty set_backlight_duty = config->display.setBacklightDuty;
     if (set_backlight_duty != nullptr) {
-        int32_t backlight_duty = app::settings::display::preferences_get_backlight_duty();
+        int32_t backlight_duty = app::display::preferences_get_backlight_duty();
         set_backlight_duty(backlight_duty);
     }
 
-    lv_display_rotation_t rotation = app::settings::display::preferences_get_rotation();
+    lv_display_rotation_t rotation = app::display::preferences_get_rotation();
     if (rotation != lv_disp_get_rotation(lv_disp_get_default())) {
         lv_disp_set_rotation(lv_disp_get_default(), static_cast<lv_display_rotation_t>(rotation));
     }

Tactility/Source/lvgl/Statusbar.cpp

@@ -4,8 +4,8 @@
 #include "Mutex.h"
 #include "Pubsub.h"
 #include "TactilityCore.h"
-#include "ui/Spacer.h"
-#include "ui/Style.h"
+#include "lvgl/Spacer.h"
+#include "lvgl/Style.h"
 
 #include "LvglSync.h"
 #include "lvgl.h"

Tactility/Source/lvgl/Toolbar.cpp

@@ -3,8 +3,8 @@
 #include "Tactility.h"
 
 #include "service/loader/Loader.h"
-#include "ui/Spacer.h"
-#include "ui/Style.h"
+#include "lvgl/Spacer.h"
+#include "lvgl/Style.h"
 
 namespace tt::lvgl {
 

Tactility/Source/service/gui/Gui.cpp

@@ -1,8 +1,8 @@
 #include "Tactility.h"
 #include "service/gui/Gui_i.h"
 #include "service/loader/Loader.h"
-#include "ui/LvglKeypad.h"
-#include "ui/LvglSync.h"
+#include "lvgl/LvglKeypad.h"
+#include "lvgl/LvglSync.h"
 
 #ifdef ESP_PLATFORM
 #include "freertos/FreeRTOS.h"

Tactility/Source/service/gui/GuiDraw.cpp

@@ -1,9 +1,9 @@
 #include "Check.h"
 #include "Log.h"
 #include "service/gui/Gui_i.h"
-#include "ui/LvglSync.h"
-#include "ui/Statusbar.h"
-#include "ui/Style.h"
+#include "lvgl/LvglSync.h"
+#include "lvgl/Statusbar.h"
+#include "lvgl/Style.h"
 
 namespace tt::service::gui {
 

Tactility/Source/service/gui/Keyboard.cpp

@@ -1,8 +1,8 @@
 #include "Check.h"
 #include "TactilityConfig.h"
 #include "service/gui/Gui_i.h"
-#include "ui/LvglKeypad.h"
-#include "ui/LvglSync.h"
+#include "lvgl/LvglKeypad.h"
+#include "lvgl/LvglSync.h"
 
 namespace tt::service::gui {
 

Tactility/Source/service/gui/ViewPort.cpp

@@ -2,7 +2,7 @@
 
 #include "Check.h"
 #include "service/gui/ViewPort_i.h"
-#include "ui/Style.h"
+#include "lvgl/Style.h"
 
 namespace tt::service::gui {
 

Tactility/Source/service/loader/Loader.cpp

@@ -10,7 +10,7 @@
 #include "freertos/FreeRTOS.h"
 #else
 #include "FreeRTOS.h"
-#include "ui/LvglSync.h"
+#include "lvgl/LvglSync.h"
 
 #endif
 

Tactility/Source/service/screenshot/ScreenshotTask.cpp

@@ -6,7 +6,7 @@
 #include "TactilityCore.h"
 #include "Thread.h"
 #include "service/loader/Loader.h"
-#include "ui/LvglSync.h"
+#include "lvgl/LvglSync.h"
 
 namespace tt::service::screenshot {
 

Tactility/Source/service/statusbar/Statusbar.cpp

@@ -5,7 +5,7 @@
 #include "service/Service.h"
 #include "service/wifi/Wifi.h"
 #include "Tactility.h"
-#include "ui/Statusbar.h"
+#include "lvgl/Statusbar.h"
 
 namespace tt::service::statusbar {