messagegui: refactoring and fix

Author: thyttan

apps/messagegui/app.js

@@ -90,7 +90,8 @@ var onMessagesModified = function(type,msg) {
   }
   if (msg && msg.id=="nav" && msg.t=="modify" && active!="map")
     return; // don't show an updated nav message if we're just in the menu
-  showMessage(msg&&msg.id, false);
+  //showMessage(msg&&msg.id, false);
+  showMessagesScroller(msg, false)
 };
 Bangle.on("message", onMessagesModified);
 
@@ -248,44 +249,36 @@ function showMusicMessage(msg) {
 
 function showMessagesScroller(msg, persist, alreadyProcessed) {
   if (persist===undefined) {persist = true;}
+  const MSG_IDX = msg ? MESSAGES.findIndex((m)=>m.id==msg.id) : 0;
+  const INITIATED_FROM =
+    alreadyProcessed===undefined ? "other function" :
+      (MSG_IDX<=alreadyProcessed.startIdx ? "scrolling up" :
+        (MSG_IDX >= alreadyProcessed.stopIdx-1 ? "scrolling down" : undefined));
 
   const WU = require("widget_utils");
   WU.hide();
 
   if (replying) { return; }
-  if (persist) {
-    cancelReloadTimeout();
-  } else {
-    resetReloadTimeout();
-  }
-
-  let msgIdx = MESSAGES.findIndex((m) =>  m.id == msg.id)
+  if (persist) {cancelReloadTimeout();} else {resetReloadTimeout();}
 
   let updatedProcessed = {};
   let startIdx = 0;
   let stopIdx = 0;
-  let initiatedFrom = alreadyProcessed===undefined ?
-    "other function" :
-    (msgIdx<=alreadyProcessed.startIdx ?
-      "scrolling up" :
-      (msgIdx >= alreadyProcessed.stopIdx-1 ?
-        "scrolling down" :
-        undefined
-      )
-    )
-
-  if (initiatedFrom === "other function") {
-    startIdx = Math.max(msgIdx-1, 0);
-    stopIdx = Math.min(msgIdx+2, MESSAGES.length);
-    Object.assign(updatedProcessed, {startIdx:startIdx, stopIdx:stopIdx})
-  } else if (initiatedFrom === "scrolling up") {
-    startIdx = Math.max(msgIdx, 0);
+
+  if (INITIATED_FROM === "other function") {
+    startIdx = Math.max(MSG_IDX-1, 0);
+    stopIdx = Math.min(MSG_IDX+2, MESSAGES.length);
+    Object.assign(updatedProcessed, {startIdx:startIdx, stopIdx:stopIdx});
+  } else if (INITIATED_FROM === "scrolling up") {
+    startIdx = MSG_IDX;
     stopIdx = alreadyProcessed.startIdx;
-    Object.assign(updatedProcessed, {startIdx:startIdx, stopIdx:alreadyProcessed.stopIdx})
-  } else if (initiatedFrom === "scrolling down") {
+    Object.assign(updatedProcessed,
+      {startIdx:startIdx, stopIdx:alreadyProcessed.stopIdx});
+  } else if (INITIATED_FROM === "scrolling down") {
     startIdx = alreadyProcessed.stopIdx;
-    stopIdx = Math.min(msgIdx+1, MESSAGES.length);
-    Object.assign(updatedProcessed, {startIdx:alreadyProcessed.startIdx, stopIdx:stopIdx})
+    stopIdx = Math.min(MSG_IDX+1, MESSAGES.length);
+    Object.assign(updatedProcessed,
+      {startIdx:alreadyProcessed.startIdx, stopIdx:stopIdx});
   }
 
   active = "scroller";
@@ -307,32 +300,33 @@ function showMessagesScroller(msg, persist, alreadyProcessed) {
     if (msgLocal.title) {
       lines = g.wrapString(msgLocal.title, g.getWidth()-10);
       for (let i=0; i<lines.length; i++) {
-        titleLines.push(i + (messagesWrapped[0]?messagesWrapped[0].length:0) + (messagesWrapped[1]?messagesWrapped[1].length:0));
+        titleLines.push(i + (messagesWrapped[0]?messagesWrapped[0].length:0) +
+          (messagesWrapped[1]?messagesWrapped[1].length:0));
       }
     }
     var titleCnt = lines.length;
     if (titleCnt) {lines.push("");} // add blank line after title
-    lines = lines.concat(g.wrapString(msgLocal.body, g.getWidth()-10), ["-".repeat(i+1)]);
+    lines = lines.concat(g.wrapString(msgLocal.body, g.getWidth()-10),
+      ["-".repeat(i+1)]);
     messagesWrapped.push(lines);
   }
+
   let allLines = [];
   for (let i=0 ; i<messagesWrapped.length ; i++) {
     allLines = allLines.concat(messagesWrapped[i]);
   }
 
   var initScroll = messagesWrapped[0].length;
-  if (initiatedFrom === "other function"){
-    if (msgIdx==0) initScroll = 0;
-  } else if (initiatedFrom === "scrolling up") {
-    titleLines = titleLines.concat(alreadyProcessed.titleLines.map((x) => x + allLines.length));
-  } else if (initiatedFrom === "scrolling down"){
-    initScroll = alreadyProcessed.lines.length-9;
-    titleLines = alreadyProcessed.titleLines.concat(titleLines.map((x) => x + alreadyProcessed.lines.length));
-  }
-
-  if (initiatedFrom === "scrolling up") {
+  if (INITIATED_FROM === "other function") {
+    if (MSG_IDX==0) {initScroll = 0;}
+  } else if (INITIATED_FROM === "scrolling up") {
+    titleLines = titleLines.concat(alreadyProcessed.titleLines.
+      map((x) => x + allLines.length));
     allLines = allLines.concat(alreadyProcessed.lines);
-  } else if (initiatedFrom === "scrolling down"){
+  } else if (INITIATED_FROM === "scrolling down") {
+    initScroll = alreadyProcessed.lines.length-9; // FIXME: `-9` corresponds to the Bangle.js 2 screen height - should probably be variable by screen height, font height.
+    titleLines = alreadyProcessed.titleLines.concat(titleLines.
+      map((x) => x + alreadyProcessed.lines.length));
     allLines = alreadyProcessed.lines.concat(allLines);
   }
 
@@ -341,14 +335,10 @@ function showMessagesScroller(msg, persist, alreadyProcessed) {
     returnToClockIfEmpty();
   }
 
-  Object.assign(
-    updatedProcessed,
-    {
-      lines : allLines,
+  Object.assign(updatedProcessed,
+    { lines : allLines,
       titleLines : titleLines,
-      messagesWrappedLength : messagesWrapped.length
-    }
-  )
+      messagesWrappedLength : messagesWrapped.length });
 
   let prevScrollIdx; // Used for stopping multiple triggers of next message by the scroller.
 
@@ -364,7 +354,8 @@ function showMessagesScroller(msg, persist, alreadyProcessed) {
         clearRect(r);
       g.setFont(bodyFont).setFontAlign(0,-1).drawString(allLines[scrollIdx], r.x+r.w/2, r.y);
       // Load in next/previous message on demand by reinitializing showMessagesScroller while passing on the processed messages.
-      if (scrollIdx>=allLines.length-1 && scrollIdx!=prevScrollIdx && updatedProcessed.stopIdx < MESSAGES.length) {
+      if (scrollIdx>=allLines.length-1 && scrollIdx!=prevScrollIdx &&
+        updatedProcessed.stopIdx<MESSAGES.length) {
         setTimeout(() => {
           E.showScroller();
           showMessagesScroller(MESSAGES[updatedProcessed.stopIdx], true, updatedProcessed);
@@ -629,7 +620,7 @@ function checkMessages(options) {
     //showMessage(newMessages[0].id, false);
     showMessagesScroller(newMessages[0], false);
     // buzz after showMessage, so being busy during layout doesn't affect the buzz pattern
-    if (global.BUZZ_ON_NEW_MESSAGE) {espruino
+    if (global.BUZZ_ON_NEW_MESSAGE) {
       // this is set if we entered the messages app by loading `messagegui.new.js`
       // ... but only buzz the first time we view a new message
       global.BUZZ_ON_NEW_MESSAGE = false;