diff --git a/apps/dutchclock/ChangeLog b/apps/dutchclock/ChangeLog index b8e2bfeb9..ebb8e9a25 100644 --- a/apps/dutchclock/ChangeLog +++ b/apps/dutchclock/ChangeLog @@ -1 +1,2 @@ -0.12: First release \ No newline at end of file +0.12: First release +0.13: Fix widgets reappearing \ No newline at end of file diff --git a/apps/dutchclock/app.js b/apps/dutchclock/app.js index 9523a360c..921f73401 100644 --- a/apps/dutchclock/app.js +++ b/apps/dutchclock/app.js @@ -1,5 +1,6 @@ const storage = require("Storage"); const locale = require('locale'); +const widget_utils = require('widget_utils'); const SCREEN_WIDTH = g.getWidth(); const SCREEN_HEIGHT = g.getHeight(); @@ -46,14 +47,12 @@ const Y = SCREEN_HEIGHT / 2 let date, mins; function initialize() { + // Load widgets + Bangle.loadWidgets(); + // draw immediately at first tick(); -// for (let mm = 0; mm < 60; mm++) { -// console.log(23, mm); -// console.log(getTimeLines(23 * 60 + mm)); -// } - // now check every second let secondInterval = setInterval(tick, 1000); // Stop updates when LCD is off, restart when on @@ -76,6 +75,10 @@ function tick() { mins = m; draw(); } + + if (!settings.showWidgets) { + widget_utils.hide(); + } } function draw() { @@ -106,9 +109,9 @@ function draw() { Bangle.setUI("clock"); if (settings.showWidgets) { - // Load widgets - Bangle.loadWidgets(); Bangle.drawWidgets(); + } else { + widget_utils.hide(); } } diff --git a/apps/dutchclock/metadata.json b/apps/dutchclock/metadata.json index 7fa9e9148..cec484219 100644 --- a/apps/dutchclock/metadata.json +++ b/apps/dutchclock/metadata.json @@ -3,7 +3,7 @@ "name": "Dutch Clock", "shortName":"Dutch Clock", "icon": "app.png", - "version":"0.12", + "version":"0.13", "description": "A clock that displays the time the way a Dutch person would respond when asked what time it is.", "type": "clock", "tags": "clock,dutch,text",