Merge remote-tracking branch 'upstream/master' into app-loader

Author: thyttan

apps/andark/ChangeLog

@@ -7,3 +7,5 @@
 0.06: Fix issue showing widgets when app is fast-loaded into from launcher with widgets disabled
 0.07: Enable fast loading and queue updates to the second
 0.08: Restore redraw on charging event + fixup for safer fast-loading
+0.09: Add setting to show the weekday and not the year + add setting to hide the battery +
+      changed to follow system them with setting for dark theme

apps/andark/README.md

@@ -7,10 +7,19 @@
 * battery percentage (showing charge status with color)
 * turned off or swipeable widgets (choose in settings)
 
-![logo](andark_screen.png)
+![Screenshot of Dark Analog Clock with default settings](andark_screen.png)
+
+*Default settings*
+
+![Screenshot of Dark Analog Clock with default settings](andark_screen_light_weekday_nobatt.png)
+
+*Following system theme, with weekday shown and battery hidden*
 
 ## Settings
 
 * whether to load widgets, or not; if widgets are loaded, they are swipeable from the top; if not, NO ACTIONS of widgets are available
 * date and battery can be printed both below hands (as if hands were physical) and above (more readable)
 * hour hand can be made slighly shorter to improve readability when minute hand is behind a number
+* show the weekday and not the year
+* hide the battery percentage; the font for the date is increased since there is more space
+* dark theme (enabled by default); disable to follow system theme

apps/andark/andark_screen_light_weekday_nobatt.png

@@ -2,10 +2,19 @@
 const defaultSettings = {
   loadWidgets    : false,
   textAboveHands : false,
-  shortHrHand    : false
+  shortHrHand    : false,
+  weekdayNoYear  : false,
+  noBattery      : false,
+  darkTheme      : true
 };
 const settings = Object.assign(defaultSettings, require('Storage').readJSON('andark.json',1)||{});
 
