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, 13 insertions, 4 deletions

diff --git a/src/displayapp/screens/Label.h b/src/displayapp/screens/Label.h
index dba89bbf..a1bcba95 100644
--- a/src/displayapp/screens/Label.h
+++ b/src/displayapp/screens/Label.h
@@ -9,13 +9,22 @@ namespace Pinetime {
 
       class Label : public Screen {
         public:
-          Label(DisplayApp* app, const char* text);
+          Label( uint8_t screenID, uint8_t numScreens,
+            DisplayApp* app, lv_obj_t* labelText );
           ~Label() override;
-          bool Refresh() override {return false;}
+          
+          bool Refresh() override;
+          
 
         private:
-          lv_obj_t * label = nullptr;
-          const char* text = nullptr;
+
+          bool running = true;
+          
+          lv_obj_t * labelText = nullptr;
+          lv_point_t pageIndicatorBasePoints[2];
+          lv_point_t pageIndicatorPoints[2];
+          lv_obj_t* pageIndicatorBase;
+          lv_obj_t* pageIndicator;
       };
     }
   }