diff --git a/apps/fuzzyw/ChangeLog b/apps/fuzzyw/ChangeLog index 0e5b66949..206efb10f 100644 --- a/apps/fuzzyw/ChangeLog +++ b/apps/fuzzyw/ChangeLog @@ -1,2 +1,3 @@ 0.01: First release 0.02: Move translations to locale module (removed watch settings, now pick language in Bangle App Loader, More..., Settings) +0.03: Change for fast loading, use widget_utils to hide widgets \ No newline at end of file diff --git a/apps/fuzzyw/fuzzyw.app.js b/apps/fuzzyw/fuzzyw.app.js index debcb3c4d..e185e2ccf 100644 --- a/apps/fuzzyw/fuzzyw.app.js +++ b/apps/fuzzyw/fuzzyw.app.js @@ -1,6 +1,8 @@ // adapted from https://github.com/hallettj/Fuzzy-Text-International/ +{ + const SETTINGS_FILE = "fuzzyw.settings.json"; -let fuzzy_string = { + let fuzzy_string = { "hours":[ /*LANG*/"twelve", /*LANG*/"one", @@ -35,7 +37,11 @@ let text_scale = 3.5; let timeout = 2.5*60; let drawTimeout; -function queueDraw(seconds) { +let loadSettings = function() { + settings = require("Storage").readJSON(SETTINGS_FILE,1)|| {'showWidgets': false}; +} + +let queueDraw = function(seconds) { let millisecs = seconds * 1000; if (drawTimeout) clearTimeout(drawTimeout); drawTimeout = setTimeout(function() { @@ -47,7 +53,7 @@ function queueDraw(seconds) { const h = g.getHeight(); const w = g.getWidth(); -function getTimeString(date) { +let getTimeString = function(date) { let segment = Math.round((date.getMinutes()*60 + date.getSeconds() + 1)/300); let hour = date.getHours() + Math.floor(segment/12); f_string = fuzzy_string.minutes[segment % 12]; @@ -59,7 +65,7 @@ function getTimeString(date) { return f_string; } -function draw() { +let draw = function() { let time_string = getTimeString(new Date()).replace('*', ''); // print(time_string); g.setFont('Vector', (h-24*2)/text_scale); @@ -71,7 +77,7 @@ function draw() { } g.clear(); -draw(); +loadSettings(); // Stop updates when LCD is off, restart when on Bangle.on('lcdPower',on=>{ @@ -83,6 +89,22 @@ Bangle.on('lcdPower',on=>{ } }); -Bangle.setUI('clock'); +Bangle.setUI({ + mode : 'clock', + remove : function() { + // Called to unload all of the clock app + if (drawTimeout) clearTimeout(drawTimeout); + drawTimeout = undefined; + require('widget_utils').show(); // re-show widgets + } +}); + Bangle.loadWidgets(); -Bangle.drawWidgets(); +if (settings.showWidgets) { + Bangle.drawWidgets(); +} else { + require("widget_utils").swipeOn(); // hide widgets, make them visible with a swipe +} + +draw(); +} \ No newline at end of file diff --git a/apps/fuzzyw/fuzzyw.settings.js b/apps/fuzzyw/fuzzyw.settings.js new file mode 100644 index 000000000..8feb30bfb --- /dev/null +++ b/apps/fuzzyw/fuzzyw.settings.js @@ -0,0 +1,33 @@ +(function(back) { + const SETTINGS_FILE = "fuzzy.settings.json"; + + // initialize with default settings... + let s = {'showWidgets': false} + + // ...and overwrite them with any saved values + // This way saved values are preserved if a new version adds more settings + const storage = require('Storage') + let settings = storage.readJSON(SETTINGS_FILE, 1) || s; + const saved = settings || {} + for (const key in saved) { + s[key] = saved[key] + } + + function save() { + settings = s + storage.write(SETTINGS_FILE, settings) + } + + E.showMenu({ + '': { 'title': 'Fuzzy Word Clock' }, + '< Back': back, + 'Show Widgets': { + value: settings.showWidgets, + format: () => (settings.showWidgets ? 'Yes' : 'No'), + onchange: () => { + settings.showWidgets = !settings.showWidgets; + save(); + } + }, + }); +}) diff --git a/apps/fuzzyw/metadata.json b/apps/fuzzyw/metadata.json index 5d3045edb..d1040fda3 100644 --- a/apps/fuzzyw/metadata.json +++ b/apps/fuzzyw/metadata.json @@ -2,7 +2,7 @@ "id":"fuzzyw", "name":"Fuzzy Text Clock", "shortName": "Fuzzy Text", - "version": "0.02", + "version": "0.03", "description": "An imprecise clock for when you're not in a rush", "readme": "README.md", "icon":"fuzzyw.png", @@ -13,6 +13,10 @@ "allow_emulator": true, "storage": [ {"name":"fuzzyw.app.js","url":"fuzzyw.app.js"}, + {"name":"fuzzyw.settings.js","url":"fuzzyw.settings.js"}, {"name":"fuzzyw.img","url":"fuzzyw.icon.js","evaluate":true} + ], + "data": [ + {"name":"fuzzyw.settings.json"} ] } diff --git a/apps/mosaic/ChangeLog b/apps/mosaic/ChangeLog index f26a9df0a..acebd4321 100644 --- a/apps/mosaic/ChangeLog +++ b/apps/mosaic/ChangeLog @@ -1,2 +1,3 @@ 0.01: First release 0.02: Use locale time +0.03: Change for fast loading, use widget_utils to hide widgets \ No newline at end of file diff --git a/apps/mosaic/README.md b/apps/mosaic/README.md index b2f31aef2..05a39c556 100644 --- a/apps/mosaic/README.md +++ b/apps/mosaic/README.md @@ -4,7 +4,7 @@ A fabulously colourful clock! * Clearly shows the time on a colourful background that changes every minute. * Dark and Light theme compatible, with a setting to override the digit colour scheme. -* Show or hide widgets with a setting (default shows widgets). +* Show or hide widgets with a setting (default hides widgets, swipe down to show them thanks to `widget_utils`). ![](mosaic-scr1.png) ![](mosaic-scr2.png) diff --git a/apps/mosaic/metadata.json b/apps/mosaic/metadata.json index 92548ce9c..d6eff12a7 100644 --- a/apps/mosaic/metadata.json +++ b/apps/mosaic/metadata.json @@ -2,7 +2,7 @@ "id":"mosaic", "name":"Mosaic Clock", "shortName": "Mosaic Clock", - "version": "0.02", + "version": "0.03", "description": "A fabulously colourful clock", "readme": "README.md", "icon":"mosaic.png", @@ -15,5 +15,8 @@ {"name":"mosaic.app.js","url":"mosaic.app.js"}, {"name":"mosaic.settings.js","url":"mosaic.settings.js"}, {"name":"mosaic.img","url":"mosaic.icon.js","evaluate":true} + ], + "data": [ + {"name":"mosaic.settings.json"} ] } diff --git a/apps/mosaic/mosaic.app.js b/apps/mosaic/mosaic.app.js index 03eb417fd..7fcb631f1 100644 --- a/apps/mosaic/mosaic.app.js +++ b/apps/mosaic/mosaic.app.js @@ -2,6 +2,7 @@ Array.prototype.sample = function(){ return this[Math.floor(Math.random()*this.length)]; }; +{ const SETTINGS_FILE = "mosaic.settings.json"; let settings; let theme; @@ -24,11 +25,11 @@ let digits = [ E.toArrayBuffer(atob("BQcB/Gsex+A=")) ]; -function loadSettings() { +let loadSettings = function() { settings = require("Storage").readJSON(SETTINGS_FILE,1)|| {'showWidgets': false, 'theme':'System'}; } -function loadThemeColors() { +let loadThemeColors = function() { theme = {fg: g.theme.fg, bg: g.theme.bg}; if (settings.theme === "Dark") { theme.fg = g.toColor(1,1,1); @@ -40,7 +41,7 @@ function loadThemeColors() { } } -function queueDraw(seconds) { +let queueDraw = function(seconds) { let millisecs = seconds * 1000; if (drawTimeout) clearTimeout(drawTimeout); drawTimeout = setTimeout(function() { @@ -49,7 +50,7 @@ function queueDraw(seconds) { }, millisecs - (Date.now() % millisecs)); } -function draw() { +let draw = function() { // draw colourful grid for (let i_x = 0; i_x < num_squares_w; i_x++) { for (let i_y = 0; i_y < num_squares_h; i_y++) { @@ -87,8 +88,6 @@ let o_h = Math.floor((g.getHeight() - num_squares_h * s+offset_widgets)/2); let mid_x = Math.floor(num_squares_w/2); let mid_y = Math.floor((num_squares_h-1)/2); -draw(); - Bangle.on('lcdPower',on=>{ if (on) { draw(); // draw immediately, queue redraw @@ -98,8 +97,23 @@ Bangle.on('lcdPower',on=>{ } }); -Bangle.setUI('clock'); +Bangle.setUI({ + mode : 'clock', + remove : function() { + // Called to unload all of the clock app + if (drawTimeout) clearTimeout(drawTimeout); + drawTimeout = undefined; + delete Array.prototype.sample; + require('widget_utils').show(); // re-show widgets + } +}); + +Bangle.loadWidgets(); if (settings.showWidgets) { - Bangle.loadWidgets(); Bangle.drawWidgets(); +} else { + require("widget_utils").swipeOn(); // hide widgets, make them visible with a swipe } + +draw(); +} \ No newline at end of file diff --git a/modules/widget_utils.js b/modules/widget_utils.js index 154a95f68..2a6a407be 100644 --- a/modules/widget_utils.js +++ b/modules/widget_utils.js @@ -145,4 +145,5 @@ exports.swipeOn = function(autohide) { }; Bangle.on("swipe", exports.swipeHandler); + Bangle.drawWidgets(); };