Fixed all the includes that were broken due to the renames

src/displayapp/DisplayApp.cpp

@@ -1,24 +1,25 @@
+#include <string>
+
 #include "DisplayApp.h"
 #include <FreeRTOS.h>
 #include <task.h>
 #include <libraries/log/nrf_log.h>
 #include <nrf_font.h>
 #include <queue.h>
-#include <Components/DateTime/DateTimeController.h>
+#include "components/datetime/DateTimeController.h"
 #include <drivers/Cst816s.h>
-#include <string>
-#include <DisplayApp/Screens/Tile.h>
-#include <DisplayApp/Screens/Meter.h>
-#include <DisplayApp/Screens/Gauge.h>
-#include <DisplayApp/Screens/Brightness.h>
-#include <DisplayApp/Screens/SystemInfo.h>
-#include <DisplayApp/Screens/Music.h>
-#include <Components/Ble/NotificationManager.h>
-#include <DisplayApp/Screens/FirmwareUpdate.h>
-#include <DisplayApp/Screens/ApplicationList.h>
-#include <DisplayApp/Screens/FirmwareValidation.h>
-#include <DisplayApp/Screens/InfiniPaint.h>
-#include "../SystemTask/SystemTask.h"
+#include "displayapp/screens/Tile.h"
+#include "displayapp/screens/Meter.h"
+#include "displayapp/screens/Gauge.h"
+#include "displayapp/screens/Brightness.h"
+#include "displayapp/screens/SystemInfo.h"
+#include "displayapp/screens/Music.h"
+#include "components/ble/NotificationManager.h"
+#include "displayapp/screens/FirmwareUpdate.h"
+#include "displayapp/screens/ApplicationList.h"
+#include "displayapp/screens/FirmwareValidation.h"
+#include "displayapp/screens/InfiniPaint.h"
+#include "systemtask/SystemTask.h"
 
 using namespace Pinetime::Applications;
 
@@ -148,7 +149,7 @@ void DisplayApp::Refresh() {
           }
         }
 
-//        lvgl.SetFullRefresh(Components::LittleVgl::FullRefreshDirections::Down);
+//        lvgl.SetFullRefresh(components::LittleVgl::FullRefreshDirections::Down);
 //        currentScreen.reset(nullptr);
 //        if(toggle) {
 //          currentScreen.reset(new Screens::Tile(this));

src/displayapp/DisplayApp.h

@@ -3,21 +3,21 @@
 #include <task.h>
 #include <drivers/St7789.h>
 #include <drivers/SpiMaster.h>
-#include <Components/Gfx/Gfx.h>
 #include <bits/unique_ptr.h>
 #include <queue.h>
-#include <Components/Battery/BatteryController.h>
-#include <Components/Brightness/BrightnessController.h>
-#include <Components/Ble/BleController.h>
-#include <Components/DateTime/DateTimeController.h>
-#include "../drivers/Cst816s.h"
+#include "components/gfx/Gfx.h"
+#include "components/battery/BatteryController.h"
+#include "components/brightness/BrightnessController.h"
+#include "components/ble/BleController.h"
+#include "components/datetime/DateTimeController.h"
+#include "components/ble/NotificationManager.h"
+#include "components/firmwarevalidator/FirmwareValidator.h"
+#include "drivers/Cst816s.h"
 #include "LittleVgl.h"
 #include <date/date.h>
-#include <DisplayApp/Screens/Clock.h>
+#include "displayapp/screens/Clock.h"
+#include "displayapp/screens/Modal.h"
 #include <drivers/Watchdog.h>
-#include <DisplayApp/Screens/Modal.h>
-#include <Components/Ble/NotificationManager.h>
-#include <Components/FirmwareValidator/FirmwareValidator.h>
 #include "TouchEvents.h"
 #include "Apps.h"
 

src/displayapp/screens/ApplicationList.cpp

@@ -1,5 +1,5 @@
 #include <libs/lvgl/lvgl.h>
-#include <DisplayApp/DisplayApp.h>
+#include <displayapp/DisplayApp.h>
 #include <functional>
 #include "ApplicationList.h"
 #include "Tile.h"

src/displayapp/screens/ApplicationList.h

@@ -1,13 +1,14 @@
 #pragma once
 
+#include <functional>
 #include <vector>
-#include <Components/Ble/NimbleController.h>
+
+#include "components/ble/NimbleController.h"
 #include "Screen.h"
 #include "Label.h"
 #include "ScreenList.h"
 #include "Gauge.h"
 #include "Meter.h"
