From 31ced9ea24cfc052bb9d21864a8fdbb494ee4f4e Mon Sep 17 00:00:00 2001 From: Marco H Date: Tue, 25 Oct 2022 08:11:19 +0200 Subject: [PATCH 1/7] Support to show big weather info --- apps/circlesclock/ChangeLog | 1 + apps/circlesclock/README.md | 3 +- apps/circlesclock/app.js | 58 +++++++++++++++++++++++---------- apps/circlesclock/default.json | 3 +- apps/circlesclock/metadata.json | 2 +- apps/circlesclock/settings.js | 5 +++ 6 files changed, 52 insertions(+), 20 deletions(-) diff --git a/apps/circlesclock/ChangeLog b/apps/circlesclock/ChangeLog index c398a89b6..d74badcad 100644 --- a/apps/circlesclock/ChangeLog +++ b/apps/circlesclock/ChangeLog @@ -26,3 +26,4 @@ 0.12: Allow configuration of update interval 0.13: Load step goal from Bangle health app as fallback Memory optimizations +0.14: Support to show big weather info diff --git a/apps/circlesclock/README.md b/apps/circlesclock/README.md index aa429d5ec..160cacbec 100644 --- a/apps/circlesclock/README.md +++ b/apps/circlesclock/README.md @@ -35,4 +35,5 @@ The color of each circle can be configured. The following colors are available: Marco ([myxor](https://github.com/myxor)) ## Icons -Icons taken from [materialdesignicons](https://materialdesignicons.com) under Apache License 2.0 +Most of the icons are taken from [materialdesignicons](https://materialdesignicons.com) under Apache License 2.0 except the big weather icons which are from +[icons8](https://icons8.com/icon/set/weather/small--static--black) diff --git a/apps/circlesclock/app.js b/apps/circlesclock/app.js index fc501a5d0..d4cb5069f 100644 --- a/apps/circlesclock/app.js +++ b/apps/circlesclock/app.js @@ -22,7 +22,7 @@ let settings = Object.assign( if (settings.stepGoal == undefined) { let d = storage.readJSON("health.json", true) || {}; settings.stepGoal = d != undefined && d.settings != undefined ? d.settings.stepGoal : undefined; - + if (settings.stepGoal == undefined) { d = storage.readJSON("wpedom.json", true) || {}; settings.stepGoal = d != undefined && d.settings != undefined ? d.settings.goal : 10000; @@ -39,6 +39,7 @@ let location = getLocation(); const showWidgets = settings.showWidgets || false; const circleCount = settings.circleCount || 3; +const showBigWeather = settings.showBigWeather || false; let hrtValue; let now = Math.round(new Date().getTime() / 1000); @@ -116,17 +117,40 @@ function draw() { // time g.setFontRobotoRegular50NumericOnly(); - g.setFontAlign(0, -1); g.setColor(colorFg); - g.drawString(locale.time(new Date(), 1), w / 2, h1 + 6); + if (!showBigWeather) { + g.setFontAlign(0, -1); + g.drawString(locale.time(new Date(), 1), w / 2, h1 + 6); + } + else { + g.setFontAlign(-1, -1); + g.drawString(locale.time(new Date(), 1), 5, h1 + 6); + } now = Math.round(new Date().getTime() / 1000); // date & dow g.setFontRobotoRegular21(); - g.setFontAlign(0, 0); - g.drawString(locale.date(new Date()), w / 2, h2); - g.drawString(locale.dow(new Date()), w / 2, h2 + dowOffset); - + if (!showBigWeather) { + g.setFontAlign(0, 0); + g.drawString(locale.date(new Date()), w / 2, h2); + g.drawString(locale.dow(new Date()), w / 2, h2 + dowOffset); + } else { + g.setFontAlign(-1, 0); + g.drawString(locale.date(new Date()), 5, h2); + g.drawString(locale.dow(new Date()), 5, h2 + dowOffset, 1); + } + + // weather + if (showBigWeather) { + const weather = getWeather(); + const tempString = weather ? locale.temp(weather.temp - 273.15) : undefined; + g.setFontAlign(1, 0); + if (tempString) g.drawString(tempString, w, h2 + dowOffset); + + const code = weather ? weather.code : -1; + g.drawImage(getWeatherIconByCode(code, true), w - 64, h1); + } + drawCircle(1); drawCircle(2); drawCircle(3); @@ -417,7 +441,6 @@ function drawWeather(w) { } } - function drawSunProgress(w) { if (!w) w = getCircleXPosition("sunprogress"); const percent = getSunProgress(); @@ -557,19 +580,20 @@ function windAsBeaufort(windInKmh) { * Choose weather icon to display based on weather conditition code * https://openweathermap.org/weather-conditions#Weather-Condition-Codes-2 */ -function getWeatherIconByCode(code) { +function getWeatherIconByCode(code, big) { const codeGroup = Math.round(code / 100); + if (big == undefined) big = false; // weather icons: - const weatherCloudy = atob("EBCBAAAAAAAAAAfgD/Af8H/4//7///////9//z/+AAAAAAAA"); - const weatherSunny = atob("EBCBAAAAAYAQCBAIA8AH4A/wb/YP8A/gB+ARiBAIAYABgAAA"); - const weatherMoon = atob("EBCBAAAAAYAP8B/4P/w//D/8f/5//j/8P/w//B/4D/ABgAAA"); - const weatherPartlyCloudy = atob("EBCBAAAAAAAYQAMAD8AIQBhoW+AOYBwwOBBgHGAGP/wf+AAA"); - const weatherRainy = atob("EBCBAAAAAYAH4AwwOBBgGEAOQAJBgjPOEkgGYAZgA8ABgAAA"); - const weatherPartlyRainy = atob("EBCBAAAAEEAQAAeADMAYaFvoTmAMMDgQIBxhhiGGG9wDwAGA"); - const weatherSnowy = atob("EBCBAAAAAAADwAGAEYg73C50BCAEIC50O9wRiAGAA8AAAAAA"); + const weatherCloudy = big ? atob("QEDBAP//wxgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AAAAAAAAB//gAAAAAAAP//gAAAAAAD///AAAAAAAf4H+AAAAAAD8AD8AAAAAAfgAH4AAAAAB8AAPwAAAAAPgAAf/AAAAB8AAA//AAAAHgAAB/+AAAAeAAAH/8AAAH4AAAIH4AAB/AAAAAHwAAf8AAAAAPgAD/wAAAAAeAAPwAAAAAB4AB8AAAAAADwAHgAAAAAAPAA+AAAAAAA8ADwAAAAAADwA/AAAAAAAPAH8AAAAAAA8A/wAAAAAAHwH4AAAAAAAfg+AAAAAAAAfHwAAAAAAAA+eAAAAAAAAB54AAAAAAAAHvAAAAAAAAAP8AAAAAAAAA/wAAAAAAAAD/AAAAAAAAAP8AAAAAAAAA/wAAAAAAAAD3gAAAAAAAAeeAAAAAAAAB58AAAAAAAAPj4AAAAAAAB8H4AAAAAAAfgP////////8Af////////gA////////8AAf//////+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==") : atob("EBCBAAAAAAAAAAfgD/Af8H/4//7///////9//z/+AAAAAAAA"); + const weatherSunny = big ? atob("QEDBAP//wxgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AAAAAAAAADwAAAAAAAAAPAAAAAAAAAA8AAAAAAAAADwAAAAAAAAAPAAAAAAAAAA8AAAAAAAwADwADAAAAHgAPAAeAAAAfAA8AD4AAAA+ADwAfAAAAB8APAD4AAAAD4B+AfAAAAAHw//D4AAAAAPv//fAAAAAAf///4AAAAAA/4H/AAAAAAB+AH4AAAAAAPgAHwAAAAAA8AAPAAAAAAHwAA+AAAAAAeAAB4AAAAAB4AAHgAAAAAPAAAPAAAA//8AAA//8AD//wAAD//wAP//AAAP//AA//8AAA//8AAADwAADwAAAAAHgAAeAAAAAAeAAB4AAAAAB8AAPgAAAAADwAA8AAAAAAPgAHwAAAAAAfgB+AAAAAAD/gf8AAAAAAf///4AAAAAD7//3wAAAAAfD/8PgAAAAD4B+AfAAAAAfADwA+AAAAD4APAB8AAAAfAA8AD4AAAB4ADwAHgAAADAAPAAMAAAAAAA8AAAAAAAAADwAAAAAAAAAPAAAAAAAAAA8AAAAAAAAADwAAAAAAAAAPAAAAAAAAAA8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==") : atob("EBCBAAAAAYAQCBAIA8AH4A/wb/YP8A/gB+ARiBAIAYABgAAA"); + const weatherMoon = big ? atob("QEDBAP//wxgAAAYAAAAPAAAAD4AAAA8AAAAPwAAADwAAAA/gAAAPAAAAB/APAP/wAAAH+A8A//AAAAf4DwD/8AAAB/wPAP/wAAAH/gAADwAAAAe+AAAPAAAAB54AAA8AAAAHngAADwAAAAePAAAAAAAAD48OAAAAAAAPDw+AAAAAAB8PD8AAAAAAHg8P4AAAAAA+DwPwAAAAAHwfAfgAAAAB+D4A/AAA8AfwfgB/8AD//+D+AD/8AP//wfgAH/4Af/8B8AAf/wB//APgAAgfgD+AA8AAAAfAH8AHwAAAA+AP8B+AAAAB4Af//4AAAAHgA///gAAAAPAA//8AAAAA8AAf/wAAAADwAAAAAAAAAPAAAAAAAAAA8AcAAAAAAADwD+AAAAAAAfAfgAAAAAAB+D4AAAAAAAB8fAAAAAAAAD54AAAAAAAAHngAAAAAAAAe8AAAAAAAAA/wAAAAAAAAD/AAAAAAAAAP8AAAAAAAAA/wAAAAAAAAD/AAAAAAAAAPeAAAAAAAAB54AAAAAAAAHnwAAAAAAAA+PgAAAAAAAHwfgAAAAAAB+A/////////wB////////+AD////////wAB///////4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==") : atob("EBCBAAAAAYAP8B/4P/w//D/8f/5//j/8P/w//B/4D/ABgAAA"); + const weatherPartlyCloudy = big ? atob("QEDBAP//wxgAAA8AAAAAAAAADwAAAAAAAAAPAAAAAAAAAA8AAAAAAAAADwAAAAAABwAPAA4AAAAHgA8AHgAAAAfADwA+AAAAA+AfgHwAAAAB8P/w+AAAAAD7//3wAAAAAH///+BAAAAAP+B/wOAAAAAfgB+B8AAAAD4AD8H4AAAAPAA/wPwAAAB8AH+Af/AAAHgA/AA//AAAeAH4AB/+AADwAfAAH/8A//AD4AAIH4D/8AfAAAAHwP/wB4AAAAPg//AHgAAAAeAA8B+AAAAB4AB4fwAAAADwAHn/AAAAAPAAff8AAAAA8AA/8AAAAADwAD/AAAAAAPAEH4AAAAAA8A4PgAAAAAHwHgcAAAAAAfg+AwAAAAAAfHwAAAAAAAA+eAAAAAAAAB54AAAAAAAAHvAAAAAAAAAP8AAAAAAAAA/wAAAAAAAAD/AAAAAAAAAP8AAAAAAAAA/wAAAAAAAAD3gAAAAAAAAeeAAAAAAAAB58AAAAAAAAPj4AAAAAAAB8H4AAAAAAAfgP////////8Af////////gA////////8AAf//////+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==") : atob("EBCBAAAAAAAYQAMAD8AIQBhoW+AOYBwwOBBgHGAGP/wf+AAA"); + const weatherRainy = big ? atob("QEDBAP//wxgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AAAAAAAAB//gAAAAAAAP//gAAAAAAD///AAAAAAAf4H+AAAAAAD8AD8AAAAAAfgAH4AAAAAB8AAPwAAAAAPgAAf/AAAAB8AAA//AAAAHgAAB/+AAAAeAAAH/8AAAH4AAAIH4AAB/AAAAAHwAAf8AAAAAPgAD/wAAAAAeAAPwAAAAAB4AB8AAAAAADwAHgAAAAAAPAA+AAAAAAA8ADwAAAAAADwA/AAAAAAAPAH8AAAAAAA8A/wAAAAAAHwH4APAA8AAfg+AA8ADwAAfHwADwAPAAA+eAAPAA8AAB54AAAAAAAAHvAAAAAAAAAP8AAAAAAAAA/wAAAAAAAAD/AADw8PDwAP8AAPDw8PAA/wAA8PDw8AD3gADw8PDwAeeAAAAAAAAB58AAAAAAAAPj4AAAAAAAB8H4AAAAAAAfgP/w8PDw8P8Af/Dw8PDw/gA/8PDw8PD8AAfw8PDw8OAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAPAAAAAAAPAA8AAAAAAA8ADwAAAAAADwAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==") : atob("EBCBAAAAAYAH4AwwOBBgGEAOQAJBgjPOEkgGYAZgA8ABgAAA"); + const weatherPartlyRainy = big ? atob("QEDBAP//wxgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AAAAAAAAB//gAAAAAAAP//gAAAAAAD///AAAAAAAf4H+AAAAAAD8AD8AAAAAAfgAH4AAAAAB8AAPwAAAAAPgAAf/AAAAB8AAA//AAAAHgAAB/+AAAAeAAAH/8AAAH4AAAIH4AAB/AAAAAHwAAf8AAAAAPgAD/wAAAAAeAAPwAAAAAB4AB8AAAAAADwAHgAAAAAAPAA+AAAAAAA8ADwAAAAAADwA/AAAAAAAPAH8AAAAAAA8A/wAAAAAAHwH4AAAA8AAfg+AAAADwAAfHwAAAAPAAA+eAAAAA8AAB54AAAADwAAHvAAAAAPAAAP8AAAAA8AAA/wAAAADwAAD/AAAA8PAAAP8AAADw8AAA/wAAAPDwAAD3gAAA8PAAAeeAAADw8AAB58AAAPDwAAPj4AAA8PAAB8H4AADw8AAfgP//8PDw//8Af//w8PD//gA///Dw8P/8AAf/8PDw/+AAAAAA8AAAAAAAAADwAAAAAAAAAPAAAAAAAAAA8AAAAAAAAADwAAAAAAAAAPAAAAAAAAAA8AAAAAAAAADwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==") : atob("EBCBAAAAEEAQAAeADMAYaFvoTmAMMDgQIBxhhiGGG9wDwAGA"); + const weatherSnowy = big ? atob("QEDBAP//wxgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AAAAAAAAB//gAAAAAAAP//gAAAAAAD///AAAAAAAf4H+AAAAAAD8AD8AAAAAAfgAH4AAAAAB8AAPwAAAAAPgAAf/AAAAB8AAA//AAAAHgAAB/+AAAAeAAAH/8AAAH4AAAIH4AAB/AAAAAHwAAf8AAAAAPgAD/wAAAAAeAAPwAAAAAB4AB8AAAAAADwAHgAAAAAAPAA+AAAAAAA8ADwAAAAAADwA/AAAAAAAPAH8AAAAAAA8A/wAAAAAAHwH4AAAADwAfg+AAAAAPAAfHwAAAAA8AA+eAAAAADwAB54AA8AD/8AHvAADwAP/wAP8AAPAA//AA/wAA8AD/8AD/AA//AA8AAP8AD/8ADwAA/wAP/wAPAAD3gA//AA8AAeeAAPAAAAAB58AA8AAAAAPj4ADwAAAAB8H4APAAAAAfgP/wAA8A//8Af/AADwD//gA/8AAPAP/8AAfwAA8A/+AAAAAA//AAAAAAAAD/8AAAAAAAAP/wAAAAAAAA//AAAAAAAAAPAAAAAAAAAA8AAAAAAAAADwAAAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==") : atob("EBCBAAAAAAADwAGAEYg73C50BCAEIC50O9wRiAGAA8AAAAAA"); const weatherFoggy = atob("EBCBAAAAAAADwAZgDDA4EGAcQAZAAgAAf74AAAAAd/4AAAAA"); - const weatherStormy = atob("EBCBAAAAAYAH4AwwOBBgGEAOQMJAgjmOGcgAgACAAAAAAAAA"); + const weatherStormy = big ? atob("QEDBAP//wxgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AAAAAAAAB//gAAAAAAAP//gAAAAAAD///AAAAAAAf4H+AAAAAAD8AD8AAAAAAfgAH4AAAAAB8AAPwAAAAAPgAAf/AAAAB8AAA//AAAAHgAAB/+AAAAeAAAH/8AAAH4AAAIH4AAB/AAAAAHwAAf8AAAAAPgAD/wAAAAAeAAPwAAAAAB4AB8AAAAAADwAHgAAAAAAPAA+AAAAAAA8ADwAAAAAADwA/AAAAAAAPAH8AAAAAAA8A/wAAAAAAHwH4AAAAAAAfg+AAAAAAAAfHwAAAAAAAA+eAAAAAAAAB54AAAAD/AAHvAAAAAf4AAP8AAAAB/gAA/wAAAAP8AAD/AAAAA/gAAP8AAAAH+AAA/wAAAAfwAAD3gAAAD/AAAeeAAAAP4AAB58AAAB/AAAPj4AAAH8AAB8H4AAA/gAAfgP//+D//D/8Af//4f/4P/gA///B//B/8AAf/8P/8P+AAAAAAAPgAAAAAAAAB8AAAAAAAAAHwAAAAAAAAA+AAAAAAAAADwAAAAAAAAAfAAAAAAAAAB4AAAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==") : atob("EBCBAAAAAYAH4AwwOBBgGEAOQMJAgjmOGcgAgACAAAAAAAAA"); switch (codeGroup) { case 2: diff --git a/apps/circlesclock/default.json b/apps/circlesclock/default.json index ea00dc347..6247c058c 100644 --- a/apps/circlesclock/default.json +++ b/apps/circlesclock/default.json @@ -22,5 +22,6 @@ "circle3colorizeIcon": true, "circle4colorizeIcon": false, "hrmValidity": 60, - "updateInterval": 60 + "updateInterval": 60, + "showBigWeather": false } diff --git a/apps/circlesclock/metadata.json b/apps/circlesclock/metadata.json index 837fcaa88..a1a291546 100644 --- a/apps/circlesclock/metadata.json +++ b/apps/circlesclock/metadata.json @@ -1,7 +1,7 @@ { "id": "circlesclock", "name": "Circles clock", "shortName":"Circles clock", - "version":"0.13", + "version":"0.14", "description": "A clock with three or four circles for different data at the bottom in a probably familiar style", "icon": "app.png", "screenshots": [{"url":"screenshot-dark.png"}, {"url":"screenshot-light.png"}, {"url":"screenshot-dark-4.png"}, {"url":"screenshot-light-4.png"}], diff --git a/apps/circlesclock/settings.js b/apps/circlesclock/settings.js index fb23f8d5e..349e3fdf2 100644 --- a/apps/circlesclock/settings.js +++ b/apps/circlesclock/settings.js @@ -68,6 +68,11 @@ return x + 's'; }, onchange: x => save('updateInterval', x), + }, + /*LANG*/'show big weather': { + value: settings[showBigWeather] || false, + format: () => (settings[showBigWeather] ? 'Yes' : 'No'), + onchange: x => save(showBigWeather, x), } }; E.showMenu(menu); From e0d86d60d89187234443ac5a7808e8814f0fa0ab Mon Sep 17 00:00:00 2001 From: Marco H Date: Tue, 25 Oct 2022 08:40:39 +0200 Subject: [PATCH 2/7] Fix settings and crash when no weather is available --- apps/circlesclock/app.js | 5 ++++- apps/circlesclock/settings.js | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/apps/circlesclock/app.js b/apps/circlesclock/app.js index d4cb5069f..1554b24ba 100644 --- a/apps/circlesclock/app.js +++ b/apps/circlesclock/app.js @@ -148,7 +148,10 @@ function draw() { if (tempString) g.drawString(tempString, w, h2 + dowOffset); const code = weather ? weather.code : -1; - g.drawImage(getWeatherIconByCode(code, true), w - 64, h1); + if (code > -1) { + const icon = getWeatherIconByCode(code, true); + if (icon) g.drawImage(icon, w - 48, h1, {scale:0.75}); + } } drawCircle(1); diff --git a/apps/circlesclock/settings.js b/apps/circlesclock/settings.js index 349e3fdf2..0aa8dc826 100644 --- a/apps/circlesclock/settings.js +++ b/apps/circlesclock/settings.js @@ -70,9 +70,9 @@ onchange: x => save('updateInterval', x), }, /*LANG*/'show big weather': { - value: settings[showBigWeather] || false, - format: () => (settings[showBigWeather] ? 'Yes' : 'No'), - onchange: x => save(showBigWeather, x), + value: !!settings.showBigWeather, + format: () => (settings.showBigWeather ? 'Yes' : 'No'), + onchange: x => save('showBigWeather', x), } }; E.showMenu(menu); From e553463fab186b13a947e822d7ad62732cd5271d Mon Sep 17 00:00:00 2001 From: Marco H Date: Tue, 25 Oct 2022 08:45:37 +0200 Subject: [PATCH 3/7] Fix position of temperature --- apps/circlesclock/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/circlesclock/app.js b/apps/circlesclock/app.js index 1554b24ba..7cd2ad0ec 100644 --- a/apps/circlesclock/app.js +++ b/apps/circlesclock/app.js @@ -145,7 +145,7 @@ function draw() { const weather = getWeather(); const tempString = weather ? locale.temp(weather.temp - 273.15) : undefined; g.setFontAlign(1, 0); - if (tempString) g.drawString(tempString, w, h2 + dowOffset); + if (tempString) g.drawString(tempString, w, h2); const code = weather ? weather.code : -1; if (code > -1) { From fc71c746d18f73fd07cd54f894546b650b441a9f Mon Sep 17 00:00:00 2001 From: Marco H Date: Tue, 25 Oct 2022 08:49:16 +0200 Subject: [PATCH 4/7] Update README --- apps/circlesclock/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/circlesclock/README.md b/apps/circlesclock/README.md index 160cacbec..0084da5fa 100644 --- a/apps/circlesclock/README.md +++ b/apps/circlesclock/README.md @@ -9,10 +9,11 @@ It can show the following information (this can be configured): * Steps distance * Heart rate (automatically updates when screen is on and unlocked) * Battery (including charging status and battery low warning) - * Weather (requires [weather app](https://banglejs.com/apps/#weather)) + * Weather (requires [OWM weather provider](https://banglejs.com/apps/?id=owmweather)) * Humidity or wind speed as circle progress * Temperature inside circle * Condition as icon below circle + * Big weather icon next to clock * Time and progress until next sunrise or sunset (requires [my location app](https://banglejs.com/apps/#mylocation)) * Temperature, air pressure or altitude from internal pressure sensor From 1be8c502f0aad79a74f19c4e361e972eb5738720 Mon Sep 17 00:00:00 2001 From: Marco H Date: Tue, 25 Oct 2022 08:59:25 +0200 Subject: [PATCH 5/7] Improve positioning with big weather enabled --- apps/circlesclock/app.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/circlesclock/app.js b/apps/circlesclock/app.js index 7cd2ad0ec..1f53eccf4 100644 --- a/apps/circlesclock/app.js +++ b/apps/circlesclock/app.js @@ -124,7 +124,7 @@ function draw() { } else { g.setFontAlign(-1, -1); - g.drawString(locale.time(new Date(), 1), 5, h1 + 6); + g.drawString(locale.time(new Date(), 1), 2, h1 + 6); } now = Math.round(new Date().getTime() / 1000); @@ -136,8 +136,8 @@ function draw() { g.drawString(locale.dow(new Date()), w / 2, h2 + dowOffset); } else { g.setFontAlign(-1, 0); - g.drawString(locale.date(new Date()), 5, h2); - g.drawString(locale.dow(new Date()), 5, h2 + dowOffset, 1); + g.drawString(locale.date(new Date()), 2, h2); + g.drawString(locale.dow(new Date()), 2, h2 + dowOffset, 1); } // weather From ee61b7200e0d65bfad7d3e6c6f843ded61f419c3 Mon Sep 17 00:00:00 2001 From: Marco H Date: Tue, 25 Oct 2022 11:50:03 +0200 Subject: [PATCH 6/7] Add missing icon --- apps/circlesclock/app.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/apps/circlesclock/app.js b/apps/circlesclock/app.js index 1f53eccf4..824445ff6 100644 --- a/apps/circlesclock/app.js +++ b/apps/circlesclock/app.js @@ -148,10 +148,8 @@ function draw() { if (tempString) g.drawString(tempString, w, h2); const code = weather ? weather.code : -1; - if (code > -1) { - const icon = getWeatherIconByCode(code, true); - if (icon) g.drawImage(icon, w - 48, h1, {scale:0.75}); - } + const icon = getWeatherIconByCode(code, true); + if (icon) g.drawImage(icon, w - 48, h1, {scale:0.75}); } drawCircle(1); @@ -595,9 +593,10 @@ function getWeatherIconByCode(code, big) { const weatherRainy = big ? atob("QEDBAP//wxgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AAAAAAAAB//gAAAAAAAP//gAAAAAAD///AAAAAAAf4H+AAAAAAD8AD8AAAAAAfgAH4AAAAAB8AAPwAAAAAPgAAf/AAAAB8AAA//AAAAHgAAB/+AAAAeAAAH/8AAAH4AAAIH4AAB/AAAAAHwAAf8AAAAAPgAD/wAAAAAeAAPwAAAAAB4AB8AAAAAADwAHgAAAAAAPAA+AAAAAAA8ADwAAAAAADwA/AAAAAAAPAH8AAAAAAA8A/wAAAAAAHwH4APAA8AAfg+AA8ADwAAfHwADwAPAAA+eAAPAA8AAB54AAAAAAAAHvAAAAAAAAAP8AAAAAAAAA/wAAAAAAAAD/AADw8PDwAP8AAPDw8PAA/wAA8PDw8AD3gADw8PDwAeeAAAAAAAAB58AAAAAAAAPj4AAAAAAAB8H4AAAAAAAfgP/w8PDw8P8Af/Dw8PDw/gA/8PDw8PD8AAfw8PDw8OAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAPAAAAAAAPAA8AAAAAAA8ADwAAAAAADwAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==") : atob("EBCBAAAAAYAH4AwwOBBgGEAOQAJBgjPOEkgGYAZgA8ABgAAA"); const weatherPartlyRainy = big ? atob("QEDBAP//wxgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AAAAAAAAB//gAAAAAAAP//gAAAAAAD///AAAAAAAf4H+AAAAAAD8AD8AAAAAAfgAH4AAAAAB8AAPwAAAAAPgAAf/AAAAB8AAA//AAAAHgAAB/+AAAAeAAAH/8AAAH4AAAIH4AAB/AAAAAHwAAf8AAAAAPgAD/wAAAAAeAAPwAAAAAB4AB8AAAAAADwAHgAAAAAAPAA+AAAAAAA8ADwAAAAAADwA/AAAAAAAPAH8AAAAAAA8A/wAAAAAAHwH4AAAA8AAfg+AAAADwAAfHwAAAAPAAA+eAAAAA8AAB54AAAADwAAHvAAAAAPAAAP8AAAAA8AAA/wAAAADwAAD/AAAA8PAAAP8AAADw8AAA/wAAAPDwAAD3gAAA8PAAAeeAAADw8AAB58AAAPDwAAPj4AAA8PAAB8H4AADw8AAfgP//8PDw//8Af//w8PD//gA///Dw8P/8AAf/8PDw/+AAAAAA8AAAAAAAAADwAAAAAAAAAPAAAAAAAAAA8AAAAAAAAADwAAAAAAAAAPAAAAAAAAAA8AAAAAAAAADwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==") : atob("EBCBAAAAEEAQAAeADMAYaFvoTmAMMDgQIBxhhiGGG9wDwAGA"); const weatherSnowy = big ? atob("QEDBAP//wxgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AAAAAAAAB//gAAAAAAAP//gAAAAAAD///AAAAAAAf4H+AAAAAAD8AD8AAAAAAfgAH4AAAAAB8AAPwAAAAAPgAAf/AAAAB8AAA//AAAAHgAAB/+AAAAeAAAH/8AAAH4AAAIH4AAB/AAAAAHwAAf8AAAAAPgAD/wAAAAAeAAPwAAAAAB4AB8AAAAAADwAHgAAAAAAPAA+AAAAAAA8ADwAAAAAADwA/AAAAAAAPAH8AAAAAAA8A/wAAAAAAHwH4AAAADwAfg+AAAAAPAAfHwAAAAA8AA+eAAAAADwAB54AA8AD/8AHvAADwAP/wAP8AAPAA//AA/wAA8AD/8AD/AA//AA8AAP8AD/8ADwAA/wAP/wAPAAD3gA//AA8AAeeAAPAAAAAB58AA8AAAAAPj4ADwAAAAB8H4APAAAAAfgP/wAA8A//8Af/AADwD//gA/8AAPAP/8AAfwAA8A/+AAAAAA//AAAAAAAAD/8AAAAAAAAP/wAAAAAAAA//AAAAAAAAAPAAAAAAAAAA8AAAAAAAAADwAAAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==") : atob("EBCBAAAAAAADwAGAEYg73C50BCAEIC50O9wRiAGAA8AAAAAA"); - const weatherFoggy = atob("EBCBAAAAAAADwAZgDDA4EGAcQAZAAgAAf74AAAAAd/4AAAAA"); + const weatherFoggy = big ? atob("QEDBAP//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AAAAAAAAADwAAAAAAAAAPAAAAAAAAAA8AAAAAAAAADwAAAAAAAAAPAAAAAAAAAA8AAAAAAAwADwADAAAAHgAPAAeAAAAfAA8AD4AAAA+ADwAfAAAAB8APAD4AAAAD4B+AfAAAAAHw//D4AAAAAPv//fAAAAAAf///4AAAAAA/4H/AAAAAAB+AH4AAAAAAPgAHwAAAAAA8AAPAAAAAAHwAA+AAAAAAeAAB4AAAAAB4AAHgAAAAAPAAAPAAAAAAAAAA//8AAAAAAAD//wAAAAAAAP//AAAAAAAA//8AD///AADwAAAP//8AAeAAAA///wAB4AAAD///AAPgAAAAAAAAA8AAAAAAAAAHwAAAAAAAAB+AAAAAAAAAf8AAAAD///D/4AAAAP//8P3wAAAA///w8PgAAAD///CAfAAAAAAAAAA+AAAAAAAAAB8AAAAAAAAAD4AAAAAAAAAHgAAP//8PAAMAAA///w8AAAAAD///DwAAAAAP//8PAAAAAAAAAA8AAAAAAAAADwAAAAAAAAAPAAAAAAAAAA8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==") : atob("EBCBAAAAAAADwAZgDDA4EGAcQAZAAgAAf74AAAAAd/4AAAAA"); const weatherStormy = big ? atob("QEDBAP//wxgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AAAAAAAAB//gAAAAAAAP//gAAAAAAD///AAAAAAAf4H+AAAAAAD8AD8AAAAAAfgAH4AAAAAB8AAPwAAAAAPgAAf/AAAAB8AAA//AAAAHgAAB/+AAAAeAAAH/8AAAH4AAAIH4AAB/AAAAAHwAAf8AAAAAPgAD/wAAAAAeAAPwAAAAAB4AB8AAAAAADwAHgAAAAAAPAA+AAAAAAA8ADwAAAAAADwA/AAAAAAAPAH8AAAAAAA8A/wAAAAAAHwH4AAAAAAAfg+AAAAAAAAfHwAAAAAAAA+eAAAAAAAAB54AAAAD/AAHvAAAAAf4AAP8AAAAB/gAA/wAAAAP8AAD/AAAAA/gAAP8AAAAH+AAA/wAAAAfwAAD3gAAAD/AAAeeAAAAP4AAB58AAAB/AAAPj4AAAH8AAB8H4AAA/gAAfgP//+D//D/8Af//4f/4P/gA///B//B/8AAf/8P/8P+AAAAAAAPgAAAAAAAAB8AAAAAAAAAHwAAAAAAAAA+AAAAAAAAADwAAAAAAAAAfAAAAAAAAAB4AAAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==") : atob("EBCBAAAAAYAH4AwwOBBgGEAOQMJAgjmOGcgAgACAAAAAAAAA"); - + const unknown = big ? atob("QEDBAP//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/wAAAAAAAAf/4AAAAAAAH//4AAAAAAA///wAAAAAAH+B/gAAAAAA/AA/AAAAAAH4AB+AAAAAA/AAD4AAAAAD4H4HwAAAAAfB/4PgAAAAB8P/weAAAAAHg//h4AAAAA+Hw+HwAAAAD4eB8PAAAAAP/wDw8AAAAA//APDwAAAAD/8A8PAAAAAH/gDw8AAAAAAAAfDwAAAAAAAH4fAAAAAAAB/B4AAAAAAAf4HgAAAAAAD/A+AAAAAAAfwHwAAAAAAD8A+AAAAAAAPgH4AAAAAAB8B/AAAAAAAHgf4AAAAAAA+H+AAAAAAADwfwAAAAAAAPD8AAAAAAAA8PAAAAAAAAD/8AAAAAAAAP/wAAAAAAAA//AAAAAAAAB/4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAf+AAAAAAAAD/8AAAAAAAAP/wAAAAAAAA//AAAAAAAADw8AAAAAAAAPDwAAAAAAAA8PAAAAAAAADw8AAAAAAAAP/wAAAAAAAA//AAAAAAAAD/8AAAAAAAAH/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==") : undefined; + switch (codeGroup) { case 2: return weatherStormy; @@ -634,7 +633,7 @@ function getWeatherIconByCode(code, big) { return weatherCloudy; } default: - return undefined; + return unknown; } } From 9a9f75b262626461ae9a061795336966e62fa9c0 Mon Sep 17 00:00:00 2001 From: Marco H Date: Tue, 25 Oct 2022 12:01:28 +0200 Subject: [PATCH 7/7] New screenshot with big weather --- apps/circlesclock/README.md | 2 ++ .../screenshot-light-with-big-weather.png | Bin 0 -> 4474 bytes 2 files changed, 2 insertions(+) create mode 100644 apps/circlesclock/screenshot-light-with-big-weather.png diff --git a/apps/circlesclock/README.md b/apps/circlesclock/README.md index 0084da5fa..8c8fbe4ae 100644 --- a/apps/circlesclock/README.md +++ b/apps/circlesclock/README.md @@ -28,6 +28,8 @@ The color of each circle can be configured. The following colors are available: ![Screenshot light theme](screenshot-light.png) ![Screenshot dark theme with four circles](screenshot-dark-4.png) ![Screenshot light theme with four circles](screenshot-light-4.png) +![Screenshot light theme with big weather enabled](screenshot-light-with-big-weather.png) + ## Ideas * Show compass heading diff --git a/apps/circlesclock/screenshot-light-with-big-weather.png b/apps/circlesclock/screenshot-light-with-big-weather.png new file mode 100644 index 0000000000000000000000000000000000000000..d1d569247ed490ed730675d6e1263140a40cb679 GIT binary patch literal 4474 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 M07*qoM6N<$f(^od0RR91 literal 0 HcmV?d00001