diff --git a/apps.json b/apps.json index 8d90a1d1a..ea42a1c68 100644 --- a/apps.json +++ b/apps.json @@ -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","supports":["BANGLEJS2"]} ], + "data": [ + {"name":"launch.json"} + ] + , "sortorder": -10 }, { @@ -4316,7 +4321,9 @@ {"name":"binwatch.img","url":"app-icon.js","evaluate":true} ] }, + { + "id": "hidmsicswipe", "name": "Bluetooth Music Swipe Controls", "shortName": "Swipe Control", @@ -4329,6 +4336,7 @@ {"name":"hidmsicswipe.app.js","url":"hidmsicswipe.js"}, {"name":"hidmsicswipe.img","url":"hidmsicswipe-icon.js","evaluate":true} ] + }, { "id": "authentiwatch", @@ -4348,5 +4356,7 @@ {"name":"authentiwatch.img","url":"app-icon.js","evaluate":true} ], "data": [{"name":"authentiwatch.json"}] + + } ] diff --git a/apps/launch/ChangeLog b/apps/launch/ChangeLog index bd8a9bd03..acabd9b11 100644 --- a/apps/launch/ChangeLog +++ b/apps/launch/ChangeLog @@ -6,3 +6,4 @@ 0.06: Use Bangle.setUI for buttons 0.07: Theme colours fix 0.08: Merge Bangle.js 1 and 2 launchers +0.09: Added Scaling factor to settings and changed to vector font for Bangle.js2 diff --git a/apps/launch/app-bangle2.js b/apps/launch/app-bangle2.js index 8b66247c5..161a226e5 100644 --- a/apps/launch/app-bangle2.js +++ b/apps/launch/app-bangle2.js @@ -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]; diff --git a/apps/launch/settings.js b/apps/launch/settings.js new file mode 100644 index 000000000..4842019fe --- /dev/null +++ b/apps/launch/settings.js @@ -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 || 1, + min:0.1,max:2,step:0.05,wrap:true, + onchange: (m) => {save('scaleval', m)} + } + }; + E.showMenu(appMenu) +})