From c0921c6a1db1b05f7acb4a2fca133ca170ed0667 Mon Sep 17 00:00:00 2001 From: Richard de Boer Date: Sat, 19 Feb 2022 21:24:13 +0100 Subject: [PATCH 1/3] messages: add Home Assistant icon --- apps/messages/ChangeLog | 1 + apps/messages/app.js | 2 ++ apps/messages/metadata.json | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/messages/ChangeLog b/apps/messages/ChangeLog index 4811cd19b..1290ad089 100644 --- a/apps/messages/ChangeLog +++ b/apps/messages/ChangeLog @@ -31,3 +31,4 @@ 0.19: Use a larger font for message text if it'll fit 0.20: Allow tapping on the body to show a scrollable view of the message and title in a bigger font (fix #1405, #1031) 0.21: Improve list readability on dark theme +0.22: Add Home Assistant icon diff --git a/apps/messages/app.js b/apps/messages/app.js index 4aaf97369..56753995f 100644 --- a/apps/messages/app.js +++ b/apps/messages/app.js @@ -83,6 +83,7 @@ function getMessageImage(msg) { if (s=="calendar") return atob("GBiBAAAAAAAAAAAAAA//8B//+BgAGBgAGBgAGB//+B//+B//+B9m2B//+B//+Btm2B//+B//+Btm+B//+B//+A//8AAAAAAAAAAAAA=="); if (s=="facebook") return getFBIcon(); if (s=="hangouts") return atob("FBaBAAH4AH/gD/8B//g//8P//H5n58Y+fGPnxj5+d+fmfj//4//8H//B//gH/4A/8AA+AAHAABgAAAA="); + if (s=="home assistant") return atob("FhaBAAAAAADAAAeAAD8AAf4AD/3AfP8D7fwft/D/P8ec572zbzbNsOEhw+AfD8D8P4fw/z/D/P8P8/w/z/AAAAA="); if (s=="instagram") return atob("GBiBAAAAAAAAAAAAAAAAAAP/wAYAYAwAMAgAkAh+EAjDEAiBEAiBEAiBEAiBEAjDEAh+EAgAEAwAMAYAYAP/wAAAAAAAAAAAAAAAAA=="); if (s=="gmail") return getNotificationImage(); if (s=="google home") return atob("GBiCAAAAAAAAAAAAAAAAAAAAAoAAAAAACqAAAAAAKqwAAAAAqroAAAACquqAAAAKq+qgAAAqr/qoAACqv/6qAAKq//+qgA6r///qsAqr///6sAqv///6sAqv///6sAqv///6sA6v///6sA6v///qsA6qqqqqsA6qqqqqsA6qqqqqsAP7///vwAAAAAAAAAAAAAAAAA=="); @@ -114,6 +115,7 @@ function getMessageImageCol(msg,def) { "facebook": "#4267b2", "gmail": "#ea4335", "google home": "#fbbc05", + "home assistant": "#fff", // ha-blue is #41bdf5, but that's the background "hangouts": "#1ba261", "instagram": "#dd2a7b", "messenger": "#0078ff", diff --git a/apps/messages/metadata.json b/apps/messages/metadata.json index 6834693ae..e84d9f0d9 100644 --- a/apps/messages/metadata.json +++ b/apps/messages/metadata.json @@ -1,7 +1,7 @@ { "id": "messages", "name": "Messages", - "version": "0.21", + "version": "0.22", "description": "App to display notifications from iOS and Gadgetbridge", "icon": "app.png", "type": "app", From c130fa05d1bda5471239d46cc069863abfc5ec4f Mon Sep 17 00:00:00 2001 From: Richard de Boer Date: Sat, 19 Feb 2022 21:24:35 +0100 Subject: [PATCH 2/3] messages: fix ChangeLog typo --- apps/messages/ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/messages/ChangeLog b/apps/messages/ChangeLog index 1290ad089..6b967d566 100644 --- a/apps/messages/ChangeLog +++ b/apps/messages/ChangeLog @@ -15,7 +15,7 @@ 0.10: Respect the 'new' attribute if it was set from iOS integrations 0.11: Open app when touching the widget (Bangle.js 2 only) 0.12: Extra app-specific notification icons - New animated notifcationicon (instead of large blinking 'MESSAGES') + New animated notification icon (instead of large blinking 'MESSAGES') Added screenshots 0.13: Add /*LANG*/ comments for internationalisation Add 'Delete All' option to message options From b77578333337250e21133a46bbd83388f2f11e52 Mon Sep 17 00:00:00 2001 From: David Peer Date: Mon, 21 Feb 2022 19:19:08 +0100 Subject: [PATCH 3/3] Bugfix: Ensure that widgets are always hidden in fulscreen mode. --- apps/neonx/ChangeLog | 3 ++- apps/neonx/metadata.json | 2 +- apps/neonx/neonx.app.js | 28 +++++++++++++++------------- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/apps/neonx/ChangeLog b/apps/neonx/ChangeLog index 968d6d629..2e815a449 100644 --- a/apps/neonx/ChangeLog +++ b/apps/neonx/ChangeLog @@ -1,3 +1,4 @@ 0.01: Initial release 0.02: Optional fullscreen mode -0.03: Optional show lock status via color \ No newline at end of file +0.03: Optional show lock status via color +0.04: Ensure that widgets are always hidden in fullscreen mode \ No newline at end of file diff --git a/apps/neonx/metadata.json b/apps/neonx/metadata.json index 4ac7c4cea..840e5b82e 100644 --- a/apps/neonx/metadata.json +++ b/apps/neonx/metadata.json @@ -2,7 +2,7 @@ "id": "neonx", "name": "Neon X & IO X Clock", "shortName": "Neon X Clock", - "version": "0.03", + "version": "0.04", "description": "Pebble Neon X & Neon IO X for Bangle.js", "icon": "neonx.png", "type": "clock", diff --git a/apps/neonx/neonx.app.js b/apps/neonx/neonx.app.js index 6a8b933e5..4b9231b0e 100644 --- a/apps/neonx/neonx.app.js +++ b/apps/neonx/neonx.app.js @@ -74,6 +74,12 @@ function drawLine(poly, thickness){ function drawClock(num){ let tx, ty; + if(settings.fullscreen){ + g.clearRect(0,0,screenWidth,screenHeight); + } else { + g.clearRect(0,24,240,240); + } + for (let x = 0; x <= 1; x++) { for (let y = 0; y <= 1; y++) { const current = ((y + 1) * 2 + x - 1); @@ -106,6 +112,14 @@ function drawClock(num){ function draw(date){ queueDraw(); + // Depending on the settings, we clear all widgets or draw those. + if(settings.fullscreen){ + for (let wd of WIDGETS) {wd.draw=()=>{};wd.area="";} + } else { + Bangle.drawWidgets(); + } + + // Now lets draw the time/date let d = new Date(); let l1, l2; @@ -126,12 +140,6 @@ function draw(date){ l2 = ('0' + d.getMinutes()).substr(-2); } - if(settings.fullscreen){ - g.clearRect(0,0,screenWidth,screenHeight); - } else { - g.clearRect(0,24,240,240); - } - drawClock([l1, l2]); } @@ -175,12 +183,6 @@ Bangle.on('lock', function(isLocked) { */ g.clear(1); Bangle.setUI("clock"); -draw(); - Bangle.loadWidgets(); -if(settings.fullscreen){ - for (let wd of WIDGETS) {wd.draw=()=>{};wd.area="";} -} else { - Bangle.drawWidgets(); -} \ No newline at end of file +draw(); \ No newline at end of file