From c873bbe0dd6c4aa55d145a6b25b22d4cdf286f08 Mon Sep 17 00:00:00 2001 From: rnist Date: Sun, 18 Dec 2022 11:59:07 +0200 Subject: [PATCH] Added setting to show single offset small, as if there is more than one --- apps/hworldclock/README.md | 1 + apps/hworldclock/app.js | 3 ++- apps/hworldclock/settings.js | 21 ++++++++++++++------- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/apps/hworldclock/README.md b/apps/hworldclock/README.md index 273389775..d8343e5b9 100644 --- a/apps/hworldclock/README.md +++ b/apps/hworldclock/README.md @@ -9,6 +9,7 @@ All this is configurable: - Show seconds only when unlocked (saves battery) / always / do not show seconds - Green color on dark mode (on/off) + - 1 Offset Small: single location shows as small (like more than 1) - Show sun info (on/off) (set your location in the mylocation app) - Rotation degree on swipe (off / 90 / 180 / 270) diff --git a/apps/hworldclock/app.js b/apps/hworldclock/app.js index c5ab16b32..79e916ea9 100644 --- a/apps/hworldclock/app.js +++ b/apps/hworldclock/app.js @@ -104,6 +104,7 @@ let def = function(value, def) { let settings = require('Storage').readJSON(SETTINGSFILE, true) || {}; secondsMode = def(settings.secondsMode, "when unlocked"); showSunInfo = def(settings.showSunInfo, true); +singleOffsetSmall = def(settings.singleOffsetSmall, false); colorWhenDark = def(settings.colorWhenDark, "green"); rotationTarget = def(settings.rotationTarget, "90"); rotationTarget = parseInt(rotationTarget) || 0; @@ -257,7 +258,7 @@ let draw = function() { minutes = doublenum(dx.getMinutes()); - if (offsets.length === 1 && false) { + if (offsets.length === 1 && !singleOffsetSmall) { let date = [require("locale").dow(new Date(), 1), require("locale").date(new Date(), 1)]; // For a single secondary timezone, draw it bigger and drop time zone to second line const xOffset = 30; diff --git a/apps/hworldclock/settings.js b/apps/hworldclock/settings.js index ad97c161a..fd61baa76 100644 --- a/apps/hworldclock/settings.js +++ b/apps/hworldclock/settings.js @@ -36,13 +36,20 @@ "< Back": () => back(), "Seconds": stringInSettings("secondsMode", ["always", "when unlocked", "none"]), "Color w. dark": stringInSettings("colorWhenDark", ["green", "default"]), - "Show SunInfo": { - value: (settings.showSunInfo !== undefined ? settings.showSunInfo : true), - onchange: v => { - settings.showSunInfo = v; - writeSettings(); - } - }, + "1 Offset Small": { + value: (settings.singleOffsetSmall !== undefined ? settings.singleOffsetSmall : true), + onchange: v=> { + settings.singleOffsetSmall = v; + writeSettings(); + } + }, + "Show SunInfo": { + value: (settings.showSunInfo !== undefined ? settings.showSunInfo : true), + onchange: v => { + settings.showSunInfo = v; + writeSettings(); + } + }, "Rotation": stringInSettings("rotationTarget", ["off", "90", "180", "270"]), };