diff --git a/apps/messages/app-icon.js b/apps/messages/app-icon.js index 4fe202dd6..a1695d04d 100644 --- a/apps/messages/app-icon.js +++ b/apps/messages/app-icon.js @@ -1 +1 @@ -require("heatshrink").decompress(atob("mEwwMB/4Ak/k/Aof4j4FD/OfAYPvAof38//+EP//n5//4ED//z51/gEB/1zzwFBgH+vOc/wFBv85zn8AoM/nO5AoednIFDzgFG/AFHj4FezgFDI4IFFvAFBj055wFDufPCIfz4/wAoMP8fvAof3//gAoMHSwIFF4AFBSAIFGABitCApDRFAEIA==")) \ No newline at end of file +require("heatshrink").decompress(atob("mEw4UA///mlmtnzAoI3rhWoBREC1Wq0ALHlQLBDBAKBAAIiJ9WqwALH1f6GA8KBYYwGBZZGBBZxIGBb0BqoACtQLFioLFQggKDBYuoEQlVrQLEgoLGR4YLFqwLEitX/4ADEYeABYy9BIwgLELoSaBFwgACEQQLIAANABcStBKY3/+oLPEQ9UBYKPFBYqzFAAVQdQRSJGBIKCEg4iDAAghFAAonBBRALBKAQAHgoLKgI5IBYQ6JAFYA==")) \ No newline at end of file diff --git a/apps/messages/app.js b/apps/messages/app.js index f2f1ee6e9..20b5bb3bf 100644 --- a/apps/messages/app.js +++ b/apps/messages/app.js @@ -65,7 +65,13 @@ function saveMessages() { function getBackImage() { return atob("FhYBAAAAEAAAwAAHAAA//wH//wf//g///BwB+DAB4EAHwAAPAAA8AADwAAPAAB4AAHgAB+AH/wA/+AD/wAH8AA=="); } -function getMailImage() { +function getNotificationImage() { + return atob("FxeBABgAAPgAAfAAB/AAD+AAH+AAP8AAP4AAfgAA/AAA+AAA+AAA+AAB+AAB+AAB+OAB//AB//gB//gA//AA/8AAf4AAPAA="); +} +function getFBIcon() { + return atob("FxeBABgAAPgAAfAAB/AAD+AAH+AAP8AAP4AAfgAA/AAA+AAA+AAA+AAB+AAB+AAB+OAB//AB//gB//gA//AA/8AAf4AAPAA="); +} +function getMailIcon() { return atob("HBKBAD///8H///iP//8cf//j4//8f5//j/x/8//j/H//H4//4PB//EYj/44HH/Hw+P4//8fH//44///xH///g////A=="); } function getPosImage() { @@ -83,11 +89,14 @@ function getMessageImage(msg) { if (s=="whatsapp") return atob("GBiBAAB+AAP/wAf/4A//8B//+D///H9//n5//nw//vw///x///5///4///8e//+EP3/APn/wPn/+/j///H//+H//8H//4H//wMB+AA=="); if (s=="telegram") return atob("GBiBAAAAAAAAAAAAAAAAAwAAHwAA/wAD/wAf3gD/Pgf+fh/4/v/z/P/H/D8P/Acf/AM//AF/+AF/+AH/+ADz+ADh+ADAcAAAMAAAAA=="); if (s=="twitter") return atob("GhYBAABgAAB+JgA/8cAf/ngH/5+B/8P8f+D///h///4f//+D///g///wD//8B//+AP//gD//wAP/8AB/+AB/+AH//AAf/AAAYAAA"); - if (s=="mail") return getMailImage(); - if (s=="gmail") return getMailImage(); + if (s=="slack") return atob("FxeBABgAAPgAAfAAB/AAD+AAH+AAP8AAP4AAfgAA/AAA+AAA+AAA+AAB+AAB+AAB+OAB//AB//gB//gA//AA/8AAf4AAPAA="); + if (s=="facebook") return getFBIcon(); + if (s=="fb messenger") return getFBIcon(); + if (s=="mail") return getMailIcon(); + if (s=="gmail") return getMailIcon(); if (msg.id=="music") return atob("FhaBAH//+/////////////h/+AH/4Af/gB/+H3/7/f/v9/+/3/7+f/vB/w8H+Dwf4PD/x/////////////3//+A="); if (msg.id=="back") return getBackImage(); - return atob("HBKBAD///8H///iP//8cf//j4//8f5//j/x/8//j/H//H4//4PB//EYj/44HH/Hw+P4//8fH//44///xH///g////A=="); + return getNotificationImage(); } @@ -152,7 +161,7 @@ function showMusicMessage(msg) { ]}, {type:"txt", font:fontLarge, label:msg.track, fillx:1, filly:1, pad:2 }, Bangle.musicControl?{type:"h",fillx:1, c: [ - {type:"btn", pad:8, label:"\0"+atob("FhgBwAADwAAPwAA/wAD/gAP/gA//gD//gP//g///j///P//////////P//4//+D//gP/4A/+AD/gAP8AA/AADwAAMAAA"), cb:()=>Bangle.musicControl("play")}, // play + {type:"btn", pad:8, label:"\0"+atob("FxeBABgAAPgAAfAAB/AAD+AAH+AAP8AAP4AAfgAA/AAA+AAA+AAA+AAB+AAB+AAB+OAB//AB//gB//gA//AA/8AAf4AAPAA="), cb:()=>Bangle.musicControl("play")}, // play {type:"btn", pad:8, label:"\0"+atob("EhaBAHgHvwP/wP/wP/wP/wP/wP/wP/wP/wP/wP/wP/wP/wP/wP/wP/wP/wP/wP/wP/wP3gHg"), cb:()=>Bangle.musicControl("pause")}, // pause {type:"btn", pad:8, label:"\0"+atob("EhKBAMAB+AB/gB/wB/8B/+B//B//x//5//5//x//B/+B/8B/wB/gB+AB8ABw"), cb:()=>Bangle.musicControl("next")}, // next ]}:{}, diff --git a/apps/messages/app.png b/apps/messages/app.png index 2ea4253f1..2e832a0bb 100644 Binary files a/apps/messages/app.png and b/apps/messages/app.png differ diff --git a/apps/messages/widget.js b/apps/messages/widget.js index 6403c6b8d..be4f56abc 100644 --- a/apps/messages/widget.js +++ b/apps/messages/widget.js @@ -2,10 +2,18 @@ WIDGETS["messages"]={area:"tl",width:0,draw:function() { Bangle.removeListener('touch', this.touch); if (!this.width) return; var c = (Date.now()-this.t)/1000; + /* g.reset().setBgColor((c&1) ? "#0f0" : "#030").setColor((c&1) ? "#000" : "#fff"); g.clearRect(this.x,this.y,this.x+this.width,this.y+23); g.setFont("6x8:1x2").setFontAlign(0,0).drawString("MESSAGES", this.x+this.width/2, this.y+12); + */ + var c = parseInt(Date.now()/1000); + g.reset().clearRect(this.x,this.y,this.x+this.width+2,this.y+this.width+2); + g.drawImage((c&1) ? atob("FBSBAAGAABwAA/gAf8AP/AD/wA/8AP/gD/8Af/AP/4D//A//4f//H//x//w//gP8gAA4AAOA") : atob("FBSBAAAYAAOAAfwAP+AD/wA/8AP/AH/wD/8A/+Af/wP/8H//D//4//+D//gH/8AT/AHAABwA"), this.x+2, this.y+2); + + //if (c<60) Bangle.setLCDPower(1); // keep LCD on for 1 minute + let settings = require('Storage').readJSON("messages.settings.json", true) || {}; if (settings.repeat===undefined) settings.repeat = 4; if (c<120 && (Date.now()-this.l)>settings.repeat*1000) {