1 files changed, 19 insertions, 47 deletions
diff --git a/src/displayapp/screens/ApplicationList.cpp b/src/displayapp/screens/ApplicationList.cpp
index 385b7ec..f04b9ef 100644
--- a/src/displayapp/screens/ApplicationList.cpp
+++ b/src/displayapp/screens/ApplicationList.cpp
@@ -1,13 +1,23 @@
 #include "displayapp/screens/ApplicationList.h"
 #include <lvgl/lvgl.h>
 #include <array>
-#include "displayapp/screens/Symbols.h"
-#include "displayapp/screens/Tile.h"
 #include "displayapp/Apps.h"
 #include "displayapp/DisplayApp.h"
 
 using namespace Pinetime::Applications::Screens;
 
+constexpr std::array<Tile::Applications, ApplicationList::applications.size()> ApplicationList::applications;
+
+auto ApplicationList::CreateScreenList() const {
+  std::array<std::function<std::unique_ptr<Screen>()>, nScreens> screens;
+  for (size_t i = 0; i < screens.size(); i++) {
+    screens[i] = [this, i]() -> std::unique_ptr<Screen> {
+      return CreateScreen(i);
+    };
+  }
+  return screens;
+}
+
 ApplicationList::ApplicationList(Pinetime::Applications::DisplayApp* app,
                                  Pinetime::Controllers::Settings& settingsController,
                                  Pinetime::Controllers::Battery& batteryController,
@@ -16,14 +26,7 @@ ApplicationList::ApplicationList(Pinetime::Applications::DisplayApp* app,
     settingsController {settingsController},
     batteryController {batteryController},
     dateTimeController {dateTimeController},
-    screens {app,
-             settingsController.GetAppMenu(),
-             {
-               [this]() -> std::unique_ptr<Screen> { return CreateScreen1(); },
-               [this]() -> std::unique_ptr<Screen> { return CreateScreen2(); },
-               [this]() -> std::unique_ptr<Screen> { return CreateScreen3(); }
-             },
-             Screens::ScreenListModes::UpDown} {
+    screens {app, settingsController.GetAppMenu(), CreateScreenList(), Screens::ScreenListModes::UpDown} {
 }
 
 ApplicationList::~ApplicationList() {
@@ -34,43 +37,12 @@ bool ApplicationList::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
   return screens.OnTouchEvent(event);
 }
 
-std::unique_ptr<Screen> ApplicationList::CreateScreen1() {
-  std::array<Screens::Tile::Applications, 6> applications {{
-    {Symbols::music, Apps::Music},
-    {Symbols::shoe, Apps::Steps},
-    {Symbols::stopWatch, Apps::StopWatch},
-    {Symbols::heartBeat, Apps::HeartRate},
-    {Symbols::hourGlass, Apps::Timer},
-    {Symbols::alarmClock, Apps::Alarm},
-  }};
-
-  return std::make_unique<Screens::Tile>(0, 3, app, settingsController, batteryController, dateTimeController, applications);
-}
-
-std::unique_ptr<Screen> ApplicationList::CreateScreen2() {
-  std::array<Screens::Tile::Applications, 6> applications {{
-    {Symbols::drum, Apps::Jumpscore},
-    {Symbols::map, Apps::Navigation},
-    {Symbols::drum, Apps::Metronome},
-    {Symbols::paintbrush, Apps::Paint},
-    {Symbols::paddle, Apps::Paddle},
-    {"2", Apps::Twos},
-  }};
+std::unique_ptr<Screen> ApplicationList::CreateScreen(unsigned int screenNum) const {
+  std::array<Tile::Applications, 6> apps;
+  for (int i = 0; i < 6; i++) {
+    apps[i] = applications[screenNum * 6 + i];
+  }
 
-  return std::make_unique<Screens::Tile>(1, 3, app, settingsController, batteryController, dateTimeController, applications);
+  return std::make_unique<Screens::Tile>(screenNum, nScreens, app, settingsController, batteryController, dateTimeController, apps);
 }
 
-std::unique_ptr<Screen> ApplicationList::CreateScreen3() {
-  std::array<Screens::Tile::Applications, 6> applications {
-    {Symbols::chartLine, Apps::Motion},
-    // {{"A", Apps::Meter},
-    //       {"B", Apps::Navigation},
-    //       {"C", Apps::Clock},
-    //       {"D", Apps::Music},
-    //       {"E", Apps::SysInfo},
-    //       {"F", Apps::Brightness}
-    //      }
-  };
-
-  return std::make_unique<Screens::Tile>(2, 3, app, settingsController, batteryController, dateTimeController, applications);
-}