From f6640e10ce2133e5ec43cf116627bb1e98bd12be Mon Sep 17 00:00:00 2001 From: storm64 Date: Tue, 6 Sep 2022 12:15:52 +0200 Subject: [PATCH 1/3] [ptlaunch] Add setUI custom clock recognition Update boot.js to support clocks in custom setUI mode, started with: `Bangle.setUI({ mode: "custom", clock: 1, ... }); --- apps/ptlaunch/ChangeLog | 1 + apps/ptlaunch/boot.js | 9 ++------- apps/ptlaunch/metadata.json | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/apps/ptlaunch/ChangeLog b/apps/ptlaunch/ChangeLog index eec3610ed..5871b1fdc 100644 --- a/apps/ptlaunch/ChangeLog +++ b/apps/ptlaunch/ChangeLog @@ -6,3 +6,4 @@ 0.12: Improve pattern detection code readability by PaddeK http://forum.espruino.com/profiles/117930/ 0.13: Improve pattern rendering by HughB http://forum.espruino.com/profiles/167235/ 0.14: Update setUI to work with new Bangle.js 2v13 menu style +0.15: Update to support clocks in custom setUI mode diff --git a/apps/ptlaunch/boot.js b/apps/ptlaunch/boot.js index 748d564f3..9aefe54a8 100644 --- a/apps/ptlaunch/boot.js +++ b/apps/ptlaunch/boot.js @@ -76,13 +76,8 @@ var sui = Bangle.setUI; Bangle.setUI = function (mode, cb) { sui(mode, cb); - if ("object"==typeof mode) mode = mode.mode; - if (!mode) { - Bangle.removeListener("drag", dragHandler); - storedPatterns = {}; - return; - } - if (!mode.startsWith("clock")) { + if (typeof mode === "object") mode = { mode: mode }; + if (!mode || !(mode.clock || mode.startsWith("clock"))) { storedPatterns = {}; Bangle.removeListener("drag", dragHandler); return; diff --git a/apps/ptlaunch/metadata.json b/apps/ptlaunch/metadata.json index 0b6dce3d1..6f8a9e16f 100644 --- a/apps/ptlaunch/metadata.json +++ b/apps/ptlaunch/metadata.json @@ -2,7 +2,7 @@ "id": "ptlaunch", "name": "Pattern Launcher", "shortName": "Pattern Launcher", - "version": "0.14", + "version": "0.15", "description": "Directly launch apps from the clock screen with custom patterns.", "icon": "app.png", "screenshots": [{"url":"manage_patterns_light.png"}], From 505a1183e4fa3ed8767dd2ea4ebf5bbe1382b40e Mon Sep 17 00:00:00 2001 From: storm64 Date: Tue, 6 Sep 2022 12:36:17 +0200 Subject: [PATCH 2/3] [ptlaunch] Correct setUI mode-object conversion --- apps/ptlaunch/boot.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/ptlaunch/boot.js b/apps/ptlaunch/boot.js index 9aefe54a8..87dccbdac 100644 --- a/apps/ptlaunch/boot.js +++ b/apps/ptlaunch/boot.js @@ -76,10 +76,10 @@ var sui = Bangle.setUI; Bangle.setUI = function (mode, cb) { sui(mode, cb); - if (typeof mode === "object") mode = { mode: mode }; - if (!mode || !(mode.clock || mode.startsWith("clock"))) { + if (typeof mode === "object") mode = (mode.clock ? "clock" : "") + mode.mode; + if (!mode || !mode.startsWith("clock")) { storedPatterns = {}; - Bangle.removeListener("drag", dragHandler); + Bangle.removeListener("drag", dragHandler);s return; } From 8f25103d3725a814e1a20ca49745afb2b21540de Mon Sep 17 00:00:00 2001 From: storm64 Date: Tue, 6 Sep 2022 12:39:28 +0200 Subject: [PATCH 3/3] [ptlaunch] Correct typo --- apps/ptlaunch/boot.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/ptlaunch/boot.js b/apps/ptlaunch/boot.js index 87dccbdac..885962761 100644 --- a/apps/ptlaunch/boot.js +++ b/apps/ptlaunch/boot.js @@ -79,7 +79,7 @@ if (typeof mode === "object") mode = (mode.clock ? "clock" : "") + mode.mode; if (!mode || !mode.startsWith("clock")) { storedPatterns = {}; - Bangle.removeListener("drag", dragHandler);s + Bangle.removeListener("drag", dragHandler); return; }