Merge branch 'messagegui' into app-loader

Author: thyttan

apps/messagegui/app.js

@@ -285,6 +285,7 @@ function showMessagesScroller(msg) {
   var titleLines = [];
   let allLines = [];
   let firstTitleLinePerMsg = [];
+  let footerImgNeg, footerImgPos;
   for (let i=0 ; i<MESSAGES.length ; i++) {
     if (MSG_IDX === i) {initScroll = allLines.length*FONT_HEIGHT;}
     let msgIter = MESSAGES[i];
@@ -298,10 +299,15 @@ function showMessagesScroller(msg) {
     }
     let footer = [""];
     if (msg.negative) {
-      footer[0] += "<" + "-".repeat(4) + " " + ((!msg.reply&&!msg.positive)?" ".repeat(6):"");
+      //footer[0] += "<" + "-".repeat(4) + " " + ((!msg.reply&&!msg.positive)?" ".repeat(6):"");
+      footerImgNeg = atob("PhAB4A8AAAAAAAPAfAMAAAAAD4PwHAAAAAA/H4DwAAAAAH78B8AAAAAA/+A/AAAAAAH/Af//////w/gP//////8P4D///////H/Af//////z/4D8AAAAAB+/AfAAAAAA/H4DwAAAAAPg/AcAAAAADwHwDAAAAAA4A8AAAAAAAA==");
     }
-    if (msg.reply || msg.positive) {
-      footer[0] += ((!msg.negative)?" ".repeat(6):"") + " " + "-".repeat(4) + ">";
+    if (msg.reply && reply) {
+      //footer[0] += ((!msg.negative)?" ".repeat(6):"") + " " + "-".repeat(4) + ">";
+      footerImgPos = atob("QRABAAAAAAAH//+AAAAABgP//8AAAAADgf//4AAAAAHg4ABwAAAAAPh8APgAAAAAfj+B////////geHv///////hf+f///////GPw///////8cGBwAAAAAPx/gDgAAAAAfD/gHAAAAAA8DngOAAAAABwDHP8AAAAADACGf4AAAAAAAAM/w==");
+    } else if (msg.positive) {
+      //footer[0] += ((!msg.negative)?" ".repeat(6):"") + " " + "-".repeat(4) + ">";
+      footerImgPos = atob("QRABAAAAAAAAAAOAAAAABgAAA8AAAAADgAAD4AAAAAHgAAPgAAAAAPgAA+AAAAAAfgAD4///////gAPh///////gA+D///////AD4H//////8cPgAAAAAAPw8+AAAAAAAfB/4AAAAAAA8B/gAAAAAABwB+AAAAAAADAB4AAAAAAAAABgAA==");
     }
     if (!footer) {
       footer = ["-".repeat(12)];
@@ -330,6 +336,16 @@ function showMessagesScroller(msg) {
         setColor(titleLines.find(e=>e==scrollIdx)!==undefined ? g.theme.fg2 : g.theme.fg).
         clearRect(r);
       g.setFont(bodyFont).setFontAlign(0,-1).drawString(allLines[scrollIdx], r.x+r.w/2, r.y);
+      if (allLines[scrollIdx]==="") {
+        g.
+          setColor("#f00").drawImage(footerImgNeg,r.x+5+3,r.y).
+          setColor("#0f0").drawImage(footerImgPos,r.w-64-5,r.y);
+      }
+      if (0===scrollIdx) {
+        g.
+          setColor("#f00").drawImage(atob("GBiBAAAYAAH/gAf/4A//8B//+D///D///H/P/n+H/n8P/n4f/vwAP/wAP34f/n8P/n+H/n/P/j///D///B//+A//8Af/4AH/gAAYAA=="), r.x, r.y-1).
+          setColor(g.theme.fg2).drawImage(atob("GBgBABgAAf+AB//gD//wH//4P//8P//8fAA+fAA+f//+f//+/AA//AA/f//+f//+fAA+fAA+P//8P//8H//4D//wB//gAf+AABgA"),r.w-24,r.y-1);
+      }
       if (scrollIdx<shownScrollIdxFirst) {shownScrollIdxFirst = scrollIdx;}
       if (scrollIdx>shownScrollIdxLast) {shownScrollIdxLast = scrollIdx;}
     },
@@ -339,7 +355,9 @@ function showMessagesScroller(msg) {
           if (touch && touch.type===2) {return;}
           const MSG_SELECTED = MESSAGES[i];
           WU&&WU.show();
-          //E.showScroller();
+          print(process.memory());
+          E.showScroller();
+          print(process.memory());
           updateReadMessages();
           delete titleLines, allLines;
           if (touch && touch.type.back) {
@@ -361,30 +379,34 @@ function showMessagesScroller(msg) {
     }
   });
 
+  // Add an external back touch handler.
+  let touchHandler = (button, xy)=>{
+    // if ((left side of Banlge 1 screen) || (top left corner of Bangle 2 screen))
+    if ((!xy && 1===button) || (xy && xy.type===0 && xy.x<30 && xy.y<30)) {
+      if (!persist) {return load();}
+      returnToMain();
+      E.stopEventPropagation();
+      Bangle.removeListener("touch", touchHandler);
+      if (btnWatch) {clearWatch(btnWatch); btnWatch = undefined;}
+    }
+  };
+  Bangle.prependListener("touch", touchHandler);
+
   // If Bangle.js 2 add an external back hw button handler.
+  let btnWatch;
   if (2===process.env.HWVERSION) {
-    setWatch(()=>{
+    btnWatch = setWatch(()=>{
       if ("scroller"!==active) {return;}
       Bangle.emit("drag", {dy:0}); // Compatibility with `kineticscroll`, stopping the scroller so it doesn't continue scrolling when the `showMessageOverview` screen is loaded.
       // Zero ms timeout as to not move on before the scroller has registered the emitted drag event.
       setTimeout(()=>{
         if (!persist) {return load();}
+        Bangle.removeListener("touch", touchHandler);
         Bangle.emit("touch", 1, {x:Math.floor(APP_RECT.x2/2), y:Math.floor(APP_RECT.y2/2), type:{back:true}});
       },0);
     }, BTN);
   }
 
-  // Add an external back touch handler.
-  let touchHandler = (button, xy)=>{
-    // if ((left side of Banlge 1 screen) || (top left corner of Bangle 2 screen))
-    if ((!xy && 1===button) || (xy && xy.type===0 && xy.x<30 && xy.y<30)) {
-      if (!persist) {return load();}
-      returnToMain();
-      E.stopEventPropagation();
-      Bangle.removeListener("touch", touchHandler);
-    }
-  };
-  Bangle.prependListener("touch", touchHandler);
 
   function updateReadMessages() {
     let shownMsgIdxFirst, shownMsgIdxLast;