messagegui: small refactoring

Author: thyttan

apps/messagegui/app.js

@@ -246,7 +246,7 @@ function showMusicMessage(msg) {
   }, 400);
 }
 
-function showMessageScroller2(msg, persist, alreadyProcessed) {
+function showMessagesScroller(msg, persist, alreadyProcessed) {
   if (persist===undefined) {persist = true;}
 
   const WU = require("widget_utils");
@@ -293,8 +293,8 @@ function showMessageScroller2(msg, persist, alreadyProcessed) {
   g.setFont(bodyFont);
   var titleLines = [];
   var messagesWrapped = [];
-  for (let j=startIdx; j<stopIdx; j++) {
-    let msgLocal = MESSAGES[j];
+  for (let i=startIdx ; i<stopIdx ; i++) {
+    let msgLocal = MESSAGES[i];
     msgLocal.new = false;
 
     if (msgLocal.id=="music" || msgLocal.source=="maps" || msgLocal.id =="call") {
@@ -312,11 +312,11 @@ function showMessageScroller2(msg, persist, alreadyProcessed) {
     }
     var titleCnt = lines.length;
     if (titleCnt) {lines.push("");} // add blank line after title
-    lines = lines.concat(g.wrapString(msgLocal.body, g.getWidth()-10), ["-".repeat(j+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++) {
+  for (let i=0 ; i<messagesWrapped.length ; i++) {
     allLines = allLines.concat(messagesWrapped[i]);
   }
 
@@ -330,9 +330,7 @@ function showMessageScroller2(msg, persist, alreadyProcessed) {
     titleLines = alreadyProcessed.titleLines.concat(titleLines.map((x) => x + alreadyProcessed.lines.length));
   }
 
-  if (initiatedFrom === "other function"){
-    // no-op
-  } else if (initiatedFrom === "scrolling up") {
+  if (initiatedFrom === "scrolling up") {
     allLines = allLines.concat(alreadyProcessed.lines);
   } else if (initiatedFrom === "scrolling down"){
     allLines = alreadyProcessed.lines.concat(allLines);
@@ -365,34 +363,35 @@ function showMessageScroller2(msg, persist, alreadyProcessed) {
         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);
+      // 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) {
         setTimeout(() => {
           E.showScroller();
-          showMessageScroller2(MESSAGES[updatedProcessed.stopIdx], true, updatedProcessed);
+          showMessagesScroller(MESSAGES[updatedProcessed.stopIdx], true, updatedProcessed);
         }, 40);
       }
       if (scrollIdx==0 && scrollIdx!=prevScrollIdx && updatedProcessed.startIdx>0) {
         setTimeout(() => {
           E.showScroller();
-          showMessageScroller2(MESSAGES[updatedProcessed.startIdx-1], true, updatedProcessed);
+          showMessagesScroller(MESSAGES[updatedProcessed.startIdx-1], true, updatedProcessed);
         }, 40);
       }
       prevScrollIdx = scrollIdx;
     }, select : function(scrollIdx, touch) {
-      let msgSelectIdx;
+      let msgSelect;
       for (let i = titleLines.length-1; i>=0 ; i--) {
         if (scrollIdx>=titleLines[i]) {
-          msgSelectIdx = i + updatedProcessed.startIdx;
+          msgSelect = MESSAGES[i + updatedProcessed.startIdx];
           break;
         }
       }
       if (touch.type == 0) {
         WU.show();
-        showMessage(MESSAGES[msgSelectIdx].id, true)
+        showMessage(msgSelect.id, true)
       }
       if (touch.type == 2) {
         WU.show();
-        showMessageSettings(MESSAGES[msgSelectIdx])
+        showMessageSettings(msgSelect)
       }
     },
     //back : () => showMessage(messages[idx].id, true)
@@ -408,7 +407,7 @@ function showMessageSettings(msg) {
   };
 
   if (msg.id!="music")
-    menu[/*LANG*/"View Message"] = () => showMessageScroller2(msg);
+    menu[/*LANG*/"View Message"] = () => showMessagesScroller(msg);
 
   if (msg.reply && reply) {
     menu[/*LANG*/"Reply"] = () => {
@@ -581,7 +580,7 @@ function showMessage(msgid, persist) {
     ]},
     {type:"txt", font:bodyFont, label:body, fillx:1, filly:1, pad:2, cb:()=>{
       // allow tapping to show a larger version
-      showMessageScroller2(msg);
+      showMessagesScroller(msg);
     } },
     {type:"h",fillx:1, c: footer}
   ]},{back:goBack});
@@ -628,9 +627,9 @@ function checkMessages(options) {
   if (!options.ignoreUnread && newMessages.length) {
     delete newMessages[0].show; // stop us getting stuck here if we're called a second time
     //showMessage(newMessages[0].id, false);
-    showMessageScroller2(newMessages[0], 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) {
+    if (global.BUZZ_ON_NEW_MESSAGE) {espruino
       // 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;