Merge remote-tracking branch 'bobrippling/feat/messages-no-show-1st-u…

…nread' into app-loader

apps/messagegui/ChangeLog

@@ -109,4 +109,5 @@
 0.80: Add ability to reply to messages if a reply library is installed and the message can be replied to
 0.81: Fix issue stopping Music message for being marked as read
       Make sure play button image is transparent
-      Add top-right menu to music playback to allow message to be deleted
+      Add top-right menu to music playback to allow message to be deleted
+0.82: Add option to not open the first unread message

apps/messagegui/app.js

@@ -155,7 +155,7 @@ function showMapMessage(msg) {
   function back() { // mark as not new and return to menu
     msg.new = false;
     layout = undefined;
-    checkMessages({clockIfNoMsg:1,clockIfAllRead:1,showMsgIfUnread:1,openMusic:0});
+    checkMessages({clockIfNoMsg:1,clockIfAllRead:1,showMsgIfUnread:settings.showMsgIfUnread,openMusic:0});
   }
   Bangle.setUI({mode:"updown", back: back}, back); // any input takes us back
 }
@@ -196,7 +196,7 @@ function showMusicMessage(msg) {
     msg.new = false;
     layout = undefined;
     if (wasNew) checkMessages({clockIfNoMsg:1,clockIfAllRead:1,showMsgIfUnread:0,openMusic:0});
-    else checkMessages({clockIfNoMsg:0,clockIfAllRead:0,showMsgIfUnread:0,openMusic:0});
+    else returnToMain();
   }
   function updateLabels() {
     trackName = reduceStringAndPad(msg.track, trackScrollOffset, 13);
@@ -304,7 +304,7 @@ function showMessageSettings(msg) {
   menu = Object.assign(menu, {
     /*LANG*/"Delete" : () => {
       MESSAGES = MESSAGES.filter(m=>m.id!=msg.id);
-      checkMessages({clockIfNoMsg:0,clockIfAllRead:0,showMsgIfUnread:0,openMusic:0});
+      returnToMain();
     },
   });
 
@@ -315,25 +315,25 @@ function showMessageSettings(msg) {
           Bangle.messageIgnore(msg);
           MESSAGES = MESSAGES.filter(m=>m.id!=msg.id);
         }
-        checkMessages({clockIfNoMsg:0,clockIfAllRead:0,showMsgIfUnread:0,openMusic:0});
+        returnToMain();
       });
     };
 
   menu = Object.assign(menu, {
     /*LANG*/"Mark Unread" : () => {
       msg.new = true;
-      checkMessages({clockIfNoMsg:0,clockIfAllRead:0,showMsgIfUnread:0,openMusic:0});
+      returnToMain();
     },
     /*LANG*/"Mark all read" : () => {
       MESSAGES.forEach(msg => msg.new = false);
-      checkMessages({clockIfNoMsg:0,clockIfAllRead:0,showMsgIfUnread:0,openMusic:0});
+      returnToMain();
     },
     /*LANG*/"Delete all messages" : () => {
       E.showPrompt(/*LANG*/"Are you sure?", {title:/*LANG*/"Delete All Messages"}).then(isYes => {
         if (isYes) {
           MESSAGES = [];
         }
-        checkMessages({clockIfNoMsg:0,clockIfAllRead:0,showMsgIfUnread:0,openMusic:0});
+        returnToMain();
       });
     },
   });
@@ -349,7 +349,7 @@ function showMessage(msgid, persist) {
     clearInterval(updateLabelsInterval);
     updateLabelsInterval=undefined;
   }
