From 4b2b9c722b924479faad8d5b95464646f684db39 Mon Sep 17 00:00:00 2001 From: thyttan <6uuxstm66@mozmail.comā©> Date: Sat, 11 Mar 2023 19:36:33 +0100 Subject: [PATCH] tweak app.js and boot.js to match settings.js --- apps/quicklaunch/app.js | 12 +++++++----- apps/quicklaunch/boot.js | 15 ++++++++------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/apps/quicklaunch/app.js b/apps/quicklaunch/app.js index 13105f2c4..e63e5d049 100644 --- a/apps/quicklaunch/app.js +++ b/apps/quicklaunch/app.js @@ -8,18 +8,20 @@ storage.write("quicklaunch.json", settings); }; + // l=left, r=right, u=up, d=down, t=tap. + let touchHandler = (_,e) => { let R = Bangle.appRect; if (e.x < R.x || e.x > R.x2 || e.y < R.y || e.y > R.y2 ) return; - qlTrace += "tap"; + qlTrace += "t"; if (settings[qlTrace+"app"].src){ if (settings[qlTrace+"app"].name == "Show Launcher") Bangle.showLauncher(); else if (!storage.read(settings[qlTrace+"app"].src)) reset(qlTrace+"app"); else load(settings[qlTrace+"app"].src); } }; let swipeHandler = (lr,ud) => { - if (lr == -1) qlTrace += "left"; - if (lr == 1) qlTrace += "right"; - if (ud == -1) qlTrace += "up"; - if (ud == 1) qlTrace += "down"; + if (lr == -1) qlTrace += "l"; // l=left, + if (lr == 1) qlTrace += "r"; // r=right, + if (ud == -1) qlTrace += "u"; // u=up, + if (ud == 1) qlTrace += "d"; // d=down. if (lr == -1 && settings[qlTrace+"app"] && settings[qlTrace+"app"].src){ if (settings[qlTrace+"app"].name == "Show Launcher") Bangle.showLauncher(); else if (!storage.read(settings[qlTrace+"app"].src)) reset(qlTrace+"app"); else load(settings[qlTrace+"app"].src); } if (lr == 1 && settings[qlTrace+"app"] && settings[qlTrace+"app"].src){ if (settings[qlTrace+"app"].name == "Show Launcher") Bangle.showLauncher(); else if (!storage.read(settings[qlTrace+"app"].src)) reset(qlTrace+"app"); else load(settings[qlTrace+"app"].src); } if (ud == -1 && settings[qlTrace+"app"] && settings[qlTrace+"app"].src){ if (settings[qlTrace+"app"].name == "Show Launcher") Bangle.showLauncher(); else if (!storage.read(settings[qlTrace+"app"].src)) reset(qlTrace+"app"); else load(settings[qlTrace+"app"].src); } diff --git a/apps/quicklaunch/boot.js b/apps/quicklaunch/boot.js index 10848a457..f9a9cad97 100644 --- a/apps/quicklaunch/boot.js +++ b/apps/quicklaunch/boot.js @@ -14,17 +14,18 @@ if (Bangle.CLKINFO_FOCUS) return; let R = Bangle.appRect; if (e.x < R.x || e.x > R.x2 || e.y < R.y || e.y > R.y2 ) return; - qlTrace = "tap"; - if (settings.tapapp.src){ if (settings[qlTrace+"app"].name == "Show Launcher") Bangle.showLauncher(); else if (!storage.read(settings[qlTrace+"app"].src)) reset(qlTrace+"app"); else load(settings[qlTrace+"app"].src); } + qlTrace = "t"; // t=tap + if (settings[qlTrace].src){ if (settings[qlTrace+"app"].name == "Show Launcher") Bangle.showLauncher(); else if (!storage.read(settings[qlTrace+"app"].src)) reset(qlTrace+"app"); else load(settings[qlTrace+"app"].src); } }); - + + Bangle.on("swipe", (lr,ud) => { if (!Bangle.CLOCK) return; if (Bangle.CLKINFO_FOCUS) return; - if (lr == -1) qlTrace = "left"; - if (lr == 1) qlTrace = "right"; - if (ud == -1) qlTrace = "up"; - if (ud == 1) qlTrace = "down"; + if (lr == -1) qlTrace = "l"; // l=left, + if (lr == 1) qlTrace = "r"; // r=right, + if (ud == -1) qlTrace = "u"; // u=up, + if (ud == 1) qlTrace = "d"; // d=down. if (lr == -1 && settings[qlTrace+"app"] && settings[qlTrace+"app"].src){ if (settings[qlTrace+"app"].name == "Show Launcher") Bangle.showLauncher(); else if (!storage.read(settings[qlTrace+"app"].src)) reset(qlTrace+"app"); else load(settings[qlTrace+"app"].src); } if (lr == 1 && settings[qlTrace+"app"] && settings[qlTrace+"app"].src){ if (settings[qlTrace+"app"].name == "Show Launcher") Bangle.showLauncher(); else if (!storage.read(settings[qlTrace+"app"].src)) reset(qlTrace+"app"); else load(settings[qlTrace+"app"].src); } if (ud == -1 && settings[qlTrace+"app"] && settings[qlTrace+"app"].src){ if (settings[qlTrace+"app"].name == "Show Launcher") Bangle.showLauncher(); else if (!storage.read(settings[qlTrace+"app"].src)) reset(qlTrace+"app"); else load(settings[qlTrace+"app"].src); }