Replace magic values with appsPerScreen and entriesPerScreen

1 files changed, 8 insertions, 2 deletions

diff --git a/src/displayapp/screens/ApplicationList.h b/src/displayapp/screens/ApplicationList.h
index ac11a9b..dfd9119 100644
--- a/src/displayapp/screens/ApplicationList.h
+++ b/src/displayapp/screens/ApplicationList.h
@@ -30,7 +30,8 @@ namespace Pinetime {
         Pinetime::Controllers::Battery& batteryController;
         Controllers::DateTime& dateTimeController;
 
-        static constexpr std::array<Tile::Applications, 13> applications {{
+        static constexpr int appsPerScreen = 6;
+        static constexpr std::array<Tile::Applications, appsPerScreen * 3> applications {{
           {Symbols::stopWatch, Apps::StopWatch},
           {Symbols::clock, Apps::Alarm},
           {Symbols::hourGlass, Apps::Timer},
@@ -46,8 +47,13 @@ namespace Pinetime {
           {Symbols::map, Apps::Navigation},
 
           {Symbols::drum, Apps::Jumpscore},
+          {Symbols::none, Apps::None},
+          {Symbols::none, Apps::None},
+          {Symbols::none, Apps::None},
+          {Symbols::none, Apps::None},
+          {Symbols::none, Apps::None},
         }};
-        static constexpr int nScreens = (applications.size() + 5) / 6;
+        static constexpr int nScreens = (applications.size() + appsPerScreen - 1) / appsPerScreen;
         ScreenList<nScreens> screens;
       };
     }