From d4572eea8652489af0811ea2c8941db561705675 Mon Sep 17 00:00:00 2001 From: sir-indy <53864146+sir-indy@users.noreply.github.com> Date: Thu, 12 Jan 2023 20:46:59 +0000 Subject: [PATCH] Tweaks to mosaic clock, let and data file --- apps/mosaic/metadata.json | 3 +++ apps/mosaic/mosaic.app.js | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/apps/mosaic/metadata.json b/apps/mosaic/metadata.json index 221d79376..d6eff12a7 100644 --- a/apps/mosaic/metadata.json +++ b/apps/mosaic/metadata.json @@ -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 0ad69e9b5..7fcb631f1 100644 --- a/apps/mosaic/mosaic.app.js +++ b/apps/mosaic/mosaic.app.js @@ -25,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); @@ -41,7 +41,7 @@ function loadThemeColors() { } } -function queueDraw(seconds) { +let queueDraw = function(seconds) { let millisecs = seconds * 1000; if (drawTimeout) clearTimeout(drawTimeout); drawTimeout = setTimeout(function() { @@ -50,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++) {