Bram
/
BangleApps
forked from FOSS/BangleApps
1
0
Fork 0
Code Pull Requests Activity

Nav messages with '/' now get split on newlines

master
Gordon Williams 2023-06-09 14:16:27 +01:00
parent 38e3fe40e5
commit 0f431d53cf
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/messagegui/ChangeLog
View File

@ -92,4 +92,5 @@
0.67: Support for 'Ignore' for messages from Gadgetbridge 0.67: Support for 'Ignore' for messages from Gadgetbridge
Message view is now taller, and we use swipe left/right to dismiss messages rather than buttons Message view is now taller, and we use swipe left/right to dismiss messages rather than buttons
0.68: More navigation icons (for roundabouts) 0.68: More navigation icons (for roundabouts)
0.69: More navigation icons (keep/uturn left/right) 0.69: More navigation icons (keep/uturn left/right)
Nav messages with '/' now get split on newlines

8
apps/messagegui/app.js
View File

@ -17,6 +17,7 @@ require("messages").pushMessage({"t":"add","id":1575479849,"src":"Skype","title"
// maps // maps
GB({t:"nav",src:"maps",title:"Navigation",instr:"High St towards Tollgate Rd",distance:966,action:"continue",eta:"08:39"}) GB({t:"nav",src:"maps",title:"Navigation",instr:"High St towards Tollgate Rd",distance:966,action:"continue",eta:"08:39"})
GB({t:"nav",src:"maps",title:"Navigation",instr:"High St",distance:12345,action:"left_slight",eta:"08:39"}) GB({t:"nav",src:"maps",title:"Navigation",instr:"High St",distance:12345,action:"left_slight",eta:"08:39"})
GB({t:"nav",src:"maps",title:"Navigation",instr:"Main St / I-29 ALT / Centerpoint Dr",distance:12345,action:"left_slight",eta:"08:39"})
// call // call
require("messages").pushMessage({"t":"add","id":"call","src":"Phone","title":"Bob","body":"12421312",positive:true,negative:true}) require("messages").pushMessage({"t":"add","id":"call","src":"Phone","title":"Bob","body":"12421312",positive:true,negative:true})
*/ */
@ -84,12 +85,13 @@ function showMapMessage(msg) {
if (msg.distance!==undefined) if (msg.distance!==undefined)
distance = require("locale").distance(msg.distance); distance = require("locale").distance(msg.distance);
if (msg.instr) { if (msg.instr) {
if (msg.instr.includes("towards") || msg.instr.includes("toward")) { var instr = msg.instr.replace(/\s*\/\s*/g," \/\n"); // convert slashes to newlines
m = msg.instr.split(/towards|toward/); if (instr.includes("towards") || instr.includes("toward")) {
m = instr.split(/towards|toward/);
target = m[0].trim(); target = m[0].trim();
street = m[1].trim(); street = m[1].trim();
}else }else
target = msg.instr; target = instr;
} }
switch (msg.action) { switch (msg.action) {
case "continue": img = "EBgBAIABwAPgD/Af+D/8f/773/PPY8cDwAPAA8ADwAPAA8AAAAPAA8ADwAAAA8ADwAPA";break; case "continue": img = "EBgBAIABwAPgD/Af+D/8f/773/PPY8cDwAPAA8ADwAPAA8AAAAPAA8ADwAAAA8ADwAPA";break;