Bram
/
BangleApps
forked from FOSS/BangleApps
1
0
Fork 0
Code Pull Requests Activity

fixes, now functional together with fastload utils

master
thyttan 2023-03-11 22:48:59 +01:00
parent 4b2b9c722b
commit 2268b438e7
3 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/quicklaunch/app.js
View File

@ -8,8 +8,6 @@
storage.write("quicklaunch.json", settings); storage.write("quicklaunch.json", settings);
}; };
// l=left, r=right, u=up, d=down, t=tap.
let touchHandler = (_,e) => { let touchHandler = (_,e) => {
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;
@ -51,8 +49,8 @@
// Draw app hints // Draw app hints
g.setFont("Vector", 11) g.setFont("Vector", 11)
.setFontAlign(0,1,0).drawString(settings[qlTrace+"app"].name, R.x+R.w/2, R.y2) .setFontAlign(0,1,3).drawString(settings[qlTrace+"lapp"].name, R.x2, R.y+R.h/2)
.setFontAlign(0,1,1).drawString(settings[qlTrace+"app"].name, R.x, R.y+R.h/2) .setFontAlign(0,1,1).drawString(settings[qlTrace+"rapp"].name, R.x, R.y+R.h/2)
.setFontAlign(0,-1,0).drawString(settings[qlTrace+"app"].name, R.x+R.w/2, R.y) .setFontAlign(0,1,0).drawString(settings[qlTrace+"uapp"].name, R.x+R.w/2, R.y2)
.setFontAlign(0,1,3).drawString(settings[qlTrace+"app"].name, R.x2, R.y+R.h/2); .setFontAlign(0,-1,0).drawString(settings[qlTrace+"dapp"].name, R.x+R.w/2, R.y);
} }

1
apps/quicklaunch/boot.js
View File

@ -1,5 +1,4 @@
{ {
// TODO: Change the settings object and settings.js to match qlTrace.
const storage = require("Storage"); const storage = require("Storage");
let settings = storage.readJSON("quicklaunch.json", true) || {}; let settings = storage.readJSON("quicklaunch.json", true) || {};

21
apps/quicklaunch/settings.js
View File

@ -22,7 +22,7 @@ let extension = {
"type": "app", "type": "app",
"sortorder": -11, "sortorder": -11,
"src": "quicklaunch.app.js" "src": "quicklaunch.app.js"
} };
apps.push(extension); apps.push(extension);
apps.sort((a,b)=>{ apps.sort((a,b)=>{
@ -33,16 +33,13 @@ apps.sort((a,b)=>{
return 0; return 0;
}); });
function findPath(key) { function findPath(key) {return key.substring(0, key.length-3);}
let path = key.substring(0, key.lenght-3);
return path;
}
function save(key, value) { function save(key, value) {
let path = findPath(key); let path = findPath(key);
// If changing from extension app (to something else) remove downstream settings entries. // If changing from extension app (to something else) remove downstream settings entries.
if (settings[key].name == extension.name && value.name != extension.name) { if (settings[key].name == extension.name && value.name != extension.name) {
for (let c of [path+"lapp", path+"rapp", path+"uapp", path+"dapp", path+"tapapp"]) { for (let c of [path+"lapp", path+"rapp", path+"uapp", path+"dapp", path+"tapp"]) {
delete settings[c]; delete settings[c];
} }
} }
@ -51,6 +48,7 @@ function save(key, value) {
if (value.name == "Quick Launch Extension" && settings[key].name != extension.name) { if (value.name == "Quick Launch Extension" && settings[key].name != extension.name) {
for (let c of [path+"lapp", path+"rapp", path+"uapp", path+"dapp", path+"tapp"]) { for (let c of [path+"lapp", path+"rapp", path+"uapp", path+"dapp", path+"tapp"]) {
settings[c] = {"name":"(none)"}; settings[c] = {"name":"(none)"};
storage.write("quicklaunch.json",settings);
} }
} }
@ -67,17 +65,18 @@ function showMainMenu() {
}; };
//List all selected apps //List all selected apps
for (let key of settings.keys()) { for (let key of Object.keys(settings)) {
mainmenu[key+ ": "+settings[key].name] = function() {showSubMenu(key);}; let keyCurrent = key;
} mainmenu[key+ ": "+settings[key].name] = function() {showSubMenu(keyCurrent);};
}
return E.showMenu(mainmenu); return E.showMenu(mainmenu);
} }
function showSubMenu(key) { function showSubMenu(key) {
//Left swipe menu let path = findPath(key);
var submenu = { var submenu = {
"" : { "title" : "path: "+findPath(key)}, "" : { "title" : "path: "+path},
"< Back" : showMainMenu "< Back" : showMainMenu
}; };