From c21ea99724bcfab50d0b6b593f28c329ef59ad6c Mon Sep 17 00:00:00 2001 From: Paul Spenke Date: Sat, 20 Jan 2024 19:48:33 +0100 Subject: [PATCH] Refactor settings in line_clock app The `settings` object has been renamed to `initialSettings` for better clarity as these values represent the initial, default settings. Also, the code to remove the clock UI has been commented out, possibly signaling future work on applying the Fast Load system, but this needs to be confirmed. Lastly, calling settings to draw locking and minute indicators has been updated to call the renamed `initialSettings` object. --- apps/line_clock/app.js | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/apps/line_clock/app.js b/apps/line_clock/app.js index 67ad742f5..eadc46fad 100644 --- a/apps/line_clock/app.js +++ b/apps/line_clock/app.js @@ -13,14 +13,14 @@ const storage = require('Storage'); const SETTINGS_FILE = "line_clock.setting.json"; -let settings = { +let initialSettings = { showLock: true, showMinute: true, }; -let saved_settings = storage.readJSON(SETTINGS_FILE, 1) || settings; +let saved_settings = storage.readJSON(SETTINGS_FILE, 1) || initialSettings; for (const key in saved_settings) { - settings[key] = saved_settings[key]; + initialSettings[key] = saved_settings[key]; } let gWidth = g.getWidth(), gCenterX = gWidth/2; @@ -237,11 +237,12 @@ Bangle.on('lock', lockListenerBw); Bangle.setUI({ mode : "clock", - remove : function() { - Bangle.removeListener('lock', lockListenerBw); - if (drawTimeout) clearTimeout(drawTimeout); - drawTimeout = undefined; - } + // TODO implement https://www.espruino.com/Bangle.js+Fast+Load + // remove : function() { + // Bangle.removeListener('lock', lockListenerBw); + // if (drawTimeout) clearTimeout(drawTimeout); + // drawTimeout = undefined; + // } }); /** @@ -266,7 +267,7 @@ function draw() { g.setColor(g.theme.bg); g.fillRect(0, 0, gWidth, gHeight); - if(settings.showLock && Bangle.isLocked()){ + if(initialSettings.showLock && Bangle.isLocked()){ g.setColor(g.theme.fg); g.drawImage(imgLock(), gWidth-16, 2); } @@ -278,7 +279,7 @@ function draw() { drawHand(); - if(settings.showMinute){ + if(initialSettings.showMinute){ drawNumber(currentMinute); } }