Merge branch 'master' of github.com:espruino/BangleApps

apps/alarm/app.js

@@ -217,7 +217,12 @@ function showEditRepeatMenu(repeat, dow, dowChangeCallback) {
 function showCustomDaysMenu(dow, dowChangeCallback, originalRepeat, originalDow) {
   const menu = {
     "": { "title": /*LANG*/"Custom Days" },
-    "< Back": () => dowChangeCallback(true, dow),
+    "< Back": () => {
+      // If the user unchecks all the days then we assume repeat = once
+      // and we force the dow to every day.
+      var repeat = dow > 0;
+      dowChangeCallback(repeat, repeat ? dow : EVERY_DAY)
+    }
   };
 
   require("date_utils").dows(firstDayOfWeek).forEach((day, i) => {
@@ -315,12 +320,12 @@ function showAdvancedMenu() {
 
 function enableAll(on) {
   if (alarms.filter(e => e.on == !on).length == 0) {
-    E.showPrompt(on ? /*LANG*/"Nothing to Enable" : /*LANG*/"Nothing to Disable", {
+    E.showAlert(
-      title: on ? /*LANG*/"Enable All" : /*LANG*/"Disable All",
+      on ? /*LANG*/"Nothing to Enable" : /*LANG*/"Nothing to Disable",
-      buttons: { /*LANG*/"Ok": true }
+      on ? /*LANG*/"Enable All" : /*LANG*/"Disable All"
-    }).then(() => showAdvancedMenu());
+    ).then(() => showAdvancedMenu());
   } else {
-    E.showPrompt(/*LANG*/"Are you sure?", { title: on ? "/*LANG*/Enable All" : /*LANG*/"Disable All" }).then((confirm) => {
+    E.showPrompt(/*LANG*/"Are you sure?", { title: on ? /*LANG*/"Enable All" : /*LANG*/"Disable All" }).then((confirm) => {
       if (confirm) {
         alarms.forEach(alarm => alarm.on = on);
         saveAndReload();
@@ -334,7 +339,7 @@ function enableAll(on) {
 
 function deleteAll() {
   if (alarms.length == 0) {
-    E.showPrompt(/*LANG*/"Nothing to delete", { title: /*LANG*/"Delete All", buttons: { /*LANG*/"Ok": true } }).then(() => showAdvancedMenu());
+    E.showAlert(/*LANG*/"Nothing to delete", /*LANG*/"Delete All").then(() => showAdvancedMenu());
   } else {
     E.showPrompt(/*LANG*/"Are you sure?", {
       title: /*LANG*/"Delete All"

apps/bwclk/ChangeLog

@@ -6,3 +6,4 @@
 0.06: Design and usability improvements.
 0.07: Improved positioning.
 0.08: Select the color of widgets correctly. Additional settings to hide colon.
+0.09: Larger font size if colon is hidden to improve readability further.

apps/bwclk/app.js

@@ -44,6 +44,16 @@ Graphics.prototype.setLargeFont = function(scale) {
   return this;
 };
 
+Graphics.prototype.setXLargeFont = function(scale) {
+  // Actual height 53 (55 - 3)
+  this.setFontCustom(
+    E.toString(require('heatshrink').decompress(atob('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'))),
+    46,
+    atob("FR4uHyopKyksJSssGA=="),
+    70+(scale<<8)+(1<<16)
+  );
+};
+
 Graphics.prototype.setMediumFont = function(scale) {
   // Actual height 41 (42 - 2)
   this.setFontCustom(atob("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/AAAAAAAA/AAAAAAAA/AAAAAAAA/AAAAAAAA/AAAAAAAA/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAB/AAAAAAAP/AAAAAAD//AAAAAA///AAAAAP///AAAAB///8AAAAf///AAAAH///wAAAB///+AAAAH///gAAAAH//4AAAAAH/+AAAAAAH/wAAAAAAH8AAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA///8AAAAH////AAAAP////wAAAf////4AAA/////8AAB/////+AAD/gAAH+AAD+AAAD/AAH8AAAB/AAH4AAAA/gAH4AAAAfgAH4AAAAfgAPwAAAAfgAPwAAAAfgAPwAAAAfgAHwAAAAfgAH4AAAAfgAH4AAAA/gAH8AAAA/AAD+AAAD/AAD/gAAH/AAB/////+AAB/////8AAA/////4AAAf////wAAAH////gAAAB///+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAAAAAAfwAAAAAAA/gAAAAAAA/AAAAAAAB/AAAAAAAD+AAAAAAAD8AAAAAAAH8AAAAAAAH//////AAH//////AAH//////AAH//////AAH//////AAH//////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD4AAA/AAAP4AAB/AAAf4AAD/AAA/4AAD/AAB/4AAH/AAD/4AAP/AAH/AAAf/AAH8AAA//AAH4AAB//AAP4AAD//AAPwAAH+/AAPwAAP8/AAPwAAf4/AAPwAA/4/AAPwAA/w/AAPwAB/g/AAPwAD/A/AAP4AH+A/AAH8AP8A/AAH/A/4A/AAD///wA/AAD///gA/AAB///AA/AAA//+AA/AAAP/8AA/AAAD/wAA/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAH4AAAHwAAH4AAAH4AAH4AAAH8AAH4AAAP+AAH4AAAH+AAH4A4AB/AAH4A+AA/AAH4B/AA/gAH4D/AAfgAH4H+AAfgAH4P+AAfgAH4f+AAfgAH4/+AAfgAH5/+AAfgAH5//AAfgAH7+/AA/gAH/8/gB/AAH/4f4H/AAH/wf//+AAH/gP//8AAH/AH//8AAH+AD//wAAH8AB//gAAD4AAf+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+AAAAAAAD/AAAAAAAP/AAAAAAB//AAAAAAH//AAAAAAf//AAAAAB///AAAAAH///AAAAAf/8/AAAAB//w/AAAAH/+A/AAAA//4A/AAAD//gA/AAAH/+AA/AAAH/4AA/AAAH/gAA/AAAH+AAA/AAAHwAAA/AAAHAAf///AAEAAf///AAAAAf///AAAAAf///AAAAAf///AAAAAf///AAAAAAA/AAAAAAAA/AAAAAAAA/AAAAAAAA/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAP/AHgAAH///AP4AAH///gP8AAH///gP8AAH///gP+AAH///gD/AAH/A/AB/AAH4A/AA/gAH4A+AAfgAH4B+AAfgAH4B+AAfgAH4B8AAfgAH4B8AAfgAH4B+AAfgAH4B+AAfgAH4B+AA/gAH4B/AA/AAH4A/gD/AAH4A/4H+AAH4Af//+AAH4AP//8AAH4AP//4AAHwAD//wAAAAAB//AAAAAAAf8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA///8AAAAD////AAAAP////wAAAf////4AAA/////8AAB/////+AAD/gP4H+AAD/AfgD/AAH8A/AB/AAH8A/AA/gAH4B+AAfgAH4B+AAfgAPwB8AAfgAPwB8AAfgAPwB+AAfgAPwB+AAfgAH4B+AAfgAH4B/AA/gAH8B/AB/AAH+A/wD/AAD+A/8P+AAB8Af//+AAB4AP//8AAAwAH//4AAAAAD//gAAAAAA//AAAAAAAP4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPwAAAAAAAPwAAAAAAAPwAAAAAAAPwAAAAAAAPwAAAAHAAPwAAAA/AAPwAAAD/AAPwAAAf/AAPwAAB//AAPwAAP//AAPwAA//8AAPwAH//wAAPwAf/+AAAPwB//4AAAPwP//AAAAPw//8AAAAP3//gAAAAP//+AAAAAP//wAAAAAP//AAAAAAP/4AAAAAAP/gAAAAAAP+AAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP+AAAAH+A//gAAAf/h//4AAA//z//8AAB/////+AAD/////+AAD///+H/AAH+H/4B/AAH8B/wA/gAH4A/gAfgAH4A/gAfgAPwA/AAfgAPwA/AAfgAPwA/AAfgAPwA/AAfgAH4A/gAfgAH4A/gAfgAH8B/wA/gAH/H/4B/AAD///+H/AAD/////+AAB/////+AAA//z//8AAAf/h//4AAAH+A//gAAAAAAH+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/gAAAAAAD/8AAAAAAP/+AAAAAAf//AAcAAA///gA8AAB///wB+AAD/x/4B/AAD+AP4B/AAH8AH8A/gAH4AH8A/gAH4AD8AfgAP4AD8AfgAPwAB8AfgAPwAB8AfgAPwAB8AfgAPwAB8AfgAH4AD8AfgAH4AD4A/gAH8AH4B/AAD+APwD/AAD/g/wP+AAB/////+AAA/////8AAAf////4AAAP////wAAAH////AAAAA///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD8APwAAAAD8APwAAAAD8APwAAAAD8APwAAAAD8APwAAAAD8APwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=="), 46, atob("DxcjFyAfISAiHCAiEg=="), 54+(scale<<8)+(1<<16));
@@ -304,17 +314,13 @@ function drawTime(){
   g.setColor(g.theme.bg);
   g.setFontAlign(0,0);
 
-  var timeStr;
+  var hours = String(date.getHours());
-  if(settings.hideColon){
-    var hours = date.getHours();
-    hours -= hours >=12 ? 12 : 0;
   var minutes = date.getMinutes();
   minutes = minutes < 10 ? String("0") + minutes : minutes;
-    timeStr = String(hours) + minutes;
+  var colon = settings.hideColon ? "" : ":";
-  } else {
+  var timeStr = hours + colon + minutes;
-    timeStr = locale.time(date,1);
-  }
 
+  // Set y coordinates correctly
   y += parseInt((H - y)/2) + 5;
 
   var infoEntry = getInfoEntry();
@@ -324,7 +330,11 @@ function drawTime(){
 
   // Show large or small time depending on info entry
   if(infoStr == null){
+    if(settings.hideColon){
+      g.setXLargeFont();
+    } else {
       g.setLargeFont();
+    }
   } else {
     y -= 15;
     g.setMediumFont();

apps/bwclk/metadata.json

@@ -1,7 +1,7 @@
 {
   "id": "bwclk",
   "name": "BW Clock",
-  "version": "0.08",
+  "version": "0.09",
   "description": "BW Clock.",
   "readme": "README.md",
   "icon": "app.png",

apps/ffcniftya/ChangeLog

@@ -1,2 +1,4 @@
 0.01: New Clock Nifty A
-0.02: Shows the current week number (ISO8601), can be disabled via settings ""
+0.02: Shows the current week number (ISO8601), can be disabled via settings
+0.03: Call setUI before loading widgets
+      Improve settings page

apps/ffcniftya/README.md

@@ -1,13 +1,12 @@
 # Nifty-A Clock
 
-Colors are black/white - photos have non correct camera color "blue"
+Colors are black/white - photos have non correct camera color "blue".
 
-## This is the clock
+This is the clock:
 
 ![](screenshot_nifty.png)
 
-## The week number (ISO8601) can be turned of in settings
+The week number (ISO8601) can be turned off in settings (default is `On`)
-(default is **"On"**)
 
 ![](screenshot_settings_nifty.png)
 

apps/ffcniftya/app.js

@@ -1,6 +1,6 @@
 const locale = require("locale");
-const is12Hour = (require("Storage").readJSON("setting.json", 1) || {})["12hour"];
+const is12Hour = Object.assign({ "12hour": false }, require("Storage").readJSON("setting.json", true))["12hour"];
-const CFG = require('Storage').readJSON("ffcniftya.json", 1) || {showWeekNum: true};
+const showWeekNum = Object.assign({ showWeekNum: true }, require('Storage').readJSON("ffcniftya.json", true))["showWeekNum"];
 
 /* Clock *********************************************/
 const scale = g.getWidth() / 176;
@@ -17,7 +17,8 @@ const center = {
   y: Math.round(((viewport.height - widget) / 2) + widget),
 }
 
-function ISO8601_week_no(date) { //copied from: https://gist.github.com/IamSilviu/5899269#gistcomment-3035480
+// copied from: https://gist.github.com/IamSilviu/5899269#gistcomment-3035480
+function ISO8601_week_no(date) {
   var tdt = new Date(date.valueOf());
   var dayn = (date.getDay() + 6) % 7;
   tdt.setDate(tdt.getDate() - dayn + 3);
@@ -59,7 +60,7 @@ function draw() {
   g.drawString(year, centerDatesScaleX, center.y - 62 * scale);
   g.drawString(month, centerDatesScaleX, center.y - 44 * scale);
   g.drawString(day, centerDatesScaleX, center.y - 26 * scale);
-  if (CFG.showWeekNum) g.drawString(d02(ISO8601_week_no(now)), centerDatesScaleX, center.y + 15 * scale);
+  if (showWeekNum) g.drawString(weekNum, centerDatesScaleX, center.y + 15 * scale);
   g.drawString(monthName, centerDatesScaleX, center.y + 48 * scale);
   g.drawString(dayName, centerDatesScaleX, center.y + 66 * scale);
 }
@@ -79,7 +80,6 @@ function clearTickTimer() {
 function queueNextTick() {
   clearTickTimer();
   tickTimer = setTimeout(tick, 60000 - (Date.now() % 60000));
-  // tickTimer = setTimeout(tick, 3000);
 }
 
 function tick() {
@@ -91,21 +91,16 @@ function tick() {
 
 // Clear the screen once, at startup
 g.clear();
-// Start ticking
 tick();
 
-// Stop updates when LCD is off, restart when on
 Bangle.on('lcdPower', (on) => {
   if (on) {
-    tick(); // Start ticking
+    tick();
   } else {
-    clearTickTimer(); // stop ticking
+    clearTickTimer();
   }
 });
 
-// Load widgets
+Bangle.setUI("clock");
 Bangle.loadWidgets();
 Bangle.drawWidgets();
-
-// Show launcher when middle button pressed
-Bangle.setUI("clock");

apps/ffcniftya/metadata.json

@@ -1,7 +1,7 @@
 {
   "id": "ffcniftya",
   "name": "Nifty-A Clock",
-  "version": "0.02",
+  "version": "0.03",
   "description": "A nifty clock with time and date",
   "icon": "app.png",
   "screenshots": [{"url":"screenshot_nifty.png"}],

apps/ffcniftya/settings.js

@@ -1,22 +1,14 @@
-(function(back) {
+(function (back) {
-  var FILE = "ffcniftya.json";
+  const settings = Object.assign({ showWeekNum: true }, require("Storage").readJSON("ffcniftya.json", true));
-  // Load settings
-  var cfg = require('Storage').readJSON(FILE, 1) || { showWeekNum: true };
 
-  function writeSettings() {
-    require('Storage').writeJSON(FILE, cfg);
-  }
-
-  // Show the menu
   E.showMenu({
-    "" : { "title" : "Nifty-A Clock" },
+    "": { "title": "Nifty-A Clock" },
-    "< Back" : () => back(),
+    "< Back": () => back(),
-    'week number?': {
+    /*LANG*/"Show Week Number": {
-      value: cfg.showWeekNum,
+      value: settings.showWeekNum,
-      format: v => v?"On":"Off",
       onchange: v => {
-        cfg.showWeekNum = v;
+        settings.showWeekNum = v;
-        writeSettings();
+        require("Storage").writeJSON("ffcniftya.json", settings);
       }
     }
   });

apps/ffcniftyb/ChangeLog

@@ -1,2 +1,5 @@
 0.01: New Clock Nifty B
 0.02: Added configuration
+0.03: Call setUI before loading widgets
+      Fix bug with black being unselectable
+      Improve settings page

apps/ffcniftyb/README.md

@@ -1,9 +1,6 @@
 # Nifty Series B Clock
 
 - Display Time and Date
-- Color Configuration
+- Colour Configuration
-
-##
 
 ![](screenshot.png)
-

apps/ffcniftyb/app.js

@@ -1,9 +1,5 @@
-const locale = require("locale");
+const is12Hour = Object.assign({ "12hour": false }, require("Storage").readJSON("setting.json", true))["12hour"];
-const storage = require('Storage');
+const color = Object.assign({ color: 63488 }, require("Storage").readJSON("ffcniftyb.json", true)).color; // Default to RED
-
-const is12Hour = (storage.readJSON("setting.json", 1) || {})["12hour"];
-const color = (storage.readJSON("ffcniftyb.json", 1) || {})["color"] || 63488 /* red */;
-
 
 /* Clock *********************************************/
 const scale = g.getWidth() / 176;
@@ -19,7 +15,7 @@ const center = {
 };
 
 function d02(value) {
-  return ('0' + value).substr(-2);
+  return ("0" + value).substr(-2);
 }
 
 function renderEllipse(g) {
@@ -35,8 +31,8 @@ function renderText(g) {
   const month = d02(now.getMonth() + 1);
   const year = now.getFullYear();
 
-  const month2 = locale.month(now, 3);
+  const month2 = require("locale").month(now, 3);
-  const day2 = locale.dow(now, 3);
+  const day2 = require("locale").dow(now, 3);
 
   g.setFontAlign(1, 0).setFont("Vector", 90 * scale);
   g.drawString(hour, center.x + 32 * scale, center.y - 31 * scale);
@@ -96,7 +92,6 @@ function startTick(run) {
   stopTick();
   run();
   ticker = setTimeout(() => startTick(run), 60000 - (Date.now() % 60000));
-  // ticker = setTimeout(() => startTick(run), 3000);
 }
 
 /* Init **********************************************/
@@ -104,7 +99,7 @@ function startTick(run) {
 g.clear();
 startTick(draw);
 
-Bangle.on('lcdPower', (on) => {
+Bangle.on("lcdPower", (on) => {
   if (on) {
     startTick(draw);
   } else {
@@ -112,7 +107,6 @@ Bangle.on('lcdPower', (on) => {
   }
 });
 
+Bangle.setUI("clock");
 Bangle.loadWidgets();
 Bangle.drawWidgets();
-
-Bangle.setUI("clock");

apps/ffcniftyb/metadata.json

@@ -1,8 +1,8 @@
 {
   "id": "ffcniftyb",
   "name": "Nifty-B Clock",
-  "version": "0.02",
+  "version": "0.03",
-  "description": "A nifty clock (series B) with time, date and color configuration",
+  "description": "A nifty clock (series B) with time, date and colour configuration",
   "icon": "app.png",
   "screenshots": [{"url":"screenshot.png"}],
   "type": "clock",

apps/ffcniftyb/settings.js

@@ -1,49 +1,31 @@
 (function (back) {
-  const storage = require('Storage');
+  const settings = Object.assign({ color: 63488 }, require("Storage").readJSON("ffcniftyb.json", true));
-  const SETTINGS_FILE = "ffcniftyb.json";
 
   const colors = {
-    65535: 'White',
+    65535: /*LANG*/"White",
-    63488: 'Red',
+    63488: /*LANG*/"Red",
-    65504: 'Yellow',
+    65504: /*LANG*/"Yellow",
-    2047: 'Cyan',
+    2047: /*LANG*/"Cyan",
-    2016: 'Green',
+    2016: /*LANG*/"Green",
-    31: 'Blue',
+    31: /*LANG*/"Blue",
-    0: 'Black',
+    0: /*LANG*/"Black"
   }
 
-  function load(settings) {
+  const menu = {};
-    return Object.assign(settings, storage.readJSON(SETTINGS_FILE, 1) || {});
+  menu[""] = { title: "Nifty-B Clock" };
-  }
+  menu["< Back"] = back;
 
-  function save(settings) {
+  Object.keys(colors).forEach(color => {
-    storage.write(SETTINGS_FILE, settings)
+    var label = colors[color];
+    menu[label] = {
+      value: settings.color == color,
+      onchange: () => {
+        settings.color = color;
+        require("Storage").write("ffcniftyb.json", settings);
+        setTimeout(load, 10);
       }
-
+    };
-  const settings = load({
-    color: 63488 /* red */,
   });
 
-  const saveColor = (color) => () => {
+  E.showMenu(menu);
-    settings.color = color;
-    save(settings);
-    back();
-  };
-
-  function showMenu(items, opt) {
-    items[''] = opt || {};
-    items['< Back'] = back;
-    E.showMenu(items);
-  }
-
-  showMenu(
-    Object.keys(colors).reduce((menu, color) => {
-      menu[colors[color]] = saveColor(color);
-      return menu;
-    }, {}),
-    {
-      title: 'Color',
-      selected: Object.keys(colors).indexOf(settings.color)
-    }
-  );
 });

apps/rebble/ChangeLog

@@ -4,4 +4,5 @@
 0.04: Fixed icon and png to 48x48 pixels
 0.05: added charging icon
 0.06: Add 12h support and autocycle control
-0.07: added localization; removed deprecated code
+0.07: added localization, removed deprecated code
+0.08: removed unused font, fix autocycle,  imported suncalc and trimmed, removed pedometer dependency, "tap to cycle" setting

apps/rebble/metadata.json

@@ -2,11 +2,11 @@
   "id": "rebble",
   "name": "Rebble Clock",
   "shortName": "Rebble",
-  "version": "0.07",
+  "version": "0.08",
   "description": "A Pebble style clock, with configurable background, three sidebars including steps, day, date, sunrise, sunset, long live the rebellion",
   "readme": "README.md",
   "icon": "rebble.png",
-  "dependencies": {"mylocation":"app", "widpedom":"app"},
+  "dependencies": {"mylocation":"app"},
   "screenshots": [{"url":"screenshot_rebble.png"}],
   "type": "clock",
   "tags": "clock",
@@ -14,6 +14,7 @@
   "storage": [
     {"name":"rebble.app.js","url":"rebble.app.js"},
     {"name":"rebble.settings.js","url":"rebble.settings.js"},
-    {"name":"rebble.img","url":"rebble.icon.js","evaluate":true}
+    {"name":"rebble.img","url":"rebble.icon.js","evaluate":true},
+    {"name":"suncalc","url":"suncalc.js"}
   ]
 }

apps/rebble/rebble.settings.js

@@ -2,12 +2,14 @@
   const SETTINGS_FILE = "rebble.json";
 
   // initialize with default settings...
-  let localSettings = {'bg': '#0f0', 'color': 'Green', 'autoCycle': true}
+  let localSettings = {'bg': '#0f0', 'color': 'Green', 'autoCycle': true, 'sideTap':0};
+  //sideTap 0 = on| 1= sideBar1 | 2 = ...
 
   // ...and overwrite them with any saved values
   // This way saved values are preserved if a new version adds more settings
   const storage = require('Storage')
   let settings = storage.readJSON(SETTINGS_FILE, 1) || localSettings;
+
   const saved = settings || {}
   for (const key in saved) {
     localSettings[key] = saved[key]
@@ -21,7 +23,9 @@
   var color_options = ['Green','Orange','Cyan','Purple','Red','Blue'];
   var bg_code = ['#0f0','#ff0','#0ff','#f0f','#f00','#00f'];
   
-  E.showMenu({
+  function showMenu()
+  {
+    const menu={
       '': { 'title': 'Rebble Clock' },
       '< Back': back,
       'Colour': {
@@ -35,12 +39,39 @@
         },
       },
       'Auto Cycle': {
-      value: "autoCycle" in localSettings ? localSettings.autoCycle : true,
+        value: localSettings.autoCycle,
-      format: () => (localSettings.autoCycle ? 'Yes' : 'No'),
+        onchange: (v) => {
-      onchange: () => {
+          localSettings.autoCycle = v;
-        localSettings.autoCycle = !localSettings.autoCycle;
           save();
+          showMenu();
         }
       }
-  });
+    };
+
+    if( !localSettings.autoCycle)
+    {
+      menu['Tap to Cycle']= {
+        value: localSettings.sideTap,
+        min: 0,
+        max: 3,
+        step: 1,
+        format: v => NumberToSideTap(v),
+        onchange: v => {
+          localSettings.sideTap=v
+          save();
+          setTimeout(showMenu, 10);
+        }
+      };
+    }
+    E.showMenu(menu);
+  }
+
+  function NumberToSideTap(Number)
+  {
+    if(Number==0)
+      return 'on';
+    return Number+"";
+  }
+  
+  showMenu();
 })

apps/rebble/suncalc.js

@@ -0,0 +1,143 @@
+/*
+ (c) 2011-2015, Vladimir Agafonkin
+ SunCalc is a JavaScript library for calculating sun/moon position and light phases.
+ https://github.com/mourner/suncalc
+ 
+ edit for banglejs
+*/
+
+(function () { 'use strict';
+
+// shortcuts for easier to read formulas
+
+var PI   = Math.PI,
+    sin  = Math.sin,
+    cos  = Math.cos,
+    tan  = Math.tan,
+    asin = Math.asin,
+    atan = Math.atan2,
+    acos = Math.acos,
+    rad  = PI / 180;
+
+// sun calculations are based on http://aa.quae.nl/en/reken/zonpositie.html formulas
+
+
+// date/time constants and conversions
+
+var dayMs = 1000 * 60 * 60 * 24,
+    J1970 = 2440588,
+    J2000 = 2451545;
+
+function toJulian(date) { return date.valueOf() / dayMs - 0.5 + J1970; }
+function fromJulian(j)  { return new Date((j + 0.5 - J1970) * dayMs); }
+function toDays(date)   { return toJulian(date) - J2000; }
+
+
+// general calculations for position
+
+var e = rad * 23.4397; // obliquity of the Earth
+
+function declination(l, b)    { return asin(sin(b) * cos(e) + cos(b) * sin(e) * sin(l)); }
+
+
+// general sun calculations
+
+function solarMeanAnomaly(d) { return rad * (357.5291 + 0.98560028 * d); }
+
+function eclipticLongitude(M) {
+
+    var C = rad * (1.9148 * sin(M) + 0.02 * sin(2 * M) + 0.0003 * sin(3 * M)), // equation of center
+        P = rad * 102.9372; // perihelion of the Earth
+
+    return M + C + P + PI;
+}
+
+var SunCalc = {};
+
+
+// sun times configuration (angle, morning name, evening name)
+
+var times = SunCalc.times = [
+    [-0.833, 'sunrise',       'sunset'      ],
+    [  -0.3, 'sunriseEnd',    'sunsetStart' ],
+    [    -6, 'dawn',          'dusk'        ],
+    [   -12, 'nauticalDawn',  'nauticalDusk'],
+    [   -18, 'nightEnd',      'night'       ],
+    [     6, 'goldenHourEnd', 'goldenHour'  ]
+];
+
+
+
+// calculations for sun times
+
+var J0 = 0.0009;
+
+function julianCycle(d, lw) { return Math.round(d - J0 - lw / (2 * PI)); }
+
+function approxTransit(Ht, lw, n) { return J0 + (Ht + lw) / (2 * PI) + n; }
+function solarTransitJ(ds, M, L)  { return J2000 + ds + 0.0053 * sin(M) - 0.0069 * sin(2 * L); }
+
+function hourAngle(h, phi, d) { return acos((sin(h) - sin(phi) * sin(d)) / (cos(phi) * cos(d))); }
+function observerAngle(height) { return -2.076 * Math.sqrt(height) / 60; }
+
+// returns set time for the given sun altitude
+function getSetJ(h, lw, phi, dec, n, M, L) {
+
+    var w = hourAngle(h, phi, dec),
+        a = approxTransit(w, lw, n);
+    return solarTransitJ(a, M, L);
+}
+
+
+// calculates sun times for a given date, latitude/longitude, and, optionally,
+// the observer height (in meters) relative to the horizon
+
+SunCalc.getTimes = function (date, lat, lng, height) {
+
+    height = height || 0;
+
+    var lw = rad * -lng,
+        phi = rad * lat,
+
+        dh = observerAngle(height),
+
+        d = toDays(date),
+        n = julianCycle(d, lw),
+        ds = approxTransit(0, lw, n),
+
+        M = solarMeanAnomaly(ds),
+        L = eclipticLongitude(M),
+        dec = declination(L, 0),
+
+        Jnoon = solarTransitJ(ds, M, L),
+
+        i, len, time, h0, Jset, Jrise;
+
+
+    var result = {
+        solarNoon: fromJulian(Jnoon),
+        nadir: fromJulian(Jnoon - 0.5)
+    };
+
+    for (i = 0, len = times.length; i < len; i += 1) {
+        time = times[i];
+        h0 = (time[0] + dh) * rad;
+
+        Jset = getSetJ(h0, lw, phi, dec, n, M, L);
+        Jrise = Jnoon - (Jset - Jnoon);
+
+        result[time[1]] = fromJulian(Jrise);
+        result[time[2]] = fromJulian(Jset);
+    }
+
+    return result;
+};
+
+
+// export as Node module / AMD module / browser variable
+if (typeof exports === 'object' && typeof module !== 'undefined') module.exports = SunCalc;
+else if (typeof define === 'function' && define.amd) define(SunCalc);
+else window.SunCalc = SunCalc;
+
+
+}());

lang/it_IT.json

@@ -192,7 +192,15 @@
         "Notifications": "Notifiche",
         "Scheduler": "Schedulatore",
         "Stop": "Stop",
-        "Min Font": "Dimensione minima del font"
+        "Min Font": "Dimensione minima del font",
+        "White": "Bianco",
+        "Red": "Rosso",
+        "Yellow": "Giallo",
+        "Cyan": "Ciano",
+        "Green": "Verde",
+        "Blue": "Blu",
+        "Black": "Nero",
+        "Show Week Number": "Mostra numero settimana"
     },
     "//2": "App-specific overrides",
     "alarm": {