Make namespaces more consistent (#92)

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;