Encapsulate Notification management in NotificationManager. It implement a static array of notifications to avoid dynamic allocation.

1 files changed, 2 insertions, 39 deletions

diff --git a/src/DisplayApp/Screens/Modal.cpp b/src/DisplayApp/Screens/Modal.cpp
index ec477b6e..63ae70c0 100644
--- a/src/DisplayApp/Screens/Modal.cpp
+++ b/src/DisplayApp/Screens/Modal.cpp
@@ -25,42 +25,6 @@ bool Modal::OnButtonPushed() {
   return true;
 }
 
-void Modal::Show() {
-  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(), NULL);
-  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 */
-
-  static const char * btns2[] = {"Ok", ""};
-
-  /* Create the message box as a child of the modal background */
-  mbox = lv_mbox_create(obj, NULL);
-  lv_mbox_add_btns(mbox, btns2);
-  char versionStr[20];
-  sprintf(versionStr, "VERSION: %d.%d.%d", Version::Major(), Version::Minor(), Version::Patch());
-  lv_mbox_set_text(mbox, versionStr);
-//  lv_mbox_set_text(mbox, "Hello world!");
-  lv_obj_align(mbox, NULL, 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);
-}
-
 void Modal::Hide() {
   /* Delete the parent modal background */
   lv_obj_del_async(lv_obj_get_parent(mbox));
@@ -83,9 +47,8 @@ void Modal::OnEvent(lv_obj_t *event_obj, lv_event_t evt) {
   }
 }
 
-void Modal::Show(const std::string& message) {
+void Modal::Show(const char* msg) {
   if(isVisible) return;
-  this->message = message;
   isVisible = true;
   lv_style_copy(&modal_style, &lv_style_plain_color);
   modal_style.body.main_color = modal_style.body.grad_color = LV_COLOR_BLACK;
@@ -102,7 +65,7 @@ void Modal::Show(const std::string& message) {
   /* Create the message box as a child of the modal background */
   mbox = lv_mbox_create(obj, NULL);
   lv_mbox_add_btns(mbox, btns2);
-  lv_mbox_set_text(mbox, message.data());
+  lv_mbox_set_text(mbox, msg);
   lv_obj_align(mbox, NULL, LV_ALIGN_CENTER, 0, 0);
   lv_obj_set_event_cb(mbox, Modal::mbox_event_cb);