From 3c5de5ff701ebd71af4fffa0838b29af7b858e6b Mon Sep 17 00:00:00 2001 From: Victor Serain Date: Thu, 28 Oct 2021 14:45:29 +0200 Subject: [PATCH 1/4] fix: add semicolumn --- apps/gpstouch/gpstouch.app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/gpstouch/gpstouch.app.js b/apps/gpstouch/gpstouch.app.js index 0425cdc23..cac19cdef 100644 --- a/apps/gpstouch/gpstouch.app.js +++ b/apps/gpstouch/gpstouch.app.js @@ -196,7 +196,7 @@ function prevInfo() { } Bangle.on('swipe', dir => { - if (dir == 1) prevInfo() else nextInfo(); + if (dir == 1) prevInfo(); else nextInfo(); draw(); }); From 1b539fee8dbe16dbf9c2984898e1b4e19a25f784 Mon Sep 17 00:00:00 2001 From: Victor Serain Date: Thu, 28 Oct 2021 15:14:51 +0200 Subject: [PATCH 2/4] fix: app json --- apps.json | 7 ++++--- apps/gpstouch/gpstouch.app.js | 2 +- apps/swiperclocklaunch/icon.js | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 apps/swiperclocklaunch/icon.js diff --git a/apps.json b/apps.json index 440257e3c..a9a3b2f53 100644 --- a/apps.json +++ b/apps.json @@ -4108,11 +4108,12 @@ "version": "0.01", "description": "Navigate between clock and launcher with Swipe action", "icon": "swiperclocklaunch.png", - "type": "boot", - "tags": "system", + "type": "bootloader", + "tags": "tools, system", "supports": ["BANGLEJS", "BANGLEJS2"], "storage": [ - {"name":"swiperclocklaunch.boot.js","url":"boot.js"} + {"name":"swiperclocklaunch.boot.js","url":"boot.js"}, + {"name":"swiperclocklaunch.img","url":"icon.js","evaluate":true} ] } ] diff --git a/apps/gpstouch/gpstouch.app.js b/apps/gpstouch/gpstouch.app.js index 0425cdc23..cac19cdef 100644 --- a/apps/gpstouch/gpstouch.app.js +++ b/apps/gpstouch/gpstouch.app.js @@ -196,7 +196,7 @@ function prevInfo() { } Bangle.on('swipe', dir => { - if (dir == 1) prevInfo() else nextInfo(); + if (dir == 1) prevInfo(); else nextInfo(); draw(); }); diff --git a/apps/swiperclocklaunch/icon.js b/apps/swiperclocklaunch/icon.js new file mode 100644 index 000000000..c9089ce5c --- /dev/null +++ b/apps/swiperclocklaunch/icon.js @@ -0,0 +1 @@ +require("heatshrink").decompress(atob("lEoxH+AB8WAAwYQEaQrdEp4pWEyYoRC49kxGs2fX6+z1mIsgpUCQtAxAjCAA+zxFAFCAQFxAkJAAuIFBxMF1oeHgEABI+sFBomEORInJPgJ7EEyonLFAJQJBIh0IE5x6GE47CME5nXsgnGOojmME5p5HJyAnO6+IE5LEKE6JQEE4lkC5gnPUIh2SE6B4EAAesC5oAP1gnHTxpPDAQIAFeJQACH5wnP64nWAA3CBJB3WAA203fQBAp3IY4plENQ4HC2gABkjHNxAnX2nJBYeIEYf+AYVkE5oDGE4e0UgdkEwYnDUAITEACikBTwgnFxAnZFAJ2FE4lAJ7dAE4pQFY6yfCToYmDE4kW1jvX1geEE4YoF2YfFABRzD67EEEwqiGFCAmETg5QJPQYAMTQJ0GE5AoGshSPYQgmKFA72BFJWzxBzEExgoIKYOI1grC2esxBLGExwpKABolPFCwmSFKQlVFZoXP")) \ No newline at end of file From 5bbe209a44e8cd15dbcd293197d8a865f2a62427 Mon Sep 17 00:00:00 2001 From: qucchia Date: Thu, 28 Oct 2021 16:00:43 +0200 Subject: [PATCH 3/4] Update Q Alarm --- apps/qalarm/ChangeLog | 1 + apps/qalarm/app.js | 13 +++---------- apps/qalarm/qalarm.js | 4 ---- apps/qalarm/qalarmcheck.js | 7 +++---- 4 files changed, 7 insertions(+), 18 deletions(-) diff --git a/apps/qalarm/ChangeLog b/apps/qalarm/ChangeLog index 4022f485c..135e69d23 100644 --- a/apps/qalarm/ChangeLog +++ b/apps/qalarm/ChangeLog @@ -1 +1,2 @@ 0.01: First version! +0.02: Fixed alarms not working and localised days of week. \ No newline at end of file diff --git a/apps/qalarm/app.js b/apps/qalarm/app.js index 4d27739cf..64f601bf6 100644 --- a/apps/qalarm/app.js +++ b/apps/qalarm/app.js @@ -172,21 +172,14 @@ function showDaysMenu(alarmIndex, alarm) { "< Back": () => showEditAlarmMenu(alarmIndex, alarm), }; - [ - "Sunday", - "Monday", - "Tuesday", - "Wednesday", - "Thursday", - "Friday", - "Saturday", - ].forEach((dayOfWeek, i) => { + for (let i = 0; i < 7; i++) { + let dayOfWeek = require("locale").dow({ getDay: () => i }); menu[dayOfWeek] = { value: alarm.daysOfWeek[i], format: (v) => (v ? "Yes" : "No"), onchange: (v) => (alarm.daysOfWeek[i] = v), }; - }); + } return E.showMenu(menu); } diff --git a/apps/qalarm/qalarm.js b/apps/qalarm/qalarm.js index 38571987e..6b31ba645 100644 --- a/apps/qalarm/qalarm.js +++ b/apps/qalarm/qalarm.js @@ -1,7 +1,5 @@ // This file shows the alarm -print("Starting alarm"); - function formatTime(t) { let hrs = Math.floor(t / 3600000); let mins = Math.round((t / 60000) % 60); @@ -150,8 +148,6 @@ let active = alarms.filter( (alarm.timer || alarm.daysOfWeek[time.getDay()]) ); -print(active); - if (active.length) { showAlarm(active.sort((a, b) => a.t - b.t)[0]); } diff --git a/apps/qalarm/qalarmcheck.js b/apps/qalarm/qalarmcheck.js index de3db68ab..9a3f10d5e 100644 --- a/apps/qalarm/qalarmcheck.js +++ b/apps/qalarm/qalarmcheck.js @@ -29,13 +29,12 @@ let nextAlarms = (require("Storage").readJSON("qalarm.json", 1) || []) .sort((a, b) => a.t - b.t); if (nextAlarms[0]) { - print("Found alarm, scheduling...", nextAlarms[0].t - t); setTimeout(() => { - load("qalarm.js"); eval(require("Storage").read("qalarmcheck.js")); - }, 3600000 * (nextAlarms[0].t - t)); + load("qalarm.js"); + }, nextAlarms[0].t - t); } else { - print("No alarms found. Will re-check at midnight."); + // No alarms found: will re-check at midnight setTimeout(() => { eval(require("Storage").read("qalarmcheck.js")); }, 86400000 - t); From 7ad7fa6c325395539ec5f5d7d8a91daab3e25f2b Mon Sep 17 00:00:00 2001 From: qucchia Date: Thu, 28 Oct 2021 16:03:01 +0200 Subject: [PATCH 4/4] Update Q Alarm --- apps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps.json b/apps.json index 4d2c4fdb9..12c51ff72 100644 --- a/apps.json +++ b/apps.json @@ -4172,7 +4172,7 @@ "name": "Q Alarm and Timer", "shortName": "Q Alarm", "icon": "app.png", - "version": "0.01", + "version": "0.02", "description": "Alarm and timer app with days of week and 'hard' option.", "tags": "tool,alarm,widget", "supports": ["BANGLEJS", "BANGLEJS2"],