Merge branch 'develop' into motion-sensor

# Conflicts:
#	src/CMakeLists.txt
#	src/displayapp/Apps.h
#	src/displayapp/DisplayApp.cpp
#	src/displayapp/DisplayApp.h
#	src/displayapp/lv_pinetime_theme.c
#	src/displayapp/screens/ApplicationList.cpp
#	src/drivers/TwiMaster.cpp
#	src/systemtask/SystemTask.h

1 files changed, 25 insertions, 27 deletions

diff --git a/src/displayapp/screens/ApplicationList.cpp b/src/displayapp/screens/ApplicationList.cpp
index 4083c4b..056d128 100644
--- a/src/displayapp/screens/ApplicationList.cpp
+++ b/src/displayapp/screens/ApplicationList.cpp
@@ -9,10 +9,14 @@
 using namespace Pinetime::Applications::Screens;
 
 ApplicationList::ApplicationList(Pinetime::Applications::DisplayApp *app,
-        Pinetime::Controllers::Settings &settingsController) :
+          Pinetime::Controllers::Settings &settingsController,
+          Pinetime::Controllers::Battery& batteryController,
+          Controllers::DateTime& dateTimeController) :
         Screen(app),
         settingsController{settingsController},
-        screens{app, 
+        batteryController{batteryController},
+        dateTimeController{dateTimeController},
+        screens{app,
           settingsController.GetAppMenu(),
           {
                 [this]() -> std::unique_ptr<Screen> { return CreateScreen1(); },
@@ -33,47 +37,41 @@ bool ApplicationList::Refresh() {
   return running;
 }
 
-bool ApplicationList::OnButtonPushed() {
-  running = false;
-  app->StartApp(Apps::Clock);
-  return true;
-}
-
 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::info, Apps::Notifications},
-          {Symbols::music, Apps::Music},
-          {Symbols::sun, Apps::Brightness},
-          {Symbols::list, Apps::SysInfo},
-          {Symbols::check, Apps::FirmwareValidation},
-          {Symbols::heartBeat, Apps::HeartRate}
+          {
+            {Symbols::stopWatch,    Apps::StopWatch},
+            {Symbols::music,        Apps::Music},
+            {Symbols::map,          Apps::Navigation},
+            {Symbols::shoe,         Apps::Motion},
+            {Symbols::heartBeat,    Apps::HeartRate},
+            {"",                    Apps::None},
           }
-
-
   };
 
-  return std::make_unique<Screens::Tile>(0, app, settingsController, applications);
+  return std::make_unique<Screens::Tile>(0, 2, app, settingsController, batteryController, dateTimeController, applications);
 }
 
 std::unique_ptr<Screen> ApplicationList::CreateScreen2() {
   std::array<Screens::Tile::Applications, 6> applications {
-          {{Symbols::map, Apps::Navigation},
-           {Symbols::stopWatch, Apps::StopWatch},
-           {Symbols::paintbrush, Apps::Paint},
-           {Symbols::shoe, Apps::Motion},
-           {Symbols::paddle, Apps::Paddle},
-           {"2", Apps::Twos}
+          {
+            {Symbols::paintbrush,   Apps::Paint},
+            {Symbols::paddle,       Apps::Paddle},
+            {"2",                   Apps::Twos},
+            {"",                    Apps::None},
+            {"",                    Apps::None},
+            {"",                    Apps::None},
           }
   };
 
-  return std::make_unique<Screens::Tile>(1, app, settingsController, applications);
+  return std::make_unique<Screens::Tile>(1, 2, app, settingsController, batteryController, dateTimeController, applications);
 }
 
-std::unique_ptr<Screen> ApplicationList::CreateScreen3() {
+/*std::unique_ptr<Screen> ApplicationList::CreateScreen3() {
   std::array<Screens::Tile::Applications, 6> applications {
           {{"A", Apps::Meter},
            {"B", Apps::Navigation},
@@ -84,6 +82,6 @@ std::unique_ptr<Screen> ApplicationList::CreateScreen3() {
           }
   };
 
-  return std::make_unique<Screens::Tile>(2, app, settingsController, applications);
-}
+  return std::make_unique<Screens::Tile>(2, 3, app, settingsController, batteryController, dateTimeController, applications);
+}*/