From 11e34f73b4450c695f5567da329030c1e7301fdd Mon Sep 17 00:00:00 2001 From: thyttan <6uuxstm66@mozmail.com⁩> Date: Wed, 7 Sep 2022 01:09:46 +0200 Subject: [PATCH] Clock apps tell clock widgets to hide #7 --- apps/simple_clock/ChangeLog | 1 + apps/simple_clock/app.js | 4 +-- apps/simple_clock/metadata.json | 2 +- apps/stardateclock/ChangeLog | 1 + apps/stardateclock/app.js | 4 +-- apps/stardateclock/metadata.json | 2 +- apps/verticalface/ChangeLog | 1 + apps/verticalface/app.js | 44 ++++++++++++++++---------------- apps/verticalface/metadata.json | 2 +- apps/wclock/ChangeLog | 1 + apps/wclock/clock-word.js | 6 ++--- apps/wclock/metadata.json | 2 +- 12 files changed, 37 insertions(+), 33 deletions(-) diff --git a/apps/simple_clock/ChangeLog b/apps/simple_clock/ChangeLog index 84e7affed..9d55c1a91 100644 --- a/apps/simple_clock/ChangeLog +++ b/apps/simple_clock/ChangeLog @@ -1,2 +1,3 @@ ... 0.02: First update with ChangeLog Added +0.03: Tell clock widgets to hide. diff --git a/apps/simple_clock/app.js b/apps/simple_clock/app.js index 3c1843cb0..9f679beb2 100644 --- a/apps/simple_clock/app.js +++ b/apps/simple_clock/app.js @@ -225,6 +225,6 @@ } }); - Bangle.loadWidgets(); - Bangle.setUI('clock'); + + Bangle.loadWidgets(); diff --git a/apps/simple_clock/metadata.json b/apps/simple_clock/metadata.json index ccec0bfbc..512bcd674 100644 --- a/apps/simple_clock/metadata.json +++ b/apps/simple_clock/metadata.json @@ -1,7 +1,7 @@ { "id": "simple_clock", "name": "Simple Analog Clock", "shortName":"Simple Clock", - "version":"0.02", + "version":"0.03", "description": "a simple, yet stylish, analog clock", "icon": "app-icon.png", "type": "clock", diff --git a/apps/stardateclock/ChangeLog b/apps/stardateclock/ChangeLog index 1b1719352..bb6430b65 100644 --- a/apps/stardateclock/ChangeLog +++ b/apps/stardateclock/ChangeLog @@ -1,2 +1,3 @@ 0.01: Initial release on the app repository for Bangle.js 1 and 2 0.02: Fixed let/const usage while using firmware version >=2v14 +0.03: Tell clock widgets to hide. diff --git a/apps/stardateclock/app.js b/apps/stardateclock/app.js index cdc730970..adf2c14c7 100644 --- a/apps/stardateclock/app.js +++ b/apps/stardateclock/app.js @@ -334,10 +334,10 @@ updateStardate(); updateConventionalTime(); // Make sure widgets can be shown. //g.setColor("#FF0000"); g.fillRect(0, 0, g.getWidth(), widgetsHeight); // debug -Bangle.loadWidgets(); -Bangle.drawWidgets(); // Show launcher on button press as usual for a clock face Bangle.setUI("clock", Bangle.showLauncher); +Bangle.loadWidgets(); +Bangle.drawWidgets(); // Stop updates when LCD is off, restart when on Bangle.on('lcdPower', on => { if (on) { diff --git a/apps/stardateclock/metadata.json b/apps/stardateclock/metadata.json index 9569d3a53..d27b14512 100644 --- a/apps/stardateclock/metadata.json +++ b/apps/stardateclock/metadata.json @@ -3,7 +3,7 @@ "name":"Stardate Clock", "shortName":"Stardate Clock", "description": "A clock displaying a stardate along with a 'standard' digital/analog clock in LCARS design", - "version":"0.02", + "version":"0.03", "icon": "app.png", "type":"clock", "tags": "clock", diff --git a/apps/verticalface/ChangeLog b/apps/verticalface/ChangeLog index 99ab68ec4..dc6c11eab 100644 --- a/apps/verticalface/ChangeLog +++ b/apps/verticalface/ChangeLog @@ -4,3 +4,4 @@ 0.07: Added leading zero to hours and minutes 0.08: Show step count by calling wpedom.getSteps() or activepedom.getSteps() 0.09: Fix time when minutes<10 and hours>9 (fix #767) +0.10: Tell clock widgets to hide. diff --git a/apps/verticalface/app.js b/apps/verticalface/app.js index 4fcae5642..178481047 100644 --- a/apps/verticalface/app.js +++ b/apps/verticalface/app.js @@ -97,6 +97,28 @@ function drawBattery() { // Clear the screen once, at startup g.clear(); +// Show launcher when button pressed +Bangle.setUI("clockupdown", btn=>{ + if (btn!=0) return; + //HRM Controller. + if(!HRMstate){ + //console.log("Toggled HRM"); + //Turn on. + Bangle.buzz(); + Bangle.setHRMPower(1); + currentHRM = "CALC"; + HRMstate = true; + } else if(HRMstate){ + //console.log("Toggled HRM"); + //Turn off. + Bangle.buzz(); + Bangle.setHRMPower(0); + HRMstate = false; + currentHRM = []; + } + drawBPM(HRMstate); +}); + // Load and draw widgets Bangle.loadWidgets(); Bangle.drawWidgets(); @@ -128,28 +150,6 @@ Bangle.on('lcdPower',on=>{ } }); -// Show launcher when button pressed -Bangle.setUI("clockupdown", btn=>{ - if (btn!=0) return; - //HRM Controller. - if(!HRMstate){ - //console.log("Toggled HRM"); - //Turn on. - Bangle.buzz(); - Bangle.setHRMPower(1); - currentHRM = "CALC"; - HRMstate = true; - } else if(HRMstate){ - //console.log("Toggled HRM"); - //Turn off. - Bangle.buzz(); - Bangle.setHRMPower(0); - HRMstate = false; - currentHRM = []; - } - drawBPM(HRMstate); -}); - Bangle.on('touch', function(button) { if(button == 1 || button == 2){ Bangle.showLauncher(); diff --git a/apps/verticalface/metadata.json b/apps/verticalface/metadata.json index da41b3f0d..273070022 100644 --- a/apps/verticalface/metadata.json +++ b/apps/verticalface/metadata.json @@ -2,7 +2,7 @@ "id": "verticalface", "name": "Vertical watch face", "shortName": "Vertical Face", - "version": "0.09", + "version": "0.10", "description": "A simple vertical watch face with the date. Heart rate monitor is toggled with BTN1", "icon": "app.png", "type": "clock", diff --git a/apps/wclock/ChangeLog b/apps/wclock/ChangeLog index 9a2ebdd5f..e50ee6842 100644 --- a/apps/wclock/ChangeLog +++ b/apps/wclock/ChangeLog @@ -1,2 +1,3 @@ 0.02: Modified for use with new bootloader and firmware 0.03: setUI and support for different screens +0.04: Tell clock widgets to hide. diff --git a/apps/wclock/clock-word.js b/apps/wclock/clock-word.js index aff134273..7ddb7bc35 100644 --- a/apps/wclock/clock-word.js +++ b/apps/wclock/clock-word.js @@ -122,11 +122,11 @@ Bangle.on('lcdPower', function(on) { if (on) drawWordClock(); }); +// Show launcher when button pressed +Bangle.setUI("clock"); + g.clear(); Bangle.loadWidgets(); Bangle.drawWidgets(); setInterval(drawWordClock, 1E4); drawWordClock(); - -// Show launcher when button pressed -Bangle.setUI("clock"); diff --git a/apps/wclock/metadata.json b/apps/wclock/metadata.json index f22b53dc1..820af7ac0 100644 --- a/apps/wclock/metadata.json +++ b/apps/wclock/metadata.json @@ -1,7 +1,7 @@ { "id": "wclock", "name": "Word Clock", - "version": "0.03", + "version": "0.04", "description": "Display Time as Text", "icon": "clock-word.png", "screenshots": [{"url":"screenshot_word.png"}],