Merge pull request #924 from t0m1o1/scaledlauncher

Add setting to scale launcher up/down for Bangle.js2

apps.json

@@ -104,7 +104,7 @@
     "id": "launch",
     "name": "Launcher",
     "shortName": "Launcher",
-    "version": "0.09",
+    "version": "0.10",
     "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",
@@ -112,8 +112,10 @@
     "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
   },
   {

apps/launch/ChangeLog

@@ -8,3 +8,4 @@
 0.08: Merge Bangle.js 1 and 2 launchers
 0.09: Bangle.js 2 - pressing the button goes back to clock (fix #971)
       After 10s of being locked, the launcher goes back to the clock screen
+0.10: added in selectable font in settings including scalable vector font

apps/launch/app-bangle2.js

@@ -1,4 +1,22 @@
 var s = require("Storage");
+let fonts = g.getFonts();
+var scaleval = 1;
+var vectorval = 20;
+var font = g.getFonts().includes("12x20") ? "12x20" : "6x8:2";
+let settings = require('Storage').readJSON("launch.json", true) || {};
+if ("vectorsize" in settings) {
+    vectorval = parseInt(settings.vectorsize);
+}
+if ("font" in settings){
+    if(settings.font == "Vector"){
+        scaleval = vectorval/20;
+        font = "Vector"+(vectorval).toString();
+    }
+    else{
+        font = settings.font;
+        scaleval = (font.split('x')[1])/20;
+    }
+}
 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);
@@ -11,8 +29,6 @@ apps.forEach(app=>{
   if (app.icon)
     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";
 // FIXME: check not needed after 2v11
 if (g.wrapString) {
   g.setFont(font);
@@ -22,9 +38,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 +48,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];

apps/launch/settings.js

@@ -0,0 +1,25 @@
+// make sure to enclose the function in parentheses
+(function(back) {
+  let settings = require('Storage').readJSON('launch.json',1)||{};
+  let fonts = g.getFonts();
+  function save(key, value) {
+    settings[key] = value;
+    require('Storage').write('launch.json',settings);
+  }
+  const appMenu = {
+    '': {'title': 'Launcher Settings'},
+    '< Back': back,
+    'Font': {
+      value: fonts.includes(settings.font)? fonts.indexOf(settings.font) : fonts.indexOf("12x20"),
+      min:0, max:fonts.length-1, step:1,wrap:true,
+      onchange: (m) => {save('font', fonts[m])},
+      format: v => fonts[v]
+     },
+    'Vector font size': {
+      value: settings.vectorsize || 10,
+      min:10, max: 20,step:1,wrap:true,
+      onchange: (m) => {save('vectorsize', m)}
+    }
+  };
+  E.showMenu(appMenu);
+});

core

@@ -1 +1 @@
-Subproject commit 23854083e0c3f83c649073a2d85e8079efc471d3
+Subproject commit 59f80bb52a38da12cb272f9106cb3951b49dab2e