From 41c36d3a422fd08867f743de78c0aeee4418b622 Mon Sep 17 00:00:00 2001
From: JF <jf@codingfield.com>
Date: Fri, 14 Aug 2020 20:47:21 +0200
Subject: Re-order apps in application menu on 2 pages. Add firmware validation
 app.

---
 src/DisplayApp/Screens/ApplicationList.cpp | 28 +++++++++++++++-------------
 src/DisplayApp/Screens/ApplicationList.h   |  2 +-
 src/DisplayApp/Screens/Symbols.h           |  1 +
 3 files changed, 17 insertions(+), 14 deletions(-)

(limited to 'src/DisplayApp/Screens')

diff --git a/src/DisplayApp/Screens/ApplicationList.cpp b/src/DisplayApp/Screens/ApplicationList.cpp
index c7c096f4..575426f0 100644
--- a/src/DisplayApp/Screens/ApplicationList.cpp
+++ b/src/DisplayApp/Screens/ApplicationList.cpp
@@ -11,7 +11,7 @@ ApplicationList::ApplicationList(Pinetime::Applications::DisplayApp *app) :
         Screen(app),
         screens{app, {
                 [this]() -> std::unique_ptr<Screen> { return CreateScreen1(); },
-                //[this]() -> std::unique_ptr<Screen> { return CreateScreen2(); },
+                [this]() -> std::unique_ptr<Screen> { return CreateScreen2(); },
                 //[this]() -> std::unique_ptr<Screen> { return CreateScreen3(); }
           }
         } {}
@@ -39,13 +39,15 @@ bool ApplicationList::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
 
 std::unique_ptr<Screen> ApplicationList::CreateScreen1() {
   std::array<Screens::Tile::Applications, 6> applications {
-          {{Symbols::asterisk, Apps::Meter},
-           {Symbols::tachometer, Apps::Gauge},
-           {Symbols::clock, Apps::Clock},
-           {Symbols::music, Apps::Music},
-           {Symbols::list, Apps::SysInfo},
-           {Symbols::sun, Apps::Brightness}
+          {{Symbols::clock, Apps::Clock},
+          {Symbols::music, Apps::Music},
+          {Symbols::sun, Apps::Brightness},
+          {Symbols::list, Apps::SysInfo},
+          {Symbols::check, Apps::FirmwareValidation},
+          {Symbols::none, Apps::None}
           }
+
+
   };
 
   return std::unique_ptr<Screen>(new Screens::Tile(app, applications));
@@ -53,12 +55,12 @@ std::unique_ptr<Screen> ApplicationList::CreateScreen1() {
 
 std::unique_ptr<Screen> ApplicationList::CreateScreen2() {
   std::array<Screens::Tile::Applications, 6> applications {
-          {{"0", Apps::Meter},
-           {"1", Apps::Gauge},
-           {"2", Apps::Clock},
-           {"3", Apps::Music},
-           {"4", Apps::SysInfo},
-           {"5", Apps::Brightness}
+          {{Symbols::tachometer, Apps::Gauge},
+           {Symbols::asterisk, Apps::Meter},
+           {Symbols::none, Apps::None},
+           {Symbols::none, Apps::None},
+           {Symbols::none, Apps::None},
+           {Symbols::none, Apps::None}
           }
   };
 
diff --git a/src/DisplayApp/Screens/ApplicationList.h b/src/DisplayApp/Screens/ApplicationList.h
index 372cbb7a..a1e6811b 100644
--- a/src/DisplayApp/Screens/ApplicationList.h
+++ b/src/DisplayApp/Screens/ApplicationList.h
@@ -22,7 +22,7 @@ namespace Pinetime {
         private:
           bool running = true;
 
-          ScreenList<1> screens;
+          ScreenList<2> screens;
           std::unique_ptr<Screen> CreateScreen1();
           std::unique_ptr<Screen> CreateScreen2();
           std::unique_ptr<Screen> CreateScreen3();
diff --git a/src/DisplayApp/Screens/Symbols.h b/src/DisplayApp/Screens/Symbols.h
index 940006d5..54c3f8f0 100644
--- a/src/DisplayApp/Screens/Symbols.h
+++ b/src/DisplayApp/Screens/Symbols.h
@@ -4,6 +4,7 @@ namespace Pinetime {
   namespace Applications {
     namespace Screens {
       namespace Symbols {
+        static constexpr char* none = "";
         static constexpr char* batteryFull = "\xEF\x89\x80";
         static constexpr char* batteryEmpty = "\xEF\x89\x84";
         static constexpr char* batteryThreeQuarter = "\xEF\x89\x81";
-- 
cgit v1.2.3