From f7d9a835d48e4a7deb39cb79b5f1cb1163899c4e Mon Sep 17 00:00:00 2001 From: Marco H Date: Thu, 23 Feb 2023 14:05:41 +0100 Subject: [PATCH 1/4] Add setting to unlock screen --- apps/activityreminder/ChangeLog | 1 + apps/activityreminder/alert.js | 9 ++++++++- apps/activityreminder/metadata.json | 2 +- apps/activityreminder/settings.js | 9 ++++++++- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/apps/activityreminder/ChangeLog b/apps/activityreminder/ChangeLog index 3811425ac..76f0945c8 100644 --- a/apps/activityreminder/ChangeLog +++ b/apps/activityreminder/ChangeLog @@ -8,3 +8,4 @@ 0.08: Use default Bangle formatter for booleans 0.09: New app screen (instead of showing settings or the alert) and some optimisations 0.10: Add software back button via setUI +0.11: Add setting to unlock screen diff --git a/apps/activityreminder/alert.js b/apps/activityreminder/alert.js index 96a9b76c4..eba305d0c 100644 --- a/apps/activityreminder/alert.js +++ b/apps/activityreminder/alert.js @@ -26,6 +26,13 @@ if (!(storage.readJSON('setting.json', 1) || {}).quiet) { Bangle.buzz(400); } + + if ((storage.readJSON('activityreminder.s.json', 1) || {}).unlock) { + console.log("unlock"); + Bangle.setLocked(false); + Bangle.setLCDPower(1); + } + setTimeout(load, 20000); } @@ -34,4 +41,4 @@ Bangle.drawWidgets(); run(); -})(); \ No newline at end of file +})(); diff --git a/apps/activityreminder/metadata.json b/apps/activityreminder/metadata.json index a7fb0c487..a5df15a26 100644 --- a/apps/activityreminder/metadata.json +++ b/apps/activityreminder/metadata.json @@ -3,7 +3,7 @@ "name": "Activity Reminder", "shortName":"Activity Reminder", "description": "A reminder to take short walks for the ones with a sedentary lifestyle", - "version":"0.10", + "version":"0.11", "icon": "app.png", "type": "app", "tags": "tool,activity", diff --git a/apps/activityreminder/settings.js b/apps/activityreminder/settings.js index 051c0dcd8..7bcd8ca90 100644 --- a/apps/activityreminder/settings.js +++ b/apps/activityreminder/settings.js @@ -75,7 +75,14 @@ settings.tempThreshold = v; activityreminder.writeSettings(settings); } - } + }, + 'Unlock on alarm': { + value: settings.unlock, + onchange: v => { + settings.unlock = v; + activityreminder.writeSettings(settings); + } + }, }; return mainMenu; From c98378194c59b06b1a765f80ccae2427b2cac0e9 Mon Sep 17 00:00:00 2001 From: Marco H Date: Thu, 23 Feb 2023 14:16:02 +0100 Subject: [PATCH 2/4] Fix remarks --- apps/activityreminder/alert.js | 1 - apps/activityreminder/settings.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/activityreminder/alert.js b/apps/activityreminder/alert.js index eba305d0c..8b359a073 100644 --- a/apps/activityreminder/alert.js +++ b/apps/activityreminder/alert.js @@ -28,7 +28,6 @@ } if ((storage.readJSON('activityreminder.s.json', 1) || {}).unlock) { - console.log("unlock"); Bangle.setLocked(false); Bangle.setLCDPower(1); } diff --git a/apps/activityreminder/settings.js b/apps/activityreminder/settings.js index 7bcd8ca90..28082a8a0 100644 --- a/apps/activityreminder/settings.js +++ b/apps/activityreminder/settings.js @@ -77,7 +77,7 @@ } }, 'Unlock on alarm': { - value: settings.unlock, + value: !!settings.unlock, onchange: v => { settings.unlock = v; activityreminder.writeSettings(settings); From 3b849ef3262ebe6ac7f440ebebac05f398f55605 Mon Sep 17 00:00:00 2001 From: Erik Andresen Date: Thu, 23 Feb 2023 19:20:16 +0100 Subject: [PATCH 3/4] sleepphasealarm: Fix inverted setting --- apps/sleepphasealarm/ChangeLog | 1 + apps/sleepphasealarm/metadata.json | 2 +- apps/sleepphasealarm/settings.js | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/sleepphasealarm/ChangeLog b/apps/sleepphasealarm/ChangeLog index b22db7170..d6e3cb30b 100644 --- a/apps/sleepphasealarm/ChangeLog +++ b/apps/sleepphasealarm/ChangeLog @@ -18,3 +18,4 @@ Limit logging on Bangle.js 1 to one day due to low memory Add plot logged data to settings 0.15: Convert Yes/No On/Off in settings to checkboxes +0.16: Fix Keep alarm enabled inverted settings diff --git a/apps/sleepphasealarm/metadata.json b/apps/sleepphasealarm/metadata.json index 4ad1588ea..aa69694ab 100644 --- a/apps/sleepphasealarm/metadata.json +++ b/apps/sleepphasealarm/metadata.json @@ -2,7 +2,7 @@ "id": "sleepphasealarm", "name": "SleepPhaseAlarm", "shortName": "SleepPhaseAlarm", - "version": "0.15", + "version": "0.16", "description": "Uses the accelerometer to estimate sleep and wake states with the principle of Estimation of Stationary Sleep-segments (ESS, see https://ubicomp.eti.uni-siegen.de/home/datasets/ichi14/index.html.en). This app will read the next alarm from the alarm application and will wake you up to 30 minutes early at the best guessed time when you are almost already awake.", "icon": "app.png", "tags": "tool,alarm", diff --git a/apps/sleepphasealarm/settings.js b/apps/sleepphasealarm/settings.js index 626de6cd0..29e3d33c9 100644 --- a/apps/sleepphasealarm/settings.js +++ b/apps/sleepphasealarm/settings.js @@ -92,7 +92,7 @@ 'Keep alarm enabled': { value: !!config.settings.disableAlarm, onchange: v => { - config.settings.disableAlarm = v; + config.settings.disableAlarm = !v; writeSettings(); } }, "< Back" : () => back(), From fb1518f6b8fd4c2250e58dcbe9785d14341dc556 Mon Sep 17 00:00:00 2001 From: Erik Andresen Date: Fri, 24 Feb 2023 07:52:30 +0100 Subject: [PATCH 4/4] settings: Also invert value --- apps/sleepphasealarm/settings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/sleepphasealarm/settings.js b/apps/sleepphasealarm/settings.js index 29e3d33c9..e72d95e7f 100644 --- a/apps/sleepphasealarm/settings.js +++ b/apps/sleepphasealarm/settings.js @@ -90,7 +90,7 @@ E.showMenu({ "" : { "title" : "SleepPhaseAlarm" }, 'Keep alarm enabled': { - value: !!config.settings.disableAlarm, + value: !config.settings.disableAlarm, onchange: v => { config.settings.disableAlarm = !v; writeSettings();