From 041a8ef9106ede9bd90bad0ab36e7eaef146fc95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20Arguill=C3=A8re?= Date: Thu, 28 Mar 2024 09:00:07 +0100 Subject: [PATCH 1/6] fix bug where lock event would conflict with menu UI --- apps/elapsed_t/app.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/elapsed_t/app.js b/apps/elapsed_t/app.js index b38735a32..384d869c3 100644 --- a/apps/elapsed_t/app.js +++ b/apps/elapsed_t/app.js @@ -57,7 +57,7 @@ function writeSettings() { let inMenu = false; Bangle.on('touch', function (zone, e) { - if (!inMenu) { + if (!inMenu && e.y > 24) { if (drawTimeout) clearTimeout(drawTimeout); E.showMenu(menu); inMenu = true; @@ -276,6 +276,10 @@ function updateQueueMillis(displaySeconds) { } Bangle.on('lock', function (on, reason) { + if (inMenu) { // if already in a menu, nothing to do + return; + } + if (on) { // screen is locked temp_displaySeconds = false; updateQueueMillis(false); From 27a6aeea8f2a876009fd882bc806ba11055437dd Mon Sep 17 00:00:00 2001 From: paul-arg Date: Tue, 11 Jun 2024 13:08:43 +0200 Subject: [PATCH 2/6] elapsed_t: add option to set clock as default --- apps/elapsed_t/app.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/apps/elapsed_t/app.js b/apps/elapsed_t/app.js index 384d869c3..c387746d0 100644 --- a/apps/elapsed_t/app.js +++ b/apps/elapsed_t/app.js @@ -206,9 +206,25 @@ var menu = { setTarget(false); updateQueueMillis(settings.displaySeconds); draw(); + }, + 'Set clock as default': function () { + setClockAsDefault(); + E.showAlert("Elapsed Time was set as default").then(function() { + E.showMenu(); + inMenu = false; + Bangle.setUI("clock"); + draw(); + }); } }; +function setClockAsDefault(){ + let storage = require('Storage'); + let settings = storage.readJSON('setting.json',true)||{clock:null}; + settings.clock = "elapsed_t.app.js"; + storage.writeJSON('setting.json', settings); +} + function setTarget(set) { if (set) { target = new Date( From e5372957179d8068cbad734c0eb4103c8e562945 Mon Sep 17 00:00:00 2001 From: paul-arg Date: Tue, 11 Jun 2024 13:09:05 +0200 Subject: [PATCH 3/6] elapsed_t: add option to set clock as default --- apps/elapsed_t/ChangeLog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/elapsed_t/ChangeLog b/apps/elapsed_t/ChangeLog index 45cb47c9a..49fa514a8 100644 --- a/apps/elapsed_t/ChangeLog +++ b/apps/elapsed_t/ChangeLog @@ -1,2 +1,3 @@ 0.01: New App! -0.02: Handle AM/PM time in the "set target" menu. Add yesterday/today/tomorrow when showing target date to improve readability. \ No newline at end of file +0.02: Handle AM/PM time in the "set target" menu. Add yesterday/today/tomorrow when showing target date to improve readability. +0.03: Add option to set clock as default From eb55e5ddf29e63a622abfd0bfc35a4e7502d168e Mon Sep 17 00:00:00 2001 From: paul-arg Date: Tue, 11 Jun 2024 13:09:19 +0200 Subject: [PATCH 4/6] elapsed_t: add option to set clock as default --- apps/elapsed_t/metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/elapsed_t/metadata.json b/apps/elapsed_t/metadata.json index 7f8460e49..fa0674e0b 100644 --- a/apps/elapsed_t/metadata.json +++ b/apps/elapsed_t/metadata.json @@ -3,7 +3,7 @@ "name": "Elapsed Time Clock", "shortName": "Elapsed Time", "type": "clock", - "version":"0.02", + "version":"0.03", "description": "A clock that calculates the time difference between now and any given target date.", "tags": "clock,tool", "supports": ["BANGLEJS2"], From 4e428a6fbc89384cb257d3c637dc3d270a06d395 Mon Sep 17 00:00:00 2001 From: paul-arg Date: Wed, 12 Jun 2024 19:09:07 +0200 Subject: [PATCH 5/6] elapsed_t: handle DST in day/month/year mode --- apps/elapsed_t/ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/elapsed_t/ChangeLog b/apps/elapsed_t/ChangeLog index 49fa514a8..6a72c2590 100644 --- a/apps/elapsed_t/ChangeLog +++ b/apps/elapsed_t/ChangeLog @@ -1,3 +1,3 @@ 0.01: New App! 0.02: Handle AM/PM time in the "set target" menu. Add yesterday/today/tomorrow when showing target date to improve readability. -0.03: Add option to set clock as default +0.03: Add option to set clock as default, handle DST in day/month/year mode From 532abba4d5a4c039bf894e11d44298a0cbe75fe5 Mon Sep 17 00:00:00 2001 From: paul-arg Date: Wed, 12 Jun 2024 19:09:58 +0200 Subject: [PATCH 6/6] elapsed_t: handle DST in day/month/year mode --- apps/elapsed_t/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/elapsed_t/app.js b/apps/elapsed_t/app.js index c387746d0..13fbca2cd 100644 --- a/apps/elapsed_t/app.js +++ b/apps/elapsed_t/app.js @@ -346,7 +346,7 @@ function diffToTarget() { diff.M = end.getMonth() - start.getMonth(); diff.D = end.getDate() - start.getDate(); diff.hh = end.getHours() - start.getHours(); - diff.mm = end.getMinutes() - start.getMinutes(); + diff.mm = end.getMinutes() - start.getMinutes() + end.getTimezoneOffset() - start.getTimezoneOffset(); diff.ss = end.getSeconds() - start.getSeconds(); // Adjust negative differences