From 9b775c6a91b91531edda67892b93041e5fb3f882 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Thu, 16 Jun 2022 22:41:54 +0300
Subject: Automatically create screens for applist and settings (#1153)

Apps and settings are now stored in a single array (two arrays in total).
Replace magic values with appsPerScreen and entriesPerScreen.
---
 src/displayapp/screens/ApplicationList.h | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

(limited to 'src/displayapp/screens/ApplicationList.h')

diff --git a/src/displayapp/screens/ApplicationList.h b/src/displayapp/screens/ApplicationList.h
index f430a89e..14d7623c 100644
--- a/src/displayapp/screens/ApplicationList.h
+++ b/src/displayapp/screens/ApplicationList.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <array>
 #include <memory>
 
 #include "displayapp/screens/Screen.h"
@@ -7,6 +8,8 @@
 #include "components/datetime/DateTimeController.h"
 #include "components/settings/Settings.h"
 #include "components/battery/BatteryController.h"
+#include "displayapp/screens/Symbols.h"
+#include "displayapp/screens/Tile.h"
 
 namespace Pinetime {
   namespace Applications {
@@ -21,14 +24,34 @@ namespace Pinetime {
         bool OnTouchEvent(TouchEvents event) override;
 
       private:
+        auto CreateScreenList() const;
+        std::unique_ptr<Screen> CreateScreen(unsigned int screenNum) const;
+
         Controllers::Settings& settingsController;
         Pinetime::Controllers::Battery& batteryController;
         Controllers::DateTime& dateTimeController;
 
-        ScreenList<2> screens;
-        std::unique_ptr<Screen> CreateScreen1();
-        std::unique_ptr<Screen> CreateScreen2();
-        // std::unique_ptr<Screen> CreateScreen3();
+        static constexpr int appsPerScreen = 6;
+
+        // Increment this when more space is needed
+        static constexpr int nScreens = 2;
+
+        static constexpr std::array<Tile::Applications, appsPerScreen * nScreens> applications {{
+          {Symbols::stopWatch, Apps::StopWatch},
+          {Symbols::clock, Apps::Alarm},
+          {Symbols::hourGlass, Apps::Timer},
+          {Symbols::shoe, Apps::Steps},
+          {Symbols::heartBeat, Apps::HeartRate},
+          {Symbols::music, Apps::Music},
+
+          {Symbols::paintbrush, Apps::Paint},
+          {Symbols::paddle, Apps::Paddle},
+          {"2", Apps::Twos},
+          {Symbols::chartLine, Apps::Motion},
+          {Symbols::drum, Apps::Metronome},
+          {Symbols::map, Apps::Navigation},
+        }};
+        ScreenList<nScreens> screens;
       };
     }
   }
-- 
cgit v1.2.3-70-g09d2