Merge pull request #3513 from WhelanB/messagegui

Add support for reply lib to messagegui app

Author: gfwilliams

apps/messagegui/ChangeLog

@@ -106,3 +106,4 @@
 0.77: Messages can now use international fonts if they are installed
 0.78: Fix: When user taps on a new message, clear the unread timeout
 0.79: Fix: Reset the unread timeout each time a new message is shown. When the message is read from user input, do not set an unread timeout.
+0.80: Add ability to reply to messages if a reply library is installed and the message can be replied to

apps/messagegui/app.js

@@ -24,6 +24,8 @@ require("messages").pushMessage({"t":"add","id":"call","src":"Phone","title":"Bo
 var Layout = require("Layout");
 var layout; // global var containing the layout for the currently displayed message
 var settings = require('Storage').readJSON("messages.settings.json", true) || {};
+var reply;
+try { reply = require("reply"); } catch (e) {}
 var fontSmall = "6x8";
 var fontMedium = g.getFonts().includes("6x15")?"6x15":"6x8:2";
 var fontBig = g.getFonts().includes("12x20")?"12x20":"6x8:2";
@@ -45,6 +47,7 @@ if (Graphics.prototype.setFontIntl) {
 
 var active; // active screen (undefined/"list"/"music"/"map"/"message"/"scroller"/"settings")
 var openMusic = false; // go back to music screen after we handle something else?
+var replying = false; // If we're replying to a message, don't interrupt
 // hack for 2v10 firmware's lack of ':size' font handling
 try {
   g.setFont("6x8:2");
@@ -267,11 +270,31 @@ function showMessageSettings(msg) {
     /*LANG*/"View Message" : () => {
       showMessageScroller(msg);
     },
+  };
+
+  if (msg.reply && reply) {
+    menu[/*LANG*/"Reply"] = () => {
+      replying = true;
+      reply.reply({msg: msg})
+        .then(result => {
+          Bluetooth.println(JSON.stringify(result));
+          replying = false;
+          showMessage(msg.id);
+        })
+        .catch(() => {
+          replying = false;
+          showMessage(msg.id);
+        });
+    };
+  }
+
+  menu = Object.assign(menu, {
     /*LANG*/"Delete" : () => {
       MESSAGES = MESSAGES.filter(m=>m.id!=msg.id);
       checkMessages({clockIfNoMsg:0,clockIfAllRead:0,showMsgIfUnread:0,openMusic:0});
     },
-  };
+  });
+
   if (Bangle.messageIgnore && msg.src)
     menu[/*LANG*/"Ignore"] = () => {
       E.showPrompt(/*LANG*/"Ignore all messages from "+E.toJS(msg.src)+"?", {title:/*LANG*/"Ignore"}).then(isYes => {
@@ -305,6 +328,7 @@ function showMessageSettings(msg) {
 }
 
 function showMessage(msgid, persist) {
+  if (replying) { return; }
   if(!persist) resetReloadTimeout();
   let idx = MESSAGES.findIndex(m=>m.id==msgid);
   var msg = MESSAGES[idx];
@@ -374,15 +398,32 @@ function showMessage(msgid, persist) {
     }; 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
-  if (msg.positive) {
+  if (msg.reply && reply) {
+    posHandler = ()=>{
+      replying = true;
+      msg.new = false;
+      cancelReloadTimeout(); // don't auto-reload to clock now
+      reply.reply({msg: msg})
+        .then(result => {
+          Bluetooth.println(JSON.stringify(result));
+          replying = false;
+          layout.render();
+          checkMessages({clockIfNoMsg:1,clockIfAllRead:1,showMsgIfUnread:1,openMusic:openMusic});
+        })
+        .catch(() => {
+          replying = false;
+          layout.render();
+          showMessage(msg.id);
+        });
+    }; footer.push({type:"img",src:atob("QRABAAAAAAAH//+AAAAABgP//8AAAAADgf//4AAAAAHg4ABwAAAAAPh8APgAAAAAfj+B////////geHv///////hf+f///////GPw///////8cGBwAAAAAPx/gDgAAAAAfD/gHAAAAAA8DngOAAAAABwDHP8AAAAADACGf4AAAAAAAAM/w=="),col:"#0f0", cb:posHandler});
+  }
+  else if (msg.positive) {
     posHandler = ()=>{
       msg.new = false;
       cancelReloadTimeout(); // don't auto-reload to clock now
       Bangle.messageResponse(msg,true);
       checkMessages({clockIfNoMsg:1,clockIfAllRead:1,showMsgIfUnread:1,openMusic:openMusic});
-    };
-        footer.push({type:"img",src:atob("QRABAAAAAAAAAAOAAAAABgAAA8AAAAADgAAD4AAAAAHgAAPgAAAAAPgAA+AAAAAAfgAD4///////gAPh///////gA+D///////AD4H//////8cPgAAAAAAPw8+AAAAAAAfB/4AAAAAAA8B/gAAAAAABwB+AAAAAAADAB4AAAAAAAAABgAA=="),col:"#0f0",cb:posHandler});
-
+    }; footer.push({type:"img",src:atob("QRABAAAAAAAAAAOAAAAABgAAA8AAAAADgAAD4AAAAAHgAAPgAAAAAPgAA+AAAAAAfgAD4///////gAPh///////gA+D///////AD4H//////8cPgAAAAAAPw8+AAAAAAAfB/4AAAAAAA8B/gAAAAAABwB+AAAAAAADAB4AAAAAAAAABgAA=="),col:"#0f0",cb:posHandler});
   }
 
   layout = new Layout({ type:"v", c: [

apps/messagegui/metadata.json

@@ -2,13 +2,13 @@
   "id": "messagegui",
   "name": "Message UI",
   "shortName": "Messages",
-  "version": "0.79",
+  "version": "0.80",
   "description": "Default app to display notifications from iOS and Gadgetbridge/Android",
   "icon": "app.png",
   "type": "app",
   "tags": "tool,system",
   "supports": ["BANGLEJS","BANGLEJS2"],
-  "dependencies" : { "messageicons":"module" },
+  "dependencies" : { "messageicons":"module", "reply": "module" },
   "provides_modules": ["messagegui"],
   "default": true,
   "readme": "README.md",

apps/reply/ChangeLog

@@ -1 +1,2 @@
-0.01: New Library!
+0.01: New Library!
+0.02: Minor bug fixes

apps/reply/lib.js

@@ -6,7 +6,12 @@ exports.reply = function (options) {
     keyboard = null;
   }
 
-  function constructReply(msg, replyText, resolve) {
+  function constructReply(msg, replyText, resolve, reject) {
+    if (!replyText) { 
+      reject("");
+      return;
+    }
+
     var responseMessage = {msg: replyText};
     if (msg.id) {
       responseMessage = { t: "notify", id: msg.id, n: "REPLY", msg: replyText };
@@ -29,7 +34,10 @@ exports.reply = function (options) {
       }, // options
       /*LANG*/ "Compose": function () {
         keyboard.input().then((result) => {
-          constructReply(options.msg ?? {}, result, resolve);
+          if (result)
+            constructReply(options.msg ?? {}, result, resolve, reject);
+          else
+            E.showMenu(menu);
         });
       },
     };
@@ -40,7 +48,7 @@ exports.reply = function (options) {
       ) || [];
     replies.forEach((reply) => {
       menu = Object.defineProperty(menu, reply.text, {
-        value: () => constructReply(options.msg ?? {}, reply.text, resolve),
+        value: () => constructReply(options.msg ?? {}, reply.text, resolve, reject),
       });
     });
     if (!keyboard) delete menu[/*LANG*/ "Compose"];
@@ -60,10 +68,11 @@ exports.reply = function (options) {
         );
       } else {
         keyboard.input().then((result) => {
-          constructReply(options.msg.id, result, resolve);
+          constructReply(options.msg, result, resolve, reject);
         });
       }
+    } else{
+      E.showMenu(menu);
     }
-    E.showMenu(menu);
   });
-};
+};

apps/reply/metadata.json

@@ -1,6 +1,6 @@
 { "id": "reply",
   "name": "Reply Library",
-  "version": "0.01",
+  "version": "0.02",
   "description": "A library for replying to text messages via predefined responses or keyboard",
   "icon": "app.png",
   "type": "module",