Merge develop and fix conflicts.

1 files changed, 6 insertions, 7 deletions

diff --git a/src/DisplayApp/Screens/Label.h b/src/DisplayApp/Screens/Label.h
index b73540f4..3e7b3797 100644
--- a/src/DisplayApp/Screens/Label.h
+++ b/src/DisplayApp/Screens/Label.h
@@ -2,19 +2,18 @@
 
 #include <vector>
 #include "Screen.h"
+#include <lvgl/lvgl.h>
 
 namespace Pinetime {
   namespace Applications {
     namespace Screens {
-      class Label {
+
+      class Label : public Screen {
         public:
-          Label() = default;
-          explicit Label(const char* text);
-          ~Label();
-          void Refresh();
+          Label(DisplayApp* app, const char* text);
+          ~Label() override;
+          bool Refresh() override {return false;}
 
-          void Hide();
-          void Show();
         private:
           lv_obj_t * label = nullptr;
           const char* text = nullptr;