From 10be0b5e97555215ef6f92e1720cf1dbaba8b313 Mon Sep 17 00:00:00 2001 From: Jeroen Peters Date: Sat, 11 Dec 2021 00:04:10 +0100 Subject: [PATCH] Local work in progress on ios integration and new app messages app look --- apps.json | 4 ++-- apps/ios/ChangeLog | 3 ++- apps/ios/boot.js | 5 +++++ apps/messages/ChangeLog | 3 ++- apps/messages/app-icon.js | 2 +- apps/messages/app.js | 5 +++++ apps/messages/app.png | Bin 917 -> 1431 bytes 7 files changed, 17 insertions(+), 5 deletions(-) diff --git a/apps.json b/apps.json index e5d6dad8a..456ce0217 100644 --- a/apps.json +++ b/apps.json @@ -57,7 +57,7 @@ { "id": "messages", "name": "Messages", - "version": "0.10", + "version": "0.11", "description": "App to display notifications from iOS and Gadgetbridge", "icon": "app.png", "type": "app", @@ -95,7 +95,7 @@ { "id": "ios", "name": "iOS Integration", - "version": "0.06", + "version": "0.07", "description": "(BETA) App to display notifications from iOS devices", "icon": "app.png", "tags": "tool,system,ios,apple,messages,notifications", diff --git a/apps/ios/ChangeLog b/apps/ios/ChangeLog index 28ad78dec..1b52a404f 100644 --- a/apps/ios/ChangeLog +++ b/apps/ios/ChangeLog @@ -4,4 +4,5 @@ 0.04: Added common bundleId's 0.05: Added more bundleId's (app-id's which can be used to determine a friendly app name in the notifications) -0.06: Fix (not) popupping up old messages \ No newline at end of file +0.06: Fix (not) popupping up old messages +0.07: Added common bundleId's diff --git a/apps/ios/boot.js b/apps/ios/boot.js index d402facbb..acaad3925 100644 --- a/apps/ios/boot.js +++ b/apps/ios/boot.js @@ -67,6 +67,7 @@ E.on('notify',msg=>{ "com.apple.mobilemail": "Mail", "com.apple.MobileSMS": "SMS Message", "com.apple.Passbook": "iOS Wallet", + "com.apple.podcasts": "Podcasts", "com.apple.reminders": "Reminders", "com.apple.shortcuts": "Shortcuts", "com.atebits.Tweetie2": "Twitter", @@ -81,22 +82,26 @@ E.on('notify',msg=>{ "com.ifttt.ifttt" : "IFTTT", "com.jumbo.app" : "Jumbo", "com.linkedin.LinkedIn" : "LinkedIn", + "com.microsoft.Office.Outlook" : "Outlook Mail", "com.nestlabs.jasper.release" : "Nest", "com.netflix.Netflix" : "Netflix", "com.reddit.Reddit" : "Reddit", "com.skype.skype": "Skype", "com.skype.SkypeForiPad": "Skype", "com.spotify.client": "Spotify", + "com.strava.stravaride": "Strava", "com.tinyspeck.chatlyio": "Slack", "com.toyopagroup.picaboo": "Snapchat", "com.ubercab.UberClient": "Uber", "com.ubercab.UberEats": "UberEats", + "com.vilcsak.bitcoin2": "Coinbase", "com.wordfeud.free": "WordFeud", "com.zhiliaoapp.musically": "TikTok", "net.whatsapp.WhatsApp": "WhatsApp", "nl.ah.Appie": "Albert Heijn", "nl.postnl.TrackNTrace": "PostNL", "ph.telegra.Telegraph": "Telegram", + "tv.twitch": "Twitch", // could also use NRF.ancsGetAppInfo(msg.appId) here }; diff --git a/apps/messages/ChangeLog b/apps/messages/ChangeLog index 269a2cf62..f703a1e25 100644 --- a/apps/messages/ChangeLog +++ b/apps/messages/ChangeLog @@ -12,4 +12,5 @@ buzz on new message (fix #999) 0.09: Message now disappears after 60s if no action taken and clock loads (fix 922) Fix phone icon (#1014) -0.10: Respect the 'new' attribute if it was set from iOS integrations \ No newline at end of file +0.10: Respect the 'new' attribute if it was set from iOS integrations +0.11: New notification icons, more app icons diff --git a/apps/messages/app-icon.js b/apps/messages/app-icon.js index 6ed3c1141..4fe202dd6 100644 --- a/apps/messages/app-icon.js +++ b/apps/messages/app-icon.js @@ -1 +1 @@ -require("heatshrink").decompress(atob("mEw4UA///rkcAYP9ohL/ABMBqoAEoALDioLFqgLDBQoABERIkEBZcFBY9QBed61QAC1oLF7wLD24LF24LD7wLF1vqBQOrvQLFA4IuC9QLFD4IuC1QLGGAQOBBYwgBEwQLHvQBBEZHVq4jI7wWBHY5TLNZaDLTZazLffMBBY9ABZsABY4KCgEVBQtUBYYkGEQYA/AAwA=")) +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 diff --git a/apps/messages/app.js b/apps/messages/app.js index c609acb4b..f2f1ee6e9 100644 --- a/apps/messages/app.js +++ b/apps/messages/app.js @@ -65,6 +65,9 @@ function saveMessages() { function getBackImage() { return atob("FhYBAAAAEAAAwAAHAAA//wH//wf//g///BwB+DAB4EAHwAAPAAA8AADwAAPAAB4AAHgAB+AH/wA/+AD/wAH8AA=="); } +function getMailImage() { + 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() { return atob("GRSBAAAAAYAAAcAAAeAAAfAAAfAAAfAAAfAAAfAAAfBgAfA4AfAeAfAPgfAD4fAA+fAAP/AAD/AAA/AAAPAAADAAAA=="); } @@ -80,6 +83,8 @@ 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 (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=="); diff --git a/apps/messages/app.png b/apps/messages/app.png index c9177692e282e1247ced30f6ec0e2d14dc6dfa25..2ea4253f1c8a9c372dfa08f81bc4a3599547d353 100644 GIT binary patch delta 1395 zcmV-(1&sQY2bT+wHGc(6NklJMcIk%X8)3<~}d7a|D=kxU4en1BWeVL$?i3K9eO$ANO$t+Pg8bQ@zs*R`{k z({tK$dg_k_1k856(&8Wb{OdXI<#~GE_xs-O1M<8i}iG-f4$VQ5ekg+M%jbA#s*NkriH_Mv6tvA-ydRHare;bsJ!ko%_06<-X+f136MQT2(Owx*CFRip9J}6?|>^TpO{B2A! zO+qnUjMB$T03|h5&0dv_l1?*vN{3M2-|%?c#6)CS#;%>8VbAW*Aq7TYuueGbu>0SS-XOjvhIL@`B4Kw_L(E#|{(w0f0ekAhyk*9@0cs!C(;0Tbl4k z_faHe1u;Rw?_EdGyrl`DP>3jo$dfP4s;f{Y=F(=uRcqhH)jG)o;ZeAo|mDUV7k!hfCbMbaq8r^jo@x>;SNpxQPpL>Akc`!!u-Ik#h@bL^vZUW>)z;Iv$B}HT#9ROGh(+C8}8+9UN zy^#$M595oSn=y3j7FsX-Tf1pRfh-U2q0|Db7pKGR7-$Ul< zx%Jq+eFRs7JpcfPdkV{zEzN)y`E3ue0Lnxm8jXTs)W-z?cz4wr@H`IyU|I6(qkl*w z0wbHl^MF>P5u}8S60Q&(9bV$Vz!>pN$OAxoM;A)CB1j1tT4+=c1_b+nrgvm82va4E z){Ez%C`v|zGJ&EfICt?EFcmZcH-msyb6w3xRX`$^Xz4i99Rq->c@@~Yeb++~p(qNP zx9tEozY+k@e%c!o!a|FhpK1>#-+g0~-`i()xNRu#0P8kvz}#8&sC)7W&@@?3 zj0aH^(bnFH^Ot@FH@_0bQVKntedzZM#8?&w)%=OteTu_1(_}K9ee0vwEDkpZ0EiEX z80`;(4`(;iu!Sa+a7AD$#%}m}I{R>V^YN%4B%dGf|8`l;pLo5R;&9ERX>7yy_8A;o z*Wfl=D~n;Ea&x4Xk}`sWqi8$b73=p6!~{`VNJ1XS@Os_la#1{wMQo92v6508aw=th zFv|BruhYe#)%t~S`~b`1U?$h=dE}8t9(g?4_y>ON=x#H@+AIJ7002ovPDHLkV1mzl Bm{R}% delta 877 zcmV-z1Csog3zY|uHGcz2Nkluyfw*0)Qp!hncRVyj zQ`x06I|WVpyS_6!&oleZ`|h+rks?Kk9492-foC7CpC?Z3CVxQM05kxo5Ugbjz%oGR zsVFjI`Yjy4cz*zJ63_v&pm_=rv=u}S2b37?W-+TXP+tHod{A=EEM#S%vH((esWJ;3 zRb4L_63?W@S_!iOFFY4|YeJ-Wz-Ad`H6dC&AfOLq zO*G3A7F7*5rqu(hQ?}Yfl{A`V2{Zln#RCOsWHCiU=eUAb(QU-H48*q#y!^6_&T$1X zg}u%n27gy0`;+X>#uN?BvV`g~2i|_&!`&C({~CMsOeucu8i*;GJ`(cVZ-%xEfi(G=93oi6rJb@oObbpQr6Wj)Jo6tn>Zy|x!3ItjYzVmxr z1R=k7|1ft?#u4^=aH^8;>cM5*ZZ#3r3;_-UqJK)EC=<*pcTI>Zg}EiTH>5H@gL(Dr zSEGmu0%S~t{NDYqTvoUa@zREd%OmSNQ-$;2-^i>CY#y14!})0zurjb(03m!3x?&cx zFhJ)Dp@jzu#~ZVlg#qUn0RH=;ICP?u=Vn1u11m#y5lS&y7)>nDrz`jCKAS}?t5EfB zVrCG)f^bdwGcVVy-?JKEX&@5x?N#k0IslB|Xwyjp=o7hSt>fM8D`~5NdH=;!|7gue zKnEx>+CfPJ#Q*e|1fk1>I_9WBo>`?$ks?Kk{5$*tT^fbQe@cvs00000NkvXXu0mjf DONNp(