Merge branch 'messages-auto-display-settings' into app-loader

Author: thyttan

apps/messagegui/ChangeLog

@@ -119,3 +119,5 @@
 0.87: Make choosing of font size more repeatable
 0.88: Adjust padding calculation so messages are spaced out properly even when using international fonts
 0.89: Fix bugs related to empty titles and bodies
+0.90: New settings for when to auto show new message (never, on clocks -
+      default, if locked, always)

apps/messagegui/lib.js

@@ -35,7 +35,11 @@ exports.listener = function(type, msg) {
   }
 
   const appSettings = require("Storage").readJSON("messages.settings.json", 1) || {};
-  let loadMessages = (Bangle.CLOCK || msg.important); // should we load the messages app?
+  const autoOpen = appSettings.autoOpen;
+  let loadMessages = (
+    (autoOpen === 1 && Bangle.CLOCK) || (autoOpen === 2 && Bangle.isLocked()) || autoOpen === 3 ||
+      msg.important
+  ); // should we load the messages app?
   if (type==="music") {
     if (Bangle.CLOCK && msg.state && msg.title && appSettings.openMusic) loadMessages = true;
     else return;
@@ -60,7 +64,7 @@ exports.listener = function(type, msg) {
   const quiet = (require("Storage").readJSON("setting.json", 1) || {}).quiet;
   const unlockWatch = appSettings.unlockWatch;
   // don't auto-open messages in quiet mode if quietNoAutOpn is true
-  if ((quiet && appSettings.quietNoAutOpn) || appSettings.noAutOpn)
+  if ((quiet && appSettings.quietNoAutOpn))
     loadMessages = false;
   // after a delay load the app, to ensure we have all the messages
   if (exports.messageTimeout) clearTimeout(exports.messageTimeout);

apps/messagegui/metadata.json

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

apps/messages/ChangeLog

@@ -12,3 +12,5 @@
 0.66: Fix 'Auto-Open Unread Msg' polarity - previously checking the box would ignore unread messages
 0.67: Ensure default vibration pattern is longer
       Add Option to show widgets (Message GUI 0.86 removes them by default)
+0.68: New settings for when to auto show new message (never, on clocks -
+      default, if locked, always)

apps/messages/README.md

@@ -56,11 +56,16 @@ There are several options to choose from:
 * **Vibrate timer** : How many seconds should we vibrate for?
 * **Unread timer** : How long should the Messages app show an unread message for before going back to the clock?
 * **Min Font** : Minimum font size for messages
+* **Auto-Open Unread Msg** : Should the first unread message be displayed immediately when opening the app?
 * **Auto-Open Music** : Should the messages music screen auto open when music is played?
 * **Unlock Watch** : When a message arrives should the watch be unlocked?
 * **Flash Icon** : Should the messages icon in the widget flash when a message arrives?
 * **Quiet mode disables auto-open** : When in quiet mode, should we not open the messages app for new messages?
-* **Disable auto-open** : Should we not open the messages app for new messages?
+* **Auto-open new msg** : Should we open the messages app for new messages?
+  * **Never** : Never open for new messages
+  * **On clock** : Open if a clock face is showing (default)
+  * **If locked** : Open if the screen is locked
+  * **Always** : Always open new messages
 * **Widget messages** : How many message icons should the widget show?
 * **Show Widgets** : Should widgets be shown when a message is being displayed (default of disabled leaves more room for the message text)
 * **Icon color mode** : Should icons in widgets be coloured?

apps/messages/metadata.json

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

apps/messages/settings.js

@@ -12,6 +12,7 @@
     if (settings.maxMessages===undefined) settings.maxMessages=3;
     if (settings.iconColorMode === undefined) settings.iconColorMode = iconColorModes[0];
     if (settings.ignoreUnread === undefined) settings.ignoreUnread = 0;
+    if (settings.autoOpen === undefined) settings.autoOpen = 1;
     settings.unlockWatch=!!settings.unlockWatch;
     settings.openMusic=!!settings.openMusic;
     settings.maxUnreadTimeout=240;
@@ -79,9 +80,15 @@
       value: !!settings.quietNoAutOpn,
       onchange: v => updateSetting("quietNoAutOpn", v)
     },
-    /*LANG*/'Disable auto-open': {
-      value: !!settings.noAutOpn,
-      onchange: v => updateSetting("noAutOpn", v)
+    /*LANG*/'Auto-open new msg': {
+      value: settings.autoOpen,
+      min:0,max:3,step:1,
+      format: v =>
+        v===0 ? "Never" :
+          v===1 ? "On clock" :
+            v===2 ? "If locked" :
+              "Always",
+      onchange: v => updateSetting("autoOpen", v)
     },
     /*LANG*/'Widget messages': {
       value:0|settings.maxMessages,