Merge develop and fix conflicts.

1 files changed, 2 insertions, 15 deletions

diff --git a/src/DisplayApp/Screens/Label.cpp b/src/DisplayApp/Screens/Label.cpp
index ba35279d..780ee88e 100644
--- a/src/DisplayApp/Screens/Label.cpp
+++ b/src/DisplayApp/Screens/Label.cpp
@@ -3,26 +3,13 @@
 
 using namespace Pinetime::Applications::Screens;
 
-
-Label::Label(const char* text) : text{text} {
-
-}
-
-Label::~Label() {
-
-}
-
-void Label::Refresh() {
-
-}
-
-void Label::Show() {
+Label::Label(Pinetime::Applications::DisplayApp *app, const char *text)  : Screen(app), text{text} {
   label = lv_label_create(lv_scr_act(), NULL);
   lv_label_set_align(label, LV_LABEL_ALIGN_LEFT);
   lv_obj_set_size(label, 240, 240);
   lv_label_set_text(label, text);
 }
 
-void Label::Hide() {
+Label::~Label() {
   lv_obj_clean(lv_scr_act());
 }