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, 6 deletions

diff --git a/src/displayapp/screens/Tile.h b/src/displayapp/screens/Tile.h
index f717a220..54ffcdae 100644
--- a/src/displayapp/screens/Tile.h
+++ b/src/displayapp/screens/Tile.h
@@ -5,7 +5,10 @@
 #include <memory>
 #include "Screen.h"
 #include "../Apps.h"
+#include "components/datetime/DateTimeController.h"
 #include "components/settings/Settings.h"
+#include "components/datetime/DateTimeController.h"
+#include "components/battery/BatteryController.h"
 
 namespace Pinetime {
   namespace Applications {
@@ -17,19 +20,35 @@ namespace Pinetime {
             Pinetime::Applications::Apps application;
           };
 
-          explicit Tile(uint8_t screenID, DisplayApp* app, Controllers::Settings& settingsController, std::array<Applications, 6>& applications);
+          explicit Tile(uint8_t screenID, uint8_t numScreens,
+            DisplayApp* app, 
+            Controllers::Settings& settingsController,
+            Pinetime::Controllers::Battery& batteryController,
+            Controllers::DateTime& dateTimeController,
+            std::array<Applications, 6>& applications);
+
           ~Tile() override;
 
           bool Refresh() override;
-          bool OnButtonPushed() override;
-
+          void UpdateScreen();
           void OnObjectEvent(lv_obj_t* obj, lv_event_t event, uint32_t buttonId);
 
         private:
-          lv_obj_t * btnm1;
-          bool running = true;
 
-          const char* btnm_map1[8];
+          Pinetime::Controllers::Battery& batteryController;
+          Controllers::DateTime& dateTimeController;
+
+          lv_task_t* taskUpdate;
+
+          lv_obj_t* label_time;
+          lv_obj_t* batteryIcon;
+          lv_point_t pageIndicatorBasePoints[2];
+          lv_point_t pageIndicatorPoints[2];
+          lv_obj_t* pageIndicatorBase;
+          lv_obj_t* pageIndicator;
+          lv_obj_t* btnm1;
+      
+          const char* btnmMap[8];
           Pinetime::Applications::Apps apps[6];
       };
     }