-  if (!msg) return checkMessages({clockIfNoMsg:1,clockIfAllRead:0,showMsgIfUnread:0,openMusic:openMusic}); // go home if no message found
+  if (!msg) return returnToClockIfEmpty(); // go home if no message found
   if (msg.id=="music") {
     cancelReloadTimeout(); // don't auto-reload to clock now
     return showMusicMessage(msg);
@@ -399,15 +399,15 @@ function showMessage(msgid, persist) {
     layout = undefined;
     msg.new = false; // read mail
     cancelReloadTimeout(); // don't auto-reload to clock now
-    checkMessages({clockIfNoMsg:1,clockIfAllRead:0,showMsgIfUnread:0,openMusic:openMusic});
+    returnToClockIfEmpty();
   }
   var negHandler,posHandler,footer = [ ];
   if (msg.negative) {
     negHandler = ()=>{
       msg.new = false;
       cancelReloadTimeout(); // don't auto-reload to clock now
       Bangle.messageResponse(msg,false);
-      checkMessages({clockIfNoMsg:1,clockIfAllRead:1,showMsgIfUnread:1,openMusic:openMusic});
+      returnToCheckMessages();
     }; footer.push({type:"img",src:atob("PhAB4A8AAAAAAAPAfAMAAAAAD4PwHAAAAAA/H4DwAAAAAH78B8AAAAAA/+A/AAAAAAH/Af//////w/gP//////8P4D///////H/Af//////z/4D8AAAAAB+/AfAAAAAA/H4DwAAAAAPg/AcAAAAADwHwDAAAAAA4A8AAAAAAAA=="),col:"#f00",cb:negHandler});
   }
   footer.push({fillx:1}); // push images to left/right
@@ -421,7 +421,7 @@ function showMessage(msgid, persist) {
           Bluetooth.println(JSON.stringify(result));
           replying = false;
           layout.render();
-          checkMessages({clockIfNoMsg:1,clockIfAllRead:1,showMsgIfUnread:1,openMusic:openMusic});
+          returnToCheckMessages();
         })
         .catch(() => {
           replying = false;
@@ -435,7 +435,7 @@ function showMessage(msgid, persist) {
       msg.new = false;
       cancelReloadTimeout(); // don't auto-reload to clock now
       Bangle.messageResponse(msg,true);
-      checkMessages({clockIfNoMsg:1,clockIfAllRead:1,showMsgIfUnread:1,openMusic:openMusic});
+      returnToCheckMessages();
     }; footer.push({type:"img",src:atob("QRABAAAAAAAAAAOAAAAABgAAA8AAAAADgAAD4AAAAAHgAAPgAAAAAPgAA+AAAAAAfgAD4///////gAPh///////gA+D///////AD4H//////8cPgAAAAAAPw8+AAAAAAAfB/4AAAAAAA8B/gAAAAAABwB+AAAAAAADAB4AAAAAAAAABgAA=="),col:"#0f0",cb:posHandler});
   }
 
@@ -447,7 +447,7 @@ function showMessage(msgid, persist) {
       ]},
       { type:"btn",
         src:require("messageicons").getImage(msg),
-        col:require("messageicons").getColor(msg, {settings:settings, default:g.theme.fg2}),
+        col:require("messageicons").getColor(msg, {settings, default:g.theme.fg2}),
         pad: 3, cb:()=>{
           cancelReloadTimeout(); // don't auto-reload to clock now
           showMessageSettings(msg);
@@ -538,7 +538,7 @@ function checkMessages(options) {
       }
       if (img) {
         var fg = g.getColor(),
-            col = require("messageicons").getColor(msg, {settings:settings, default:fg});
+            col = require("messageicons").getColor(msg, {settings, default:fg});
         g.setColor(col).drawImage(img, x+24, r.y+24, {rotate:0}) // force centering
          .setColor(fg); // only color the icon
         x += 50;
@@ -570,6 +570,17 @@ function checkMessages(options) {
   });
 }
 
+function returnToCheckMessages(clock) {
+  checkMessages({clockIfNoMsg:1,clockIfAllRead:1,showMsgIfUnread:settings.showMsgIfUnread,openMusic});
+}
+
+function returnToMain() {
+  checkMessages({clockIfNoMsg:0,clockIfAllRead:0,showMsgIfUnread:0,openMusic:0});
+}
+
+function returnToClockIfEmpty() {
+  checkMessages({clockIfNoMsg:1,clockIfAllRead:0,showMsgIfUnread:0,openMusic});
+}
 
 function cancelReloadTimeout() {
   if (!unreadTimeout) return;
@@ -594,7 +605,7 @@ setTimeout(() => {
   // only openMusic on launch if music is new, or state=="show" (set by messagesmusic)
   var musicMsg = MESSAGES.find(m => m.id === "music");
   checkMessages({
-    clockIfNoMsg: 0, clockIfAllRead: 0, showMsgIfUnread: 1,
+    clockIfNoMsg: 0, clockIfAllRead: 0, showMsgIfUnread: settings.showMsgIfUnread,
     openMusic: ((musicMsg&&musicMsg.new) && settings.openMusic) || (musicMsg&&musicMsg.state=="show"),
     dontStopBuzz: 1 });
 }, 10); // if checkMessages wants to 'load', do that

apps/messagegui/metadata.json

@@ -2,7 +2,7 @@
   "id": "messagegui",
   "name": "Message UI",
   "shortName": "Messages",
-  "version": "0.81",
+  "version": "0.82",
   "description": "Default app to display notifications from iOS and Gadgetbridge/Android",
   "icon": "app.png",
   "type": "app",

apps/messages/ChangeLog

@@ -5,4 +5,5 @@
 0.59: fixes message timeout by using setinterval, as it was intended. So the buzz is triggered every x seconds until the timeout occours.
 0.60: Bump version to allow new buzz.js module to be loaded - fixes memory/performance hog when buzz called
 0.61: Add repeatCalls option to allow different repeat settings for messages vs calls
-0.62: Add option for driving on left (affects roundabout icons in navigation)
+0.62: Add option for driving on left (affects roundabout icons in navigation)
+0.63: Add option to not open the first unread message

apps/messages/metadata.json

@@ -1,7 +1,7 @@
 {
   "id": "messages",
   "name": "Messages",
-  "version": "0.62",
+  "version": "0.63",
   "description": "Library to handle, load and store message events received from Android/iOS",
   "icon": "app.png",
   "type": "module",

apps/messages/settings.js

@@ -11,6 +11,7 @@
     if (settings.unreadTimeout===undefined) settings.unreadTimeout=60;
     if (settings.maxMessages===undefined) settings.maxMessages=3;
     if (settings.iconColorMode === undefined) settings.iconColorMode = iconColorModes[0];
+    if (settings.showMsgIfUnread === undefined) settings.showMsgIfUnread = 1;
     settings.unlockWatch=!!settings.unlockWatch;
     settings.openMusic=!!settings.openMusic;
     settings.maxUnreadTimeout=240;
@@ -58,6 +59,10 @@
       format: v => [/*LANG*/"Small",/*LANG*/"Medium"][v],
       onchange: v => updateSetting("fontSize", v)
     },
+    /*LANG*/'Auto-Open Unread Msg': {
+      value: !!settings().showMsgIfUnread,
+      onchange: v => updateSetting("showMsgIfUnread", v)
+    },
     /*LANG*/'Auto-Open Music': {
       value: !!settings().openMusic,
       onchange: v => updateSetting("openMusic", v)