[ tune ] Add settings on changed stuff + code refactoring

apps/andark_w/app.js

@@ -1,73 +1,13 @@
+const defaultSettings = {
+  loadWidgets    : false,
+  textAboveHands : false,
+  shortHrHand    : false
+}
+const settings = Object.assign(defaultSettings, require('Storage').readJSON('andark.json',1)||{});
+
 const c={"x":g.getWidth()/2,"y":g.getHeight()/2};
+
 let zahlpos=[];
-let unlock = false;
-
-function zeiger(len,dia,tim){
-  const x =c.x+ Math.cos(tim)*len/2,
-        y =c.y + Math.sin(tim)*len/2,
-        d={"d":3,"x":dia/2*Math.cos(tim+Math.PI/2),"y":dia/2*Math.sin(tim+Math.PI/2)},
-        pol=[c.x-d.x,c.y-d.y,c.x+d.x,c.y+d.y,x+d.x,y+d.y,x-d.x,y-d.y];
-  return pol;
-
-}
-
-function draw(){
-  const d=new Date();
-  let m=d.getMinutes(), h=d.getHours(), s=d.getSeconds();
-  //draw black rectangle in the middle to clear screen from scale and hands
-  g.setColor(0,0,0);
-  g.fillRect(10,10,2*c.x-10,2*c.x-10);
-  g.setColor(1,1,1);
-
-  if(h>12){
-    h=h-12;
-  }
-  //calculates the position of the minute, second and hour hand
-  h=2*Math.PI/12*(h+m/60)-Math.PI/2;
-  //more accurate
-  //m=2*Math.PI/60*(m+s/60)-Math.PI/2;
-  m=2*Math.PI/60*(m)-Math.PI/2;
-
-  s=2*Math.PI/60*s-Math.PI/2;
-  //g.setColor(1,0,0);
-  const hz = zeiger(85,5,h);
-  g.fillPoly(hz,true);
- // g.setColor(1,1,1);
-  const minz = zeiger(150,5,m);
-  g.fillPoly(minz,true);
-  if (unlock){
-    const sekz = zeiger(150,2,s);
-    g.fillPoly(sekz,true);
-  }
-  g.fillCircle(c.x,c.y,4);
-
-  g.setFontAlign(0,0);
-  g.setFont("Vector",10);
-  g.setBgColor(0,0,0);
-  let dateStr = require("locale").date(d);
-  g.drawString(dateStr, c.x, c.y+20, true);
- // g.drawString(d.getDate(),1.4*c.x,c.y,true);
-  g.drawString(Math.round(E.getBattery()/5)*5+"%",c.x,c.y+40,true);
-
-  //draws the numbers on the screen
-  g.setFont("Vector",20);
-  for(let i = 0;i<12;i++){
-     g.drawString(zahlpos[i][0],zahlpos[i][1],zahlpos[i][2],true);
-  }
-}
-//draws the scale once the app is startet
-function drawScale(){
-  for(let i=-14;i<47;i++){
-    const win=i*2*Math.PI/60;
-    let d=2;
-    if(i%5==0){d=5;}
-    g.fillPoly(zeiger(300,d,win),true);
-    g.setColor(0,0,0);
-    g.fillRect(10,10,2*c.x-10,2*c.x-10);
-    g.setColor(1,1,1);
-  }
-}
-
 //calculates the Position of the numbers when app starts and saves them in an array
 function setlet(){
   let sk=1;
@@ -85,39 +25,124 @@ function setlet(){
   }
 }
 setlet();
