From bbc6cf35c15a5b0d7c217d5ddaccd2e265e28bc9 Mon Sep 17 00:00:00 2001
From: Richard de Boer <richard@tubul.net>
Date: Fri, 3 Apr 2020 01:41:57 +0200
Subject: [PATCH 01/13] Battery Widget with percentage: add settings
 (percentage/color/charger)

Depends on settings 0.08
---
 apps.json                 |  7 +++-
 apps/widbatpc/ChangeLog   |  1 +
 apps/widbatpc/settings.js | 58 +++++++++++++++++++++++++++++
 apps/widbatpc/widget.js   | 77 ++++++++++++++++++++++++++++++++++-----
 4 files changed, 131 insertions(+), 12 deletions(-)
 create mode 100644 apps/widbatpc/settings.js

diff --git a/apps.json b/apps.json
index 5b269e44f..58448d6f7 100644
--- a/apps.json
+++ b/apps.json
@@ -336,13 +336,16 @@
   },
   { "id": "widbatpc",
     "name": "Battery Level Widget (with percentage)",
+    "shortName": "Battery Widget",
     "icon": "widget.png",
-    "version":"0.06",
+    "version": "0.07",
     "description": "Show the current battery level and charging status in the top right of the clock, with charge percentage",
     "tags": "widget,battery",
     "type":"widget",
     "storage": [
-      {"name":"widbatpc.wid.js","url":"widget.js"}
+      {"name":"widbatpc.wid.js","url":"widget.js"},
+      {"name":"widbatpc.settings.js","url":"settings.js"},
+      {"name":"widbatpc.settings.json","content": "{}"}
     ]
   },
   { "id": "widbt",
diff --git a/apps/widbatpc/ChangeLog b/apps/widbatpc/ChangeLog
index 3988729c3..245ec3af3 100644
--- a/apps/widbatpc/ChangeLog
+++ b/apps/widbatpc/ChangeLog
@@ -3,3 +3,4 @@
 0.04: Ensure redrawing works with variable size widget system
 0.05: Change color depending on battery level, cloned from widbat
 0.06: Show battery percentage as text
+0.07: Add settings: percentage/color/charger icon
diff --git a/apps/widbatpc/settings.js b/apps/widbatpc/settings.js
new file mode 100644
index 000000000..9ea86ed39
--- /dev/null
+++ b/apps/widbatpc/settings.js
@@ -0,0 +1,58 @@
+// This file should contain exactly one function, which shows the app's settings
+/**
+ * @param {function} back Use back() to return to settings menu
+ */
+function settings(back) {
+  const SETTINGS_FILE = 'widbatpc.settings.json'
+  const COLORS = ['By Level', 'Green', 'Monochrome']
+
+  // initialize with default settings...
+  let s = {
+    'color': COLORS[0],
+    'percentage': true,
+    'charger': true,
+  }
+  // ...and overwrite them with any saved values
+  // This way saved values are preserved if a new version adds more settings
+  const storage = require('Storage')
+  const saved = storage.readJSON(SETTINGS_FILE, 1) || {}
+  for (const key in saved) {
+    s[key] = saved[key]
+  }
+
+  // creates a function to safe a specific setting, e.g.  save('color')(1)
+  function save(key) {
+    return function (value) {
+      s[key] = value
+      storage.write(SETTINGS_FILE, s)
+      WIDGETS["batpc"].reload()
+    }
+  }
+
+  const onOffFormat = b => (b ? 'on' : 'off')
+  const menu = {
+    '': { 'title': 'Battery Widget' },
+    '< Back': back,
+    'Percentage': {
+      value: s.percentage,
+      format: onOffFormat,
+      onchange: save('percentage'),
+    },
+    'Charging Icon': {
+      value: s.charger,
+      format: onOffFormat,
+      onchange: save('charger'),
+    },
+    'Color': {
+      format: () => s.color,
+      onchange: function () {
+        // cycles through options
+        const oldIndex = COLORS.indexOf(s.color)
+        const newIndex = (oldIndex + 1) % COLORS.length
+        s.color = COLORS[newIndex]
+        save('color')(s.color)
+      },
+    },
+  }
+  E.showMenu(menu)
+}
diff --git a/apps/widbatpc/widget.js b/apps/widbatpc/widget.js
index 7100dc111..a679f6721 100644
--- a/apps/widbatpc/widget.js
+++ b/apps/widbatpc/widget.js
@@ -1,20 +1,62 @@
 (function(){
+const DEFAULTS = {
+  'color': 'By Level',
+  'percentage': true,
+  'charger': true,
+}
+const COLORS = {
+  'white': -1,
+  'charging': 0x07E0, // "Green"
+  'high':  0x05E0, // slightly darker green
+  'ok': 0xFD20, // "Orange"
+  'low':0xF800, // "Red"
+}
+const SETTINGS_FILE = 'widbatpc.settings.json'
+
+let settings
+function loadSettings() {
+  settings = require('Storage').readJSON(SETTINGS_FILE, 1) || {}
+}
+function setting(key) {
+  if (!settings) { loadSettings() }
+  return (key in settings) ? settings[key] : DEFAULTS[key]
+}
+
 const levelColor = (l) => {
-  if (Bangle.isCharging()) return 0x07E0; // "Green"
-  if (l >= 50) return 0x05E0; // slightly darker green
-  if (l >= 15) return 0xFD20; // "Orange"
-  return 0xF800; // "Red"
+  // "charging" is very bright -> percentage is hard to read, "high" is ok(ish)
+  const green = setting('percentage') ? COLORS.high : COLORS.charging
+  switch (setting('color')) {
+    case 'Monochrome': return COLORS.white; // no chance of reading the percentage here :-(
+    case 'Green': return green;
+    case 'By Level': // fall through
+    default:
+      if (setting('charger')) {
+        // charger icon -> always make percentage readable
+        if (Bangle.isCharging() || l >= 50) return green;
+      } else {
+        // no icon -> brightest green to indicate charging, even when showing percentage
+        if (Bangle.isCharging()) return COLORS.charging;
+        if (l >= 50) return COLORS.high;
+      }
+      if (l >= 15) return COLORS.ok;
+      return COLORS.low;
+  }
+}
+const chargerColor = () => {
+  return (setting('color') === 'Monochrome') ? COLORS.white : COLORS.charging
 }
 
 function setWidth() {
-  WIDGETS["bat"].width = 40 + (Bangle.isCharging()?16:0);
+  WIDGETS["batpc"].width = 40;
+  if (Bangle.isCharging() && setting('charger')) {
+    WIDGETS["batpc"].width += 16;
+  }
 }
 function draw() {
   var s = 39;
   var x = this.x, y = this.y;
-  const l = E.getBattery(), c = levelColor(l);
-  if (Bangle.isCharging()) {
-    g.setColor(c).drawImage(atob(
+  if (Bangle.isCharging() && setting('charger')) {
+    g.setColor(chargerColor()).drawImage(atob(
       "DhgBHOBzgc4HOP////////////////////3/4HgB4AeAHgB4AeAHgB4AeAHg"),x,y);
     x+=16;
   }
@@ -22,8 +64,13 @@ function draw() {
   g.fillRect(x,y+2,x+s-4,y+21);
   g.clearRect(x+2,y+4,x+s-6,y+19);
   g.fillRect(x+s-3,y+10,x+s,y+14);
+  const l = E.getBattery(),
+    c = levelColor(l);
   g.setColor(c).fillRect(x+4,y+6,x+4+l*(s-12)/100,y+17);
   g.setColor(-1);
+  if (!setting('percentage')) {
+    return;
+  }
   g.setFontAlign(-1,-1);
   if (l >= 100) {
     g.setFont('4x6', 2);
@@ -34,6 +81,16 @@ function draw() {
     g.drawString(l, x + 6, y + 4);
   }
 }
+// reload widget, e.g. when settings have changed
+function reload() {
+  loadSettings()
+  // need to redraw all widgets, because changing the "charger" setting
+  // can affect the width and mess with the whole widget layout
+  setWidth()
+  g.clear();
+  Bangle.drawWidgets();
+}
+
 Bangle.on('charging',function(charging) {
   if(charging) Bangle.buzz();
   setWidth();
@@ -43,7 +100,7 @@ Bangle.on('charging',function(charging) {
 var batteryInterval;
 Bangle.on('lcdPower', function(on) {
   if (on) {
-   WIDGETS["bat"].draw();
+   WIDGETS["batpc"].draw();
    // refresh once a minute if LCD on
    if (!batteryInterval)
      batteryInterval = setInterval(draw, 60000);
@@ -54,6 +111,6 @@ Bangle.on('lcdPower', function(on) {
    }
  }
 });
-WIDGETS["bat"]={area:"tr",width:40,draw:draw};
+WIDGETS["batpc"]={area:"tr",width:40,draw:draw,reload:reload};
 setWidth();
 })()

From c269083382c4dd1ea2e53f6e04fd9c981b1849c7 Mon Sep 17 00:00:00 2001
From: Richard de Boer <richard@tubul.net>
Date: Fri, 3 Apr 2020 21:36:48 +0200
Subject: [PATCH 02/13] widbatpc: put settings function in parentheses

---
 apps/widbatpc/settings.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/widbatpc/settings.js b/apps/widbatpc/settings.js
index 9ea86ed39..5c0bdbcae 100644
--- a/apps/widbatpc/settings.js
+++ b/apps/widbatpc/settings.js
@@ -2,7 +2,7 @@
 /**
  * @param {function} back Use back() to return to settings menu
  */
-function settings(back) {
+(function(back) {
   const SETTINGS_FILE = 'widbatpc.settings.json'
   const COLORS = ['By Level', 'Green', 'Monochrome']
 
@@ -55,4 +55,4 @@ function settings(back) {
     },
   }
   E.showMenu(menu)
-}
+})

From ee4295e5c581cc81f485ad4ab3a5cc3fb77a0255 Mon Sep 17 00:00:00 2001
From: Richard de Boer <richard@tubul.net>
Date: Fri, 3 Apr 2020 22:31:08 +0200
Subject: [PATCH 03/13] widbatpc: whitespace fix in apps.json

---
 apps.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps.json b/apps.json
index 0cbcc7294..daf1fba68 100644
--- a/apps.json
+++ b/apps.json
@@ -338,7 +338,7 @@
     "name": "Battery Level Widget (with percentage)",
     "shortName": "Battery Widget",
     "icon": "widget.png",
-    "version": "0.07",
+    "version":"0.07",
     "description": "Show the current battery level and charging status in the top right of the clock, with charge percentage",
     "tags": "widget,battery",
     "type":"widget",

From 323b2dc3b41cf8b2ea52f936bf9971a74667fcba Mon Sep 17 00:00:00 2001
From: Dimitri Gigot <dgigot@luckycycle.com>
Date: Fri, 3 Apr 2020 21:37:00 +0000
Subject: [PATCH 04/13] Improvement: Close launcher when lcd turn off

---
 apps.json              | 2 +-
 apps/toucher/ChangeLog | 3 ++-
 apps/toucher/app.js    | 4 ++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/apps.json b/apps.json
index f0bc4874a..d3ff86ab0 100644
--- a/apps.json
+++ b/apps.json
@@ -1013,7 +1013,7 @@
     "name": "Touch Launcher",
     "shortName":"Menu",
     "icon": "app.png",
-    "version":"0.02",
+    "version":"0.03",
     "description": "Touch enable left to right launcher.",
     "tags": "tool,system,launcher",
     "type":"launch",
diff --git a/apps/toucher/ChangeLog b/apps/toucher/ChangeLog
index bd3d5d225..f21553c54 100644
--- a/apps/toucher/ChangeLog
+++ b/apps/toucher/ChangeLog
@@ -1,2 +1,3 @@
 0.01: New App!
-0.02: Add swipe support and doucle tap to run application
\ No newline at end of file
+0.02: Add swipe support and doucle tap to run application
+0.03: Close launcher when lcd turn off
\ No newline at end of file
diff --git a/apps/toucher/app.js b/apps/toucher/app.js
index 2b80198c9..7a3f6ff97 100644
--- a/apps/toucher/app.js
+++ b/apps/toucher/app.js
@@ -127,4 +127,8 @@ Bangle.on('touch', function(button){
 Bangle.on('swipe', dir => {
   if(dir == 1) prev();
   else next();
+});
+
+Bangle.on('lcdPower', function(on) {
+  if(!on) return load();
 });
\ No newline at end of file

From e38b7dfaa2e747a9712bd951b973d14d2e669881 Mon Sep 17 00:00:00 2001
From: Richard de Boer <richard@tubul.net>
Date: Sat, 4 Apr 2020 00:00:14 +0200
Subject: [PATCH 05/13] Readme: app settings

---
 README.md | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/README.md b/README.md
index 2d0b54a7d..f59fa54e0 100644
--- a/README.md
+++ b/README.md
@@ -32,6 +32,7 @@ easily distinguish between file types, we use the following:
 * `stuff.img` is an image
 * `stuff.app.js` is JS code for applications
 * `stuff.wid.js` is JS code for widgets
+* `stuff.settings.js` is JS code for the settings menu
 * `stuff.boot.js` is JS code that automatically gets run at boot time
 * `stuff.json` is used for JSON settings for an app
 
@@ -314,6 +315,48 @@ the data you require from Bangle.js.
 
 See [apps/gpsrec/interface.html](the GPS Recorder) for a full example.
 
+### Adding configuration to the "Settings" menu
+
+Apps (or widgets) can add their own settings to the "Settings" menu under "App/widget settings".   
+To do so, the app needs to include a `settings.js` file, containing a single function
+that handles configuring the app.   
+When the app settings are opened, this function is called with one 
+argument, `back`: a callback to return to the settings menu.
+
+Example `settings.js`
+```js
+// make sure to enclose the function in parentheses
+(function(back) {
+  let settings = require('Storage').readJSON('app.settings.json',1)||{};
+  function save(key, value) {
+    settings[key] = value;
+    require('Storage').write('app.settings.json',settings);
+  } 
+  const appMenu = {
+    '': {'title': 'App Settings'},
+    '< Back': back,
+    'Monkeys': {
+      value: settings.monkeys||12,
+      onchange: (m) => {save('monkeys', m)}
+    }   
+  };
+  E.showMenu(appMenu)
+})
+```
+In this example the app needs to add both `app.settings.js` and
+`app.settings.json` to `apps.json`:
+```json
+  { "id": "app",
+    ...
+    "storage": [
+      ...
+      {"name":"app.settings.js","url":"settings.js"},
+      {"name":"app.settings.json","content":"{}"}
+    ]
+  },
+```
+That way removing the app also cleans up `app.settings.json`.
+
 ## Coding hints
 
 - use `g.setFont(.., size)` to multiply the font size, eg ("6x8",3) : "18x24"

From 7b669cd028b8f4d0e23c9706ff58b808a6055726 Mon Sep 17 00:00:00 2001
From: Richard de Boer <richard@tubul.net>
Date: Sat, 4 Apr 2020 01:30:33 +0200
Subject: [PATCH 06/13] Move Welcome config into App/widget settings

---
 apps.json                |  5 +++--
 apps/setting/ChangeLog   |  1 +
 apps/setting/settings.js |  8 --------
 apps/welcome/ChangeLog   |  1 +
 apps/welcome/settings.js | 16 ++++++++++++++++
 5 files changed, 21 insertions(+), 10 deletions(-)
 create mode 100644 apps/welcome/settings.js

diff --git a/apps.json b/apps.json
index f0bc4874a..28e2e20c6 100644
--- a/apps.json
+++ b/apps.json
@@ -78,13 +78,14 @@
   { "id": "welcome",
     "name": "Welcome",
     "icon": "app.png",
-    "version":"0.04",
+    "version":"0.05",
     "description": "Appears at first boot and explains how to use Bangle.js",
     "tags": "start,welcome",
     "allow_emulator":true,
     "storage": [
       {"name":"welcome.js","url":"welcome.js"},
       {"name":"welcome.app.js","url":"app.js"},
+      {"name":"welcome.settings.js","url":"settings.js"},
       {"name":"welcome.img","url":"app-icon.js","evaluate":true}
     ]
   },
@@ -117,7 +118,7 @@
   { "id": "setting",
     "name": "Settings",
     "icon": "settings.png",
-    "version":"0.08",
+    "version":"0.09",
     "description": "A menu for setting up Bangle.js",
     "tags": "tool,system",
     "storage": [
diff --git a/apps/setting/ChangeLog b/apps/setting/ChangeLog
index 0cfa04bf0..db0ac834a 100644
--- a/apps/setting/ChangeLog
+++ b/apps/setting/ChangeLog
@@ -5,3 +5,4 @@
 0.06: Remove distance setting as there's a separate app for Locale now
 0.07: Added vibrate as beep workaround
 0.08: Add support for app/widget settings
+0.09: Move Welcome into App/widget settings
diff --git a/apps/setting/settings.js b/apps/setting/settings.js
index dbb03555c..3d7586851 100644
--- a/apps/setting/settings.js
+++ b/apps/setting/settings.js
@@ -95,14 +95,6 @@ function showMainMenu() {
         }
       }
     },
-    'Welcome App': {
-      value: !settings.welcomed,
-      format: boolFormat,
-      onchange: v => {
-        settings.welcomed = v?undefined:true;
-        updateSettings();
-      }
-    },
     'Locale': showLocaleMenu,
     'Select Clock': showClockMenu,
     'HID': {
diff --git a/apps/welcome/ChangeLog b/apps/welcome/ChangeLog
index d8d647138..34f6e3a82 100644
--- a/apps/welcome/ChangeLog
+++ b/apps/welcome/ChangeLog
@@ -2,3 +2,4 @@
 0.02: Animate balloon intro
 0.03: BTN3 now won't restart when at the end
 0.04: Fix regression after tweaks to Storage.readJSON
+0.05: Move configuration into App/widget settings
diff --git a/apps/welcome/settings.js b/apps/welcome/settings.js
new file mode 100644
index 000000000..2fbd585c6
--- /dev/null
+++ b/apps/welcome/settings.js
@@ -0,0 +1,16 @@
+// The welcome app is special, and gets to use global settings
+(function(back) {
+  let settings = require('Storage').readJSON('setting.json', 1) || {}
+  E.showMenu({
+    '': { 'title': 'Welcome App' },
+    'Run again': {
+      value: !settings.welcomed,
+      format: v => v ? 'Yes' : 'No',
+      onchange: v => {
+        settings.welcomed = v ? undefined : true
+        require('Storage').write('setting.json', settings)
+      },
+    },
+    '< Back': back,
+  })
+})

From 16ea9a8167b1e65b42a50701cec9a989d5e31d14 Mon Sep 17 00:00:00 2001
From: Paul Cockrell <paul.cockrell@protonmail.com>
Date: Sat, 4 Apr 2020 11:03:34 +0100
Subject: [PATCH 07/13] Enhance Mario clock performance and graphics

---
 apps.json                         |   2 +-
 apps/marioclock/ChangeLog         |   1 +
 apps/marioclock/marioclock-app.js | 303 ++++++++++++------------------
 3 files changed, 124 insertions(+), 182 deletions(-)

diff --git a/apps.json b/apps.json
index f0bc4874a..32682282c 100644
--- a/apps.json
+++ b/apps.json
@@ -893,7 +893,7 @@
   { "id": "marioclock",
     "name": "Mario Clock",
     "icon": "marioclock.png",
-    "version":"0.05",
+    "version":"0.06",
     "description": "Animated Mario clock, jumps to change the time!",
     "tags": "clock,mario,retro",
     "type": "clock",
diff --git a/apps/marioclock/ChangeLog b/apps/marioclock/ChangeLog
index 74db9bc18..dfad2d26a 100644
--- a/apps/marioclock/ChangeLog
+++ b/apps/marioclock/ChangeLog
@@ -3,3 +3,4 @@
 0.03: use short date format from locale, take timeout from settings
 0.04: modify date to display to be more at the original idea but still localized
 0.05: use 12/24 hour clock from settings
+0.06: Performance refactor, and enhanced graphics!
diff --git a/apps/marioclock/marioclock-app.js b/apps/marioclock/marioclock-app.js
index 2eeb21c97..ed1d51cde 100644
--- a/apps/marioclock/marioclock-app.js
+++ b/apps/marioclock/marioclock-app.js
@@ -3,6 +3,7 @@
   + Based on Espruino Mario Clock V3 https://github.com/paulcockrell/espruino-mario-clock
   + Converting images to 1bit BMP: Image > Mode > Indexed and tick the "Use black and white (1-bit) palette", Then export as BMP.
   + Online Image convertor: https://www.espruino.com/Image+Converter
+  + Images must be converted 1Bit White/Black !!! Not Black/White
 **********************************/
 
 const locale = require("locale");
@@ -16,110 +17,32 @@ let W, H;
 
 let intervalRef, displayTimeoutRef = null;
 
-// Space to draw watch widgets (e.g battery, bluetooth status)
-const WIDGETS_GUTTER = 10;
-
 // Colours
 const LIGHTEST = "#effedd";
 const LIGHT = "#add795";
 const DARK = "#588d77";
 const DARKEST = "#122d3e";
 
-// Mario Images
-const marioRunningImage1 = {
-  width : 15, height : 20, bpp : 1,
-  transparent : 0,
-  buffer : E.toArrayBuffer(atob("B8AfwH+B/8f/z4M+KExcnAUSCw87w4L8CJQRNB/YH+AxgCEAPAA="))
-};
-
-const marioRunningImage1Neg = {
-  width : 15, height : 20, bpp : 1,
-  transparent : 0,
-  buffer : E.toArrayBuffer(atob("AAAAAAAAAAAAAHwB0DOgY/jt8PDAPAEAB2gOyAAgAAAOAB4AAAA="))
-};
-
-const marioRunningImage2 = {
-  width : 15, height : 20, bpp : 1,
-  transparent : 0,
-  buffer : E.toArrayBuffer(atob("B8AfwH+B/8f/z4M+KExcnAUSCw87w4J6BEsPnSfyT+S+OMAAAAA="))
-};
-
-const marioRunningImage2Neg = {
-  width : 15, height : 20, bpp : 1,
-  transparent : 0,
-  buffer : E.toArrayBuffer(atob("AAAAAAAAAAAAAHwB0DOgY/jt8PDAPAGEA7QAYhgMMBhAAAAAAAA="))
-};
-
-const pyramid = {
-  width : 20, height : 20, bpp : 1,
-  transparent : 0,
-  buffer : E.toArrayBuffer(atob("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAkAAQgAIEAEAgCAEBAAggAEQAAoAAE="))
-};
-
-const pipe = {
-  width : 9, height : 6, bpp : 1,
-  transparent : 0,
-  buffer : E.toArrayBuffer(atob("/8BxaCRSCA=="))
-};
-
-const floor = {
-  width : 8, height : 3, bpp : 1,
-  transparent : 0,
-  buffer : E.toArrayBuffer(atob("/6pE"))
-};
-
-const sky = {
-  width : 128, height : 30, bpp : 1,
-  transparent : 0,
-  buffer : E.toArrayBuffer(atob("VVVVVVVVVVVVVVVVVVVVVQAAAAAAAAAAAAAAAAAAAABVVVVVVVVVVVVVVVVVVVVVIiIiIiIiIiIiIiIiIiIiIlVVVVVVVVVVVVVVVVVVVVWIiIiIiIiIiIiIiIiIiIiIVVVVVVVVVVVVVVVVVVVVVSIiIiIiIiICIiIiIiIiIiJVVVVVVVVVAVVVVVVVVVVViIiIiIiIiACIiIiIiIiIiFVVVVVVVVQAVVVVVVVVVVUiIiIiIiIgACIiIiIiIiIiVVVVVVVVUAAVVVUBVVVVUKqqqqqqqggAKCqqAKqqqoBVUBVVVVQAABAVVABVVVUAIiACIiIgAAAgAiAAIiIiAFVABVVVUAAAUAVUABRVVQCqgAKCqqAAACAAAAAgCqoAVUABAVVAAAAAAAAAAAVQAKqAAACqoAAAAAAAAAACgABAAAAAUEAAAAAAAAAABQAAgAAAACAAAAAAAAAAAAIAAAAAAABQAAAAAAAAAAAEAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"))
-};
-
-const brick = {
-  width : 21, height : 15, bpp : 1,
-  transparent : 0,
-  buffer : E.toArrayBuffer(atob("f//0AABoAAsAABgAAMAABgAAMAABgAAMAABgAAMAABoAAsAABf//wA=="))
-};
-
-const flower = {
-  width : 7, height : 7, bpp : 1,
-  transparent : 0,
-  buffer : E.toArrayBuffer(atob("fY3wjW+OAA=="))
-};
-
-const pipePlant = {
-  width : 9, height : 15, bpp : 1,
-  transparent : 0,
-  buffer : E.toArrayBuffer(atob("FBsNhsHDWPn/gOLQSKQSKQQ="))
-};
-
 const marioSprite = {
   frameIdx: 0,
-  frames: [
-    marioRunningImage1,
-    marioRunningImage2
-  ],
-  negFrames: [
-    marioRunningImage1Neg,
-    marioRunningImage2Neg
-  ],
   x: 35,
   y: 55,
   jumpCounter: 0,
-  jumpIncrement: Math.PI / 10,
+  jumpIncrement: Math.PI / 6,
   isJumping: false
 };
 
-const STATIC_TILES = {
-  "_": {img: floor, x: 16 * 8, y: 75},
-  "X": {img: sky, x: 0, y: 10},
-  "#": {img: brick, x: 0, y: 0},
+const coinSprite = {
+  frameIdx: 0,
+  x: 34,
+  y: 18,
+  isAnimating: false,
+  yDefault: 18,
 };
 
-const TILES = {
-  "T": {img: pipe, x: 16 * 8, y: 69},
-  "^": {img: pyramid, x: 16 * 8, y: 55},
-  "*": {img: flower, x: 16 * 8, y: 68},
-  "V": {img: pipePlant, x: 16 * 8, y: 60}
+const pyramidSprite = {
+  x: 90,
+  height: 34,
 };
 
 const ONE_SECOND = 1000;
@@ -136,95 +59,133 @@ function incrementTimer() {
   }
 }
 
-function drawTile(sprite) {
-  g.drawImage(sprite.img, sprite.x, sprite.y);
-}
-
 function drawBackground() {
+  // Clear screen
   g.setColor(LIGHTEST);
   g.fillRect(0, 10, W, H);
 
-  // draw floor
-  g.setColor(DARK);
-  for (var x = 0; x < 16; x++) {
-    var floorSprite = Object.assign({}, STATIC_TILES._, {x: x * 8});
-    drawTile(floorSprite);
-  }
+  // Date bar
+  g.setColor(DARKEST);
+  g.fillRect(0, 0, W, 9);
 
   // draw sky
-  var skySprite = STATIC_TILES.X;
   g.setColor(LIGHT);
-  drawTile(skySprite);
+  g.fillRect(0, 10, g.getWidth(), 15);
+  g.fillRect(0, 17, g.getWidth(), 17);
+  g.fillRect(0, 19, g.getWidth(), 19);
+  g.fillRect(0, 21, g.getWidth(), 21);
 }
 
-function drawScenery() {
-  // new random sprite
-  const spriteKeys = Object.keys(TILES);
-  const key = spriteKeys[Math.floor(Math.random() * spriteKeys.length)];
-  let newSprite = Object.assign({}, TILES[key]);
+function drawFloor() {
+  const fImg = require("heatshrink").decompress(atob("ikDxH+rgATCoIBQAQYDP")); // Floor image
+  for (let x = 0; x < 4; x++) {
+    g.drawImage(fImg, x * 20, g.getHeight() - 5);
+  }
+}
+
+function drawPyramid() {
+  const pPol = [pyramidSprite.x + 10, H - 6, pyramidSprite.x + 50, pyramidSprite.height, pyramidSprite.x + 90, H - 6]; // Pyramid poly
+
+  g.setColor(LIGHT);
+  g.fillPoly(pPol);
+
+  pyramidSprite.x -= 1;
+  // Reset and randomize pyramid if off-screen
+  if (pyramidSprite.x < - 100) {
+    pyramidSprite.x = 90;
+    pyramidSprite.height = Math.floor(Math.random() * (60 /* max */ - 25 /* min */ + 1) + 25 /* min */);
+  }
+}
+
+function drawTreesFrame(x, y) {
+  const tImg = require("heatshrink").decompress(atob("h8GxH+AAMHAAIFCAxADEBYgDCAQYAFCwobOAZAEFBxo=")); // Tree image
+
+  g.drawImage(tImg, x, y);
+  g.setColor(DARKEST);
+  g.drawLine(x + 6 /* Match stalk to palm tree */, y + 6 /* Match stalk to palm tree */, x + 6, H - 6);
+}
+
+function drawTrees() {
+  let newSprite = {x: 90, y: Math.floor(Math.random() * (40 /* max */ - 5 /* min */ + 1) + 15 /* min */)};
 
   // remove first sprite if offscreen
   let firstBackgroundSprite = backgroundArr[0];
   if (firstBackgroundSprite) {
-      if (firstBackgroundSprite.x < -20) backgroundArr.splice(0, 1);
+      if (firstBackgroundSprite.x < -15) backgroundArr.splice(0, 1);
   }
 
   // set background sprite if array empty
-  var lastBackgroundSprite = backgroundArr[backgroundArr.length - 1];
+  let lastBackgroundSprite = backgroundArr[backgroundArr.length - 1];
   if (!lastBackgroundSprite) {
     lastBackgroundSprite = newSprite;
     backgroundArr.push(lastBackgroundSprite);
   }
 
   // add random sprites
-  if (backgroundArr.length < 6 && lastBackgroundSprite.x < (16 * 7)) {
-    var randIdx = Math.floor(Math.random() * 25);
-    if (randIdx < spriteKeys.length - 1) {
+  if (backgroundArr.length < 2 && lastBackgroundSprite.x < (16 * 7)) {
+    const randIdx = Math.floor(Math.random() * 25);
+    if (randIdx < 2) {
       backgroundArr.push(newSprite);
     }
   }
 
   for (x = 0; x < backgroundArr.length; x++) {
     let scenerySprite = backgroundArr[x];
-
-    // clear sprite at previous position
-    g.setColor(LIGHTEST);
-    drawTile(scenerySprite);
-
-    // draw sprite in new position
-    g.setColor(LIGHT);
     scenerySprite.x -= 5;
-    drawTile(scenerySprite);
+    drawTreesFrame(scenerySprite.x, scenerySprite.y);
   }
 }
 
-function drawMario() {
-  // clear old mario frame
-  g.setColor(LIGHTEST);
-  g.drawImage(
-    marioSprite.negFrames[marioSprite.frameIdx],
-    marioSprite.x,
-    marioSprite.y
-  );
-  g.drawImage(
-    marioSprite.frames[marioSprite.frameIdx],
-    marioSprite.x,
-    marioSprite.y
-  );
+function drawCoinFrame(x, y) {
+  const cImg = require("heatshrink").decompress(atob("hkPxH+AAcHAAQIEBIXWAAQNEBIWHAAdcBgQLBA4IODBYQKEBAQMDBelcBaJUBM4QRBNYx1EBQILDR4QHBBISdIBIoA==")); // Coin image
+  g.drawImage(cImg, x, y);
+}
 
+function drawCoin() {
+  if (!coinSprite.isAnimating) return;
+
+  coinSprite.y -= 8;
+  if (coinSprite.y < (0 - 15 /*Coin sprite height*/)) {
+    coinSprite.isAnimating = false;
+    coinSprite.y = coinSprite.yDefault;
+    return;
+  }
+
+  drawCoinFrame(coinSprite.x, coinSprite.y);
+}
+
+function drawMarioFrame(idx, x, y) {
+  const mFr1 = require("heatshrink").decompress(atob("h8UxH+AAkHAAYKFBolcAAIPIBgYPDBpgfGFIY7EA4YcEBIPWAAYdDC4gLDAII5ECoYOFDogODFgoJCBwYZCAQYOFBAhAFFwZKGHQpMDw52FSg2HAAIoDAgIOMB5AAFGQTtKeBLuNcQwOJFwgJFA=")); // Mario Frame 1
+  const mFr2 = require("heatshrink").decompress(atob("h8UxH+AAkHAAYKFBolcAAIPIBgYPDBpgfGFIY7EA4YcEBIPWAAYdDC4gLDAII5ECoYOFDogODFgoJCBwYZCAQYOFBAhAFFwZKGHQpMDw+HCQYEBSowOBBQIdCCgTOIFgiVHFwYCBUhA9FBwz8HAo73GACQA=")); // Mario frame 2
+
+  switch(idx) {
+    case 0:
+      g.drawImage(mFr1, x, y);
+      break;
+    case 1:
+      g.drawImage(mFr2, x, y);
+      break;
+    default:
+  }
+}
+
+function drawMario(date) {
   // calculate jumping
-  const t = new Date(),
-        seconds = t.getSeconds(),
-        milliseconds = t.getMilliseconds();
+  const seconds = date.getSeconds(),
+        milliseconds = date.getMilliseconds();
 
   if (seconds == 59 && milliseconds > 800 && !marioSprite.isJumping) {
     marioSprite.isJumping = true;
   }
 
   if (marioSprite.isJumping) {
-    marioSprite.y = (Math.sin(marioSprite.jumpCounter) * -10) + 50 /* Mario Y base value */;
+    marioSprite.y = (Math.sin(marioSprite.jumpCounter) * -12) + 50 /* Mario Y base value */;
     marioSprite.jumpCounter += marioSprite.jumpIncrement;
 
+    if (parseInt(marioSprite.jumpCounter) === 2 && !coinSprite.isAnimating) {
+      coinSprite.isAnimating = true;
+    }
+
     if (marioSprite.jumpCounter.toFixed(1) >= 4) {
       marioSprite.jumpCounter = 0;
       marioSprite.isJumping = false;
@@ -232,51 +193,28 @@ function drawMario() {
   }
 
   // calculate animation timing
-  if (timer % 100 === 0) {
+  if (timer % 50 === 0) {
     // shift to next frame
     marioSprite.frameIdx ^= 1;
   }
 
-  // colour in mario
-  g.setColor(LIGHT);
-  g.drawImage(
-    marioSprite.negFrames[marioSprite.frameIdx],
-    marioSprite.x,
-    marioSprite.y
-  );
-
-  // draw mario
-  g.setColor(DARKEST);
-  g.drawImage(
-    marioSprite.frames[marioSprite.frameIdx],
-    marioSprite.x,
-    marioSprite.y
-  );
+  drawMarioFrame(marioSprite.frameIdx, marioSprite.x, marioSprite.y);
 }
 
-
-function drawBrick(x, y) {
-  const brickSprite = Object.assign({}, STATIC_TILES['#'], {x: x, y: y});
-
-  // draw brick background colour
-  g.setColor(LIGHT);
-  g.fillRect(x, y, x + 20, y+14);
-
-  // draw brick sprite
-  g.setColor(DARK);
-  drawTile(brickSprite);
+function drawBrickFrame(x, y) {
+  const brk = require("heatshrink").decompress(atob("ikQxH+/0HACASB6wAQCoPWw4AOrgT/Cf4T/Cb1cAB8H/wVBAB/+A"));
+  g.drawImage(brk, x, y);
 }
 
-function drawTime() {
+function drawTime(date) {
   // draw hour brick
-  drawBrick(20, 25);
+  drawBrickFrame(20, 25);
   // draw minute brick
-  drawBrick(42, 25);
+  drawBrickFrame(42, 25);
 
-  const t = new Date();
-  const h = t.getHours();
+  const h = date.getHours();
   const hours = ("0" + ((is12Hour && h > 12) ? h - 12 : h)).substr(-2);
-  const mins = ("0" + t.getMinutes()).substr(-2);
+  const mins = ("0" + date.getMinutes()).substr(-2);
 
   g.setFont("6x8");
   g.setColor(DARKEST);
@@ -284,25 +222,30 @@ function drawTime() {
   g.drawString(mins, 47, 29);
 }
 
-function drawDate() {
+function drawDate(date) {
   g.setFont("6x8");
   g.setColor(LIGHTEST);
-  let d = new Date(); 
-  let dateStr = locale.date(d, true);
-  dateStr = dateStr.replace(d.getFullYear(), "").trim().replace(/\/$/i,"");
-  dateStr = locale.dow(d, true) + " " + dateStr;
-  g.drawString(dateStr, (W - g.stringWidth(dateStr))/2, 0, true);
+  let dateStr = locale.date(date, true);
+  dateStr = dateStr.replace(date.getFullYear(), "").trim().replace(/\/$/i,"");
+  dateStr = locale.dow(date, true) + " " + dateStr;
+  g.drawString(dateStr, (W - g.stringWidth(dateStr))/2, 0);
 }
 
 function redraw() {
+  const date = new Date();
+
   // Update timers
   incrementTimer();
 
   // Draw frame
-  drawScenery();
-  drawTime();
-  drawDate();
-  drawMario();
+  drawBackground();
+  drawFloor();
+  drawPyramid();
+  drawTrees();
+  drawTime(date);
+  drawDate(date);
+  drawMario(date);
+  drawCoin();
 
   // Render new frame
   g.flip();
@@ -335,7 +278,6 @@ function startTimers(){
 
   resetDisplayTimeout();
 
-  drawBackground();
   redraw();
 }
 
@@ -345,7 +287,6 @@ function init() {
 
   // Initialise display
   Bangle.setLCDMode("80x80");
-  g.clear();
 
   // Store screen dimensions
   W = g.getWidth();
@@ -381,4 +322,4 @@ function init() {
 }
 
 // Initialise!
-init();
+init();
\ No newline at end of file

From 3f6e4b630ed4ff9f1274ff7bfd1aed6258fe5908 Mon Sep 17 00:00:00 2001
From: Paul Cockrell <paul.cockrell@protonmail.com>
Date: Sat, 4 Apr 2020 11:05:51 +0100
Subject: [PATCH 08/13] Vertical align date string

---
 apps/marioclock/marioclock-app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/marioclock/marioclock-app.js b/apps/marioclock/marioclock-app.js
index ed1d51cde..5622c10f2 100644
--- a/apps/marioclock/marioclock-app.js
+++ b/apps/marioclock/marioclock-app.js
@@ -228,7 +228,7 @@ function drawDate(date) {
   let dateStr = locale.date(date, true);
   dateStr = dateStr.replace(date.getFullYear(), "").trim().replace(/\/$/i,"");
   dateStr = locale.dow(date, true) + " " + dateStr;
-  g.drawString(dateStr, (W - g.stringWidth(dateStr))/2, 0);
+  g.drawString(dateStr, (W - g.stringWidth(dateStr))/2, 1);
 }
 
 function redraw() {

From 32e1642555d656bcc88b0e84dc18076c6dd65d8c Mon Sep 17 00:00:00 2001
From: Stefano Baldan <singintime@gmail.com>
Date: Sat, 4 Apr 2020 14:14:01 +0200
Subject: [PATCH 09/13] Added minion themed clock

---
 apps.json                    |  13 +++++++
 apps/minionclk/ChangeLog     |   1 +
 apps/minionclk/app-icon.js   |   1 +
 apps/minionclk/app.js        |  65 +++++++++++++++++++++++++++++++++++
 apps/minionclk/minionclk.png | Bin 0 -> 5654 bytes
 5 files changed, 80 insertions(+)
 create mode 100755 apps/minionclk/ChangeLog
 create mode 100755 apps/minionclk/app-icon.js
 create mode 100755 apps/minionclk/app.js
 create mode 100755 apps/minionclk/minionclk.png

diff --git a/apps.json b/apps.json
index f0bc4874a..d5d321bbe 100644
--- a/apps.json
+++ b/apps.json
@@ -1059,5 +1059,18 @@
     "storage": [
       {"name":"widmp.wid.js","url":"widget.js"}
     ]
+  },
+  { "id": "minionclk",
+    "name": "Minion clock",
+    "icon": "minionclk.png",
+    "version": "0.01",
+    "description": "Minion themed clock.",
+    "tags": "clock,minion",
+    "type": "clock",
+    "allow_emulator": true,
+    "storage": [
+      {"name":"minionclk.app.js","url":"app.js"},
+      {"name":"minionclk.img","url":"app-icon.js","evaluate":true}
+    ]
   }
 ]
diff --git a/apps/minionclk/ChangeLog b/apps/minionclk/ChangeLog
new file mode 100755
index 000000000..7b83706bf
--- /dev/null
+++ b/apps/minionclk/ChangeLog
@@ -0,0 +1 @@
+0.01: First release
diff --git a/apps/minionclk/app-icon.js b/apps/minionclk/app-icon.js
new file mode 100755
index 000000000..f78fb9e35
--- /dev/null
+++ b/apps/minionclk/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwhAaXlZEolVVvOj0mq1XOv9/qtWFb8rquj1XV5wBDAA2jvMqNLMqwAsCABBhBAIujqpbWvIsCLowBHMg0qFyVVFQJNDK4YoEAYxjFvIuQwHP6ur5+rDgfU5wBDMI2qCYOsC4XV0bFOwIWBAAeBAIOrMYYsF54sCCIWswQDB52AGBcrFIOtF4gAEMoJfDAAOrCYQuDAIowKFwQWIBIeA52pGQPWLYgAFA4YDBGA4uDEwQYFGQvPL4IuKC4wwHFglWAIQYIYoQuFCYwDGqrqFF4YYCYBKeHHwgRLlZhCLowMBKIIubWAtWF4PXBQRdEBAIBHGAoTRCIRfCDQQvBLofXB4NVBIQcDFweAOYdWp9WqwrDGA8ABoRJFAAOswFOqtUwBNFeQYVCwMqp4ABqwbDCowvCAgKOGf4N5aAIwKKIVPpwRBGQOBFw5fCIgZfGwFVlT/BqtVBQQwFUAVWFwMAlYvCL6mBqkqDgNUF4RLGAgVPFwMAklPwD0GX5gOCXoReBJgSvDIwWrAoN6py/Cp58DCYxQBVIYwHqyQBbgL6EX4qQDFwRdFLAifBaoQaEAJIuDCYWrEgoTIGAerWIJfHGRZdECZ5fD0bQBIwJgEIoynEGBJxIAAYPBwHNlUq6owBMIZ4OMKQPC0eiqsr53PX4guOwBhOComk0ejqpfB53OJZAeDU4lVvN5OQQXKBIeA0RfBvNV5wwBMI4uD1oLDFoN4AQJEMBYWl0fOL4NUL4QwCPw4BEwN4AAejvGACZaMBLoRfGAIWr1Z8HwGkFQRIBDgekwAVGFoOAB4QTDqgvBFwQDD1Wk1el1YsBv4oDAIoAB0d/GQOlAIV/CpF51ZfFAIgAEUoOiAJYmEAAoHDvOBFxWqAIWpFxwnDOJABBquJ1QwM5oDCMYYDDAIN/5+r6CABHRKOBmVewIwCYY4sC0bGB678B1ekZYIAB0ulwOlvWkIQLJCMY0yq2sr2sMJYABp96vQnB0tPz4FBBANzAAWj5pdI0dWq0zr2Ir2rMJKQCvNIp9PudIuYDBAIV0FwSMFL4d/LoMzL4WBwIwD6hhH5ujuZXBFAIDDAIOdFwPNL4hdCwBdCq15AgMrAQLDB52pRYYACBIWjvGdK4NJAQOdvIlB5oXB0QwBLoWjqsrAAaSCGANVGAJHBSQjBEAAINBewIDCLYIBCAAJfDv5dCLAIvBvIEDAAJoBwGqDQSUBY4htDBwIBBAoIwDL4WjvNdhAvCAAYFGhDGCY4IAB1QABFwQwDv4BB1V/0eA0mALINdP4IpGMYcAAIQABGAIxDAAIFBruCroAGq1eFALkDmdeD4IjDGQYCCBQYDBCgIqBAJAoBAQIDCmeBCoIDCGgIfBLooADL4YBCJAIiCAANdAIQoCAI4ABAYdWKQQDDMooEBlVPBwJfCGAwABFxABDSAZYGLo1OvFOIgQaBLYZhFAIsyFgYAEFAUqpxUBFYQ="))
\ No newline at end of file
diff --git a/apps/minionclk/app.js b/apps/minionclk/app.js
new file mode 100755
index 000000000..b613a5192
--- /dev/null
+++ b/apps/minionclk/app.js
@@ -0,0 +1,65 @@
+const bob = require("heatshrink").decompress(atob("nk8hAaXlYLWAEsqvN/0gBBql5lQ2tquj1XV5wBJ52j0hACPsdP1QsBAQQAGBIIBF51/P8OkN5R1GIxF5HLmAFgoDLPZfOpzmZ6vPFwomCPaA6DAYOjeq2A1YyCdI4HGQJQ8F1T2SJ4Oq1XW1es1mtAQOrPoPUAIh3J54ZHIAR5S62s64cBwIBGQIOqHQK4HKQYVDAAIFC1g+BHh9VHAQAFDwQDDHoJ5E54BB6AaBKQ5YGqo6MwJzGHQ4BDeIj/BR4JxDABY8BvI6OOYgaEHwZADHgQ6BZA42GAIusPJNW64eFqzJDlcrERA8BHQI2FqwaBDYYGBPI45GCoIgCLoVWQ5NWXA2rKhaiGLAwOGEAmADxJPDVA51ElQaMC4ouEWALdEHRg8Dc4woCDJo8EAIYxCHQQIFHiwaRegJ5EcYWsHgbrKbBA8GDSrNDO4wfRKgR3FDSh3CN4UrdwZbSHYZ5DHajMFHYQGCHalWO4jtQDQwABwAGCAAQfTKoK0EHahwCeARdFHakASIZWVZ4Q8CO4YgWO4QbCO6hWGEIKYZKzZ3DLog7UG4I6C1lWDSdWO4bpCO4bwUwKYEHajMDwOAlUkLojTUd4gaTZoRWC0YIB1eJLqo4EWiqRE0mjlcr1QkEeKFWOooBCHiB2CC4WA5wzB52rEQgfPHQwABAYJXOHQ2iO4XO6omFEJh1BEAgBGPJlWDIQbC0ej50qgHV1XPEwohKcwRbEvJ3EBQTrLFomkOwOjlR3C5w8GMAR8ClYuBLIgOCvN4HgIZFDQYbBlaOBR4YNCwA5B0XOpzvBHgWqTw4AFxB1EvQ6BAAI8GDZILEdgQBCqp3DPIRfIEQwABvJ1CvGkvGiwA6IAYoBCv6wCAAVOlQ6DAIWkL5ABEwN40Z1CAYJfCv7zEAJNWOYZ3KAIWq5yYHFYLOBLIrVCAIh7BOIzpECoYDDpw7BHAQDG1WqwGkAIN/CwIABLY4LDAAZ9BwAABvLCBC5IBBvOrO44BEAAmjAIPN0XOAJyHIAAgPEquBHBi4BAId+HwWiHxqJDRpYBDq2I1R3LIAQ6BAAOpPogABGgIDDOomk0nP5pIGd42Aq1ewI8CeZI6CHAJhCEAIDCdIo2B0er1esAQIZBC4Z9JlVW1leeKGp0es5+s6+s6ABB0oFBAIervWr0ulub7OqtWmdexJ4BGxB5G0V6pF6wItB0t6p9PvQABvINBudJudPzwXCHQwBDlY6BO4WIwPPPJbvDvA0BFgNzAAIDGugGCzrtHdYh1DAIOBrzxBPIgAIeIXNHgoBCGwYADzoVB0fNOpMyHQdW5+Bro7BHgQAB6jxJAAOjOYhxCAIukOoPN5ujdZFWqyyD0d6AwUrquBwAuB1I1FHgRJBMoQ9BWg1zzw0BDYI6B0R3DAAJ1BvMyp8rAAV4IQWBIodewAeCHAZ5IAAJoBAAXHHAJWDO4TtEdYQvEHgejAwIKClcqIQRdDXYbzFeoQBIGwIDDOot/VgQ6FAAIGBlgBCAAMzmZPBF4LzDACB1FAAOi1WjvFVr0zGYQ7GAAMAAYpPBwNeAIOIwOrfYOA1eA1WkAIWjAIekv4PBwCVBruBq5eBEYIABlcBF4wCEHw55CHwQABIQQBBABkzAILlCHQR1CFYavEPgsAAAIDEDQNdAwQAaHQNWEwQ0DHAh3KleBLoI7dHQKuFWQo0EAIsISoKdBHbyyHNgwADlVVpwEBDANWro7fd4Q6HO495vF5QgIYCd75eBHYUINAN5lQ3EA"));
+
+const locale = require("locale");
+
+const black = 0x0000;
+const white = 0xFFFF;
+
+let hour = '';
+let minute = '';
+let date = '';
+
+function draw() {
+  const d = new Date();
+
+  const newHour = ('0' + d.getHours()).substr(-2);
+  const newMinute = ('0' + d.getMinutes()).substr(-2);
+  const newDate = locale.date(d).trim();
+
+  g.setFontAlign(0, 0, 0);
+
+  if (newHour !== hour) {
+    g.setFontVector(48);
+    g.setColor(black);
+    g.drawString(hour, 64, 92);
+    g.setColor(white);
+    g.drawString(newHour, 64, 92);
+    hour = newHour;
+  }
+
+  if (newMinute !== minute) {
+    g.setFontVector(48);
+    g.setColor(black);
+    g.drawString(minute, 172, 92);
+    g.setColor(white);
+    g.drawString(newMinute, 172, 92);
+    minute = newMinute;
+  }
+
+  if (newDate !== date) {
+    g.setFontVector(12);
+    g.setColor(black);
+    g.drawString(date, 120, 228);
+    g.setColor(0xFFFF);
+    g.drawString(newDate, 120, 228);
+    date = newDate;
+  }
+}
+
+function drawAll() {
+  g.drawImage(bob, 0, 0, { scale: 4 });
+  draw();
+}
+
+Bangle.on('lcdPower', function(on) {
+  if (on) {
+    drawAll();
+  }
+});
+
+Bangle.loadWidgets();
+Bangle.drawWidgets();
+setInterval(draw, 1000);
+drawAll();
+
+setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"});
diff --git a/apps/minionclk/minionclk.png b/apps/minionclk/minionclk.png
new file mode 100755
index 0000000000000000000000000000000000000000..77cac31df144daa3092f595ab388d5459e39903f
GIT binary patch
literal 5654
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

literal 0
HcmV?d00001


From aa3f074ed4e08b98859ce77c24f66490f3fe523f Mon Sep 17 00:00:00 2001
From: Stefano Baldan <singintime@gmail.com>
Date: Sat, 4 Apr 2020 15:10:15 +0200
Subject: [PATCH 10/13] Fix drawing when lcd screen on

---
 apps/minionclk/app.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/apps/minionclk/app.js b/apps/minionclk/app.js
index b613a5192..88fe446ae 100755
--- a/apps/minionclk/app.js
+++ b/apps/minionclk/app.js
@@ -5,9 +5,9 @@ const locale = require("locale");
 const black = 0x0000;
 const white = 0xFFFF;
 
-let hour = '';
-let minute = '';
-let date = '';
+let hour;
+let minute;
+let date;
 
 function draw() {
   const d = new Date();
@@ -47,6 +47,9 @@ function draw() {
 }
 
 function drawAll() {
+  hour = '';
+  minute = '';
+  date = '';
   g.drawImage(bob, 0, 0, { scale: 4 });
   draw();
 }

From a6231c0041ba87da0d1b95a4fb9671561a8f103c Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Sat, 4 Apr 2020 14:30:46 +0100
Subject: [PATCH 11/13] license notes

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index f59fa54e0..57999186b 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,9 @@ Bangle.js App Loader (and Apps)
 * Try the **release version** at [banglejs.com/apps](https://banglejs.com/apps)
 * Try the **development version** at [github.io](https://espruino.github.io/BangleApps/)
 
+**All software (including apps) in this repository is MIT Licensed - see [LICENSE](LICENSE)** By 
+submitting code to this repository you confirm that you are happy with it being MIT licensed.
+
 ## How does it work?
 
 * A list of apps is in `apps.json`

From 62ef241369d7a9ab8c1659c2a11c1ee2eac947c7 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Sat, 4 Apr 2020 14:33:43 +0100
Subject: [PATCH 12/13] license notes

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 57999186b..877fe5e2c 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,8 @@ Bangle.js App Loader (and Apps)
 * Try the **development version** at [github.io](https://espruino.github.io/BangleApps/)
 
 **All software (including apps) in this repository is MIT Licensed - see [LICENSE](LICENSE)** By 
-submitting code to this repository you confirm that you are happy with it being MIT licensed.
+submitting code to this repository you confirm that you are happy with it being MIT licensed,
+and that it is not licensed in another way that would make this impossible.
 
 ## How does it work?
 

From 25a59c87430961ef2176e72c3b72216a0c4ffb71 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Sat, 4 Apr 2020 14:37:09 +0100
Subject: [PATCH 13/13] flip changelog

---
 apps/wohrm/ChangeLog | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/wohrm/ChangeLog b/apps/wohrm/ChangeLog
index 273b7b633..e16b50c5b 100644
--- a/apps/wohrm/ChangeLog
+++ b/apps/wohrm/ChangeLog
@@ -1,5 +1,5 @@
-0.05: Improved buzz timing and rendering
-0.04: Only buzz on high confidence (>85%)
-0.03: Optimized rendering for the background
-0.02: Adapted to new App code layout
 0.01: Only tested on the emulator.
+0.02: Adapted to new App code layout
+0.03: Optimized rendering for the background
+0.04: Only buzz on high confidence (>85%)
+0.05: Improved buzz timing and rendering