Merge branch 'LVGL7' of https://github.com/joaquimorg/Pinetime into joaquimorg-LVGL7

# Conflicts:
#	src/CMakeLists.txt
#	src/displayapp/DisplayApp.cpp
#	src/displayapp/screens/Modal.cpp
#	src/displayapp/screens/Modal.h
#	src/displayapp/screens/Notifications.cpp
#	src/displayapp/screens/Tile.h

1 files changed, 0 insertions, 109 deletions

diff --git a/src/displayapp/screens/Modal.cpp b/src/displayapp/screens/Modal.cpp
deleted file mode 100644
index 6d6768dc..00000000
--- a/src/displayapp/screens/Modal.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-#include "Modal.h"
-#include <lvgl/lvgl.h>
-#include "../DisplayApp.h"
-
-using namespace Pinetime::Applications::Screens;
-extern lv_font_t jetbrains_mono_extrabold_compressed;
-extern lv_font_t jetbrains_mono_bold_20;
-
-Modal::Modal(Pinetime::Applications::DisplayApp *app) : Screen(app), alertNotificationService(nullptr) {}
-
-Modal::~Modal() {
-  lv_obj_clean(lv_scr_act());
-}
-
-bool Modal::Refresh() {
-
-  return running;
-}
-
-bool Modal::OnButtonPushed() {
-  running = false;
-  return true;
-}
-
-void Modal::Hide() {
-  /* Delete the parent modal background */
-  lv_obj_del_async(lv_obj_get_parent(mbox));
-  mbox = NULL; /* happens before object is actually deleted! */
-  isVisible = false;
-}
-
-void Modal::mbox_event_cb(lv_obj_t *obj, lv_event_t evt) {
-  auto* m = static_cast<Modal *>(obj->user_data);
-  m->OnEvent(obj, evt);
-}
-
-void Modal::OnEvent(lv_obj_t *event_obj, lv_event_t evt) {
-  if(evt == LV_EVENT_DELETE && event_obj == mbox) {
-    Hide();
-  } else if(evt == LV_EVENT_VALUE_CHANGED) {
-    if(event_obj == mbox) {
-      if(strcmp(lv_mbox_get_active_btn_text(event_obj), this->positiveButton.c_str()) == 0) {
-        if(alertNotificationService != nullptr) {
-          alertNotificationService->event(Pinetime::Controllers::AlertNotificationService::EVENT_ANSWER_CALL);
-        }
-      } else {
-        if(alertNotificationService != nullptr) {
-          alertNotificationService->event(Pinetime::Controllers::AlertNotificationService::EVENT_HANG_UP_CALL);
-        }
-      }
-      lv_mbox_start_auto_close(mbox, 0);
-    }
-  }
-}
-
-void Modal::NewNotification(Pinetime::Controllers::NotificationManager &notificationManager, Pinetime::Controllers::AlertNotificationService* alertService) {
-  alertNotificationService = alertService;
-  auto notification = notificationManager.GetLastNotification();
-  std::string msg;
-  if(notification.valid) {
-    switch(notification.category) {
-      case Pinetime::Controllers::NotificationManager::Categories::IncomingCall:
-        this->positiveButton = "Answer";
-        this->negativeButton = "Hang up"; 
-        msg += "Incoming call from:\n";
-        msg += notification.message.data();
-        break;
-      default:
-        this->positiveButton = "Ok";
-        this->negativeButton = "Cancel"; 
-        msg = notification.message.data();
-        break;
-    }
-
-    static const char *btns[] = {this->positiveButton.c_str(), this->negativeButton.c_str(), ""};
-    this->Show(msg.c_str(), btns);
-  }
-}
-
-void Modal::Show(const char* msg, const char *btns[]) {
-  if(isVisible) return;
-  isVisible = true;
-  lv_style_copy(&modal_style, &lv_style_plain_color);
-  modal_style.body.main_color = modal_style.body.grad_color = LV_COLOR_BLACK;
-  modal_style.body.opa = LV_OPA_50;
-
-  obj = lv_obj_create(lv_scr_act(), nullptr);
-  lv_obj_set_style(obj, &modal_style);
-  lv_obj_set_pos(obj, 0, 0);
-  lv_obj_set_size(obj, LV_HOR_RES, LV_VER_RES);
-  lv_obj_set_opa_scale_enable(obj, true); /* Enable opacity scaling for the animation */
-
-  /* Create the message box as a child of the modal background */
-  mbox = lv_mbox_create(obj, nullptr);
-  lv_mbox_add_btns(mbox, btns);
-  lv_mbox_set_text(mbox, msg);
-  lv_obj_align(mbox, nullptr, LV_ALIGN_CENTER, 0, 0);
-  lv_obj_set_event_cb(mbox, Modal::mbox_event_cb);
-
-  mbox->user_data = this;
-
-  /* Fade the message box in with an animation */
-  lv_anim_t a;
-  lv_anim_init(&a);
-  lv_anim_set_time(&a, 500, 0);
-  lv_anim_set_values(&a, LV_OPA_TRANSP, LV_OPA_COVER);
-  lv_anim_set_exec_cb(&a, obj, (lv_anim_exec_xcb_t)lv_obj_set_opa_scale);
-  lv_anim_create(&a);
-}