Replace magic values with appsPerScreen and entriesPerScreen

1 files changed, 4 insertions, 5 deletions

diff --git a/src/displayapp/screens/ApplicationList.h b/src/displayapp/screens/ApplicationList.h
index 50e7fcd..3ff71b8 100644
--- a/src/displayapp/screens/ApplicationList.h
+++ b/src/displayapp/screens/ApplicationList.h
@@ -30,10 +30,11 @@ 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 * 2> applications {{
+          {Symbols::stopWatch, Apps::StopWatch},
           {Symbols::music, Apps::Music},
           {Symbols::shoe, Apps::Steps},
-          {Symbols::stopWatch, Apps::StopWatch},
           {Symbols::heartBeat, Apps::HeartRate},
           {Symbols::hourGlass, Apps::Timer},
           {Symbols::clock, Apps::Alarm},
@@ -44,10 +45,8 @@ namespace Pinetime {
           {Symbols::paintbrush, Apps::Paint},
           {Symbols::paddle, Apps::Paddle},
           {"2", Apps::Twos},
-
-          {Symbols::chartLine, Apps::Motion},
         }};
-        static constexpr int nScreens = (applications.size() + 5) / 6;
+        static constexpr int nScreens = (applications.size() + appsPerScreen - 1) / appsPerScreen;
         ScreenList<nScreens> screens;
       };
     }