-// Prepare widgets
-Bangle.loadWidgets();
-require("widget_utils").swipeOn();
+
+let unlock = false;
+
+function zeiger(len,dia,tim){
+  const x=c.x+ Math.cos(tim)*len/2,
+        y=c.y + Math.sin(tim)*len/2,
+        d={"d":3,"x":dia/2*Math.cos(tim+Math.PI/2),"y":dia/2*Math.sin(tim+Math.PI/2)},
+        pol=[c.x-d.x,c.y-d.y,c.x+d.x,c.y+d.y,x+d.x,y+d.y,x-d.x,y-d.y];
+  return pol;
+
+}
+
+function drawHands(d) {
+  let m=d.getMinutes(), h=d.getHours(), s=d.getSeconds();
+  //draw black rectangle in the middle to clear screen from scale and hands
+  g.setColor(0,0,0);
+  g.fillRect(10,10,2*c.x-10,2*c.x-10);
+  g.setColor(1,1,1);
+
+  if(h>12){
+    h=h-12;
+  }
+  //calculates the position of the minute, second and hour hand
+  h=2*Math.PI/12*(h+m/60)-Math.PI/2;
+  //more accurate
+  //m=2*Math.PI/60*(m+s/60)-Math.PI/2;
+  m=2*Math.PI/60*(m)-Math.PI/2;
+
+  s=2*Math.PI/60*s-Math.PI/2;
+  //g.setColor(1,0,0);
+  const hz = zeiger(settings.shortHrHand?88:100,5,h);
+  g.fillPoly(hz,true);
+ // g.setColor(1,1,1);
+  const minz = zeiger(150,5,m);
+  g.fillPoly(minz,true);
+  if (unlock){
+    const sekz = zeiger(150,2,s);
+    g.fillPoly(sekz,true);
+  }
+  g.fillCircle(c.x,c.y,4);
+}
+
+function drawText(d) {
+  g.setFontAlign(0,0);
+  g.setFont("Vector",10);
+  g.setBgColor(0,0,0);
+  g.setColor(1,1,1);
+  let dateStr = require("locale").date(d);
+  g.drawString(dateStr, c.x, c.y+20, true);
+ // g.drawString(d.getDate(),1.4*c.x,c.y,true);
+  let batStr = Math.round(E.getBattery()/5)*5+"%";
+  if (Bangle.isCharging()) {
+    g.setColor(1,0,0);
+  }
+  g.drawString(batStr, c.x, c.y+40, true);
+
+  //draws the numbers on the screen
+  g.setFont("Vector",20);
+  g.setColor(1,1,1);
+  for(let i = 0;i<12;i++){
+     g.drawString(zahlpos[i][0],zahlpos[i][1],zahlpos[i][2],true);
+  }
+}
+
+function draw(){
+  const d=new Date();
+  if (settings.textAboveHands) {
+    drawHands(); drawText();
+  } else {
+    drawText(); drawHands();
+  }
+}
+
+//draws the scale once the app is startet
+function drawScale(){
+  // clear the screen
+  g.setBgColor(0,0,0);
+  g.clear();
+  // draw the ticks of the scale
+  for(let i=-14;i<47;i++){
+    const win=i*2*Math.PI/60;
+    let d=2;
+    if(i%5==0){d=5;}
+    g.fillPoly(zeiger(300,d,win),true);
+    g.setColor(0,0,0);
+    g.fillRect(10,10,2*c.x-10,2*c.x-10);
+    g.setColor(1,1,1);
+  }
+}
+
+//// main running sequence ////
+
+if (settings.loadWidgets) {
+  // Prepare widgets
+  Bangle.loadWidgets();
+  require("widget_utils").swipeOn();
+}
 // Clear the screen once, at startup
-g.setBgColor(0,0,0);
-g.clear();
 drawScale();
 draw();
 
-let secondInterval= setInterval(draw, 1000);
-// Stop updates when LCD is off, restart when on
+let secondInterval = setInterval(draw, 1000);
 
+// Stop updates when LCD is off, restart when on
 Bangle.on('lcdPower',on=>{
   if (secondInterval) clearInterval(secondInterval);
   secondInterval = undefined;
   if (on) {
-      secondInterval = setInterval(draw, 1000);
-      draw(); // draw immediately
+    secondInterval = setInterval(draw, 1000);
+    draw(); // draw immediately
   }
 });
 Bangle.on('lock',on=>{
+  unlock = !on;
   if (secondInterval) clearInterval(secondInterval);
-  secondInterval = undefined;
-  if (!on) {
-      secondInterval = setInterval(draw, 1000);
-      unlock = true;
-      draw(); // draw immediately
-  }else{
-     secondInterval = setInterval(draw, 60000);
-     unlock = false;
-     draw();
-  }
- });
+  secondInterval = setInterval(draw, unlock ? 1000 : 60000);
+  draw(); // draw immediately
+});
 
 // Show launcher when middle button pressed
 Bangle.setUI("clock");

apps/andark_w/metadata.json

@@ -11,6 +11,8 @@
   "readme": "README.md",
   "storage": [
     {"name":"andark_w.app.js","url":"app.js"},
+    {"name":"andark_w.settings.js","url":"settings.js"},
     {"name":"andark_w.img","url":"app_icon.js","evaluate":true}
   ]
+  "data": [{"name":"andark.json"}]
 }

apps/andark_w/settings.js

@@ -0,0 +1,28 @@
+(function(back) {
+  const defaultSettings = {
+    loadWidgets    : false,
+    textAboveHands : false,
+    shortHrHand    : false
+  }
+  let settings = Object.assign(defaultSettings, require('Storage').readJSON('andark.json',1)||{});
+
+  const save = () => require('Storage').write('andark.json', settings);
+
+  const appMenu = {
+    '': {title: 'alarm'}, '< Back': back,
+    /*LANG*/'Load widgets': {
+      value : !!settings.loadWidgets,
+      onchange : v => { settings.loadWidgets=v; save();}
+    },
+    /*LANG*/'Text above hands': {
+      value : !!settings.textAboveHands,
+      onchange : v => { settings.textAboveHands=v; save();}
+    },
+    /*LANG*/'Short hour hand': {
+      value : !!settings.shortHrHand,
+      onchange : v => { settings.shortHrHand=v; save();}
+    },
+  };
+
+  E.showMenu(appMenu);
+});