-#include <functional>
 
 namespace Pinetime {
   namespace Applications {

src/displayapp/screens/Brightness.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <libs/lvgl/src/lv_core/lv_obj.h>
-#include <Components/Brightness/BrightnessController.h>
+#include "components/brightness/BrightnessController.h"
 #include "Screen.h"
 
 namespace Pinetime {

src/displayapp/screens/Clock.cpp

@@ -1,6 +1,7 @@
 #include <cstdio>
+
 #include <libs/date/includes/date/date.h>
-#include <Components/DateTime/DateTimeController.h>
+#include "components/datetime/DateTimeController.h"
 #include <libs/lvgl/lvgl.h>
 #include "Clock.h"
 #include "../DisplayApp.h"

src/displayapp/screens/Clock.h

@@ -2,12 +2,13 @@
 
 #include <cstdint>
 #include <chrono>
+
 #include "Screen.h"
 #include <bits/unique_ptr.h>
 #include <libs/lvgl/src/lv_core/lv_style.h>
 #include <libs/lvgl/src/lv_core/lv_obj.h>
-#include <Components/Battery/BatteryController.h>
-#include <Components/Ble/BleController.h>
+#include "components/battery/BatteryController.h"
+#include "components/ble/BleController.h"
 
 namespace Pinetime {
   namespace Applications {

src/displayapp/screens/FirmwareUpdate.h

@@ -2,11 +2,12 @@
 
 #include <cstdint>
 #include <chrono>
+
 #include "Screen.h"
 #include <bits/unique_ptr.h>
 #include <libs/lvgl/src/lv_core/lv_style.h>
 #include <libs/lvgl/src/lv_core/lv_obj.h>
-#include <Components/Ble/BleController.h>
+#include "components/ble/BleController.h"
 
 namespace Pinetime {
   namespace Applications {

src/displayapp/screens/FirmwareValidation.cpp

@@ -2,7 +2,7 @@
 #include "FirmwareValidation.h"
 #include "../DisplayApp.h"
 #include "../../Version.h"
-#include "../../Components/FirmwareValidator/FirmwareValidator.h"
+#include "components/firmwarevalidator/FirmwareValidator.h"
 
 using namespace Pinetime::Applications::Screens;
 extern lv_font_t jetbrains_mono_extrabold_compressed;

src/displayapp/screens/InfiniPaint.h

@@ -6,7 +6,7 @@
 #include <libs/lvgl/src/lv_core/lv_style.h>
 #include <libs/lvgl/src/lv_core/lv_obj.h>
 #include <drivers/St7789.h>
-#include <DisplayApp/LittleVgl.h>
+#include "displayapp/LittleVgl.h"
 
 namespace Pinetime {
   namespace Applications {

src/displayapp/screens/Music.h

@@ -2,16 +2,17 @@
 
 #include <cstdint>
 #include <chrono>
-#include <Components/Gfx/Gfx.h>
+#include <string>
+
+#include "components/gfx/Gfx.h"
+#include "components/battery/BatteryController.h"
+#include "components/ble/BleController.h"
+#include "components/ble/MusicService.h"
 #include "Screen.h"
 #include <bits/unique_ptr.h>
 #include <libs/lvgl/src/lv_core/lv_style.h>
 #include <libs/lvgl/src/lv_core/lv_obj.h>
-#include <Components/Battery/BatteryController.h>
-#include <Components/Ble/BleController.h>
 #include "../../Version.h"
-#include <Components/Ble/MusicService.h>
-#include <string>
 
 namespace Pinetime {
   namespace Applications {

src/displayapp/screens/ScreenList.h

@@ -1,8 +1,8 @@
 #pragma once
 
 #include <vector>
-#include <Components/Ble/NimbleController.h>
 #include <functional>
+#include "components/ble/NimbleController.h"
 #include "Screen.h"
 #include "Label.h"
 

src/displayapp/screens/SystemInfo.cpp

@@ -1,5 +1,5 @@
 #include <libs/lvgl/lvgl.h>
-#include <DisplayApp/DisplayApp.h>
+#include <displayapp/DisplayApp.h>
 #include <functional>
 #include "SystemInfo.h"
 #include "../../Version.h"

src/displayapp/screens/SystemInfo.h

@@ -1,13 +1,14 @@
 #pragma once
 
+#include <functional>
 #include <vector>
-#include <Components/Ble/NimbleController.h>
+
+#include "components/ble/NimbleController.h"
 #include "Screen.h"
 #include "Label.h"
 #include "ScreenList.h"
 #include "Gauge.h"
 #include "Meter.h"
-#include <functional>
 
 namespace Pinetime {
   namespace Applications {

src/displayapp/screens/Tile.cpp

@@ -1,8 +1,9 @@
 #include <libs/lvgl/src/lv_core/lv_obj.h>
 #include <libs/lvgl/src/lv_font/lv_font.h>
 #include <libs/lvgl/lvgl.h>
+
 #include "Tile.h"
-#include <DisplayApp/DisplayApp.h>
+#include "displayapp/DisplayApp.h"
 #include "Symbols.h"
 #include "../../Version.h"
 

src/displayapp/screens/Tile.h

@@ -5,7 +5,7 @@
 #include <bits/unique_ptr.h>
 #include "Modal.h"
 #include <lvgl/src/lv_core/lv_style.h>
-#include <DisplayApp/Apps.h>
+#include <displayapp/Apps.h>
 
 namespace Pinetime {
   namespace Applications {