+const origTheme = g.theme;
+if (settings.darkTheme) {
+  g.setTheme({bg: "#000"});
+  g.setTheme({fg: "#FFF"});
+}
+
 const c={"x":g.getWidth()/2,"y":g.getHeight()/2};
 
 const zahlpos=(function() {
@@ -36,7 +45,7 @@ const zeiger = function(len,dia,tim) {
 
 const drawHands = function(d) {
   let m=d.getMinutes(), h=d.getHours(), s=d.getSeconds();
-  g.setColor(1,1,1);
+  g.setColor(g.theme.fg);
 
   if(h>12){
     h=h-12;
@@ -62,23 +71,31 @@ const drawHands = function(d) {
 };
 
 const drawText = function(d) {
-  g.setFont("Vector",10);
-  g.setBgColor(0,0,0);
-  g.setColor(1,1,1);
-  const dateStr = require("locale").date(d);
-  g.drawString(dateStr, c.x, c.y+20, true);
+//g.setFont("Vector",10);
+  g.setBgColor(g.theme.bg);
+  g.setColor(g.theme.fg);
+  const dateStr = settings.weekdayNoYear
+    ? require("locale").dow(d, 1)+" "+d.getDate()+" "+require("locale").month(d, 1)
+    : require("locale").date(d);
   const batStr = Math.round(E.getBattery()/5)*5+"%";
-  if (Bangle.isCharging()) {
-    g.setBgColor(1,0,0);
+  if (settings.noBattery) {
+    g.setFont("Vector",13);
+    g.drawString(dateStr, c.x, c.y+25, true);
+  } else {
+    g.setFont("Vector",10);
+    g.drawString(dateStr, c.x, c.y+20, true);
+    if (Bangle.isCharging()) {
+      g.setBgColor(1,0,0);
+    }
+    g.drawString(batStr, c.x, c.y+40, true);
   }
-  g.drawString(batStr, c.x, c.y+40, true);
 };
 
 const drawNumbers = function() {
   //draws the numbers on the screen
   g.setFont("Vector",20);
-  g.setColor(1,1,1);
-  g.setBgColor(0,0,0);
+  g.setColor(g.theme.fg);
+  g.setBgColor(g.theme.bg);
   for(let i = 0;i<12;i++){
     g.drawString(zahlpos[i][0],zahlpos[i][1],zahlpos[i][2],true);
   }
@@ -114,7 +131,7 @@ const queueDraw = function() {
 
 const draw = function() {
   // draw black rectangle in the middle to clear screen from scale and hands
-  g.setColor(0,0,0);
+  g.setColor(g.theme.bg);
   g.fillRect(10,10,2*c.x-10,2*c.x-10);
   // prepare for drawing the text
   g.setFontAlign(0,0);
@@ -132,17 +149,17 @@ const draw = function() {
 //draws the scale once the app is startet
 const drawScale = function() {
   // clear the screen
-  g.setBgColor(0,0,0);
+  g.setBgColor(g.theme.bg);
   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.setColor(g.theme.bg);
     g.fillRect(10,10,2*c.x-10,2*c.x-10);
-    g.setColor(1,1,1);
+    g.setColor(g.theme.fg);
   }
 };
 
@@ -152,6 +169,7 @@ const drawScale = function() {
 Bangle.setUI({
   mode: "clock",
   remove: function() {
+    if (settings.darkTheme) g.setTheme(origTheme);
     Bangle.removeListener('lcdPower', updateState);
     Bangle.removeListener('lock', updateState);
     Bangle.removeListener('charging', draw);

apps/andark/app.js

@@ -1,13 +1,14 @@
 { "id": "andark",
   "name": "Analog Dark",
   "shortName":"AnDark",
-  "version":"0.08",
+  "version":"0.09",
   "description": "analog clock face without disturbing widgets",
   "icon": "andark_icon.png",
   "type": "clock",
   "tags": "clock",
+  "allow_emulator": true,
   "supports" : ["BANGLEJS2"],
-  "screenshots": [{"url":"andark_screen.png"}],
+  "screenshots": [{"url":"andark_screen.png"},{"url":"andark_screen_light_weekday_nobatt.png"}],
   "readme": "README.md",
   "storage": [
     {"name":"andark.app.js","url":"app.js"},

apps/andark/metadata.json

@@ -2,7 +2,10 @@
   const defaultSettings = {
     loadWidgets    : false,
     textAboveHands : false,
-    shortHrHand    : false
+    shortHrHand    : false,
+    weekdayNoYear  : false,
+    noBattery      : false,
+    darkTheme      : true
   }
   let settings = Object.assign(defaultSettings, require('Storage').readJSON('andark.json',1)||{});
 
@@ -22,6 +25,18 @@
       value : !!settings.shortHrHand,
       onchange : v => { settings.shortHrHand=v; save();}
     },
+    /*LANG*/'Show weekday not year': {
+      value : !!settings.weekdayNoYear,
+      onchange : v => { settings.weekdayNoYear=v; save();}
+    },
+    /*LANG*/'Hide the battery': {
+      value : !!settings.noBattery,
+      onchange : v => { settings.noBattery=v; save();}
+    },
+    /*LANG*/'Dark theme': {
+      value : !!settings.darkTheme,
+      onchange : v => { settings.darkTheme=v; save();}
+    },
   };
 
   E.showMenu(appMenu);

apps/andark/settings.js

@@ -3,3 +3,4 @@
 0.03: Fix lint warnings
 0.04: Fix lint warnings
 0.05: Fix on not reading counter defaults in Settings
+0.06: Added ability to display only one counter and fast-scrolling

apps/counter2/ChangeLog

@@ -11,10 +11,13 @@ The counter state gets saved. Best to use this with pattern launcher or ClockCal
 ## Howto
  - Tap top side or swipe up to increase counter
  - Tap bottom side or swipe down to decrease counter
- - Hold (600ms) to reset to default value (configurable)
- - Press button to exit
+ - Hold either side to quickly increase or decrease the counter.
+ - If the counters are not on their presets, then press the button to reset them
+ - If the counters are on their presets, then press the button to leave the screen
+ - Long press the button to leave the screen regardless of the counter values
 
 ## Configurable Features
+- Display both Counters or only Counter 1
 - Default value Counter 1
 - Default value Counter 2
 - Buzz on interact

apps/counter2/README.md

@@ -1,20 +1,25 @@
-Bangle.loadWidgets();
-
 var s = Object.assign({
+  display2:true,
   counter0:10,
   counter1:20,
   max0:15,
   max1:25,
+  fullscreen:true,
   buzz: true,
   colortext: true,
 }, require('Storage').readJSON("counter2.json", true) || {});
 
+var sGlob = Object.assign({
+  timeout: 10,
+}, require('Storage').readJSON("setting.json", true) || {});
+
 const f1 = (s.colortext) ? "#f00" : "#fff";
 const f2 = (s.colortext) ? "#00f" : "#fff";
 const b1 = (s.colortext) ? g.theme.bg : "#f00";
 const b2 = (s.colortext) ? g.theme.bg : "#00f";
 
 var drag;
+var dragCurr = {x:0 ,y:0 ,dx:0 ,dy:0 ,b:false};
 
 const screenwidth = g.getWidth();
 const screenheight = g.getHeight();
@@ -37,51 +42,111 @@ function saveSettings() {
 }
 
 let ignoreonce = false;
+let fastupdateoccurring = false;
 var dragtimeout;
 
 function updateScreen() {
-  g.setBgColor(b1);
-  g.clearRect(0, 0, halfwidth, screenheight);
-  g.setBgColor(b2);
-  g.clearRect(halfwidth, 0, screenwidth, screenheight);
-  g.setFont("Vector", 60).setFontAlign(0, 0);
-  g.setColor(f1);
-  g.drawString(Math.floor(counter[0]), halfwidth * 0.5, halfheight);
-  g.setColor(f2);
-  g.drawString(Math.floor(counter[1]), halfwidth * 1.5, halfheight);
+  if (s.display2) {
+    g.setBgColor(b1);
+    g.clearRect(0, 0, halfwidth, screenheight);
+    g.setBgColor(b2);
+    g.clearRect(halfwidth, 0, screenwidth, screenheight);
+    g.setFont("Vector", 60).setFontAlign(0, 0);
+    g.setColor(f1);
+    g.drawString(Math.floor(counter[0]), halfwidth * 0.5, halfheight);
+    g.setColor(f2);
+    g.drawString(Math.floor(counter[1]), halfwidth * 1.5, halfheight);
+  }
+  else {
+    g.setBgColor(b2);  // Using right counter's colors b/c blue looks nicer than red
+    g.clearRect(0, 0, screenwidth, screenheight);
+    g.setFont("Vector", 90).setFontAlign(0, 0);
+    g.setColor(f2);
+    g.drawString(Math.floor(counter[0]), halfwidth, halfheight);
+  }
   saveSettings();
   if (s.buzz)  Bangle.buzz(50,.5);
-  Bangle.drawWidgets();
+
+  Bangle.loadWidgets();
+  if (s.fullscreen) {
+    require("widget_utils").hide();
+  }
+  else {
+    Bangle.drawWidgets();
+  }
 }
 
+// Clearing the timer on lock is likely uneeded, but just in case
+Bangle.on('lock', e => {
+  drag = undefined;
+  var timeOutTimer = sGlob.timeout * 1000;
+  Bangle.setOptions({backlightTimeout: timeOutTimer, lockTimeout: timeOutTimer});
+  if (dragtimeout) clearTimeout(dragtimeout);
+  fastupdateoccurring = false;
+});
+
 Bangle.on("drag", e => {
-  const c = (e.x < halfwidth) ? 0 : 1;
+  const c = (e.x >= halfwidth && s.display2) ? 1 : 0;
+  dragCurr = e;
   if (!drag) {
     if (ignoreonce) {
       ignoreonce = false;
       return;
     }
     drag = { x: e.x, y: e.y };
-    dragtimeout = setTimeout(function () { resetcounter(c); }, 600); //if dragging for 500ms, reset counter
+    dragtimeout = setTimeout(function () { fastupdatecounter(c); }, 600); //if dragging for 500ms, reset counter
   }
   else if (drag && !e.b) { // released
-      let adjust = 0;
-      const dx = e.x - drag.x, dy = e.y - drag.y;
-      if (Math.abs(dy) > Math.abs(dx) + 30) {
-        adjust = (dy > 0) ? -1 : 1;
-      } else {
-        adjust = (e.y > halfwidth) ? -1 : 1;
-      }
-      counter[c] += adjust;
-      updateScreen();
-      drag = undefined;
+    if (!fastupdateoccurring)
+      updatecounter(c);
+    drag = undefined;
+    if (dragtimeout) {
+      let timeOutTimer = 1000;
+      Bangle.setOptions({backlightTimeout: timeOutTimer, lockTimeout: timeOutTimer});
       clearTimeout(dragtimeout);
     }
+    fastupdateoccurring = false;
+  }
 });
 
+function updatecounter(which) {
+  let adjust = 0;
+  const dx = dragCurr.x - drag.x, dy = dragCurr.y - drag.y;
+  if (Math.abs(dy) > Math.abs(dx) + 30) {
+    adjust = (dy > 0) ? -1 : 1;
+  } else {
+    adjust = (dragCurr.y > halfheight) ? -1 : 1;
+  }
+  counter[which] += adjust;
+  updateScreen();
+}
+
+function fastupdatecounter(which) {
+  fastupdateoccurring = true;
+  updatecounter(which);
+  Bangle.setOptions({backlightTimeout: 0, lockTimeout: 0});
+  dragtimeout = setTimeout(function () { fastupdatecounter(which); }, 10);
+}
+
+
 function resetcounter(which) {
-  counter[which] = defaults[which];
-  console.log("resetting counter ", which);
+  // If which is null, reset all
+  fastupdateoccurring = false;
+  if (dragtimeout) {
+    let timeOutTimer = 1000;
+    Bangle.setOptions({backlightTimeout: timeOutTimer, lockTimeout: timeOutTimer});
+    clearTimeout(dragtimeout);
+  }
+  if (which == null) {
+    for (let iter = 0; iter < defaults.length; iter++) {
+      counter[iter] = defaults[iter];
+    }
+    console.log("resetting all counters");
+  }
+  else {
+    counter[which] = defaults[which];
+    console.log("resetting counter ", which);
+  }
   updateScreen();
   drag = undefined;
   ignoreonce = true;
@@ -91,5 +156,13 @@ function resetcounter(which) {
 updateScreen();
 
 setWatch(function() {
+  for (let which = 0; which < defaults.length; which++) {
+    if(counter[which] != defaults[which]) {
+      resetcounter(null);
+      return;
+    }
+  }
+  var timeOutTimer = sGlob.timeout * 1000;
+  Bangle.setOptions({backlightTimeout: timeOutTimer, lockTimeout: timeOutTimer});
   load();
 }, BTN1, {repeat:true, edge:"falling"});

apps/counter2/app.js

@@ -1,7 +1,7 @@
 {
   "id": "counter2",
   "name": "Counter2",
-  "version": "0.05",
+  "version": "0.06",
   "description": "Dual Counter",
   "readme":"README.md",
   "icon": "counter2-icon.png",