Watch face selection with CMake

Move displayapp/Apps.h into a header only library (to make the integration easier in InfiniSim.

src/displayapp/screens/Alarm.h

@@ -17,7 +17,7 @@
 */
 #pragma once
 
-#include "displayapp/Apps.h"
+#include "displayapp/apps/Apps.h"
 #include "components/settings/Settings.h"
 #include "displayapp/screens/Screen.h"
 #include "displayapp/widgets/Counter.h"

src/displayapp/screens/ApplicationList.h

@@ -2,7 +2,7 @@
 
 #include <array>
 #include <memory>
-#include "displayapp/Apps.h"
+#include "displayapp/apps/Apps.h"
 #include "Screen.h"
 #include "ScreenList.h"
 #include "displayapp/Controllers.h"

src/displayapp/screens/CheckboxList.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "displayapp/Apps.h"
+#include "displayapp/apps/Apps.h"
 #include "displayapp/screens/Screen.h"
 #include <array>
 #include <cstdint>

src/displayapp/screens/InfiniPaint.h

@@ -6,7 +6,7 @@
 #include "displayapp/screens/Screen.h"
 #include "components/motor/MotorController.h"
 #include "Symbols.h"
-#include <displayapp/Apps.h>
+#include "displayapp/apps/Apps.h"
 #include <displayapp/Controllers.h>
 
 namespace Pinetime {

src/displayapp/screens/List.h

@@ -5,7 +5,7 @@
 #include <array>
 #include "displayapp/screens/Screen.h"
 #include "displayapp/widgets/PageIndicator.h"
-#include "displayapp/Apps.h"
+#include "displayapp/apps/Apps.h"
 #include "components/settings/Settings.h"
 
 #define MAXLISTITEMS 4

src/displayapp/screens/Motion.h

@@ -7,7 +7,7 @@
 #include <lvgl/src/lv_core/lv_obj.h>
 #include <components/motion/MotionController.h>
 #include "displayapp/Controllers.h"
-#include "displayapp/Apps.h"
+#include "displayapp/apps/Apps.h"
 
 namespace Pinetime {
   namespace Applications {

src/displayapp/screens/Music.h

@@ -21,7 +21,7 @@
 #include <lvgl/src/lv_core/lv_obj.h>
 #include <string>
 #include "displayapp/screens/Screen.h"
-#include "displayapp/Apps.h"
+#include "displayapp/apps/Apps.h"
 #include "displayapp/Controllers.h"
 #include "Symbols.h"
 

src/displayapp/screens/Navigation.h

@@ -22,7 +22,7 @@
 #include <string>
 #include "displayapp/screens/Screen.h"
 #include <array>
-#include "displayapp/Apps.h"
+#include "displayapp/apps/Apps.h"
 #include "displayapp/Controllers.h"
 #include "Symbols.h"
 

src/displayapp/screens/Paddle.h

@@ -3,7 +3,7 @@
 #include <lvgl/lvgl.h>
 #include <cstdint>
 #include "displayapp/screens/Screen.h"
-#include "displayapp/Apps.h"
+#include "displayapp/apps/Apps.h"
 #include "displayapp/Controllers.h"
 #include "Symbols.h"
 

src/displayapp/screens/Steps.h

@@ -4,7 +4,7 @@
 #include <lvgl/lvgl.h>
 #include "displayapp/screens/Screen.h"
 #include <components/motion/MotionController.h>
-#include "displayapp/Apps.h"
+#include "displayapp/apps/Apps.h"
 #include "displayapp/Controllers.h"
 #include "Symbols.h"
 

src/displayapp/screens/StopWatch.h

@@ -7,7 +7,7 @@
 #include "portmacro_cmsis.h"
 
 #include "systemtask/SystemTask.h"
-#include "displayapp/Apps.h"
+#include "displayapp/apps/Apps.h"
 #include "displayapp/Controllers.h"
 #include "Symbols.h"
 

src/displayapp/screens/Tile.h

@@ -4,7 +4,7 @@
 #include <cstdint>
 #include <memory>
 #include "displayapp/screens/Screen.h"
-#include "displayapp/Apps.h"
+#include "displayapp/apps/Apps.h"
 #include "components/datetime/DateTimeController.h"
 #include "components/settings/Settings.h"
 #include "components/battery/BatteryController.h"

src/displayapp/screens/Twos.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "displayapp/Apps.h"
+#include "displayapp/apps/Apps.h"
 #include "displayapp/screens/Screen.h"
 #include "displayapp/Controllers.h"
 

src/displayapp/screens/settings/Settings.cpp

@@ -1,7 +1,7 @@
 #include "displayapp/screens/settings/Settings.h"
 #include <lvgl/lvgl.h>
 #include <functional>
-#include "displayapp/Apps.h"
+#include "displayapp/apps/Apps.h"
 #include "displayapp/DisplayApp.h"
 
 using namespace Pinetime::Applications::Screens;