From 0d2093a134000a5aa8ac35041376bf891d0bcd9b Mon Sep 17 00:00:00 2001 From: thyttan <6uuxstm66@mozmail.com⁩> Date: Tue, 6 Sep 2022 20:56:43 +0200 Subject: [PATCH] Clock app tell clock widgets to hide #3 --- apps/ftclock/ChangeLog | 1 + apps/ftclock/app.js | 5 +++-- apps/ftclock/metadata.json | 2 +- apps/gallifr/ChangeLog | 1 + apps/gallifr/app.js | 6 ++++-- apps/gallifr/metadata.json | 2 +- apps/geissclk/ChangeLog | 1 + apps/geissclk/clock.js | 8 +++++--- apps/geissclk/metadata.json | 2 +- apps/glbasic/ChangeLog | 1 + apps/glbasic/glbasic.app.js | 3 ++- apps/glbasic/metadata.json | 2 +- apps/imgclock/ChangeLog | 1 + apps/imgclock/app.js | 5 +++-- apps/imgclock/metadata.json | 2 +- apps/impwclock/ChangeLog | 1 + apps/impwclock/clock-impword.js | 6 ++++-- apps/impwclock/metadata.json | 2 +- apps/isoclock/ChangeLog | 1 + apps/isoclock/isoclock.js | 6 +++--- apps/isoclock/metadata.json | 2 +- 21 files changed, 38 insertions(+), 22 deletions(-) diff --git a/apps/ftclock/ChangeLog b/apps/ftclock/ChangeLog index 83ec21ee6..c30dae69f 100644 --- a/apps/ftclock/ChangeLog +++ b/apps/ftclock/ChangeLog @@ -1,3 +1,4 @@ 0.01: first release 0.02: RAM efficient version of `fourTwentyTz.js` (as suggested by @gfwilliams). 0.03: `mkFourTwentyTz.js` now handles new timezonedb.com CSV format +0.04: Tell clock widgets to hide. diff --git a/apps/ftclock/app.js b/apps/ftclock/app.js index b12db10f1..4f2cef895 100644 --- a/apps/ftclock/app.js +++ b/apps/ftclock/app.js @@ -33,6 +33,8 @@ function draw() { // Clear the screen once, at startup g.clear(); +// Show launcher when middle button pressed +Bangle.setUI("clock"); // Load widgets Bangle.loadWidgets(); Bangle.drawWidgets(); @@ -47,5 +49,4 @@ Bangle.on('lcdPower',on=>{ drawTimeout = undefined; } }); -// Show launcher when middle button pressed -Bangle.setUI("clock"); + diff --git a/apps/ftclock/metadata.json b/apps/ftclock/metadata.json index 876feb1bb..96a4f84b9 100644 --- a/apps/ftclock/metadata.json +++ b/apps/ftclock/metadata.json @@ -1,7 +1,7 @@ { "id": "ftclock", "name": "Four Twenty Clock", - "version": "0.03", + "version": "0.04", "description": "A clock that tells when and where it's going to be 4:20 next", "icon": "app.png", "screenshots": [{"url":"screenshot.png"}, {"url":"screenshot1.png"}], diff --git a/apps/gallifr/ChangeLog b/apps/gallifr/ChangeLog index 0e1f45042..32c1057b0 100644 --- a/apps/gallifr/ChangeLog +++ b/apps/gallifr/ChangeLog @@ -1,2 +1,3 @@ 0.01: First released version 0.02: Changed setWatch to Bangle.setUI +0.03: Tell clock widgets to hide. diff --git a/apps/gallifr/app.js b/apps/gallifr/app.js index d327bcdc1..8468eee48 100644 --- a/apps/gallifr/app.js +++ b/apps/gallifr/app.js @@ -238,10 +238,12 @@ Bangle.on('lcdPower', (on) => { } }); +// Show launcher when button pressed +Bangle.setUI("clock"); + g.clear(); startTimers(); Bangle.loadWidgets(); drawAll(); -// Show launcher when button pressed -Bangle.setUI("clock"); + diff --git a/apps/gallifr/metadata.json b/apps/gallifr/metadata.json index 9ce7d7f97..96fe243ed 100644 --- a/apps/gallifr/metadata.json +++ b/apps/gallifr/metadata.json @@ -2,7 +2,7 @@ "id": "gallifr", "name": "Time Traveller's Chronometer", "shortName": "Time Travel Clock", - "version": "0.02", + "version": "0.03", "description": "A clock for time travellers. The light pie segment shows the minutes, the black circle, the hour. The dial itself reads 'time' just in case you forget.", "icon": "gallifr.png", "screenshots": [{"url":"screenshot_time.png"}], diff --git a/apps/geissclk/ChangeLog b/apps/geissclk/ChangeLog index 7458fadee..cd46173f7 100644 --- a/apps/geissclk/ChangeLog +++ b/apps/geissclk/ChangeLog @@ -1,3 +1,4 @@ 0.01: New App! 0.02: BTN2->launcher, use smaller text to allow "20:00" to fit on screen 0.03: Changed setWatch to Bangle.setUI +0.04: Tell clock widgets to hide. diff --git a/apps/geissclk/clock.js b/apps/geissclk/clock.js index f14ea5f39..5401fb142 100644 --- a/apps/geissclk/clock.js +++ b/apps/geissclk/clock.js @@ -142,11 +142,13 @@ Bangle.on('lcdPower',function(on) { animInterval = setInterval(iterate, 50); } }); -g.clear(); + +// Show launcher when button pressed +Bangle.setUI("clock");g.clear(); + Bangle.loadWidgets(); Bangle.drawWidgets(); iterate(); animInterval = setInterval(iterate, 50); -// Show launcher when button pressed -Bangle.setUI("clock"); + diff --git a/apps/geissclk/metadata.json b/apps/geissclk/metadata.json index 456854dbd..68bd2a970 100644 --- a/apps/geissclk/metadata.json +++ b/apps/geissclk/metadata.json @@ -1,7 +1,7 @@ { "id": "geissclk", "name": "Geiss Clock", - "version": "0.03", + "version": "0.04", "description": "7 segment clock with animated background in the style of Ryan Geiss' music visualisation. NOTE: The first run will take ~1 minute to do some precalculation", "icon": "clock.png", "type": "clock", diff --git a/apps/glbasic/ChangeLog b/apps/glbasic/ChangeLog index 89aee01f8..d97fd44d5 100644 --- a/apps/glbasic/ChangeLog +++ b/apps/glbasic/ChangeLog @@ -1,2 +1,3 @@ 0.20: New App! +0.21: Tell clock widgets to hide. diff --git a/apps/glbasic/glbasic.app.js b/apps/glbasic/glbasic.app.js index ff7837ada..c1f82f74c 100644 --- a/apps/glbasic/glbasic.app.js +++ b/apps/glbasic/glbasic.app.js @@ -178,6 +178,8 @@ function draw() { //////////////////////////////////////////////////// // Bangle.setBarometerPower(true); +Bangle.setUI("clock"); + Bangle.loadWidgets(); draw(); @@ -197,6 +199,5 @@ Bangle.on('lcdPower', on => { } }); -Bangle.setUI("clock"); Bangle.drawWidgets(); diff --git a/apps/glbasic/metadata.json b/apps/glbasic/metadata.json index 7c79097da..6d4c562a3 100644 --- a/apps/glbasic/metadata.json +++ b/apps/glbasic/metadata.json @@ -2,7 +2,7 @@ "id": "glbasic", "name": "GLBasic Clock", "shortName": "GLBasic", - "version": "0.20", + "version": "0.21", "description": "A clock with large numbers", "dependencies": {"widpedom":"app"}, "icon": "icon48.png", diff --git a/apps/imgclock/ChangeLog b/apps/imgclock/ChangeLog index 29eec7606..0895bb66d 100644 --- a/apps/imgclock/ChangeLog +++ b/apps/imgclock/ChangeLog @@ -8,3 +8,4 @@ 0.07: Don't cut off wide date formats 0.08: Use Bangle.setUI for button/launcher handling 0.09: Bangle.js 2 compatibility +0.10: Tell clock widgets to hide. diff --git a/apps/imgclock/app.js b/apps/imgclock/app.js index aff47061b..7d74bee82 100644 --- a/apps/imgclock/app.js +++ b/apps/imgclock/app.js @@ -72,6 +72,8 @@ g.drawImage(img, 0,OY,bgoptions); // draw clock itself and do it every second draw(); var secondInterval = setInterval(draw,1000); +// Show launcher when button pressed +Bangle.setUI("clock"); // load widgets Bangle.loadWidgets(); Bangle.drawWidgets(); @@ -84,5 +86,4 @@ Bangle.on('lcdPower',on=>{ draw(); } }); -// Show launcher when button pressed -Bangle.setUI("clock"); + diff --git a/apps/imgclock/metadata.json b/apps/imgclock/metadata.json index 9fa1d64c7..94dff5f17 100644 --- a/apps/imgclock/metadata.json +++ b/apps/imgclock/metadata.json @@ -2,7 +2,7 @@ "id": "imgclock", "name": "Image background clock", "shortName": "Image Clock", - "version": "0.09", + "version": "0.10", "description": "A clock with an image as a background", "icon": "app.png", "type": "clock", diff --git a/apps/impwclock/ChangeLog b/apps/impwclock/ChangeLog index 6555fcc8f..0af7c99d6 100644 --- a/apps/impwclock/ChangeLog +++ b/apps/impwclock/ChangeLog @@ -3,3 +3,4 @@ 0.03: Move to Bangle.setUI to launcher support 0.04: Tweaks for compatibility with BangleJS2 0.05: Time-word now readable on Bangle.js 2 +0.06: Tell clock widgets to hide. diff --git a/apps/impwclock/clock-impword.js b/apps/impwclock/clock-impword.js index c42dbda44..04421017b 100644 --- a/apps/impwclock/clock-impword.js +++ b/apps/impwclock/clock-impword.js @@ -154,6 +154,9 @@ Bangle.on('lcdPower', function(on) { if (on) drawWordClock(); }); +// Show launcher when button pressed +Bangle.setUI("clock"); + g.clear(); Bangle.loadWidgets(); Bangle.drawWidgets(); @@ -172,5 +175,4 @@ Bangle.on('touch',e=>{ } }); -// Show launcher when button pressed -Bangle.setUI("clock"); + diff --git a/apps/impwclock/metadata.json b/apps/impwclock/metadata.json index 733dbb957..1b92ea3ae 100644 --- a/apps/impwclock/metadata.json +++ b/apps/impwclock/metadata.json @@ -1,7 +1,7 @@ { "id": "impwclock", "name": "Imprecise Word Clock", - "version": "0.05", + "version": "0.06", "description": "Imprecise word clock for vacations, weekends, and those who never need accurate time.", "icon": "clock-impword.png", "type": "clock", diff --git a/apps/isoclock/ChangeLog b/apps/isoclock/ChangeLog index 809091ce4..7b57ecfa9 100644 --- a/apps/isoclock/ChangeLog +++ b/apps/isoclock/ChangeLog @@ -1,2 +1,3 @@ 0.01: Created app based on digiclock with some small tweaks. 0.02: Swap to Bangle.setUI for launcher/buttons +0.03: Tell clock widgets to hide. diff --git a/apps/isoclock/isoclock.js b/apps/isoclock/isoclock.js index 59f28e66e..7526660b9 100644 --- a/apps/isoclock/isoclock.js +++ b/apps/isoclock/isoclock.js @@ -89,8 +89,8 @@ Bangle.on('lcdPower',on=>{ } }); -Bangle.loadWidgets(); -Bangle.drawWidgets(); - // Show launcher when button pressed Bangle.setUI("clock"); + +Bangle.loadWidgets(); +Bangle.drawWidgets(); diff --git a/apps/isoclock/metadata.json b/apps/isoclock/metadata.json index 313153dde..488afcb41 100644 --- a/apps/isoclock/metadata.json +++ b/apps/isoclock/metadata.json @@ -2,7 +2,7 @@ "id": "isoclock", "name": "ISO Compliant Clock Face", "shortName": "ISO Clock", - "version": "0.02", + "version": "0.03", "description": "Tweaked fork of digiclock for ISO date and time", "icon": "isoclock.png", "type": "clock",