Merge pull request #6 from t0m1o1/scaledlauncher

Scaledlauncher
pull/924/head
t0m1o1 2021-11-22 02:56:33 +00:00 committed by GitHub
commit 9a311219b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 7 deletions

View File

@ -100,7 +100,7 @@
"id": "launch",
"name": "Launcher",
"shortName": "Launcher",
"version": "0.08",
"version": "0.09",
"description": "This is needed to display a menu allowing you to choose your own applications. You can replace this with a customised launcher.",
"icon": "app.png",
"type": "launch",
@ -108,8 +108,13 @@
"supports": ["BANGLEJS","BANGLEJS2"],
"storage": [
{"name":"launch.app.js","url":"app-bangle1.js","supports":["BANGLEJS"]},
{"name":"launch.app.js","url":"app-bangle2.js","supports":["BANGLEJS2"]}
{"name":"launch.app.js","url":"app-bangle2.js","supports":["BANGLEJS2"]},
{"name":"launch.settings.js","url":"settings.js"}
],
"data": [
{"name":"launch.json"}
]
,
"sortorder": -10
},
{

View File

@ -1,4 +1,9 @@
var s = require("Storage");
var scaleval = 1;
let settings = require('Storage').readJSON("launch.json", true) || {};
if ("scaleval" in settings) {
scaleval = settings.scaleval;
}
var apps = s.list(/\.info$/).map(app=>{var a=s.readJSON(app,1);return a&&{name:a.name,type:a.type,icon:a.icon,sortorder:a.sortorder,src:a.src};}).filter(app=>app && (app.type=="app" || app.type=="clock" || !app.type));
apps.sort((a,b)=>{
var n=(0|a.sortorder)-(0|b.sortorder);
@ -12,7 +17,8 @@ apps.forEach(app=>{
app.icon = s.read(app.icon); // should just be a link to a memory area
});
// FIXME: not needed after 2v11
var font = g.getFonts().includes("12x20") ? "12x20" : "6x8:2";
//var font = g.getFonts().includes("12x20") ? "12x20" : "6x8:2";
var font = "Vector"+(20*scaleval).toString();
// FIXME: check not needed after 2v11
if (g.wrapString) {
g.setFont(font);
@ -22,9 +28,9 @@ if (g.wrapString) {
function drawApp(i, r) {
var app = apps[i];
if (!app) return;
g.clearRect(r.x,r.y,r.x+r.w-1, r.y+r.h-1);
g.setFont(font).setFontAlign(-1,0).drawString(app.name,64,r.y+32);
if (app.icon) try {g.drawImage(app.icon,8,r.y+8);} catch(e){}
g.clearRect((r.x),(r.y),(r.x+r.w-1), (r.y+r.h-1));
g.setFont(font).setFontAlign(-1,0).drawString(app.name,64*scaleval,r.y+(32*scaleval));
if (app.icon) try {g.drawImage(app.icon,8*scaleval, r.y+(8*scaleval), {scale: scaleval});} catch(e){}
}
g.clear();
@ -32,7 +38,7 @@ Bangle.loadWidgets();
Bangle.drawWidgets();
E.showScroller({
h : 64, c : apps.length,
h : 64*scaleval, c : apps.length,
draw : drawApp,
select : i => {
var app = apps[i];

18
apps/launch/settings.js Normal file
View File

@ -0,0 +1,18 @@
// make sure to enclose the function in parentheses
(function(back) {
let settings = require('Storage').readJSON('launch.json',1)||{};
function save(key, value) {
settings[key] = value;
require('Storage').write('launch.json',settings);
}
const appMenu = {
'': {'title': 'Launcher Settings'},
'< Back': back,
'Scale Value': {
value: settings.scaleval,
min:0.1,max:2,step:0.05,wrap:true,
onchange: (m) => {save('scaleval', m)}
}
};
E.showMenu(appMenu)
})