Merge branch 'ntfy-msg-icon' into app-loader

thyttan · thyttan · commit 50f1b8098a31 · 2025-12-18T01:25:58.000+01:00
diff --git a/apps/confthyttan/ChangeLog b/apps/confthyttan/ChangeLog
@@ -7,4 +7,4 @@
 0.07: change dependencies order to try avoiding prompts in app loader while
       loading apps.
 0.08: hide bt indicator when connected (`widbt_notify`). Add "Message Twist to
-      Scroll".
+      Scroll". Add "Big Clock Info app".
diff --git a/apps/confthyttan/metadata.json b/apps/confthyttan/metadata.json
@@ -42,6 +42,7 @@
     "fastload":"app",
     "boot":"app",
     "ateatimer":"app",
+    "bigclkinfo":"app",
     "drained":"app"
   },
   "storage": [
diff --git a/apps/confthyttan/quicklaunch.json b/apps/confthyttan/quicklaunch.json
@@ -1 +1 @@
-{lapp:{name:"Show Launcher",sortorder:-12,src:"no source"},rapp:{name:"torch",type:"app",sortorder:-11,src:"torch.app.js"},uapp:{name:"Messages",sortorder:-9,src:"messagegui.app.js"},dapp:{name:"Extension",type:"app",sortorder:-11,src:"quicklaunch.app.js"},tapp:{name:""},dlapp:{name:"PA Remote",src:"podadrem.app.js"},drapp:{name:"Remote for Spotify",src:"spotrem.app.js"},duapp:{name:""},ddapp:{name:"Extension",type:"app",sortorder:-11,src:"quicklaunch.app.js"},dtapp:{name:""},ddlapp:{name:"Alarms",src:"alarm.app.js"},ddrapp:{name:"Run+",src:"runplus.app.js"},dduapp:{name:""},dddapp:{name:"Agenda",src:"agenda.app.js"},ddtapp:{name:""},rlapp:{name:""},rrapp:{name:""},ruapp:{name:""},rdapp:{name:""},rtapp:{name:""},trace:"dr"}
+{lapp:{name:"Show Launcher",src:"no source"},rapp:{name:"torch",src:"torch.app.js"},uapp:{name:"Messages",src:"messagegui.app.js"},dapp:{name:"Extension",src:"quicklaunch.app.js"},tapp:{name:""},dlapp:{name:"PA Remote",src:"podadrem.app.js"},drapp:{name:"Remote for Spotify",src:"spotrem.app.js"},duapp:{name:""},ddapp:{name:"Big Clk Info",src:"bigclkinfo.app.js"},dtapp:{name:""}}
diff --git a/apps/messageicons/ChangeLog b/apps/messageicons/ChangeLog
@@ -10,3 +10,4 @@
 0.09: Add Bereal, Nextcloud, Thunderbird, Davx⁵, Kleinanzeigen, Element X
 0.10: Fix broken PNG icons
 0.11: Add icons for Meshtastic, Gotify. Update icon for Home Assistant. Add icon for "Element Classic" after "Element" has been renamed. (Keeping "Element" as well for backwards compatibility.)
+0.12: Add message icon for 'ntfy'
diff --git a/apps/messageicons/icons.img b/apps/messageicons/icons.img
diff --git a/apps/messageicons/icons/icon_names.json b/apps/messageicons/icons/icon_names.json
@@ -78,6 +78,7 @@
   { "app":"nextbike", "icon":"nextbike.png" },
   { "app":"nextcloud", "icon":"nextcloud.png" },
   { "app":"nina", "icon":"nina.png" },
+  { "app":"ntfy", "icon":"ntfy.png" },
   { "app":"outlook mail", "icon":"outlook.png" },
   { "app":"paypal", "icon":"paypal.png" },
   { "app":"phone", "icon":"phone.png" },
diff --git a/apps/messageicons/icons/ntfy.png b/apps/messageicons/icons/ntfy.png
diff --git a/apps/messageicons/lib.js b/apps/messageicons/lib.js
@@ -4,7 +4,7 @@ exports.getImage = function(msg) {
   if (msg.img) return atob(msg.img);
   let s = (("string"=== typeof msg) ? msg : (msg.src || "")).toLowerCase();
   if (msg.id=="music") s="music";
-  let match = ",default|0,airbnb|1,agenda|2,alarm|3,alarmclockreceiver|3,amazon shopping|4,bereal.|5,bibel|6,bitwarden|7,1password|7,lastpass|7,dashlane|7,bring|8,calendar|9,etar|9,chat|10,chrome|11,clock|3,corona-warn|12,bmo|13,desjardins|13,rbc mobile|13,nbc|13,rabobank|13,scotiabank|13,td (canada)|13,davx⁵|14,discord|15,drive|16,element|17,element classic|17,element x|17,facebook|18,messenger|19,firefox|20,firefox beta|20,firefox nightly|20,f-droid|7,neo store|7,aurora droid|7,github|21,gitlab|22,gmail|23,gmx|24,google|25,google home|26,google play store|27,gotify|28,home assistant|29,instagram|30,jira|31,kalender|32,keep notes|33,kleinanzeigen|34,leboncoin|35,lieferando|36,linkedin|37,maps|38,meshtastic|39,organic maps|38,osmand|38,mastodon|40,fedilab|40,tooot|40,tusky|40,mattermost|41,messages|42,n26|43,netflix|44,news|45,cbc news|45,rc info|45,reuters|45,ap news|45,la presse|45,nbc news|45,nextbike|46,nextcloud|47,nina|48,outlook mail|49,paypal|50,phone|51,plex|52,pocket|53,post & dhl|54,proton mail|55,reddit|56,sync pro|56,sync dev|56,boost|56,infinity|56,slide|56,signal|57,molly|57,skype|58,slack|59,snapchat|60,starbucks|61,steam|62,teams|63,telegram|64,telegram foss|64,threema|65,threema libre|65,thunderbird|66,tiktok|67,to do|68,opentasks|68,tasks|68,transit|69,twitch|70,twitter|71,uber|72,lyft|72,vlc|73,warnapp|74,whatsapp|75,wordfeud|76,youtube|77,newpipe|77,zoom|78,meet|78,music|79,sms message|0,mail|0,".match(new RegExp(`,${s}\\|(\\d+)`))
+  let match = ",default|0,airbnb|1,agenda|2,alarm|3,alarmclockreceiver|3,amazon shopping|4,bereal.|5,bibel|6,bitwarden|7,1password|7,lastpass|7,dashlane|7,bring|8,calendar|9,etar|9,chat|10,chrome|11,clock|3,corona-warn|12,bmo|13,desjardins|13,rbc mobile|13,nbc|13,rabobank|13,scotiabank|13,td (canada)|13,davx⁵|14,discord|15,drive|16,element|17,element classic|17,element x|17,facebook|18,messenger|19,firefox|20,firefox beta|20,firefox nightly|20,f-droid|7,neo store|7,aurora droid|7,github|21,gitlab|22,gmail|23,gmx|24,google|25,google home|26,google play store|27,gotify|28,home assistant|29,instagram|30,jira|31,kalender|32,keep notes|33,kleinanzeigen|34,leboncoin|35,lieferando|36,linkedin|37,maps|38,meshtastic|39,organic maps|38,osmand|38,mastodon|40,fedilab|40,tooot|40,tusky|40,mattermost|41,messages|42,n26|43,netflix|44,news|45,cbc news|45,rc info|45,reuters|45,ap news|45,la presse|45,nbc news|45,nextbike|46,nextcloud|47,nina|48,ntfy|49,outlook mail|50,paypal|51,phone|52,plex|53,pocket|54,post & dhl|55,proton mail|56,reddit|57,sync pro|57,sync dev|57,boost|57,infinity|57,slide|57,signal|58,molly|58,skype|59,slack|60,snapchat|61,starbucks|62,steam|63,teams|64,telegram|65,telegram foss|65,threema|66,threema libre|66,thunderbird|67,tiktok|68,to do|69,opentasks|69,tasks|69,transit|70,twitch|71,twitter|72,uber|73,lyft|73,vlc|74,warnapp|75,whatsapp|76,wordfeud|77,youtube|78,newpipe|78,zoom|79,meet|79,music|80,sms message|0,mail|0,".match(new RegExp(`,${s}\\|(\\d+)`))
   return require("Storage").read("messageicons.img", (match===null)?0:match[1]*76, 76);
 };
 
diff --git a/apps/messageicons/metadata.json b/apps/messageicons/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "messageicons",
   "name": "Message Icons",
-  "version": "0.11",
+  "version": "0.12",
   "description": "Library containing a list of icons and colors for apps",
   "icon": "app.png",
   "type": "module",

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		-{lapp:{name:"Show Launcher",sortorder:-12,src:"no source"},rapp:{name:"torch",type:"app",sortorder:-11,src:"torch.app.js"},uapp:{name:"Messages",sortorder:-9,src:"messagegui.app.js"},dapp:{name:"Extension",type:"app",sortorder:-11,src:"quicklaunch.app.js"},tapp:{name:""},dlapp:{name:"PA Remote",src:"podadrem.app.js"},drapp:{name:"Remote for Spotify",src:"spotrem.app.js"},duapp:{name:""},ddapp:{name:"Extension",type:"app",sortorder:-11,src:"quicklaunch.app.js"},dtapp:{name:""},ddlapp:{name:"Alarms",src:"alarm.app.js"},ddrapp:{name:"Run+",src:"runplus.app.js"},dduapp:{name:""},dddapp:{name:"Agenda",src:"agenda.app.js"},ddtapp:{name:""},rlapp:{name:""},rrapp:{name:""},ruapp:{name:""},rdapp:{name:""},rtapp:{name:""},trace:"dr"}
	`1`	`+{lapp:{name:"Show Launcher",src:"no source"},rapp:{name:"torch",src:"torch.app.js"},uapp:{name:"Messages",src:"messagegui.app.js"},dapp:{name:"Extension",src:"quicklaunch.app.js"},tapp:{name:""},dlapp:{name:"PA Remote",src:"podadrem.app.js"},drapp:{name:"Remote for Spotify",src:"spotrem.app.js"},duapp:{name:""},ddapp:{name:"Big Clk Info",src:"bigclkinfo.app.js"},dtapp:{name:""}}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"id": "messageicons",`
`3`	`3`	`"name": "Message Icons",`
`4`		`- "version": "0.11",`
	`4`	`+ "version": "0.12",`
`5`	`5`	`"description": "Library containing a list of icons and colors for apps",`
`6`	`6`	`"icon": "app.png",`
`7`	`7`	`"type": "module",`