Merge branch 'develop' into recovery-firmware

# Conflicts:
#	src/CMakeLists.txt
#	src/displayapp/DisplayApp.h
#	src/systemtask/SystemTask.cpp
#	src/systemtask/SystemTask.h

1 files changed, 0 insertions, 36 deletions

diff --git a/src/displayapp/screens/Modal.h b/src/displayapp/screens/Modal.h
deleted file mode 100644
index 9cc177f0..00000000
--- a/src/displayapp/screens/Modal.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#pragma once
-
-#include "Screen.h"
-#include <lvgl/src/lv_core/lv_style.h>
-#include <lvgl/src/lv_core/lv_obj.h>
-
-namespace Pinetime {
-  namespace Applications {
-    namespace Screens {
-
-      class Modal : public Screen{
-        public:
-          Modal(DisplayApp* app);
-          ~Modal() override;
-
-          void Show(const char* msg);
-          void Hide();
-
-          bool Refresh() override;
-          bool OnButtonPushed() override;
-
-          static void mbox_event_cb(lv_obj_t *obj, lv_event_t evt);
-        private:
-          void OnEvent(lv_obj_t *event_obj, lv_event_t evt);
-
-          lv_style_t modal_style;
-          lv_obj_t *obj;
-          lv_obj_t *mbox;
-          lv_obj_t *info;
-          bool running = true;
-          bool isVisible = false;
-
-      };
-    }
-  }
-}