Merge branch 'master' of github.com:espruino/BangleApps

master
Gordon Williams 2022-11-11 10:04:16 +00:00
commit 572923c9ea
7 changed files with 17 additions and 12 deletions

View File

@ -2,3 +2,4 @@
0.02: Moved settings from launcher to settings->apps menu 0.02: Moved settings from launcher to settings->apps menu
0.03: Better performance by not scanning on every boot 0.03: Better performance by not scanning on every boot
0.04: Better performace by not scanning on boot at all 0.04: Better performace by not scanning on boot at all
0.05: Update to work with new 'fast switch' clock->launcher functionality

View File

@ -16,9 +16,9 @@
Bangle.on("swipe", (lr,ud) => { Bangle.on("swipe", (lr,ud) => {
if (!Bangle.CLOCK) return; if (!Bangle.CLOCK) return;
if (lr == -1 && settings.leftapp && settings.leftapp.src){ if (!storage.read(settings.leftapp.src)) reset("leftapp"); else load(settings.leftapp.src); } if (lr == -1 && settings.leftapp && settings.leftapp.src){ if (settings.leftapp.name == "Show Launcher") Bangle.showLauncher(); else if (!storage.read(settings.leftapp.src)) reset("leftapp"); else load(settings.leftapp.src); }
if (lr == 1 && settings.rightapp && settings.rightapp.src){ if (!storage.read(settings.rightapp.src)) reset("rightapp"); else load(settings.rightapp.src); } if (lr == 1 && settings.rightapp && settings.rightapp.src){ if (settings.rightapp.name == "Show Launcher") Bangle.showLauncher(); else if (!storage.read(settings.rightapp.src)) reset("rightapp"); else load(settings.rightapp.src); }
if (ud == -1 && settings.upapp && settings.upapp.src){ if (!storage.read(settings.upapp.src)) reset("upapp"); else load(settings.upapp.src); } if (ud == -1 && settings.upapp && settings.upapp.src){ if (settings.upapp.name == "Show Launcher") Bangle.showLauncher(); else if (!storage.read(settings.upapp.src)) reset("upapp"); else load(settings.upapp.src); }
if (ud == 1 && settings.downapp && settings.downapp.src){ if (!storage.read(settings.downapp.src)) reset("downapp"); else load(settings.downapp.src); } if (ud == 1 && settings.downapp && settings.downapp.src){ if (settings.downapp.name == "Show Launcher") Bangle.showLauncher(); else if (!storage.read(settings.downapp.src)) reset("downapp"); else load(settings.downapp.src); }
}); });
} }

View File

@ -2,7 +2,7 @@
"id": "quicklaunch", "id": "quicklaunch",
"name": "Quick Launch", "name": "Quick Launch",
"icon": "app.png", "icon": "app.png",
"version":"0.04", "version":"0.05",
"description": "Tap or swipe left/right/up/down on your clock face to launch up to five apps of your choice. Configurations can be accessed through Settings->Apps.", "description": "Tap or swipe left/right/up/down on your clock face to launch up to five apps of your choice. Configurations can be accessed through Settings->Apps.",
"type": "bootloader", "type": "bootloader",
"tags": "tools, system", "tags": "tools, system",

View File

@ -7,6 +7,13 @@ for (let c of ["leftapp","rightapp","upapp","downapp","tapapp"]){
var apps = require("Storage").list(/\.info$/).map(app=>{var a=require("Storage").readJSON(app,1);return a&&{name:a.name,type:a.type,sortorder:a.sortorder,src:a.src};}).filter(app=>app && (app.type=="app" || app.type=="launch" || app.type=="clock" || !app.type)); var apps = require("Storage").list(/\.info$/).map(app=>{var a=require("Storage").readJSON(app,1);return a&&{name:a.name,type:a.type,sortorder:a.sortorder,src:a.src};}).filter(app=>app && (app.type=="app" || app.type=="launch" || app.type=="clock" || !app.type));
// Add psuedo app to trigger Bangle.showLauncher later
apps.push({
"name": "Show Launcher",
"type": undefined, "sortorder": -10,
"src": "no sorce"
});
apps.sort((a,b)=>{ apps.sort((a,b)=>{
var n=(0|a.sortorder)-(0|b.sortorder); var n=(0|a.sortorder)-(0|b.sortorder);
if (n) return n; // do sortorder first if (n) return n; // do sortorder first

View File

@ -6,3 +6,4 @@
0.06: Press upper left corner to exit on Bangle.js 2 0.06: Press upper left corner to exit on Bangle.js 2
0.07: Code tweaks 0.07: Code tweaks
0.08: Force background of widget field to the torch colour 0.08: Force background of widget field to the torch colour
0.09: Change code taking FW tweaks into account

View File

@ -16,10 +16,6 @@ g.setColor(settings.bg);
g.fillRect(0,0,g.getWidth(),g.getHeight()); g.fillRect(0,0,g.getWidth(),g.getHeight());
Bangle.setUI({ Bangle.setUI({
mode : 'custom', mode : 'custom',
back : load, // B2: Clicking the hardware button or pressing upper left corner turns off (where red back button would be) back : load, // B2: SW back button to exit
btn : (n)=>{ // B1: Any button turns off btn : ()=>{load();}, // B1&2: HW button to exit. // A simple 'load' as on the line above did not work for btn???
if (process.env.HWVERSION==1 && (n==1 || n==2 || n==3)) {
load();
}
}
}); });

View File

@ -2,7 +2,7 @@
"id": "torch", "id": "torch",
"name": "Torch", "name": "Torch",
"shortName": "Torch", "shortName": "Torch",
"version": "0.08", "version": "0.09",
"description": "Turns screen white to help you see in the dark. Select from the launcher or press BTN1,BTN3,BTN1,BTN3 quickly to start when in any app that shows widgets on Bangle.js 1. You can also set the color through the app's setting menu.", "description": "Turns screen white to help you see in the dark. Select from the launcher or press BTN1,BTN3,BTN1,BTN3 quickly to start when in any app that shows widgets on Bangle.js 1. You can also set the color through the app's setting menu.",
"icon": "app.png", "icon": "app.png",
"tags": "tool,torch", "tags": "tool,torch",