From 2ffdd2d2829417572b102280b2ee3d7570dba418 Mon Sep 17 00:00:00 2001 From: Francesco Bedussi Date: Sun, 14 Jun 2020 16:15:59 +0200 Subject: [PATCH] feat: allow to disable BTN1 and BTN3 buttons --- apps.json | 2 +- apps/largeclock/ChangeLog | 1 + apps/largeclock/README.md | 2 +- apps/largeclock/largeclock.js | 4 ++-- apps/largeclock/largeclock.json | 4 ++-- apps/largeclock/settings.js | 4 ++++ 6 files changed, 11 insertions(+), 6 deletions(-) diff --git a/apps.json b/apps.json index a09aa6c6b..563e7fd70 100644 --- a/apps.json +++ b/apps.json @@ -1605,7 +1605,7 @@ "id": "largeclock", "name": "Large Clock", "icon": "largeclock.png", - "version": "0.03", + "version": "0.04", "description": "A readable and informational digital watch, with date, seconds and moon phase", "readme": "README.md", "tags": "clock", diff --git a/apps/largeclock/ChangeLog b/apps/largeclock/ChangeLog index fe44e5078..39ab5d629 100644 --- a/apps/largeclock/ChangeLog +++ b/apps/largeclock/ChangeLog @@ -1,3 +1,4 @@ 0.01: Init 0.02: fix 3/4 moon orientation 0.03: Change `largeclock.json` to 'data' file to allow settings to be preserved +0.04: Allow to disable BTN1 and BTN3 buttons diff --git a/apps/largeclock/README.md b/apps/largeclock/README.md index c9a325823..5c2ad42c2 100644 --- a/apps/largeclock/README.md +++ b/apps/largeclock/README.md @@ -11,7 +11,7 @@ A readable and informational digital watch, with date, seconds and moon phase an ## How to use it - The clock can be used as any other one, if you like it just set it as the default clock app in settings > select clock -- In setting > large clock you can select which app is to be open by BTN1 and BTN3 +- In setting > large clock you can select which app, if any, is to be open by BTN1 and BTN3 ## Credits diff --git a/apps/largeclock/largeclock.js b/apps/largeclock/largeclock.js index 9975775fb..fb4835146 100644 --- a/apps/largeclock/largeclock.js +++ b/apps/largeclock/largeclock.js @@ -9,8 +9,8 @@ const moonX = 215; const moonY = 50; const settings = require("Storage").readJSON("largeclock.json", 1); -const BTN1app = settings.BTN1 || ""; -const BTN3app = settings.BTN3 || ""; +const BTN1app = settings && settings.BTN1 || ""; +const BTN3app = settings && settings.BTN3 || ""; function drawMoon(d) { const BLACK = 0, diff --git a/apps/largeclock/largeclock.json b/apps/largeclock/largeclock.json index 7c38d59de..58c981197 100644 --- a/apps/largeclock/largeclock.json +++ b/apps/largeclock/largeclock.json @@ -1,4 +1,4 @@ { - "BTN1": "timer.app.js", - "BTN3": "calendar.app.js" + "BTN1": "", + "BTN3": "" } diff --git a/apps/largeclock/settings.js b/apps/largeclock/settings.js index a33f3c438..293f66677 100644 --- a/apps/largeclock/settings.js +++ b/apps/largeclock/settings.js @@ -21,6 +21,10 @@ if (a.n > b.n) return 1; return 0; }); + apps.push({ + n: "NONE", + src: "" + }); const settings = s.readJSON("largeclock.json", 1) || { BTN1: "",