FOSS
/
BangleApps
mirror of https://github.com/espruino/BangleApps
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

move app launch logic into a function

pull/2647/head
thyttan 2023-03-14 18:48:21 +01:00
parent 203d017727
commit f8bd92fc56
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/quicklaunch/app.js
View File

@ -14,6 +14,12 @@
return trace; return trace;
}; };
let launchApp = function(trace) {
if (settings[trace+"app"].src){
if (settings[trace+"app"].name == "Show Launcher") Bangle.showLauncher(); else if (!storage.read(settings[trace+"app"].src)) reset(trace+"app"); else load(settings[trace+"app"].src);
}
}
let trace = settings.trace; let trace = settings.trace;
let touchHandler = (_,e) => { let touchHandler = (_,e) => {
@ -21,7 +27,7 @@
let R = Bangle.appRect; let R = Bangle.appRect;
if (e.x < R.x || e.x > R.x2 || e.y < R.y || e.y > R.y2 ) return; if (e.x < R.x || e.x > R.x2 || e.y < R.y || e.y > R.y2 ) return;
trace = leaveTrace(trace+"t"); // t=tap. trace = leaveTrace(trace+"t"); // t=tap.
if (settings[trace+"app"].src){ if (settings[trace+"app"].name == "Show Launcher") Bangle.showLauncher(); else if (!storage.read(settings[trace+"app"].src)) reset(trace+"app"); else load(settings[trace+"app"].src); } launchApp(trace);
}; };
let swipeHandler = (lr,ud) => { let swipeHandler = (lr,ud) => {
@ -30,7 +36,7 @@
if (lr == 1) trace = leaveTrace(trace+"r"); // r=right, if (lr == 1) trace = leaveTrace(trace+"r"); // r=right,
if (ud == -1) trace = leaveTrace(trace+"u"); // u=up, if (ud == -1) trace = leaveTrace(trace+"u"); // u=up,
if (ud == 1) trace = leaveTrace(trace+"d"); // d=down. if (ud == 1) trace = leaveTrace(trace+"d"); // d=down.
if (settings[trace+"app"] && settings[trace+"app"].src){ if (settings[trace+"app"].name == "Show Launcher") Bangle.showLauncher(); else if (!storage.read(settings[trace+"app"].src)) reset(trace+"app"); else load(settings[trace+"app"].src); } launchApp(trace);
}; };
let onLongTouchDoPause = (e)=>{ let onLongTouchDoPause = (e)=>{

10
apps/quicklaunch/boot.js
View File

@ -14,6 +14,12 @@
return trace; return trace;
}; };
let launchApp = function(trace) {
if (settings[trace+"app"].src){
if (settings[trace+"app"].name == "Show Launcher") Bangle.showLauncher(); else if (!storage.read(settings[trace+"app"].src)) reset(trace+"app"); else load(settings[trace+"app"].src);
}
}
let trace; let trace;
Bangle.on("touch", (_,e) => { Bangle.on("touch", (_,e) => {
@ -22,7 +28,7 @@
let R = Bangle.appRect; let R = Bangle.appRect;
if (e.x < R.x || e.x > R.x2 || e.y < R.y || e.y > R.y2 ) return; if (e.x < R.x || e.x > R.x2 || e.y < R.y || e.y > R.y2 ) return;
trace = leaveTrace("t"); // t=tap trace = leaveTrace("t"); // t=tap
if (settings[trace].src){ if (settings[trace+"app"].name == "Show Launcher") Bangle.showLauncher(); else if (!storage.read(settings[trace+"app"].src)) reset(trace+"app"); else load(settings[trace+"app"].src); } launchApp(trace);
}); });
Bangle.on("swipe", (lr,ud) => { Bangle.on("swipe", (lr,ud) => {
@ -32,6 +38,6 @@
if (lr == 1) trace = leaveTrace("r"); // r=right, if (lr == 1) trace = leaveTrace("r"); // r=right,
if (ud == -1) trace = leaveTrace("u"); // u=up, if (ud == -1) trace = leaveTrace("u"); // u=up,
if (ud == 1) trace = leaveTrace("d"); // d=down. if (ud == 1) trace = leaveTrace("d"); // d=down.
if (settings[trace+"app"] && settings[trace+"app"].src){ if (settings[trace+"app"].name == "Show Launcher") Bangle.showLauncher(); else if (!storage.read(settings[trace+"app"].src)) reset(trace+"app"); else load(settings[trace+"app"].src); } launchApp(trace);
}); });
} }