From d03749ed92fd10fa690a7e79c6a5da857a826297 Mon Sep 17 00:00:00 2001
From: 7kasper <7kasper@users.noreply.github.com>
Date: Sun, 26 Dec 2021 17:14:08 +0100
Subject: [PATCH 01/45] Initial release of presentor app.

---
 apps/presentor/app.js | 277 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 277 insertions(+)
 create mode 100644 apps/presentor/app.js

diff --git a/apps/presentor/app.js b/apps/presentor/app.js
new file mode 100644
index 000000000..d9b032bd0
--- /dev/null
+++ b/apps/presentor/app.js
@@ -0,0 +1,277 @@
+// Presentor by 7kasper
+// Licensed under MIT.
+// Version 2.1
+
+const MouseReport = new Uint8Array([
+    0x05, 0x01,                    // USAGE_PAGE (Generic Desktop)
+    0x09, 0x02,                    // USAGE (Mouse)
+    0xa1, 0x01,                    // COLLECTION (Application)
+    0x85, 0x01,                    //   REPORT_ID (1)
+    0x09, 0x01,                    //   USAGE (Pointer)
+    0xa1, 0x00,                    //   COLLECTION (Physical)
+    0x05, 0x09,                    //     USAGE_PAGE (Button)
+    0x19, 0x01,                    //     USAGE_MINIMUM (Button 1)
+    0x29, 0x05,                    //     USAGE_MAXIMUM (Button 5)
+    0x15, 0x00,                    //     LOGICAL_MINIMUM (0)
+    0x25, 0x01,                    //     LOGICAL_MAXIMUM (1)
+    0x95, 0x05,                    //     REPORT_COUNT (5)
+    0x75, 0x01,                    //     REPORT_SIZE (1)
+    0x81, 0x02,                    //     INPUT (Data,Var,Abs)
+    0x95, 0x01,                    //     REPORT_COUNT (1)
+    0x75, 0x03,                    //     REPORT_SIZE (3)
+    0x81, 0x03,                    //     INPUT (Cnst,Var,Abs)
+    0x05, 0x01,                    //     USAGE_PAGE (Generic Desktop)
+    0x09, 0x30,                    //     USAGE (X)
+    0x09, 0x31,                    //     USAGE (Y)
+    0x09, 0x38,                    //     USAGE (Wheel)
+    0x15, 0x81,                    //     LOGICAL_MINIMUM (-127)
+    0x25, 0x7f,                    //     LOGICAL_MAXIMUM (127)
+    0x75, 0x08,                    //     REPORT_SIZE (8)
+    0x95, 0x03,                    //     REPORT_COUNT (3)
+    0x81, 0x06,                    //     INPUT (Data,Var,Rel)
+    0x05, 0x0c,                    //     USAGE_PAGE (Consumer Devices)
+    0x0a, 0x38, 0x02,              //     USAGE (AC Pan)
+    0x15, 0x81,                    //     LOGICAL_MINIMUM (-127)
+    0x25, 0x7f,                    //     LOGICAL_MAXIMUM (127)
+    0x75, 0x08,                    //     REPORT_SIZE (8)
+    0x95, 0x01,                    //     REPORT_COUNT (1)
+    0x81, 0x06,                    //     INPUT (Data,Var,Rel)
+    0xc0,                          //     END_COLLECTION
+    0xc0,                          // END_COLLECTION
+    0x05, 0x01,                    // USAGE_PAGE (Generic Desktop)
+    0x09, 0x06,                    // USAGE (Keyboard)
+    0xa1, 0x01,                    // COLLECTION (Application)
+    0x85, 0x02,                    //   REPORT_ID (2)
+    0x05, 0x07,                    //   USAGE_PAGE (Keyboard)
+    0x19, 0xe0,                    //   USAGE_MINIMUM (Keyboard LeftControl)
+    0x29, 0xe7,                    //   USAGE_MAXIMUM (Keyboard Right GUI)
+    0x15, 0x00,                    //   LOGICAL_MINIMUM (0)
+    0x25, 0x01,                    //   LOGICAL_MAXIMUM (1)
+    0x75, 0x01,                    //   REPORT_SIZE (1)
+    0x95, 0x08,                    //   REPORT_COUNT (8)
+    0x81, 0x02,                    //   INPUT (Data,Var,Abs)
+    0x75, 0x08,                    //   REPORT_SIZE (8)
+    0x95, 0x01,                    //   REPORT_COUNT (1)
+    0x81, 0x01,                    //   INPUT (Cnst,Ary,Abs)
+    0x19, 0x00,                    //   USAGE_MINIMUM (Reserved (no event indicated))
+    0x29, 0x73,                    //   USAGE_MAXIMUM (Keyboard F24)
+    0x15, 0x00,                    //   LOGICAL_MINIMUM (0)
+    0x25, 0x73,                    //   LOGICAL_MAXIMUM (115)
+    0x95, 0x05,                    //   REPORT_COUNT (5)
+    0x75, 0x08,                    //   REPORT_SIZE (8)
+    0x81, 0x00,                    //   INPUT (Data,Ary,Abs)
+    0xc0                           // END_COLLECTION
+]);
+
+const MouseButton = {
+  NONE : 0,
+  LEFT : 1,
+  RIGHT : 2,
+  MIDDLE : 4,
+  BACK : 8,
+  FORWARD: 16
+};
+
+const kb = require("ble_hid_keyboard");
+
+function drawMain() {
+  g.clear();
+  E.showMessage('Presentor');
+}
+
+let HIDenabled = true;
+let lastx = 0;
+let lasty = 0;
+let timeoutId = -1;
+let holding = false;
+let timeoutHolding = -1;
+
+let homeRoll = 0;
+let homePitch = 0;
+
+let trackPadMode = false;
+
+let mCal = 0;
+
+let clearToSend = true;
+let mttl = 0;
+let cttl = 0;
+
+NRF.setServices(undefined, { hid : MouseReport });
+NRF.on('HID', function() {
+  HIDenabled = true;
+});
+
+function moveMouse(x,y,b,wheel,hwheel,callback) {
+  if (!HIDenabled) return;
+  if (!b) b = 0;
+  if (!wheel) wheel = 0;
+  if (!hwheel) hwheel = 0;
+  NRF.sendHIDReport([1,b,x,y,wheel,hwheel,0,0], function() {
+    if (callback) callback();
+  });
+}
+
+function getSign(x) {
+  return ((x > 0) - (x < 0)) || +x;
+}
+
+function scroll(wheel,hwheel,callback) {
+  moveMouse(0,0,0,wheel,hwheel,callback);
+}
+
+// Single click a certain button (immidiatly release).
+function clickMouse(b, callback) {
+  if (!HIDenabled) return;
+  NRF.sendHIDReport([1,b,0,0,0,0,0,0], function() {
+    NRF.sendHIDReport([1,0,0,0,0,0,0,0], function() {
+       if (callback) callback();
+    });
+  });
+}
+
+function pressKey(keyCode, modifiers, callback) {
+  if (!HIDenabled) return;
+  if (!modifiers) modifiers = 0;
+  NRF.sendHIDReport([2, modifiers,0,keyCode,0,0,0,0], function() {
+    NRF.sendHIDReport([2,0,0,0,0,0,0,0], function() {
+       if (callback) callback();
+    });
+  });
+}
+
+function handleAcc(acc) {
+  let rRoll  = acc.y *  -50;
+  let rPitch = acc.x * -100;
+  if (mCal > 10) {
+    //console.log("x: " +  (rRoll - homeRoll) + " y:" + (rPitch - homePitch));
+    moveMouse(acc.y * -50 - homeRoll, acc.x * -100 - homePitch);
+  } else {
+    //console.log("homeroll: " +homeRoll +"homepitch: " + homePitch);
+    homeRoll  = rRoll  * 0.7 + homeRoll  * 0.3;
+    homePitch = rPitch * 0.7 + homePitch * 0.3;
+    mCal = mCal + 1;
+  }
+}
+Bangle.on('lock', function(on) {
+  if (on && holding) {
+    Bangle.setLocked(false);
+    Bangle.setLCDPower(1);
+  }
+});
+
+function startHolding() {
+  pressKey(kb.KEY.F10);
+  holding = true;
+  Bangle.buzz();
+  E.showMessage('Holding');
+  Bangle.on('accel', handleAcc);
+  Bangle.setLCDPower(1);
+}
+function stopHolding() {
+  clearTimeout(timeoutId);
+  if (holding) {
+    pressKey(kb.KEY.F10);
+    homePitch = 0;
+    homeRoll = 0;
+    holding = false;
+    mCal = 0;
+    Bangle.removeListener('accel', handleAcc);
+    Bangle.buzz();
+    drawMain();
+  } else {
+    timeoutId = setTimeout(drawMain, 1000);
+  }
+  clearTimeout(timeoutHolding);
+  timeoutHolding = -1;
+}
+
+Bangle.on('drag', function(e) {
+  if (cttl == 0) { cttl = getTime(); }
+  if (trackPadMode) {
+    if (lastx + lasty == 0) {
+      lastx = e.x;
+      lasty = e.y;
+      mttl = getTime();
+    }
+    if (clearToSend) {
+      clearToSend = false;
+      let difX = e.x - lastx, difY = e.y - lasty;
+      let dT = getTime() - mttl;
+      let vX = difX / dT, vY = difY / dT;
+      //let qX = getSign(difX) * Math.pow(Math.abs(difX), 1.2);
+      //let qY = getSign(difY) * Math.pow(Math.abs(difY), 1.2);
+      let qX = difX + 0.02 * vX, qY = difY + 0.02 * vY;
+      moveMouse(qX, qY, 0, 0, 0, function() {
+        setTimeout(function() {clearToSend = true;}, 50);
+      });
+      lastx = e.x;
+      lasty = e.y;
+      mttl = getTime();
+      console.log("Dx: " + (qX) + " Dy: " + (qY));
+    }
+    if (!e.b) {
+      // short press
+      if (getTime() - cttl < 0.2) {
+        clickMouse(MouseButton.LEFT);
+        console.log("click left");
+      }
+      // longer press in center
+      else if (getTime() - cttl < 0.6 && e.x > g.getWidth()/4 && e.x < 3 * g.getWidth()/4 && e.y > g.getHeight() / 4 && e.y < 3 * g.getHeight() / 4) {
+        clickMouse(MouseButton.RIGHT);
+        console.log("click right");
+      }
+      cttl = 0;
+      lastx = 0;
+      lasty = 0;
+    }
+  } else {
+    if(!e.b){
+      Bangle.buzz(100);
+      if(lasty >  40){
+        E.showMessage('down');
+        scroll(0,1);
+      } else if(lasty < -40){
+        E.showMessage(kb.KEY.A);
+        pressKey(kb.KEY.A);
+      } else if(lastx > 40){
+        E.showMessage('right');
+        //kb.tap(kb.KEY.RIGHT, 0);
+        scroll(-1);
+      } else if(lastx < -40){
+        E.showMessage('left');
+        //kb.tap(kb.KEY.LEFT, 0);
+        scroll(1);
+      } else if(lastx==0 && lasty==0 && holding == false){
+        E.showMessage('press');
+        clickMouse(MouseButton.LEFT);
+      }
+      stopHolding();
+      lastx = 0;
+      lasty = 0;
+    } else{
+      lastx = lastx + e.dx;
+      lasty = lasty + e.dy;
+      if (timeoutHolding == -1) {
+        timeoutHolding = setTimeout(startHolding, 500);
+      }
+    }
+  }
+});
+
+
+function onBtn() {
+  if (trackPadMode) {
+    trackPadMode = false;
+    stopHolding();
+    drawMain();
+  } else {
+    clearToSend = true;
+    trackPadMode = true;
+    E.showMessage('Mouse');
+  }
+  Bangle.buzz();
+}
+setWatch(onBtn, (process.env.HWVERSION==2) ? BTN1 : BTN2, {repeat: true});
+
+drawMain();

From 5f5b32eb148af5d44c15247576c010d5ea2691cc Mon Sep 17 00:00:00 2001
From: 7kasper <7kasper@users.noreply.github.com>
Date: Sun, 26 Dec 2021 17:28:22 +0100
Subject: [PATCH 02/45] Add app image.

---
 apps/presentor/app.png | Bin 0 -> 2208 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 apps/presentor/app.png

diff --git a/apps/presentor/app.png b/apps/presentor/app.png
new file mode 100644
index 0000000000000000000000000000000000000000..d29cf7be6f4ce71b2de84afbb97cc8c3085dc3bb
GIT binary patch
literal 2208
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

literal 0
HcmV?d00001


From 8310915e2c1455caf51977fa8b941d8a3ef83b96 Mon Sep 17 00:00:00 2001
From: 7kasper <7kasper@users.noreply.github.com>
Date: Sun, 26 Dec 2021 17:31:16 +0100
Subject: [PATCH 03/45] Add app icon file.

---
 apps/presentor/app-icon.js | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 apps/presentor/app-icon.js

diff --git a/apps/presentor/app-icon.js b/apps/presentor/app-icon.js
new file mode 100644
index 000000000..76939d548
--- /dev/null
+++ b/apps/presentor/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwxH+AH4ASlgADGmIxwLV4wqGQowfWZQwjKw4wJF7ghBmVWmQlELYoweFwYABGAwrHF7IuFGAwrIF7AuHMJADGF0AwHAYovWFxaSHADQuDEgIADYZYucAQOB1fQ1eBmQwiFwlX6AAE1gqBGD6MEmQqBwIICwIGB0rDeWYksFAIuBz+fvQHC6D0dcQssEwIuB4fC4V0M4VXF7YuFDYLqBlnDF4WeHAYugL5N6L4I4BF0IvB0vQvdQGAJeBY4YucmQxEAgJgBvYOBdwYQDFzUzmZ/EllXFIKKBAYVXBwSMaller7fFAoKSBAAOBFQK7dPoJfFEoYADRjgmEeIzFFdUQAOdUIumdRLtDAAIufdRQKCr8zCQjqmE4NeF4YudWxpqCFyovBK5LqiF6DqdR6D0BdTYwJGg5sBdTQwKEAIwHdTQwMSpQueYaAufGBouiGBYukGBIumGA4uoGAouqGAYABF1QAl"))

From 1bac672658ea5b37a6220729a1bf429768893657 Mon Sep 17 00:00:00 2001
From: 7kasper <7kasper@users.noreply.github.com>
Date: Sun, 26 Dec 2021 17:35:12 +0100
Subject: [PATCH 04/45] Create ChangeLog

---
 apps/presentor/ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 apps/presentor/ChangeLog

diff --git a/apps/presentor/ChangeLog b/apps/presentor/ChangeLog
new file mode 100644
index 000000000..a7d747684
--- /dev/null
+++ b/apps/presentor/ChangeLog
@@ -0,0 +1,6 @@
+0.1: Start of app.
+0.5: BLE keyboard functionality.
+1.0: BLE mouse functionality to scroll back/forward.
+1.5: Added accelerator style mouse.
+2.0: Added touchpad style mouse.
+2.1: Initial internal git(hub) release. Added icon and such.

From 6a25e7901fd1e9a90359fb30bc3b1f9baedebcfa Mon Sep 17 00:00:00 2001
From: 7kasper <7kasper@users.noreply.github.com>
Date: Sun, 26 Dec 2021 17:57:56 +0100
Subject: [PATCH 05/45] Add presentor to the banglejs app repository.

---
 apps.json | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/apps.json b/apps.json
index e5e9f8f02..e4e53470d 100644
--- a/apps.json
+++ b/apps.json
@@ -5062,5 +5062,22 @@
       {"name":"ltherm.app.js","url":"app.js"},
       {"name":"ltherm.img","url":"icon.js","evaluate":true}
     ]
+  },
+  {
+    "id": "presentor",
+    "name": "Presentor",
+    "version": "2.1",
+    "description": "Use your Bangle to present!",
+    "icon": "app.png",
+    "type": "app",
+    "tags": "tool,outdoors",
+    "interface": "interface.html",
+    "readme":"README.md",
+    "supports": ["BANGLEJS", "BANGLEJS2"],
+    "allow_emulator": true,
+    "storage": [
+      {"name":"presentor.app.js","url":"app.js"},
+      {"name":"presentor.img","url":"app-icon.js","evaluate":true}
+    ]
   }
 ]

From 3b4cfe038d305974e4333ff6a940acd05bb5b2d1 Mon Sep 17 00:00:00 2001
From: 7kasper <7kasper@users.noreply.github.com>
Date: Sun, 26 Dec 2021 18:03:55 +0100
Subject: [PATCH 06/45] Changed outdoor to bluetooth catagory >.<

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

diff --git a/apps.json b/apps.json
index e4e53470d..97cd97e4d 100644
--- a/apps.json
+++ b/apps.json
@@ -5070,7 +5070,7 @@
     "description": "Use your Bangle to present!",
     "icon": "app.png",
     "type": "app",
-    "tags": "tool,outdoors",
+    "tags": "tool,bluetooth",
     "interface": "interface.html",
     "readme":"README.md",
     "supports": ["BANGLEJS", "BANGLEJS2"],

From efd6e531c5023a645331ab9f72eb22b6f7e8b2d7 Mon Sep 17 00:00:00 2001
From: 7kasper <7kasper@users.noreply.github.com>
Date: Sun, 26 Dec 2021 23:29:31 +0100
Subject: [PATCH 07/45] Test gestures on BS2.. :F

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

diff --git a/apps.json b/apps.json
index 97cd97e4d..317b809dd 100644
--- a/apps.json
+++ b/apps.json
@@ -1324,7 +1324,7 @@
     "icon": "gesture.png",
     "type": "app",
     "tags": "gesture,ai",
-    "supports": ["BANGLEJS"],
+    "supports": ["BANGLEJS", "BANGLEJS2"],
     "storage": [
       {"name":"gesture.app.js","url":"gesture.js"},
       {"name":".tfnames","url":"gesture-tfnames.js","evaluate":true},

From 54475bf5e6123ca4c5983556948400c45b65e8f0 Mon Sep 17 00:00:00 2001
From: 7kasper <7kasper@users.noreply.github.com>
Date: Sat, 1 Jan 2022 16:27:31 +0100
Subject: [PATCH 08/45] Create template.html

---
 apps/presentor/template.html | 73 ++++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 apps/presentor/template.html

diff --git a/apps/presentor/template.html b/apps/presentor/template.html
new file mode 100644
index 000000000..e3a5f71ef
--- /dev/null
+++ b/apps/presentor/template.html
@@ -0,0 +1,73 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0"/>
+    <link rel="stylesheet" href="../../css/spectre.min.css">
+    <style>
+ 
+    </style>
+  </head>
+  <body>
+    <div id="data"></div>
+    <button class="btn btn-default" id="btnSave">Save</button>
+    <button class="btn btn-default" id="btnDelete">Delete</button>
+
+    <script src="../../core/lib/interface.js"></script>
+    <script>
+var dataElement = document.getElementById("data");
+var csvData = "";
+
+function getData() {
+  // show loading window
+  Util.showModal("Loading...");
+  // get the data
+  dataElement.innerHTML = "";
+  Util.readStorageFile(`gpspoilog.csv`,data=>{
+    csvData = data.trim();
+    // remove window
+    Util.hideModal();
+    // If no data, report it and exit
+    if (data.length==0) {
+      dataElement.innerHTML = "<b>No data found</b>";
+      return;
+    }
+    // Otherwise parse the data and output it as a table
+    dataElement.innerHTML = `<table>
+    <tr>
+      <th>Time</th>
+      <th>Lat</th>
+      <th>Lon</th>
+      <th>Alt</th>
+      <th>Type</th>
+    </tr>`+data.trim().split("\n").map(l=>{
+      l = l.split(",");
+      return `<tr>
+      <td>${(new Date(l[0]*1000)).toLocaleString()}</td>
+      <td>${l[1]}</td>
+      <td>${l[2]}</td>
+      <td>${l[3]}</td>
+      <td>${l[4]}</td>
+      </tr>`
+    }).join("\n")+"</table>";
+  });
+}
+
+// You can call a utility function to save the data
+document.getElementById("btnSave").addEventListener("click", function() {
+  Util.saveCSV("gpsdata", csvData);
+});
+// Or you can also delete the file
+document.getElementById("btnDelete").addEventListener("click", function() {
+  Util.showModal("Deleting...");
+  Util.eraseStorageFile("gpspoilog.csv", function() {
+    Util.hideModal();
+    getData();
+  });
+});
+// Called when app starts
+function onInit() {
+  getData();
+}
+
+    </script>
+  </body>
+</html>

From cfcf7908decd1cd661749bd6836b6414cc3c7bac Mon Sep 17 00:00:00 2001
From: 7kasper <kasper77077@gmail.com>
Date: Sat, 1 Jan 2022 20:00:08 +0100
Subject: [PATCH 09/45] Create basic UI for adding subjects.

---
 apps/presentor/template.html | 281 ++++++++++++++++++++++++++++-------
 1 file changed, 225 insertions(+), 56 deletions(-)

diff --git a/apps/presentor/template.html b/apps/presentor/template.html
index e3a5f71ef..2b0ddc1ec 100644
--- a/apps/presentor/template.html
+++ b/apps/presentor/template.html
@@ -2,71 +2,240 @@
   <head>
     <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0"/>
     <link rel="stylesheet" href="../../css/spectre.min.css">
+    <link rel="stylesheet" href="../../css/spectre-icons.min.css">
+    <script src="https://cdn.jsdelivr.net/npm/sortablejs@latest/Sortable.min.js"></script>
     <style>
- 
+      .qcent {
+        display: flex;
+        width: 100%;
+        justify-content: space-evenly;
+      }
+      h1 {
+        margin-bottom: 0;
+      }
+      .iwrap {
+        max-height: 100%;
+      }
+      .iwrap img {
+        height: 100%;
+        padding: 10%;
+      }
+      hr {
+        border: 0; 
+        height: 2px; 
+        background-image: -webkit-linear-gradient(left, #f0f0f0, #8c8b8b, #f0f0f0);
+        background-image: -moz-linear-gradient(left, #f0f0f0, #8c8b8b, #f0f0f0);
+        background-image: -ms-linear-gradient(left, #f0f0f0, #8c8b8b, #f0f0f0);
+        background-image: -o-linear-gradient(left, #f0f0f0, #8c8b8b, #f0f0f0); 
+      }
+      .fullbtn button {
+        flex-grow: 1;
+        margin-left: 1rem;
+        margin-right: 1rem;
+      }
+      .ppartrow {
+        display: flex;
+        width: 100%;
+        justify-content: space-between;
+        font-weight: bolder;
+      }
+      .timerselector {
+        display: flex;
+        justify-content: space-between;
+        inset: 1px solid black;
+        height: 1.5rem;
+      }
+      .timerselector input {
+        width: 45%;
+      }
+      .pp-order {
+        width: calc(50% / 14);
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+      }
+      .pp-order-r {
+        padding-left: 0.25rem;
+        padding-right: 0.25rem;
+      }
+      .pp-subject {
+        width: calc(350% / 14);
+      }
+      .pp-timer {
+        width: calc(200% / 14);
+      }
+      .pp-notes {
+        width: calc(800% / 14);
+      }
+      input {
+        height: 1.5rem;
+      }
+      .icon-cross {
+        color: #e85600;
+      }
     </style>
   </head>
   <body>
-    <div id="data"></div>
-    <button class="btn btn-default" id="btnSave">Save</button>
-    <button class="btn btn-default" id="btnDelete">Delete</button>
+    <header class="qcent">
+      <h1>Presentor</h1>
+      <div class="iwrap"><img src="app.png"/></div>
+    </header>
+    <hr/>
+    <div class="form-group" id="subber">
+      <div id="pparthdr" class="ppartrow">
+        <div class="pp-order">#</div>
+        <div class="pp-subject">Subject</div>
+        <div class="pp-timer">Time</div>
+        <div class="pp-notes">Notes</div>
+      </div>
+      <div id="loader">Loading...</div>
+      <div id="subber-data"></div>
+    </div>
+    <hr/>
+    <div class="qcent fullbtn">
+      <button class="btn btn-default" id="btnSave">Save</button>
+      <button class="btn btn-error" id="btnClear">Clear</button>
+    </div>
 
     <script src="../../core/lib/interface.js"></script>
     <script>
-var dataElement = document.getElementById("data");
-var csvData = "";
+      const subber = document.getElementById('subber-data');
+      let cmpStr = ''; //compare string to see if there are changes with previous save.
 
-function getData() {
-  // show loading window
-  Util.showModal("Loading...");
-  // get the data
-  dataElement.innerHTML = "";
-  Util.readStorageFile(`gpspoilog.csv`,data=>{
-    csvData = data.trim();
-    // remove window
-    Util.hideModal();
-    // If no data, report it and exit
-    if (data.length==0) {
-      dataElement.innerHTML = "<b>No data found</b>";
-      return;
-    }
-    // Otherwise parse the data and output it as a table
-    dataElement.innerHTML = `<table>
-    <tr>
-      <th>Time</th>
-      <th>Lat</th>
-      <th>Lon</th>
-      <th>Alt</th>
-      <th>Type</th>
-    </tr>`+data.trim().split("\n").map(l=>{
-      l = l.split(",");
-      return `<tr>
-      <td>${(new Date(l[0]*1000)).toLocaleString()}</td>
-      <td>${l[1]}</td>
-      <td>${l[2]}</td>
-      <td>${l[3]}</td>
-      <td>${l[4]}</td>
-      </tr>`
-    }).join("\n")+"</table>";
-  });
-}
+      function ppartsAreFilled() {
+        let pparts = subber.children;
+        for (let i = 0; i < pparts.length; i++) {
+          if (!pparts[i].getElementsByClassName('pp-subject')[0].value) return false;
+        }
+        return true;
+      }
 
-// You can call a utility function to save the data
-document.getElementById("btnSave").addEventListener("click", function() {
-  Util.saveCSV("gpsdata", csvData);
-});
-// Or you can also delete the file
-document.getElementById("btnDelete").addEventListener("click", function() {
-  Util.showModal("Deleting...");
-  Util.eraseStorageFile("gpspoilog.csv", function() {
-    Util.hideModal();
-    getData();
-  });
-});
-// Called when app starts
-function onInit() {
-  getData();
-}
+      function getJSON() {
+        let ret = [];
+        let pparts = subber.children;
+        for (let i = 0; i < pparts.length; i++) {
+          let rpart = {};
+          let ppart = pparts[i];
+          rpart.subject = ppart.getElementsByClassName('pp-subject')[0].value;
+          if (!rpart.subject) continue;
+          rpart.minutes = ppart.getElementsByClassName('pp-timer')[0].children[0].value | 0;
+          rpart.seconds = ppart.getElementsByClassName('pp-timer')[0].children[2].value | 0;
+          rpart.notes   = ppart.getElementsByClassName('pp-notes')[0].value;
+          ret.push(rpart);
+        }
+        return JSON.stringify(ret);
+      }
+
+      function save() {
+        cmpStr = getJSON();
+      }
+
+      function loadJSON(str) {
+        cmpStr = str;
+        let jparts = JSON.parse(str);
+        for (let i = 0; i < jparts.length; i++) {
+          addFormPPart(jparts[i]);
+        }
+      }
+
+      function addFormPPart(partData = {}) {
+        let part = document.createElement('div');
+        part.classList.add('ppartrow');
+
+        let orderThing = document.createElement('div');
+        orderThing.classList.add('pp-order', 'pp-order-r');
+        let orderItem = document.createElement('i');
+        orderItem.classList.add('icon', 'icon-menu', 'draghandle');
+        orderThing.appendChild(orderItem);
+        let deleteItem = document.createElement('i');
+        deleteItem.classList.add('icon', 'icon-cross');
+        deleteItem.onclick = () => {
+          subber.removeChild(part);
+          // Make sure there stays one form thing left.
+          if (!subber.hasChildNodes()) addFormPPart();
+        }
+        orderThing.appendChild(deleteItem);
+        part.appendChild(orderThing);
+
+        let subjectField = document.createElement('input');
+        subjectField.classList.add('pp-subject');
+        subjectField.type = 'text';
+        subjectField.placeholder = 'Subject';
+        if (partData.subject) subjectField.value = partData.subject;
+        part.appendChild(subjectField);
+
+        let timeField = document.createElement('div');
+        timeField.classList.add('pp-timer', 'timerselector');
+        let minSelector = document.createElement('input');
+        minSelector.type = 'number';
+        minSelector.min = 0;
+        minSelector.step = 1
+        minSelector.placeholder = 'mm';
+        if (partData.minutes !== undefined) minSelector.value = partData.minutes; 
+        let colon = document.createElement('p');
+        colon.innerText = ':';
+        let secSelector = document.createElement('input');
+        secSelector.type = 'number';
+        secSelector.min = 0;
+        secSelector.max = 59;
+        secSelector.step = 1
+        secSelector.placeholder = 'ss';
+        if (partData.seconds !== undefined) secSelector.value = partData.seconds; 
+        timeField.appendChild(minSelector);
+        timeField.appendChild(colon);
+        timeField.appendChild(secSelector);
+        part.appendChild(timeField);
+
+        let notesField = document.createElement('input');
+        notesField.classList.add('pp-notes');
+        notesField.type = 'text';
+        notesField.placeholder = 'Notes (optional)';
+        if (partData.notes !== undefined) notesField.value = partData.notes; 
+        part.appendChild(notesField);
+
+        subber.appendChild(part);
+      }
+
+      Sortable.create(subber, {
+        handle: '.draghandle',
+        animation: 150
+      });
+    
+      document.getElementById('btnSave').onclick = () => {
+        save();
+        alert(getJSON());
+      }
+
+      document.getElementById('btnClear').onclick = () => {
+        while (subber.firstChild) {
+          subber.removeChild(subber.lastChild);
+        }
+        addFormPPart();
+      }
+
+      document.addEventListener('keyup', () => {
+        if (ppartsAreFilled()) {
+          addFormPPart();
+        }
+      });
+
+      // Simple thing to check if we need to save (TODO optimise me in the future?)
+      setInterval(() => {
+        if (cmpStr == getJSON()) {
+          document.getElementById('btnSave').classList.remove('btn-primary');
+          document.getElementById('btnSave').classList.add('btn-default');
+        } else {
+          document.getElementById('btnSave').classList.remove('btn-default');
+          document.getElementById('btnSave').classList.add('btn-primary');
+        }
+      }, 1000);
+
+      document.getElementById('loader').style.display = 'none';
+
+      // load from watch first.
+      let qq = `[{"subject":"Hello","minutes":55,"seconds":4,"notes":""},{"subject":"dsfafds","minutes":4,"seconds":33,"notes":"fdasdfsafasfsd"},{"subject":"dsadsf","minutes":0,"seconds":4,"notes":""},{"subject":"sdasf","minutes":0,"seconds":0,"notes":""}]`;
+      loadJSON(qq);
+      addFormPPart(); // load empty element on startup
 
     </script>
   </body>

From aec3df87450e68418f7064002115f31cfec95def Mon Sep 17 00:00:00 2001
From: 7kasper <kasper77077@gmail.com>
Date: Sat, 1 Jan 2022 20:11:25 +0100
Subject: [PATCH 10/45] Hehe oops

---
 apps/presentor/{template.html => interface.html} | 8 ++++++++
 1 file changed, 8 insertions(+)
 rename apps/presentor/{template.html => interface.html} (97%)

diff --git a/apps/presentor/template.html b/apps/presentor/interface.html
similarity index 97%
rename from apps/presentor/template.html
rename to apps/presentor/interface.html
index 2b0ddc1ec..a3c0fd890 100644
--- a/apps/presentor/template.html
+++ b/apps/presentor/interface.html
@@ -72,6 +72,14 @@
       }
       .icon-cross {
         color: #e85600;
+        cursor: pointer;
+        transition: transform 0.2s ease-in-out;
+      }
+      .icon-cross:hover {
+        transform: scale(1.1);
+      }
+      .draghandle {
+        cursor: grab;
       }
     </style>
   </head>

From b82b65198b3912d79393840c884026ed88a478bb Mon Sep 17 00:00:00 2001
From: 7kasper <kasper77077@gmail.com>
Date: Sat, 1 Jan 2022 20:18:19 +0100
Subject: [PATCH 11/45] Add actual watch interface

---
 apps/presentor/interface.html | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/apps/presentor/interface.html b/apps/presentor/interface.html
index a3c0fd890..ac748a9f9 100644
--- a/apps/presentor/interface.html
+++ b/apps/presentor/interface.html
@@ -135,7 +135,12 @@
       }
 
       function save() {
-        cmpStr = getJSON();
+        let savestr = getJSON();
+        Util.showModal('Saving...');
+        Puck.write(`\x10require('Storage').writeJSON(${JSON.stringify('presentor.json')},${savestr})\n`,()=>{
+          Util.hideModal();
+        });
+        cmpStr = savestr;
       }
 
       function loadJSON(str) {
@@ -146,6 +151,14 @@
         }
       }
 
+      function load() {
+        Util.showModal('Loading...');
+        Puck.eval(`require('Storage').readJSON(${JSON.stringify('presentor.json')})`,data => {
+          Util.hideModal();
+          loadJSON(data);
+        });
+      }
+
       function addFormPPart(partData = {}) {
         let part = document.createElement('div');
         part.classList.add('ppartrow');
@@ -241,8 +254,9 @@
       document.getElementById('loader').style.display = 'none';
 
       // load from watch first.
-      let qq = `[{"subject":"Hello","minutes":55,"seconds":4,"notes":""},{"subject":"dsfafds","minutes":4,"seconds":33,"notes":"fdasdfsafasfsd"},{"subject":"dsadsf","minutes":0,"seconds":4,"notes":""},{"subject":"sdasf","minutes":0,"seconds":0,"notes":""}]`;
-      loadJSON(qq);
+      // let qq = `[{"subject":"Hello","minutes":55,"seconds":4,"notes":""},{"subject":"dsfafds","minutes":4,"seconds":33,"notes":"fdasdfsafasfsd"},{"subject":"dsadsf","minutes":0,"seconds":4,"notes":""},{"subject":"sdasf","minutes":0,"seconds":0,"notes":""}]`;
+      // loadJSON(qq);
+      load();
       addFormPPart(); // load empty element on startup
 
     </script>

From 02c432124f78745b6f1920b258af789223cc9b8e Mon Sep 17 00:00:00 2001
From: 7kasper <kasper77077@gmail.com>
Date: Sat, 1 Jan 2022 20:22:13 +0100
Subject: [PATCH 12/45] Bit more spacing for the drag thing.

---
 apps/presentor/interface.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/presentor/interface.html b/apps/presentor/interface.html
index ac748a9f9..aefbdf2c2 100644
--- a/apps/presentor/interface.html
+++ b/apps/presentor/interface.html
@@ -49,7 +49,7 @@
         width: 45%;
       }
       .pp-order {
-        width: calc(50% / 14);
+        width: calc(100% / 14);
         display: flex;
         justify-content: space-between;
         align-items: center;
@@ -65,7 +65,7 @@
         width: calc(200% / 14);
       }
       .pp-notes {
-        width: calc(800% / 14);
+        width: calc(750% / 14);
       }
       input {
         height: 1.5rem;

From ce6d4d76fdc1f83035e1e457793a2ddd4c6c2b1a Mon Sep 17 00:00:00 2001
From: 7kasper <kasper77077@gmail.com>
Date: Sat, 1 Jan 2022 20:23:43 +0100
Subject: [PATCH 13/45] Add readme

---
 apps/presentor/README.md | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 apps/presentor/README.md

diff --git a/apps/presentor/README.md b/apps/presentor/README.md
new file mode 100644
index 000000000..8b22eb228
--- /dev/null
+++ b/apps/presentor/README.md
@@ -0,0 +1,2 @@
+# Presentor
+Use your Bangle to present!

From aa55094e227082dc9aebdbcaeca27ded82516a96 Mon Sep 17 00:00:00 2001
From: 7kasper <kasper77077@gmail.com>
Date: Sat, 1 Jan 2022 21:46:40 +0100
Subject: [PATCH 14/45] rrr

---
 apps/presentor/interface.html | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/apps/presentor/interface.html b/apps/presentor/interface.html
index aefbdf2c2..ed265e2f6 100644
--- a/apps/presentor/interface.html
+++ b/apps/presentor/interface.html
@@ -49,7 +49,7 @@
         width: 45%;
       }
       .pp-order {
-        width: calc(100% / 14);
+        width: calc(150% / 14);
         display: flex;
         justify-content: space-between;
         align-items: center;
@@ -65,7 +65,7 @@
         width: calc(200% / 14);
       }
       .pp-notes {
-        width: calc(750% / 14);
+        width: calc(700% / 14);
       }
       input {
         height: 1.5rem;
@@ -253,11 +253,15 @@
 
       document.getElementById('loader').style.display = 'none';
 
+      function onInit() {
+        load();
+        addFormPPart(); // add empty element on startup
+      }
       // load from watch first.
       // let qq = `[{"subject":"Hello","minutes":55,"seconds":4,"notes":""},{"subject":"dsfafds","minutes":4,"seconds":33,"notes":"fdasdfsafasfsd"},{"subject":"dsadsf","minutes":0,"seconds":4,"notes":""},{"subject":"sdasf","minutes":0,"seconds":0,"notes":""}]`;
       // loadJSON(qq);
-      load();
-      addFormPPart(); // load empty element on startup
+      
+
 
     </script>
   </body>

From 6eed1b5760f303b8b76117cc0d72236dd50c9888 Mon Sep 17 00:00:00 2001
From: 7kasper <kasper77077@gmail.com>
Date: Sat, 1 Jan 2022 21:59:58 +0100
Subject: [PATCH 15/45] No double json parse >.<

---
 apps/presentor/interface.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/presentor/interface.html b/apps/presentor/interface.html
index ed265e2f6..9b79221d3 100644
--- a/apps/presentor/interface.html
+++ b/apps/presentor/interface.html
@@ -153,7 +153,7 @@
 
       function load() {
         Util.showModal('Loading...');
-        Puck.eval(`require('Storage').readJSON(${JSON.stringify('presentor.json')})`,data => {
+        Puck.eval(`require('Storage').read(${JSON.stringify('presentor.json')})`,data => {
           Util.hideModal();
           loadJSON(data);
         });

From d3a2bb4375aa938946280077a071ca17ebdda894 Mon Sep 17 00:00:00 2001
From: 7kasper <kasper77077@gmail.com>
Date: Sat, 1 Jan 2022 22:06:17 +0100
Subject: [PATCH 16/45] Fix the empty element being loaded in wrongly.

---
 apps/presentor/interface.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/presentor/interface.html b/apps/presentor/interface.html
index 9b79221d3..82bb85f57 100644
--- a/apps/presentor/interface.html
+++ b/apps/presentor/interface.html
@@ -149,6 +149,7 @@
         for (let i = 0; i < jparts.length; i++) {
           addFormPPart(jparts[i]);
         }
+        addFormPPart(); // add empty element on startup
       }
 
       function load() {
@@ -255,7 +256,6 @@
 
       function onInit() {
         load();
-        addFormPPart(); // add empty element on startup
       }
       // load from watch first.
       // let qq = `[{"subject":"Hello","minutes":55,"seconds":4,"notes":""},{"subject":"dsfafds","minutes":4,"seconds":33,"notes":"fdasdfsafasfsd"},{"subject":"dsadsf","minutes":0,"seconds":4,"notes":""},{"subject":"sdasf","minutes":0,"seconds":0,"notes":""}]`;

From b279d3bf69ef3d1a27d0f9720129b0588ac6a560 Mon Sep 17 00:00:00 2001
From: 7kasper <kasper77077@gmail.com>
Date: Sat, 1 Jan 2022 22:07:45 +0100
Subject: [PATCH 17/45] Bit more time for timer.

---
 apps/presentor/interface.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/presentor/interface.html b/apps/presentor/interface.html
index 82bb85f57..460102388 100644
--- a/apps/presentor/interface.html
+++ b/apps/presentor/interface.html
@@ -59,10 +59,10 @@
         padding-right: 0.25rem;
       }
       .pp-subject {
-        width: calc(350% / 14);
+        width: calc(300% / 14);
       }
       .pp-timer {
-        width: calc(200% / 14);
+        width: calc(250% / 14);
       }
       .pp-notes {
         width: calc(700% / 14);

From c1fdac99929285a603078e67ef1c381a8625de7e Mon Sep 17 00:00:00 2001
From: 7kasper <kasper77077@gmail.com>
Date: Sat, 1 Jan 2022 22:28:30 +0100
Subject: [PATCH 18/45] Futureproof the settings format.

---
 apps.json                     |  5 +++--
 apps/presentor/ChangeLog      |  1 +
 apps/presentor/interface.html | 12 +++++++++---
 apps/presentor/settings.json  | 17 +++++++++++++++++
 4 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 apps/presentor/settings.json

diff --git a/apps.json b/apps.json
index 317b809dd..74a24d290 100644
--- a/apps.json
+++ b/apps.json
@@ -5066,7 +5066,7 @@
   {
     "id": "presentor",
     "name": "Presentor",
-    "version": "2.1",
+    "version": "2.2",
     "description": "Use your Bangle to present!",
     "icon": "app.png",
     "type": "app",
@@ -5077,7 +5077,8 @@
     "allow_emulator": true,
     "storage": [
       {"name":"presentor.app.js","url":"app.js"},
-      {"name":"presentor.img","url":"app-icon.js","evaluate":true}
+      {"name":"presentor.img","url":"app-icon.js","evaluate":true},
+      {"name":"presentor.json","url":"settings.json"}
     ]
   }
 ]
diff --git a/apps/presentor/ChangeLog b/apps/presentor/ChangeLog
index a7d747684..2e3409855 100644
--- a/apps/presentor/ChangeLog
+++ b/apps/presentor/ChangeLog
@@ -4,3 +4,4 @@
 1.5: Added accelerator style mouse.
 2.0: Added touchpad style mouse.
 2.1: Initial internal git(hub) release. Added icon and such.
+2.2: Begin work on presentation parts.
diff --git a/apps/presentor/interface.html b/apps/presentor/interface.html
index 460102388..1af0041fb 100644
--- a/apps/presentor/interface.html
+++ b/apps/presentor/interface.html
@@ -119,7 +119,11 @@
       }
 
       function getJSON() {
-        let ret = [];
+        let ret = {
+          pparts: [],
+          sversion: 2.2
+        }
+        let jparts = [];
         let pparts = subber.children;
         for (let i = 0; i < pparts.length; i++) {
           let rpart = {};
@@ -129,8 +133,9 @@
           rpart.minutes = ppart.getElementsByClassName('pp-timer')[0].children[0].value | 0;
           rpart.seconds = ppart.getElementsByClassName('pp-timer')[0].children[2].value | 0;
           rpart.notes   = ppart.getElementsByClassName('pp-notes')[0].value;
-          ret.push(rpart);
+          jparts.push(rpart);
         }
+        ret.pparts = jparts;
         return JSON.stringify(ret);
       }
 
@@ -145,7 +150,8 @@
 
       function loadJSON(str) {
         cmpStr = str;
-        let jparts = JSON.parse(str);
+        let settings = JSON.parse(str);
+        let jparts = settings.pparts;
         for (let i = 0; i < jparts.length; i++) {
           addFormPPart(jparts[i]);
         }
diff --git a/apps/presentor/settings.json b/apps/presentor/settings.json
new file mode 100644
index 000000000..7e8d29876
--- /dev/null
+++ b/apps/presentor/settings.json
@@ -0,0 +1,17 @@
+{
+    "pparts": [
+        {
+            "subject":"#1",
+            "minutes":10,
+            "seconds":0,
+            "notes":"This is a note."
+        },
+        {
+            "subject":"#2",
+            "minutes":2,
+            "seconds":50,
+            "notes":"Change in the app!"
+        }
+    ],
+    "sversion": 2.2
+}
\ No newline at end of file

From b5ae5c291ee0d1fc62adcd47f3b75a4721c33e4a Mon Sep 17 00:00:00 2001
From: 7kasper <kasper77077@gmail.com>
Date: Sat, 1 Jan 2022 22:35:48 +0100
Subject: [PATCH 19/45] Add small credits on the page.

---
 apps/presentor/interface.html | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/apps/presentor/interface.html b/apps/presentor/interface.html
index 1af0041fb..377703898 100644
--- a/apps/presentor/interface.html
+++ b/apps/presentor/interface.html
@@ -1,6 +1,9 @@
+<!-- Presentor by Kasper Müller -->
+<!DOCTYPE html>
 <html>
   <head>
     <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0"/>
+    <meta charset="UTF-8">
     <link rel="stylesheet" href="../../css/spectre.min.css">
     <link rel="stylesheet" href="../../css/spectre-icons.min.css">
     <script src="https://cdn.jsdelivr.net/npm/sortablejs@latest/Sortable.min.js"></script>
@@ -81,6 +84,13 @@
       .draghandle {
         cursor: grab;
       }
+      footer {
+        display: inline-block;
+        width: 100%;
+        text-align: center;
+        font-size: 0.6rem;
+        color: grey;
+      }
     </style>
   </head>
   <body>
@@ -104,6 +114,7 @@
       <button class="btn btn-default" id="btnSave">Save</button>
       <button class="btn btn-error" id="btnClear">Clear</button>
     </div>
+    <footer>Presentor by <a href="https://kaspermuller.nl" target="_blank">Kasper Müller</a></footer>
 
     <script src="../../core/lib/interface.js"></script>
     <script>

From 6f6f5de32790f00951bcdc57cc0657f94064262d Mon Sep 17 00:00:00 2001
From: 7kasper <kasper77077@gmail.com>
Date: Sat, 1 Jan 2022 22:39:43 +0100
Subject: [PATCH 20/45] minify default settings

---
 apps/presentor/settings.json | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/apps/presentor/settings.json b/apps/presentor/settings.json
index 7e8d29876..398bf1332 100644
--- a/apps/presentor/settings.json
+++ b/apps/presentor/settings.json
@@ -1,17 +1 @@
-{
-    "pparts": [
-        {
-            "subject":"#1",
-            "minutes":10,
-            "seconds":0,
-            "notes":"This is a note."
-        },
-        {
-            "subject":"#2",
-            "minutes":2,
-            "seconds":50,
-            "notes":"Change in the app!"
-        }
-    ],
-    "sversion": 2.2
-}
\ No newline at end of file
+{"pparts":[{"subject":"#1","minutes":10,"seconds":0,"notes":"This is a note."},{"subject":"#2","minutes":2,"seconds":50,"notes":"Change in the app!"}],"sversion":2.2}
\ No newline at end of file

From 8b1607f9c67ab5531792fb4e0b1b782e399bee2a Mon Sep 17 00:00:00 2001
From: 7kasper <kasper77077@gmail.com>
Date: Sat, 1 Jan 2022 23:40:34 +0100
Subject: [PATCH 21/45] Started work on layout

---
 apps/presentor/app.js         | 60 +++++++++++++++++++++++++++--------
 apps/presentor/interface.html |  2 +-
 2 files changed, 48 insertions(+), 14 deletions(-)

diff --git a/apps/presentor/app.js b/apps/presentor/app.js
index d9b032bd0..314ea07f4 100644
--- a/apps/presentor/app.js
+++ b/apps/presentor/app.js
@@ -1,8 +1,7 @@
-// Presentor by 7kasper
-// Licensed under MIT.
-// Version 2.1
+// Presentor by 7kasper (Kasper Müller)
+// Version 2.2
 
-const MouseReport = new Uint8Array([
+const SpecialReport = new Uint8Array([
     0x05, 0x01,                    // USAGE_PAGE (Generic Desktop)
     0x09, 0x02,                    // USAGE (Mouse)
     0xa1, 0x01,                    // COLLECTION (Application)
@@ -74,17 +73,28 @@ const MouseButton = {
 
 const kb = require("ble_hid_keyboard");
 
-function drawMain() {
-  g.clear();
-  E.showMessage('Presentor');
-}
+const Layout = require("Layout");
+const Locale = require("locale");
+let mainLayout = new Layout( {
+  type:"v", c: [
+    {type: "h", c: [
+      {type:"txt", font:"10%", label:"12:00", id:"time" },
+      {type:"txt", font:"10%", label:"99:99", id:"timer" },
+    ]},
+    {type:"txt", font:"6x8", label:"The Date", id:"date" }
+  ]
+}, {lazy:true});
 
-let HIDenabled = true;
+let settings = require("Storage").readJSON('presentor.json');
+let HIDenabled = false;
+
+// Application variables
 let lastx = 0;
 let lasty = 0;
 let timeoutId = -1;
 let holding = false;
 let timeoutHolding = -1;
+let timeoutDraw = -1;
 
 let homeRoll = 0;
 let homePitch = 0;
@@ -97,7 +107,31 @@ let clearToSend = true;
 let mttl = 0;
 let cttl = 0;
 
-NRF.setServices(undefined, { hid : MouseReport });
+
+function drawMainFrame() {
+  var d = new Date();
+  // update time and date
+  mainLayout.time.label = require("locale").time(d,1);
+  mainLayout.date.label = require("locale").date(d);
+  mainLayout.render();
+  // schedule a draw for the next minute
+  if (timeoutDraw != -1) clearTimeout(timeoutDraw);
+  timeoutDraw = setTimeout(function() {
+    timeoutDraw = -1;
+    drawMainFrame();
+  }, 60000 - (Date.now() % 60000));
+}
+
+function drawMain() {
+  g.clear();
+  mainLayout.forgetLazyState();
+  drawMainFrame();
+  // mainLayout.render();
+  // E.showMessage('Presentor');
+}
+
+NRF.setServices(undefined, { hid : SpecialReport });
+// TODO: figure out how to detect HID.
 NRF.on('HID', function() {
   HIDenabled = true;
 });
@@ -112,9 +146,9 @@ function moveMouse(x,y,b,wheel,hwheel,callback) {
   });
 }
 
-function getSign(x) {
-  return ((x > 0) - (x < 0)) || +x;
-}
+// function getSign(x) {
+//   return ((x > 0) - (x < 0)) || +x;
+// }
 
 function scroll(wheel,hwheel,callback) {
   moveMouse(0,0,0,wheel,hwheel,callback);
diff --git a/apps/presentor/interface.html b/apps/presentor/interface.html
index 377703898..e772d24da 100644
--- a/apps/presentor/interface.html
+++ b/apps/presentor/interface.html
@@ -1,4 +1,4 @@
-<!-- Presentor by Kasper Müller -->
+<!-- Presentor by 7kasper (Kasper Müller) -->
 <!DOCTYPE html>
 <html>
   <head>

From f6efbf82e9420d5aa7cca7b7d5defdffe3bee3be Mon Sep 17 00:00:00 2001
From: 7kasper <kasper77077@gmail.com>
Date: Sun, 2 Jan 2022 17:03:48 +0100
Subject: [PATCH 22/45] work on layout

---
 apps/presentor/app.js | 74 +++++++++++++++++++++++++++++++++++++------
 1 file changed, 65 insertions(+), 9 deletions(-)

diff --git a/apps/presentor/app.js b/apps/presentor/app.js
index 314ea07f4..e2b020a1c 100644
--- a/apps/presentor/app.js
+++ b/apps/presentor/app.js
@@ -76,12 +76,67 @@ const kb = require("ble_hid_keyboard");
 const Layout = require("Layout");
 const Locale = require("locale");
 let mainLayout = new Layout( {
-  type:"v", c: [
-    {type: "h", c: [
-      {type:"txt", font:"10%", label:"12:00", id:"time" },
-      {type:"txt", font:"10%", label:"99:99", id:"timer" },
-    ]},
-    {type:"txt", font:"6x8", label:"The Date", id:"date" }
+  'type': 'v', 
+  filly: 1, 
+  c: [
+    {
+      type: 'txt', 
+      font: '6x8', 
+      label: 'Presentor', 
+      valign: -1,
+      halign: 0,
+      col: g.theme.fg1, 
+      // bgCol: g.theme.bg2,
+      bgCol: '#00F',
+      fillx: 1,
+    }, {
+      type: 'h',
+      fillx: 1,
+      c: [
+        {
+          type: 'txt',
+          font: '15%',
+          label: '00:00',
+          id: 'Time',
+          halign: -1,
+          pad: 3
+        }, {
+          fillx: 1
+        }, {
+          type: 'txt',
+          font: '15%',
+          label: '00:00',
+          id: 'Timer',
+          halign: 1,
+          pad: 3
+        }
+      ]
+    }, {
+      type: 'txt',
+      font: '10%',
+      label: '+00:00',
+      id: 'RestTime',
+      col: '#fff'
+    }, {
+      type: 'txt',
+      font: '10%',
+      label: '--------------'
+    }, {
+      type: 'txt',
+      font: '15%',
+      label: 'Subject',
+      id: 'Subject'
+    }, {
+      type: 'txt',
+      font: '6x8',
+      label: 'Notes...',
+      id: 'Notes',
+      col: '#ff0',
+      fillx: 1,
+      filly: 1,
+      valign: 1
+    }
+    
   ]
 }, {lazy:true});
 
@@ -89,6 +144,8 @@ let settings = require("Storage").readJSON('presentor.json');
 let HIDenabled = false;
 
 // Application variables
+let pparti = 0;
+
 let lastx = 0;
 let lasty = 0;
 let timeoutId = -1;
@@ -110,9 +167,8 @@ let cttl = 0;
 
 function drawMainFrame() {
   var d = new Date();
-  // update time and date
-  mainLayout.time.label = require("locale").time(d,1);
-  mainLayout.date.label = require("locale").date(d);
+  // update time
+  mainLayout.Time.label = Locale.time(d,1);
   mainLayout.render();
   // schedule a draw for the next minute
   if (timeoutDraw != -1) clearTimeout(timeoutDraw);

From 602679c6bc2aa95c35e390e6ed840f76a28d727c Mon Sep 17 00:00:00 2001
From: 7kasper <kasper77077@gmail.com>
Date: Sun, 2 Jan 2022 20:13:56 +0100
Subject: [PATCH 23/45] Working on interface functionality

---
 apps/presentor/app.js | 613 +++++++++++++++++++++++-------------------
 1 file changed, 332 insertions(+), 281 deletions(-)

diff --git a/apps/presentor/app.js b/apps/presentor/app.js
index e2b020a1c..819f1ebc2 100644
--- a/apps/presentor/app.js
+++ b/apps/presentor/app.js
@@ -2,73 +2,73 @@
 // Version 2.2
 
 const SpecialReport = new Uint8Array([
-    0x05, 0x01,                    // USAGE_PAGE (Generic Desktop)
-    0x09, 0x02,                    // USAGE (Mouse)
-    0xa1, 0x01,                    // COLLECTION (Application)
-    0x85, 0x01,                    //   REPORT_ID (1)
-    0x09, 0x01,                    //   USAGE (Pointer)
-    0xa1, 0x00,                    //   COLLECTION (Physical)
-    0x05, 0x09,                    //     USAGE_PAGE (Button)
-    0x19, 0x01,                    //     USAGE_MINIMUM (Button 1)
-    0x29, 0x05,                    //     USAGE_MAXIMUM (Button 5)
-    0x15, 0x00,                    //     LOGICAL_MINIMUM (0)
-    0x25, 0x01,                    //     LOGICAL_MAXIMUM (1)
-    0x95, 0x05,                    //     REPORT_COUNT (5)
-    0x75, 0x01,                    //     REPORT_SIZE (1)
-    0x81, 0x02,                    //     INPUT (Data,Var,Abs)
-    0x95, 0x01,                    //     REPORT_COUNT (1)
-    0x75, 0x03,                    //     REPORT_SIZE (3)
-    0x81, 0x03,                    //     INPUT (Cnst,Var,Abs)
-    0x05, 0x01,                    //     USAGE_PAGE (Generic Desktop)
-    0x09, 0x30,                    //     USAGE (X)
-    0x09, 0x31,                    //     USAGE (Y)
-    0x09, 0x38,                    //     USAGE (Wheel)
-    0x15, 0x81,                    //     LOGICAL_MINIMUM (-127)
-    0x25, 0x7f,                    //     LOGICAL_MAXIMUM (127)
-    0x75, 0x08,                    //     REPORT_SIZE (8)
-    0x95, 0x03,                    //     REPORT_COUNT (3)
-    0x81, 0x06,                    //     INPUT (Data,Var,Rel)
-    0x05, 0x0c,                    //     USAGE_PAGE (Consumer Devices)
-    0x0a, 0x38, 0x02,              //     USAGE (AC Pan)
-    0x15, 0x81,                    //     LOGICAL_MINIMUM (-127)
-    0x25, 0x7f,                    //     LOGICAL_MAXIMUM (127)
-    0x75, 0x08,                    //     REPORT_SIZE (8)
-    0x95, 0x01,                    //     REPORT_COUNT (1)
-    0x81, 0x06,                    //     INPUT (Data,Var,Rel)
-    0xc0,                          //     END_COLLECTION
-    0xc0,                          // END_COLLECTION
-    0x05, 0x01,                    // USAGE_PAGE (Generic Desktop)
-    0x09, 0x06,                    // USAGE (Keyboard)
-    0xa1, 0x01,                    // COLLECTION (Application)
-    0x85, 0x02,                    //   REPORT_ID (2)
-    0x05, 0x07,                    //   USAGE_PAGE (Keyboard)
-    0x19, 0xe0,                    //   USAGE_MINIMUM (Keyboard LeftControl)
-    0x29, 0xe7,                    //   USAGE_MAXIMUM (Keyboard Right GUI)
-    0x15, 0x00,                    //   LOGICAL_MINIMUM (0)
-    0x25, 0x01,                    //   LOGICAL_MAXIMUM (1)
-    0x75, 0x01,                    //   REPORT_SIZE (1)
-    0x95, 0x08,                    //   REPORT_COUNT (8)
-    0x81, 0x02,                    //   INPUT (Data,Var,Abs)
-    0x75, 0x08,                    //   REPORT_SIZE (8)
-    0x95, 0x01,                    //   REPORT_COUNT (1)
-    0x81, 0x01,                    //   INPUT (Cnst,Ary,Abs)
-    0x19, 0x00,                    //   USAGE_MINIMUM (Reserved (no event indicated))
-    0x29, 0x73,                    //   USAGE_MAXIMUM (Keyboard F24)
-    0x15, 0x00,                    //   LOGICAL_MINIMUM (0)
-    0x25, 0x73,                    //   LOGICAL_MAXIMUM (115)
-    0x95, 0x05,                    //   REPORT_COUNT (5)
-    0x75, 0x08,                    //   REPORT_SIZE (8)
-    0x81, 0x00,                    //   INPUT (Data,Ary,Abs)
-    0xc0                           // END_COLLECTION
+  0x05, 0x01,                    // USAGE_PAGE (Generic Desktop)
+  0x09, 0x02,                    // USAGE (Mouse)
+  0xa1, 0x01,                    // COLLECTION (Application)
+  0x85, 0x01,                    //   REPORT_ID (1)
+  0x09, 0x01,                    //   USAGE (Pointer)
+  0xa1, 0x00,                    //   COLLECTION (Physical)
+  0x05, 0x09,                    //     USAGE_PAGE (Button)
+  0x19, 0x01,                    //     USAGE_MINIMUM (Button 1)
+  0x29, 0x05,                    //     USAGE_MAXIMUM (Button 5)
+  0x15, 0x00,                    //     LOGICAL_MINIMUM (0)
+  0x25, 0x01,                    //     LOGICAL_MAXIMUM (1)
+  0x95, 0x05,                    //     REPORT_COUNT (5)
+  0x75, 0x01,                    //     REPORT_SIZE (1)
+  0x81, 0x02,                    //     INPUT (Data,Var,Abs)
+  0x95, 0x01,                    //     REPORT_COUNT (1)
+  0x75, 0x03,                    //     REPORT_SIZE (3)
+  0x81, 0x03,                    //     INPUT (Cnst,Var,Abs)
+  0x05, 0x01,                    //     USAGE_PAGE (Generic Desktop)
+  0x09, 0x30,                    //     USAGE (X)
+  0x09, 0x31,                    //     USAGE (Y)
+  0x09, 0x38,                    //     USAGE (Wheel)
+  0x15, 0x81,                    //     LOGICAL_MINIMUM (-127)
+  0x25, 0x7f,                    //     LOGICAL_MAXIMUM (127)
+  0x75, 0x08,                    //     REPORT_SIZE (8)
+  0x95, 0x03,                    //     REPORT_COUNT (3)
+  0x81, 0x06,                    //     INPUT (Data,Var,Rel)
+  0x05, 0x0c,                    //     USAGE_PAGE (Consumer Devices)
+  0x0a, 0x38, 0x02,              //     USAGE (AC Pan)
+  0x15, 0x81,                    //     LOGICAL_MINIMUM (-127)
+  0x25, 0x7f,                    //     LOGICAL_MAXIMUM (127)
+  0x75, 0x08,                    //     REPORT_SIZE (8)
+  0x95, 0x01,                    //     REPORT_COUNT (1)
+  0x81, 0x06,                    //     INPUT (Data,Var,Rel)
+  0xc0,                          //     END_COLLECTION
+  0xc0,                          // END_COLLECTION
+  0x05, 0x01,                    // USAGE_PAGE (Generic Desktop)
+  0x09, 0x06,                    // USAGE (Keyboard)
+  0xa1, 0x01,                    // COLLECTION (Application)
+  0x85, 0x02,                    //   REPORT_ID (2)
+  0x05, 0x07,                    //   USAGE_PAGE (Keyboard)
+  0x19, 0xe0,                    //   USAGE_MINIMUM (Keyboard LeftControl)
+  0x29, 0xe7,                    //   USAGE_MAXIMUM (Keyboard Right GUI)
+  0x15, 0x00,                    //   LOGICAL_MINIMUM (0)
+  0x25, 0x01,                    //   LOGICAL_MAXIMUM (1)
+  0x75, 0x01,                    //   REPORT_SIZE (1)
+  0x95, 0x08,                    //   REPORT_COUNT (8)
+  0x81, 0x02,                    //   INPUT (Data,Var,Abs)
+  0x75, 0x08,                    //   REPORT_SIZE (8)
+  0x95, 0x01,                    //   REPORT_COUNT (1)
+  0x81, 0x01,                    //   INPUT (Cnst,Ary,Abs)
+  0x19, 0x00,                    //   USAGE_MINIMUM (Reserved (no event indicated))
+  0x29, 0x73,                    //   USAGE_MAXIMUM (Keyboard F24)
+  0x15, 0x00,                    //   LOGICAL_MINIMUM (0)
+  0x25, 0x73,                    //   LOGICAL_MAXIMUM (115)
+  0x95, 0x05,                    //   REPORT_COUNT (5)
+  0x75, 0x08,                    //   REPORT_SIZE (8)
+  0x81, 0x00,                    //   INPUT (Data,Ary,Abs)
+  0xc0                           // END_COLLECTION
 ]);
 
 const MouseButton = {
-  NONE : 0,
-  LEFT : 1,
-  RIGHT : 2,
-  MIDDLE : 4,
-  BACK : 8,
-  FORWARD: 16
+NONE : 0,
+LEFT : 1,
+RIGHT : 2,
+MIDDLE : 4,
+BACK : 8,
+FORWARD: 16
 };
 
 const kb = require("ble_hid_keyboard");
@@ -76,130 +76,180 @@ const kb = require("ble_hid_keyboard");
 const Layout = require("Layout");
 const Locale = require("locale");
 let mainLayout = new Layout( {
-  'type': 'v', 
-  filly: 1, 
-  c: [
-    {
-      type: 'txt', 
-      font: '6x8', 
-      label: 'Presentor', 
-      valign: -1,
-      halign: 0,
-      col: g.theme.fg1, 
-      // bgCol: g.theme.bg2,
-      bgCol: '#00F',
-      fillx: 1,
-    }, {
-      type: 'h',
-      fillx: 1,
-      c: [
-        {
-          type: 'txt',
-          font: '15%',
-          label: '00:00',
-          id: 'Time',
-          halign: -1,
-          pad: 3
-        }, {
-          fillx: 1
-        }, {
-          type: 'txt',
-          font: '15%',
-          label: '00:00',
-          id: 'Timer',
-          halign: 1,
-          pad: 3
-        }
-      ]
-    }, {
-      type: 'txt',
-      font: '10%',
-      label: '+00:00',
-      id: 'RestTime',
-      col: '#fff'
-    }, {
-      type: 'txt',
-      font: '10%',
-      label: '--------------'
-    }, {
-      type: 'txt',
-      font: '15%',
-      label: 'Subject',
-      id: 'Subject'
-    }, {
-      type: 'txt',
-      font: '6x8',
-      label: 'Notes...',
-      id: 'Notes',
-      col: '#ff0',
-      fillx: 1,
-      filly: 1,
-      valign: 1
-    }
-    
-  ]
+'type': 'v', 
+filly: 1, 
+c: [
+  {
+    type: 'txt', 
+    font: '6x8', 
+    label: 'Presentor', 
+    valign: -1,
+    halign: 0,
+    col: g.theme.fg1, 
+    // bgCol: g.theme.bg2,
+    bgCol: '#00F',
+    fillx: 1,
+  }, {
+    type: 'h',
+    fillx: 1,
+    c: [
+      {
+        type: 'txt',
+        font: '15%',
+        label: '00:00',
+        id: 'Time',
+        halign: -1,
+        pad: 3
+      }, {
+        fillx: 1
+      }, {
+        type: 'txt',
+        font: '15%',
+        label: '00:00',
+        id: 'Timer',
+        halign: 1,
+        pad: 3
+      }
+    ]
+  }, {
+    type: 'txt',
+    font: '10%',
+    label: '+00:00',
+    id: 'RestTime',
+    col: '#fff'
+  }, {
+    type: 'txt',
+    font: '10%',
+    label: '--------------'
+  }, {
+    type: 'txt',
+    font: '15%',
+    label: 'Presenting',
+    id: 'Subject'
+  }, {
+    type: 'txt',
+    font: '6x8',
+    label: 'Swipe down to start the time.',
+    id: 'Notes',
+    col: '#ff0',
+    fillx: 1,
+    filly: 1,
+    valign: 1
+  }
+  
+]
 }, {lazy:true});
 
-let settings = require("Storage").readJSON('presentor.json');
+let settings = {pparts: [], sversion: 0};
 let HIDenabled = false;
 
 // Application variables
-let pparti = 0;
+let pparti = -1;
 
 let lastx = 0;
 let lasty = 0;
-let timeoutId = -1;
+
+// Mouse states
 let holding = false;
+let trackPadMode = false;
+
+// Timeout IDs.
+let timeoutId = -1;
 let timeoutHolding = -1;
 let timeoutDraw = -1;
+let timeoutDrawTimer = -1;
+
 
 let homeRoll = 0;
 let homePitch = 0;
-
-let trackPadMode = false;
-
 let mCal = 0;
-
-let clearToSend = true;
 let mttl = 0;
 let cttl = 0;
 
+// BT helper.
+let clearToSend = true;
+
+// Presentation Timers
+let ptimers = [];
+
+function loadSettings() {
+settings = require("Storage").readJSON('presentor.json');
+for (let i = 0; i < settings.pparts.length; i++) {
+  ptimers[i] = {
+    active: false,
+    tracked: -1,
+    left: settings.pparts[i].minutes * 60 + settings.pparts[i].seconds
+  };
+}
+}
+
+function getCurrentTimer() {
+if (pparti < 0) return '00:00';
+if (!settings.pparts || pparti >= settings.pparts.length) return '00:00';
+if (ptimers[pparti].tracked == -1) return '00:00';
+ptimers[pparti].left -= (getTime() - ptimers[pparti].tracked);
+ptimers[pparti].tracked = getTime();
+return `${Math.floor(ptimers[pparti].left/60)}:${Math.floor(ptimers[pparti].left%60)}`;
+}
+
+function getRestTime() {
+let rem = 0;
+// Add all remaining time from previous presentation parts.
+for (let i = 0; i < pparti; i++) {
+  rem += ptimers[i].left;
+}
+return `${rem >= 0 ? '+':'-'}${Math.floor(rem/60)}:${Math.floor(rem%60)}`;
+}
 
 function drawMainFrame() {
-  var d = new Date();
-  // update time
-  mainLayout.Time.label = Locale.time(d,1);
-  mainLayout.render();
-  // schedule a draw for the next minute
-  if (timeoutDraw != -1) clearTimeout(timeoutDraw);
-  timeoutDraw = setTimeout(function() {
-    timeoutDraw = -1;
-    drawMainFrame();
-  }, 60000 - (Date.now() % 60000));
+var d = new Date();
+// update time
+mainLayout.Time.label = Locale.time(d,1);
+// update timer
+mainLayout.Timer.label = getCurrentTimer();
+mainLayout.RestTime.label = getRestTime();
+mainLayout.render();
+// schedule a draw for the next minute
+if (timeoutDraw != -1) clearTimeout(timeoutDraw);
+timeoutDraw = setTimeout(function() {
+  timeoutDraw = -1;
+  drawMainFrame();
+}, 1000 - (Date.now() % 1000));
 }
 
 function drawMain() {
-  g.clear();
-  mainLayout.forgetLazyState();
-  drawMainFrame();
-  // mainLayout.render();
-  // E.showMessage('Presentor');
+g.clear();
+mainLayout.forgetLazyState();
+drawMainFrame();
+// mainLayout.render();
+// E.showMessage('Presentor');
+}
+
+function doPPart(r) {
+pparti += r;
+if (pparti < 0) return;
+if (!settings.pparts || pparti >= settings.pparts.length) return;
+let ppart = settings.pparts[pparti];
+mainLayout.Subject.label = ppart.subject;
+mainLayout.Notes.label = ppart.notes;
+ptimers[pparti].tracked = getTime();
+drawMainFrame();
 }
 
 NRF.setServices(undefined, { hid : SpecialReport });
 // TODO: figure out how to detect HID.
 NRF.on('HID', function() {
-  HIDenabled = true;
+HIDenabled = true;
 });
 
 function moveMouse(x,y,b,wheel,hwheel,callback) {
-  if (!HIDenabled) return;
-  if (!b) b = 0;
-  if (!wheel) wheel = 0;
-  if (!hwheel) hwheel = 0;
-  NRF.sendHIDReport([1,b,x,y,wheel,hwheel,0,0], function() {
-    if (callback) callback();
-  });
+if (!HIDenabled) return;
+if (!b) b = 0;
+if (!wheel) wheel = 0;
+if (!hwheel) hwheel = 0;
+NRF.sendHIDReport([1,b,x,y,wheel,hwheel,0,0], function() {
+  if (callback) callback();
+});
 }
 
 // function getSign(x) {
@@ -207,161 +257,162 @@ function moveMouse(x,y,b,wheel,hwheel,callback) {
 // }
 
 function scroll(wheel,hwheel,callback) {
-  moveMouse(0,0,0,wheel,hwheel,callback);
+moveMouse(0,0,0,wheel,hwheel,callback);
 }
 
 // Single click a certain button (immidiatly release).
 function clickMouse(b, callback) {
-  if (!HIDenabled) return;
-  NRF.sendHIDReport([1,b,0,0,0,0,0,0], function() {
-    NRF.sendHIDReport([1,0,0,0,0,0,0,0], function() {
-       if (callback) callback();
-    });
+if (!HIDenabled) return;
+NRF.sendHIDReport([1,b,0,0,0,0,0,0], function() {
+  NRF.sendHIDReport([1,0,0,0,0,0,0,0], function() {
+     if (callback) callback();
   });
+});
 }
 
 function pressKey(keyCode, modifiers, callback) {
-  if (!HIDenabled) return;
-  if (!modifiers) modifiers = 0;
-  NRF.sendHIDReport([2, modifiers,0,keyCode,0,0,0,0], function() {
-    NRF.sendHIDReport([2,0,0,0,0,0,0,0], function() {
-       if (callback) callback();
-    });
+if (!HIDenabled) return;
+if (!modifiers) modifiers = 0;
+NRF.sendHIDReport([2, modifiers,0,keyCode,0,0,0,0], function() {
+  NRF.sendHIDReport([2,0,0,0,0,0,0,0], function() {
+     if (callback) callback();
   });
+});
 }
 
 function handleAcc(acc) {
-  let rRoll  = acc.y *  -50;
-  let rPitch = acc.x * -100;
-  if (mCal > 10) {
-    //console.log("x: " +  (rRoll - homeRoll) + " y:" + (rPitch - homePitch));
-    moveMouse(acc.y * -50 - homeRoll, acc.x * -100 - homePitch);
-  } else {
-    //console.log("homeroll: " +homeRoll +"homepitch: " + homePitch);
-    homeRoll  = rRoll  * 0.7 + homeRoll  * 0.3;
-    homePitch = rPitch * 0.7 + homePitch * 0.3;
-    mCal = mCal + 1;
-  }
+let rRoll  = acc.y *  -50;
+let rPitch = acc.x * -100;
+if (mCal > 10) {
+  //console.log("x: " +  (rRoll - homeRoll) + " y:" + (rPitch - homePitch));
+  moveMouse(acc.y * -50 - homeRoll, acc.x * -100 - homePitch);
+} else {
+  //console.log("homeroll: " +homeRoll +"homepitch: " + homePitch);
+  homeRoll  = rRoll  * 0.7 + homeRoll  * 0.3;
+  homePitch = rPitch * 0.7 + homePitch * 0.3;
+  mCal = mCal + 1;
+}
 }
 Bangle.on('lock', function(on) {
-  if (on && holding) {
-    Bangle.setLocked(false);
-    Bangle.setLCDPower(1);
-  }
+if (on && holding) {
+  Bangle.setLocked(false);
+  Bangle.setLCDPower(1);
+}
 });
 
 function startHolding() {
-  pressKey(kb.KEY.F10);
-  holding = true;
-  Bangle.buzz();
-  E.showMessage('Holding');
-  Bangle.on('accel', handleAcc);
-  Bangle.setLCDPower(1);
+pressKey(kb.KEY.F10);
+holding = true;
+Bangle.buzz();
+E.showMessage('Holding');
+Bangle.on('accel', handleAcc);
+Bangle.setLCDPower(1);
 }
 function stopHolding() {
-  clearTimeout(timeoutId);
-  if (holding) {
-    pressKey(kb.KEY.F10);
-    homePitch = 0;
-    homeRoll = 0;
-    holding = false;
-    mCal = 0;
-    Bangle.removeListener('accel', handleAcc);
-    Bangle.buzz();
-    drawMain();
-  } else {
-    timeoutId = setTimeout(drawMain, 1000);
-  }
-  clearTimeout(timeoutHolding);
-  timeoutHolding = -1;
+clearTimeout(timeoutId);
+if (holding) {
+  pressKey(kb.KEY.F10);
+  homePitch = 0;
+  homeRoll = 0;
+  holding = false;
+  mCal = 0;
+  Bangle.removeListener('accel', handleAcc);
+  Bangle.buzz();
+  drawMain();
+} else {
+  timeoutId = setTimeout(drawMain, 1000);
+}
+clearTimeout(timeoutHolding);
+timeoutHolding = -1;
 }
 
 Bangle.on('drag', function(e) {
-  if (cttl == 0) { cttl = getTime(); }
-  if (trackPadMode) {
-    if (lastx + lasty == 0) {
-      lastx = e.x;
-      lasty = e.y;
-      mttl = getTime();
+if (cttl == 0) { cttl = getTime(); }
+if (trackPadMode) {
+  if (lastx + lasty == 0) {
+    lastx = e.x;
+    lasty = e.y;
+    mttl = getTime();
+  }
+  if (clearToSend) {
+    clearToSend = false;
+    let difX = e.x - lastx, difY = e.y - lasty;
+    let dT = getTime() - mttl;
+    let vX = difX / dT, vY = difY / dT;
+    //let qX = getSign(difX) * Math.pow(Math.abs(difX), 1.2);
+    //let qY = getSign(difY) * Math.pow(Math.abs(difY), 1.2);
+    let qX = difX + 0.02 * vX, qY = difY + 0.02 * vY;
+    moveMouse(qX, qY, 0, 0, 0, function() {
+      setTimeout(function() {clearToSend = true;}, 50);
+    });
+    lastx = e.x;
+    lasty = e.y;
+    mttl = getTime();
+    console.log("Dx: " + (qX) + " Dy: " + (qY));
+  }
+  if (!e.b) {
+    // short press
+    if (getTime() - cttl < 0.2) {
+      clickMouse(MouseButton.LEFT);
+      console.log("click left");
     }
-    if (clearToSend) {
-      clearToSend = false;
-      let difX = e.x - lastx, difY = e.y - lasty;
-      let dT = getTime() - mttl;
-      let vX = difX / dT, vY = difY / dT;
-      //let qX = getSign(difX) * Math.pow(Math.abs(difX), 1.2);
-      //let qY = getSign(difY) * Math.pow(Math.abs(difY), 1.2);
-      let qX = difX + 0.02 * vX, qY = difY + 0.02 * vY;
-      moveMouse(qX, qY, 0, 0, 0, function() {
-        setTimeout(function() {clearToSend = true;}, 50);
-      });
-      lastx = e.x;
-      lasty = e.y;
-      mttl = getTime();
-      console.log("Dx: " + (qX) + " Dy: " + (qY));
+    // longer press in center
+    else if (getTime() - cttl < 0.6 && e.x > g.getWidth()/4 && e.x < 3 * g.getWidth()/4 && e.y > g.getHeight() / 4 && e.y < 3 * g.getHeight() / 4) {
+      clickMouse(MouseButton.RIGHT);
+      console.log("click right");
     }
-    if (!e.b) {
-      // short press
-      if (getTime() - cttl < 0.2) {
-        clickMouse(MouseButton.LEFT);
-        console.log("click left");
-      }
-      // longer press in center
-      else if (getTime() - cttl < 0.6 && e.x > g.getWidth()/4 && e.x < 3 * g.getWidth()/4 && e.y > g.getHeight() / 4 && e.y < 3 * g.getHeight() / 4) {
-        clickMouse(MouseButton.RIGHT);
-        console.log("click right");
-      }
-      cttl = 0;
-      lastx = 0;
-      lasty = 0;
+    cttl = 0;
+    lastx = 0;
+    lasty = 0;
+  }
+} else {
+  if(!e.b){
+    Bangle.buzz(100);
+    if(lasty >  40){
+      doPPart(1);
+      E.showMessage('down');
+    } else if(lasty < -40){
+      doPPart(-1);
+      E.showMessage('up');
+    } else if(lastx > 40){
+      E.showMessage('right');
+      //kb.tap(kb.KEY.RIGHT, 0);
+      scroll(-1);
+    } else if(lastx < -40){
+      E.showMessage('left');
+      //kb.tap(kb.KEY.LEFT, 0);
+      scroll(1);
+    } else if(lastx==0 && lasty==0 && holding == false){
+      E.showMessage('press');
+      clickMouse(MouseButton.LEFT);
     }
-  } else {
-    if(!e.b){
-      Bangle.buzz(100);
-      if(lasty >  40){
-        E.showMessage('down');
-        scroll(0,1);
-      } else if(lasty < -40){
-        E.showMessage(kb.KEY.A);
-        pressKey(kb.KEY.A);
-      } else if(lastx > 40){
-        E.showMessage('right');
-        //kb.tap(kb.KEY.RIGHT, 0);
-        scroll(-1);
-      } else if(lastx < -40){
-        E.showMessage('left');
-        //kb.tap(kb.KEY.LEFT, 0);
-        scroll(1);
-      } else if(lastx==0 && lasty==0 && holding == false){
-        E.showMessage('press');
-        clickMouse(MouseButton.LEFT);
-      }
-      stopHolding();
-      lastx = 0;
-      lasty = 0;
-    } else{
-      lastx = lastx + e.dx;
-      lasty = lasty + e.dy;
-      if (timeoutHolding == -1) {
-        timeoutHolding = setTimeout(startHolding, 500);
-      }
+    stopHolding();
+    lastx = 0;
+    lasty = 0;
+  } else{
+    lastx = lastx + e.dx;
+    lasty = lasty + e.dy;
+    if (timeoutHolding == -1) {
+      timeoutHolding = setTimeout(startHolding, 500);
     }
   }
+}
 });
 
 
 function onBtn() {
-  if (trackPadMode) {
-    trackPadMode = false;
-    stopHolding();
-    drawMain();
-  } else {
-    clearToSend = true;
-    trackPadMode = true;
-    E.showMessage('Mouse');
-  }
-  Bangle.buzz();
+if (trackPadMode) {
+  trackPadMode = false;
+  stopHolding();
+  drawMain();
+} else {
+  clearToSend = true;
+  trackPadMode = true;
+  E.showMessage('Mouse');
+}
+Bangle.buzz();
 }
 setWatch(onBtn, (process.env.HWVERSION==2) ? BTN1 : BTN2, {repeat: true});
 
-drawMain();
+loadSettings();
+drawMain();
\ No newline at end of file

From 10a50fdde236bffd27d0255ec1b48dd17f8a2239 Mon Sep 17 00:00:00 2001
From: 7kasper <kasper77077@gmail.com>
Date: Sun, 2 Jan 2022 20:29:28 +0100
Subject: [PATCH 24/45] fix time formatting

---
 apps/presentor/app.js | 500 +++++++++++++++++++++---------------------
 1 file changed, 254 insertions(+), 246 deletions(-)

diff --git a/apps/presentor/app.js b/apps/presentor/app.js
index 819f1ebc2..1d836b7ae 100644
--- a/apps/presentor/app.js
+++ b/apps/presentor/app.js
@@ -63,81 +63,80 @@ const SpecialReport = new Uint8Array([
 ]);
 
 const MouseButton = {
-NONE : 0,
-LEFT : 1,
-RIGHT : 2,
-MIDDLE : 4,
-BACK : 8,
-FORWARD: 16
+  NONE : 0,
+  LEFT : 1,
+  RIGHT : 2,
+  MIDDLE : 4,
+  BACK : 8,
+  FORWARD: 16
 };
 
 const kb = require("ble_hid_keyboard");
 
 const Layout = require("Layout");
 const Locale = require("locale");
-let mainLayout = new Layout( {
-'type': 'v', 
-filly: 1, 
-c: [
-  {
-    type: 'txt', 
-    font: '6x8', 
-    label: 'Presentor', 
-    valign: -1,
-    halign: 0,
-    col: g.theme.fg1, 
-    // bgCol: g.theme.bg2,
-    bgCol: '#00F',
-    fillx: 1,
-  }, {
-    type: 'h',
-    fillx: 1,
-    c: [
-      {
-        type: 'txt',
-        font: '15%',
-        label: '00:00',
-        id: 'Time',
-        halign: -1,
-        pad: 3
-      }, {
-        fillx: 1
-      }, {
-        type: 'txt',
-        font: '15%',
-        label: '00:00',
-        id: 'Timer',
-        halign: 1,
-        pad: 3
-      }
-    ]
-  }, {
-    type: 'txt',
-    font: '10%',
-    label: '+00:00',
-    id: 'RestTime',
-    col: '#fff'
-  }, {
-    type: 'txt',
-    font: '10%',
-    label: '--------------'
-  }, {
-    type: 'txt',
-    font: '15%',
-    label: 'Presenting',
-    id: 'Subject'
-  }, {
-    type: 'txt',
-    font: '6x8',
-    label: 'Swipe down to start the time.',
-    id: 'Notes',
-    col: '#ff0',
-    fillx: 1,
-    filly: 1,
-    valign: 1
-  }
-  
-]
+let mainLayout = new Layout({
+  'type': 'v', 
+  filly: 1, 
+  c: [
+    {
+      type: 'txt', 
+      font: '6x8', 
+      label: 'Presentor', 
+      valign: -1,
+      halign: 0,
+      col: g.theme.fg1, 
+      // bgCol: g.theme.bg2,
+      bgCol: '#00F',
+      fillx: 1,
+    }, {
+      type: 'h',
+      fillx: 1,
+      c: [
+        {
+          type: 'txt',
+          font: '15%',
+          label: '00:00',
+          id: 'Time',
+          halign: -1,
+          pad: 3
+        }, {
+          fillx: 1
+        }, {
+          type: 'txt',
+          font: '15%',
+          label: '00:00',
+          id: 'Timer',
+          halign: 1,
+          pad: 3
+        }
+      ]
+    }, {
+      type: 'txt',
+      font: '10%',
+      label: '+00:00',
+      id: 'RestTime',
+      col: '#fff'
+    }, {
+      type: 'txt',
+      font: '10%',
+      label: '--------------'
+    }, {
+      type: 'txt',
+      font: '15%',
+      label: 'Presenting',
+      id: 'Subject'
+    }, {
+      type: 'txt',
+      font: '6x8',
+      label: 'Swipe down to start the time.',
+      id: 'Notes',
+      col: '#ff0',
+      fillx: 1,
+      filly: 1,
+      valign: 1
+    }
+  ]
 }, {lazy:true});
 
 let settings = {pparts: [], sversion: 0};
@@ -172,84 +171,93 @@ let clearToSend = true;
 // Presentation Timers
 let ptimers = [];
 
-function loadSettings() {
-settings = require("Storage").readJSON('presentor.json');
-for (let i = 0; i < settings.pparts.length; i++) {
-  ptimers[i] = {
-    active: false,
-    tracked: -1,
-    left: settings.pparts[i].minutes * 60 + settings.pparts[i].seconds
-  };
+function formatTimePart(time) {
+  time = Math.floor(Math.abs(time));
+  return time < 10 ? `0${time}` : `${time}`;
 }
+
+function formatTime(time, doPlus) {
+  return `${time < 0 ? '-' : (doPlus ? '+' : '')}${formatTimePart(time/60)}:${formatTimePart(time%60)}`;
+}
+
+function loadSettings() {
+  settings = require("Storage").readJSON('presentor.json');
+  for (let i = 0; i < settings.pparts.length; i++) {
+    ptimers[i] = {
+      active: false,
+      tracked: -1,
+      left: settings.pparts[i].minutes * 60 + settings.pparts[i].seconds
+    };
+  }
 }
 
 function getCurrentTimer() {
-if (pparti < 0) return '00:00';
-if (!settings.pparts || pparti >= settings.pparts.length) return '00:00';
-if (ptimers[pparti].tracked == -1) return '00:00';
-ptimers[pparti].left -= (getTime() - ptimers[pparti].tracked);
-ptimers[pparti].tracked = getTime();
-return `${Math.floor(ptimers[pparti].left/60)}:${Math.floor(ptimers[pparti].left%60)}`;
+  if (pparti < 0) return '00:00';
+  if (!settings.pparts || pparti >= settings.pparts.length) return '00:00';
+  if (ptimers[pparti].tracked == -1) return '00:00';
+  ptimers[pparti].left -= (getTime() - ptimers[pparti].tracked);
+  ptimers[pparti].tracked = getTime();
+  return formatTime(ptimers[pparti].left);
 }
 
 function getRestTime() {
-let rem = 0;
-// Add all remaining time from previous presentation parts.
-for (let i = 0; i < pparti; i++) {
-  rem += ptimers[i].left;
-}
-return `${rem >= 0 ? '+':'-'}${Math.floor(rem/60)}:${Math.floor(rem%60)}`;
+  let rem = 0;
+  // Add all remaining time from previous presentation parts.
+  for (let i = 0; i < pparti; i++) {
+    rem += ptimers[i].left;
+  }
+  return formatTime(rem, true);
 }
 
 function drawMainFrame() {
-var d = new Date();
-// update time
-mainLayout.Time.label = Locale.time(d,1);
-// update timer
-mainLayout.Timer.label = getCurrentTimer();
-mainLayout.RestTime.label = getRestTime();
-mainLayout.render();
-// schedule a draw for the next minute
-if (timeoutDraw != -1) clearTimeout(timeoutDraw);
-timeoutDraw = setTimeout(function() {
-  timeoutDraw = -1;
-  drawMainFrame();
-}, 1000 - (Date.now() % 1000));
+  var d = new Date();
+  // update time
+  mainLayout.Time.label = Locale.time(d,1);
+  // update timer
+  mainLayout.Timer.label = getCurrentTimer();
+  mainLayout.RestTime.label = getRestTime();
+  mainLayout.render();
+  // schedule a draw for the next minute
+  if (timeoutDraw != -1) clearTimeout(timeoutDraw);
+  timeoutDraw = setTimeout(function() {
+    timeoutDraw = -1;
+    drawMainFrame();
+  }, 1000 - (Date.now() % 1000));
 }
 
 function drawMain() {
-g.clear();
-mainLayout.forgetLazyState();
-drawMainFrame();
-// mainLayout.render();
-// E.showMessage('Presentor');
+  g.clear();
+  mainLayout.forgetLazyState();
+  drawMainFrame();
+  // mainLayout.render();
+  // E.showMessage('Presentor');
 }
 
 function doPPart(r) {
-pparti += r;
-if (pparti < 0) return;
-if (!settings.pparts || pparti >= settings.pparts.length) return;
-let ppart = settings.pparts[pparti];
-mainLayout.Subject.label = ppart.subject;
-mainLayout.Notes.label = ppart.notes;
-ptimers[pparti].tracked = getTime();
-drawMainFrame();
+  pparti += r;
+  if (pparti < 0) return;
+  if (!settings.pparts || pparti >= settings.pparts.length) return;
+  let ppart = settings.pparts[pparti];
+  mainLayout.Subject.label = ppart.subject;
+  mainLayout.Notes.label = ppart.notes;
+  ptimers[pparti].tracked = getTime();
+  drawMainFrame();
 }
 
 NRF.setServices(undefined, { hid : SpecialReport });
 // TODO: figure out how to detect HID.
 NRF.on('HID', function() {
-HIDenabled = true;
+  HIDenabled = true;
 });
 
 function moveMouse(x,y,b,wheel,hwheel,callback) {
-if (!HIDenabled) return;
-if (!b) b = 0;
-if (!wheel) wheel = 0;
-if (!hwheel) hwheel = 0;
-NRF.sendHIDReport([1,b,x,y,wheel,hwheel,0,0], function() {
-  if (callback) callback();
-});
+  if (!HIDenabled) return;
+  if (!b) b = 0;
+  if (!wheel) wheel = 0;
+  if (!hwheel) hwheel = 0;
+  NRF.sendHIDReport([1,b,x,y,wheel,hwheel,0,0], function() {
+    if (callback) callback();
+  });
 }
 
 // function getSign(x) {
@@ -257,160 +265,160 @@ NRF.sendHIDReport([1,b,x,y,wheel,hwheel,0,0], function() {
 // }
 
 function scroll(wheel,hwheel,callback) {
-moveMouse(0,0,0,wheel,hwheel,callback);
+  moveMouse(0,0,0,wheel,hwheel,callback);
 }
 
 // Single click a certain button (immidiatly release).
 function clickMouse(b, callback) {
-if (!HIDenabled) return;
-NRF.sendHIDReport([1,b,0,0,0,0,0,0], function() {
-  NRF.sendHIDReport([1,0,0,0,0,0,0,0], function() {
-     if (callback) callback();
+  if (!HIDenabled) return;
+  NRF.sendHIDReport([1,b,0,0,0,0,0,0], function() {
+    NRF.sendHIDReport([1,0,0,0,0,0,0,0], function() {
+      if (callback) callback();
+    });
   });
-});
 }
 
 function pressKey(keyCode, modifiers, callback) {
-if (!HIDenabled) return;
-if (!modifiers) modifiers = 0;
-NRF.sendHIDReport([2, modifiers,0,keyCode,0,0,0,0], function() {
-  NRF.sendHIDReport([2,0,0,0,0,0,0,0], function() {
-     if (callback) callback();
+  if (!HIDenabled) return;
+  if (!modifiers) modifiers = 0;
+  NRF.sendHIDReport([2, modifiers,0,keyCode,0,0,0,0], function() {
+    NRF.sendHIDReport([2,0,0,0,0,0,0,0], function() {
+      if (callback) callback();
+    });
   });
-});
 }
 
 function handleAcc(acc) {
-let rRoll  = acc.y *  -50;
-let rPitch = acc.x * -100;
-if (mCal > 10) {
-  //console.log("x: " +  (rRoll - homeRoll) + " y:" + (rPitch - homePitch));
-  moveMouse(acc.y * -50 - homeRoll, acc.x * -100 - homePitch);
-} else {
-  //console.log("homeroll: " +homeRoll +"homepitch: " + homePitch);
-  homeRoll  = rRoll  * 0.7 + homeRoll  * 0.3;
-  homePitch = rPitch * 0.7 + homePitch * 0.3;
-  mCal = mCal + 1;
-}
+  let rRoll  = acc.y *  -50;
+  let rPitch = acc.x * -100;
+  if (mCal > 10) {
+    //console.log("x: " +  (rRoll - homeRoll) + " y:" + (rPitch - homePitch));
+    moveMouse(acc.y * -50 - homeRoll, acc.x * -100 - homePitch);
+  } else {
+    //console.log("homeroll: " +homeRoll +"homepitch: " + homePitch);
+    homeRoll  = rRoll  * 0.7 + homeRoll  * 0.3;
+    homePitch = rPitch * 0.7 + homePitch * 0.3;
+    mCal = mCal + 1;
+  }
 }
 Bangle.on('lock', function(on) {
-if (on && holding) {
-  Bangle.setLocked(false);
-  Bangle.setLCDPower(1);
-}
+  if (on && holding) {
+    Bangle.setLocked(false);
+    Bangle.setLCDPower(1);
+  }
 });
 
 function startHolding() {
-pressKey(kb.KEY.F10);
-holding = true;
-Bangle.buzz();
-E.showMessage('Holding');
-Bangle.on('accel', handleAcc);
-Bangle.setLCDPower(1);
+  pressKey(kb.KEY.F10);
+  holding = true;
+  Bangle.buzz();
+  E.showMessage('Holding');
+  Bangle.on('accel', handleAcc);
+  Bangle.setLCDPower(1);
 }
 function stopHolding() {
-clearTimeout(timeoutId);
-if (holding) {
-  pressKey(kb.KEY.F10);
-  homePitch = 0;
-  homeRoll = 0;
-  holding = false;
-  mCal = 0;
-  Bangle.removeListener('accel', handleAcc);
-  Bangle.buzz();
-  drawMain();
-} else {
-  timeoutId = setTimeout(drawMain, 1000);
-}
-clearTimeout(timeoutHolding);
-timeoutHolding = -1;
+  clearTimeout(timeoutId);
+  if (holding) {
+    pressKey(kb.KEY.F10);
+    homePitch = 0;
+    homeRoll = 0;
+    holding = false;
+    mCal = 0;
+    Bangle.removeListener('accel', handleAcc);
+    Bangle.buzz();
+    drawMain();
+  } else {
+    timeoutId = setTimeout(drawMain, 1000);
+  }
+  clearTimeout(timeoutHolding);
+  timeoutHolding = -1;
 }
 
 Bangle.on('drag', function(e) {
-if (cttl == 0) { cttl = getTime(); }
-if (trackPadMode) {
-  if (lastx + lasty == 0) {
-    lastx = e.x;
-    lasty = e.y;
-    mttl = getTime();
-  }
-  if (clearToSend) {
-    clearToSend = false;
-    let difX = e.x - lastx, difY = e.y - lasty;
-    let dT = getTime() - mttl;
-    let vX = difX / dT, vY = difY / dT;
-    //let qX = getSign(difX) * Math.pow(Math.abs(difX), 1.2);
-    //let qY = getSign(difY) * Math.pow(Math.abs(difY), 1.2);
-    let qX = difX + 0.02 * vX, qY = difY + 0.02 * vY;
-    moveMouse(qX, qY, 0, 0, 0, function() {
-      setTimeout(function() {clearToSend = true;}, 50);
-    });
-    lastx = e.x;
-    lasty = e.y;
-    mttl = getTime();
-    console.log("Dx: " + (qX) + " Dy: " + (qY));
-  }
-  if (!e.b) {
-    // short press
-    if (getTime() - cttl < 0.2) {
-      clickMouse(MouseButton.LEFT);
-      console.log("click left");
+  if (cttl == 0) { cttl = getTime(); }
+  if (trackPadMode) {
+    if (lastx + lasty == 0) {
+      lastx = e.x;
+      lasty = e.y;
+      mttl = getTime();
     }
-    // longer press in center
-    else if (getTime() - cttl < 0.6 && e.x > g.getWidth()/4 && e.x < 3 * g.getWidth()/4 && e.y > g.getHeight() / 4 && e.y < 3 * g.getHeight() / 4) {
-      clickMouse(MouseButton.RIGHT);
-      console.log("click right");
+    if (clearToSend) {
+      clearToSend = false;
+      let difX = e.x - lastx, difY = e.y - lasty;
+      let dT = getTime() - mttl;
+      let vX = difX / dT, vY = difY / dT;
+      //let qX = getSign(difX) * Math.pow(Math.abs(difX), 1.2);
+      //let qY = getSign(difY) * Math.pow(Math.abs(difY), 1.2);
+      let qX = difX + 0.02 * vX, qY = difY + 0.02 * vY;
+      moveMouse(qX, qY, 0, 0, 0, function() {
+        setTimeout(function() {clearToSend = true;}, 50);
+      });
+      lastx = e.x;
+      lasty = e.y;
+      mttl = getTime();
+      console.log("Dx: " + (qX) + " Dy: " + (qY));
     }
-    cttl = 0;
-    lastx = 0;
-    lasty = 0;
-  }
-} else {
-  if(!e.b){
-    Bangle.buzz(100);
-    if(lasty >  40){
-      doPPart(1);
-      E.showMessage('down');
-    } else if(lasty < -40){
-      doPPart(-1);
-      E.showMessage('up');
-    } else if(lastx > 40){
-      E.showMessage('right');
-      //kb.tap(kb.KEY.RIGHT, 0);
-      scroll(-1);
-    } else if(lastx < -40){
-      E.showMessage('left');
-      //kb.tap(kb.KEY.LEFT, 0);
-      scroll(1);
-    } else if(lastx==0 && lasty==0 && holding == false){
-      E.showMessage('press');
-      clickMouse(MouseButton.LEFT);
+    if (!e.b) {
+      // short press
+      if (getTime() - cttl < 0.2) {
+        clickMouse(MouseButton.LEFT);
+        console.log("click left");
+      }
+      // longer press in center
+      else if (getTime() - cttl < 0.6 && e.x > g.getWidth()/4 && e.x < 3 * g.getWidth()/4 && e.y > g.getHeight() / 4 && e.y < 3 * g.getHeight() / 4) {
+        clickMouse(MouseButton.RIGHT);
+        console.log("click right");
+      }
+      cttl = 0;
+      lastx = 0;
+      lasty = 0;
     }
-    stopHolding();
-    lastx = 0;
-    lasty = 0;
-  } else{
-    lastx = lastx + e.dx;
-    lasty = lasty + e.dy;
-    if (timeoutHolding == -1) {
-      timeoutHolding = setTimeout(startHolding, 500);
+  } else {
+    if(!e.b){
+      Bangle.buzz(100);
+      if(lasty >  40){
+        doPPart(1);
+        E.showMessage('down');
+      } else if(lasty < -40){
+        doPPart(-1);
+        E.showMessage('up');
+      } else if(lastx > 40){
+        E.showMessage('right');
+        //kb.tap(kb.KEY.RIGHT, 0);
+        scroll(-1);
+      } else if(lastx < -40){
+        E.showMessage('left');
+        //kb.tap(kb.KEY.LEFT, 0);
+        scroll(1);
+      } else if(lastx==0 && lasty==0 && holding == false){
+        E.showMessage('press');
+        clickMouse(MouseButton.LEFT);
+      }
+      stopHolding();
+      lastx = 0;
+      lasty = 0;
+    } else{
+      lastx = lastx + e.dx;
+      lasty = lasty + e.dy;
+      if (timeoutHolding == -1) {
+        timeoutHolding = setTimeout(startHolding, 500);
+      }
     }
   }
-}
 });
 
 
 function onBtn() {
-if (trackPadMode) {
-  trackPadMode = false;
-  stopHolding();
-  drawMain();
-} else {
-  clearToSend = true;
-  trackPadMode = true;
-  E.showMessage('Mouse');
-}
-Bangle.buzz();
+  if (trackPadMode) {
+    trackPadMode = false;
+    stopHolding();
+    drawMain();
+  } else {
+    clearToSend = true;
+    trackPadMode = true;
+    E.showMessage('Mouse');
+  }
+  Bangle.buzz();
 }
 setWatch(onBtn, (process.env.HWVERSION==2) ? BTN1 : BTN2, {repeat: true});
 

From d7e0a7d214e2754df16eeaee8fa00c4b099e6a17 Mon Sep 17 00:00:00 2001
From: 7kasper <kasper77077@gmail.com>
Date: Sun, 2 Jan 2022 22:03:15 +0100
Subject: [PATCH 25/45] Add buzzing when timer finishes

---
 apps/presentor/app.js | 35 ++++++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/apps/presentor/app.js b/apps/presentor/app.js
index 1d836b7ae..18bcc1066 100644
--- a/apps/presentor/app.js
+++ b/apps/presentor/app.js
@@ -144,6 +144,7 @@ let HIDenabled = false;
 
 // Application variables
 let pparti = -1;
+let ppartBuzzed = false;
 
 let lastx = 0;
 let lasty = 0;
@@ -171,12 +172,19 @@ let clearToSend = true;
 // Presentation Timers
 let ptimers = [];
 
+function delay(t, v) {
+  return new Promise(function(resolve) { 
+      setTimeout(resolve.bind(null, v), t)
+  });
+}
+
 function formatTimePart(time) {
   time = Math.floor(Math.abs(time));
   return time < 10 ? `0${time}` : `${time}`;
 }
 
 function formatTime(time, doPlus) {
+  if (time == Infinity) return ' --:-- ';
   return `${time < 0 ? '-' : (doPlus ? '+' : '')}${formatTimePart(time/60)}:${formatTimePart(time%60)}`;
 }
 
@@ -192,12 +200,18 @@ function loadSettings() {
 }
 
 function getCurrentTimer() {
-  if (pparti < 0) return '00:00';
-  if (!settings.pparts || pparti >= settings.pparts.length) return '00:00';
-  if (ptimers[pparti].tracked == -1) return '00:00';
+  if (pparti < 0) return Infinity;
+  if (!settings.pparts || pparti >= settings.pparts.length) return Infinity;
+  if (ptimers[pparti].tracked == -1) return Infinity;
   ptimers[pparti].left -= (getTime() - ptimers[pparti].tracked);
   ptimers[pparti].tracked = getTime();
-  return formatTime(ptimers[pparti].left);
+  // if we haven't buzzed yet and timer became negative just buzz here.
+  // TODO better place?
+  if (ptimers[pparti].left <= 0 && !ppartBuzzed) {
+    Bangle.buzz().then(() => delay(500)).then(() => Bangle.buzz());
+    ppartBuzzed = true;
+  }
+  return ptimers[pparti].left;
 }
 
 function getRestTime() {
@@ -206,7 +220,10 @@ function getRestTime() {
   for (let i = 0; i < pparti; i++) {
     rem += ptimers[i].left;
   }
-  return formatTime(rem, true);
+  if (pparti > 0 && pparti < ptimers.length && ptimers[pparti].left < 0) {
+    rem += ptimers[pparti].left;
+  }
+  return rem;
 }
 
 function drawMainFrame() {
@@ -214,8 +231,10 @@ function drawMainFrame() {
   // update time
   mainLayout.Time.label = Locale.time(d,1);
   // update timer
-  mainLayout.Timer.label = getCurrentTimer();
-  mainLayout.RestTime.label = getRestTime();
+  mainLayout.Timer.label = formatTime(getCurrentTimer());
+  let restTime = getRestTime();
+  mainLayout.RestTime.label = formatTime(restTime, true);
+  mainLayout.RestTime.col = restTime < 0 ? '#f00' : (restTime > 0 ? '#0f0' : '#fff');
   mainLayout.render();
   // schedule a draw for the next minute
   if (timeoutDraw != -1) clearTimeout(timeoutDraw);
@@ -241,6 +260,8 @@ function doPPart(r) {
   mainLayout.Subject.label = ppart.subject;
   mainLayout.Notes.label = ppart.notes;
   ptimers[pparti].tracked = getTime();
+  // We haven't buzzed if there was time left.
+  ppartBuzzed = ptimers[pparti].left <= 0;
   drawMainFrame();
 }
 

From a68aa6bd6871e6b50d8b1c20da11935e9c77f550 Mon Sep 17 00:00:00 2001
From: 7kasper <kasper77077@gmail.com>
Date: Sun, 2 Jan 2022 22:41:52 +0100
Subject: [PATCH 26/45] Change swipe direction

---
 apps/presentor/app.js | 54 +++++++++++++++++++++++++++++++------------
 1 file changed, 39 insertions(+), 15 deletions(-)

diff --git a/apps/presentor/app.js b/apps/presentor/app.js
index 18bcc1066..2fc9d0d2f 100644
--- a/apps/presentor/app.js
+++ b/apps/presentor/app.js
@@ -129,7 +129,7 @@ let mainLayout = new Layout({
     }, {
       type: 'txt',
       font: '6x8',
-      label: 'Swipe down to start the time.',
+      label: 'Swipe up to start the time.',
       id: 'Notes',
       col: '#ff0',
       fillx: 1,
@@ -145,6 +145,7 @@ let HIDenabled = false;
 // Application variables
 let pparti = -1;
 let ppartBuzzed = false;
+let restBuzzed = false;
 
 let lastx = 0;
 let lasty = 0;
@@ -157,7 +158,6 @@ let trackPadMode = false;
 let timeoutId = -1;
 let timeoutHolding = -1;
 let timeoutDraw = -1;
-let timeoutDrawTimer = -1;
 
 
 let homeRoll = 0;
@@ -173,8 +173,8 @@ let clearToSend = true;
 let ptimers = [];
 
 function delay(t, v) {
-  return new Promise(function(resolve) { 
-      setTimeout(resolve.bind(null, v), t)
+  return new Promise((resolve) => { 
+      setTimeout(resolve, t)
   });
 }
 
@@ -208,7 +208,9 @@ function getCurrentTimer() {
   // if we haven't buzzed yet and timer became negative just buzz here.
   // TODO better place?
   if (ptimers[pparti].left <= 0 && !ppartBuzzed) {
-    Bangle.buzz().then(() => delay(500)).then(() => Bangle.buzz());
+    Bangle.buzz(400)
+      .then(() => delay(400))
+      .then(() => Bangle.buzz(400));
     ppartBuzzed = true;
   }
   return ptimers[pparti].left;
@@ -220,9 +222,19 @@ function getRestTime() {
   for (let i = 0; i < pparti; i++) {
     rem += ptimers[i].left;
   }
-  if (pparti > 0 && pparti < ptimers.length && ptimers[pparti].left < 0) {
+  if (pparti >= 0 && pparti < ptimers.length && ptimers[pparti].left < 0) {
     rem += ptimers[pparti].left;
   }
+  // if we haven't buzzed yet and timer became negative just buzz here.
+  // TODO better place?
+  if (rem < 0 && !restBuzzed) {
+    Bangle.buzz(200)
+      .then(() => delay(400))
+      .then(() => Bangle.buzz(200))
+      .then(() => delay(400))
+      .then(() => Bangle.buzz(200));
+    restBuzzed = true;
+  }
   return rem;
 }
 
@@ -254,14 +266,26 @@ function drawMain() {
 
 function doPPart(r) {
   pparti += r;
-  if (pparti < 0) return;
-  if (!settings.pparts || pparti >= settings.pparts.length) return;
+  if (pparti < 0) {
+    pparti = -1;
+    mainLayout.Subject.label = 'PAUSED';
+    mainLayout.Notes.label = 'Swipe up to start again.';
+    return;
+  }
+  if (!settings.pparts || pparti >= settings.pparts.length) {
+    pparti = settings.pparts.length;
+    mainLayout.Subject.label = 'FINISHED';
+    mainLayout.Notes.label = 'Good Job!';
+    return;
+  }
   let ppart = settings.pparts[pparti];
   mainLayout.Subject.label = ppart.subject;
   mainLayout.Notes.label = ppart.notes;
   ptimers[pparti].tracked = getTime();
   // We haven't buzzed if there was time left.
   ppartBuzzed = ptimers[pparti].left <= 0;
+  // Always reset buzzstate for the rest timer.
+  restBuzzed = getRestTime() < 0;
   drawMainFrame();
 }
 
@@ -398,21 +422,21 @@ Bangle.on('drag', function(e) {
     if(!e.b){
       Bangle.buzz(100);
       if(lasty >  40){
-        doPPart(1);
-        E.showMessage('down');
-      } else if(lasty < -40){
         doPPart(-1);
-        E.showMessage('up');
+        // E.showMessage('down');
+      } else if(lasty < -40){
+        doPPart(1);
+        // E.showMessage('up');
       } else if(lastx > 40){
-        E.showMessage('right');
+        // E.showMessage('right');
         //kb.tap(kb.KEY.RIGHT, 0);
         scroll(-1);
       } else if(lastx < -40){
-        E.showMessage('left');
+        // E.showMessage('left');
         //kb.tap(kb.KEY.LEFT, 0);
         scroll(1);
       } else if(lastx==0 && lasty==0 && holding == false){
-        E.showMessage('press');
+        // E.showMessage('press');
         clickMouse(MouseButton.LEFT);
       }
       stopHolding();

From 08c0f2068f6c81dac4281f99b670e7e57d214f17 Mon Sep 17 00:00:00 2001
From: 7kasper <kasper77077@gmail.com>
Date: Sun, 2 Jan 2022 22:43:01 +0100
Subject: [PATCH 27/45] Bumb version

---
 apps.json                | 2 +-
 apps/presentor/ChangeLog | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps.json b/apps.json
index 74a24d290..3c4986aca 100644
--- a/apps.json
+++ b/apps.json
@@ -5066,7 +5066,7 @@
   {
     "id": "presentor",
     "name": "Presentor",
-    "version": "2.2",
+    "version": "3.0",
     "description": "Use your Bangle to present!",
     "icon": "app.png",
     "type": "app",
diff --git a/apps/presentor/ChangeLog b/apps/presentor/ChangeLog
index 2e3409855..00833cf91 100644
--- a/apps/presentor/ChangeLog
+++ b/apps/presentor/ChangeLog
@@ -5,3 +5,4 @@
 2.0: Added touchpad style mouse.
 2.1: Initial internal git(hub) release. Added icon and such.
 2.2: Begin work on presentation parts.
+3.0: Presentation parts!
\ No newline at end of file

From 26a3ff74af6d63ea832dd26e34153eaeefbdbc5d Mon Sep 17 00:00:00 2001
From: 7kasper <kasper77077@gmail.com>
Date: Sun, 2 Jan 2022 22:44:52 +0100
Subject: [PATCH 28/45] oops

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

diff --git a/apps/presentor/app.js b/apps/presentor/app.js
index 2fc9d0d2f..a607842bb 100644
--- a/apps/presentor/app.js
+++ b/apps/presentor/app.js
@@ -140,7 +140,7 @@ let mainLayout = new Layout({
 }, {lazy:true});
 
 let settings = {pparts: [], sversion: 0};
-let HIDenabled = false;
+let HIDenabled = true;
 
 // Application variables
 let pparti = -1;

From a0492d7ac2658d9c7a9fef69df7bcaf793921f35 Mon Sep 17 00:00:00 2001
From: 7kasper <kasper77077@gmail.com>
Date: Sun, 2 Jan 2022 22:45:16 +0100
Subject: [PATCH 29/45] :-)

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

diff --git a/apps/presentor/app.js b/apps/presentor/app.js
index a607842bb..6b7450a0c 100644
--- a/apps/presentor/app.js
+++ b/apps/presentor/app.js
@@ -1,5 +1,5 @@
 // Presentor by 7kasper (Kasper Müller)
-// Version 2.2
+// Version 3.0
 
 const SpecialReport = new Uint8Array([
   0x05, 0x01,                    // USAGE_PAGE (Generic Desktop)

From 26854f8fba96c65c00d81acbf8769b2be9b87953 Mon Sep 17 00:00:00 2001
From: David Peer <david.peer@outlook.com>
Date: Tue, 4 Jan 2022 18:37:18 +0100
Subject: [PATCH 30/45] Minor improvements.

---
 apps/lcars/lcars.app.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/lcars/lcars.app.js b/apps/lcars/lcars.app.js
index 74d0450c0..c3e3b2bfc 100644
--- a/apps/lcars/lcars.app.js
+++ b/apps/lcars/lcars.app.js
@@ -191,7 +191,7 @@ function drawState(){
     return;
   }
 
-  g.clearRect(20, 93, 77, 170);
+  g.clearRect(20, 93, 80, 170);
   g.setColor(cWhite);
   var bat = E.getBattery();
   var current = new Date();
@@ -206,16 +206,16 @@ function drawState(){
         hours % 4 == 1 ? iconMars :
         hours % 4 == 2 ? iconMoon :
         iconEarth;
-    g.drawImage(iconImg, 29, 104);
+    g.drawImage(iconImg, 31, 104);
   } else {
     // Alarm within symbol
     g.setFontAntonioMedium();
     g.setFontAlign(0, 0, 0);
     g.setColor(cOrange);
-    g.drawString("ALARM", 29+25, 107);
+    g.drawString("ALARM", 31+25, 107);
     g.setColor(cWhite);
     g.setFontAntonioLarge();
-    g.drawString(getAlarmMinutes(), 29+25, 107+35);
+    g.drawString(getAlarmMinutes(), 31+25, 107+35);
   }
 
   g.setFontAlign(-1, -1, 0);

From 34b73682edc0785013cbd3f5dcb4085880da6a62 Mon Sep 17 00:00:00 2001
From: David Peer <david.peer@outlook.com>
Date: Wed, 5 Jan 2022 10:30:10 +0100
Subject: [PATCH 31/45] Design improvements

---
 apps/lcars/lcars.app.js | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/apps/lcars/lcars.app.js b/apps/lcars/lcars.app.js
index c3e3b2bfc..cae66c1ec 100644
--- a/apps/lcars/lcars.app.js
+++ b/apps/lcars/lcars.app.js
@@ -147,14 +147,17 @@ function printData(key, y, c){
   }
 
   g.setColor(c);
+  g.fillRect(79, y-2, 85 ,y+18);
+
+  g.setFontAlign(0,-1,0);
+  g.drawString(value, 109, y);
+
+  g.setColor(c);
+  g.setFontAlign(-1,-1,0);
   g.fillRect(133, y-2, 165 ,y+18);
   g.fillCircle(161, y+8, 10);
   g.setColor(cBlack);
   g.drawString(text, 135, y);
-
-  g.setColor(c);
-  g.setFontAlign(1,-1,0);
-  g.drawString(value, 130, y);
 }
 
 function drawHorizontalBgLine(color, x1, x2, y, h){
@@ -191,7 +194,7 @@ function drawState(){
     return;
   }
 
-  g.clearRect(20, 93, 80, 170);
+  g.clearRect(20, 93, 75, 170);
   g.setColor(cWhite);
   var bat = E.getBattery();
   var current = new Date();
@@ -206,16 +209,18 @@ function drawState(){
         hours % 4 == 1 ? iconMars :
         hours % 4 == 2 ? iconMoon :
         iconEarth;
-    g.drawImage(iconImg, 31, 104);
+
+    // g.drawRect(25, 104, 25+50, 104+50);
+    g.drawImage(iconImg, 24, 104);
   } else {
     // Alarm within symbol
     g.setFontAntonioMedium();
     g.setFontAlign(0, 0, 0);
     g.setColor(cOrange);
-    g.drawString("ALARM", 31+25, 107);
+    g.drawString("ALARM", 24+25, 108);
     g.setColor(cWhite);
     g.setFontAntonioLarge();
-    g.drawString(getAlarmMinutes(), 31+25, 107+35);
+    g.drawString(getAlarmMinutes(), 24+25, 108+35);
   }
 
   g.setFontAlign(-1, -1, 0);
@@ -401,7 +406,7 @@ function draw(){
  * Step counter via widget
  */
 function getSteps() {
-  var steps = 0
+  var steps = 0;
   try {
     health = require("health");
   } catch(ex) {

From 47b93192b2986cc53e41baa9f9c1ef3a9bf14d61 Mon Sep 17 00:00:00 2001
From: David Peer <david.peer@outlook.com>
Date: Wed, 5 Jan 2022 10:33:58 +0100
Subject: [PATCH 32/45] Open luncher on touch.

---
 apps/lcars/lcars.app.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/lcars/lcars.app.js b/apps/lcars/lcars.app.js
index cae66c1ec..727ef6bae 100644
--- a/apps/lcars/lcars.app.js
+++ b/apps/lcars/lcars.app.js
@@ -558,6 +558,10 @@ Bangle.on("drag", e => {
   }
 });
 
+Bangle.on("touch", e => {
+  Bangle.showLauncher();
+});
+
 
 /*
  * Lets start widgets, listen for btn etc.

From 154dc0a315cd173e69815893dcf4d1c2796caf6a Mon Sep 17 00:00:00 2001
From: David Peer <david.peer@outlook.com>
Date: Wed, 5 Jan 2022 10:35:58 +0100
Subject: [PATCH 33/45] Created version 0.09

---
 apps.json                 |   6 +++---
 apps/lcars/ChangeLog      |   3 ++-
 apps/lcars/README.md      |   4 +++-
 apps/lcars/screenshot.png | Bin 5195 -> 5630 bytes
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/apps.json b/apps.json
index 89c5f7b70..3b593e9d5 100644
--- a/apps.json
+++ b/apps.json
@@ -4487,7 +4487,7 @@
     "name": "LCARS Clock",
     "shortName":"LCARS",
     "icon": "lcars.png",
-    "version":"0.08",
+    "version":"0.09",
     "readme": "README.md",
     "supports": ["BANGLEJS2"],
     "description": "Library Computer Access Retrieval System (LCARS) clock.",
@@ -5099,7 +5099,7 @@
     "tags": "clock",
     "allow_emulator":true,
     "supports" : ["BANGLEJS2"],
-    "type": "clock",  
+    "type": "clock",
     "storage": [
       {"name":"contourclock.app.js","url":"app.js"},
       {"name":"contourclock.img","url":"app-icon.js","evaluate":true}
@@ -5334,7 +5334,7 @@
     "icon": "andark_icon.png",
     "type": "clock",
     "tags": "clock",
-    "supports" : ["BANGLEJS2"],  
+    "supports" : ["BANGLEJS2"],
     "readme": "README.md",
     "storage": [
       {"name":"andark.app.js","url":"app.js"},
diff --git a/apps/lcars/ChangeLog b/apps/lcars/ChangeLog
index c171ec3d4..f5d8346da 100644
--- a/apps/lcars/ChangeLog
+++ b/apps/lcars/ChangeLog
@@ -5,4 +5,5 @@
 0.05: Additional icons for (1) charging and (2) bat < 30%.
 0.06: Fix - Alarm disabled, if clock was closed.
 0.07: Added settings to adjust data that is shown for each row.
-0.08: Support for multiple screens. 24h graph for steps + HRM. Fullscreen Mode.
\ No newline at end of file
+0.08: Support for multiple screens. 24h graph for steps + HRM. Fullscreen Mode.
+0.09: Tab anywhere to open the launcher.
\ No newline at end of file
diff --git a/apps/lcars/README.md b/apps/lcars/README.md
index 97695a408..4bf5218f6 100644
--- a/apps/lcars/README.md
+++ b/apps/lcars/README.md
@@ -8,13 +8,15 @@ To contribute you can open a PR at this [GitHub Repo]( https://github.com/peerda
  * LCARS Style watch face.
  * Full screen mode - widgets are still loaded.
  * Supports multiple screens with different data.
+ * Tab anywhere to open the launcher.
  * [Screen 1] Date + Time + Lock status.
  * [Screen 1] Shows randomly images of real planets.
  * [Screen 1] Shows different states such as (charging, out of battery, GPS on etc.)
  * [Screen 1] Swipe up/down to activate an alarm.
  * [Screen 1] Shows 3 customizable datapoints on the first screen.
  * [Screen 1] The lower orange line indicates the battery level.
- * [Screen 2] Display month graphs for steps + hrm on the second screen.
+ * [Screen 2] Display graphs for steps + hrm on the second screen.
+ * [Screen 2] Switch between day/month via swipe up/down.
 
 
 ## Multiple screens support
diff --git a/apps/lcars/screenshot.png b/apps/lcars/screenshot.png
index b3dfd42000766a5bff8e62a6e5d66103ac4f2a9b..bbc25abc30d9da3b1bf35a62698083c1d0eca781 100644
GIT binary patch
literal 5630
zcmV<a6#?prP)<h;3K|Lk000e1NJLTq006K6006KE1^@s6ueao000001b5ch_0Itp)
z=>Px~xJg7oRCr$PUFn*oDh%v?|A(IWj)=yXrGTh-I{jnr?Pd=}QG~_cpP!$9Ki<#3
ze?LFJYs~y_vDlmJuvFIj`S-qd5m+j%duO9w1+H5L0|4Ncl2ql9BY<DpnAb7mE#Uoh
zEdbz;@$RZmU^!<1CwSi_4<IlA0Dft|9|3%IBOoU5v|5Iz1$GPU01gE&FygZp(gFb%
zC;(3I2ADFlc)|j|KmY#yi(9oP^FGmuf4R)xpAY>)3jx3noErBpW9gB$Cj&oX_AE5Y
z0?EKpmdtz}vA|a{@JH5bKfk}%>GY?{eFQm^6gnjXb0DCgvjD{Hjpm8=6Iym}xl;bU
zd7*83L%b;&_-z12!MkkgcFq7-0(hCPJ_loz$*G1@ZxxTaOnU3Cf|L&pNAvl_^XALx
z7`V5iT0m5pr58+;neHf8D<h)*3wBrVNnnw{D}kNI;~>`Zp&&&;PVGMp1CQ!Q5BOeq
z?{w+q>xCobUJhV`fjP5kOv}NiF?9XAln<W?yqRH{(Vp}JqwIw+jRzDj908IP2gw(S
zW0ik7fB^=sj7pi5f)r(7%FLYkz27ApJ<7mW0+@q-6hyt?EmQQ_D}oG4Ep4O(TFF<{
zz#6EyjA&(GsoZ2>g0ciKKBpiWI2l;5r{rzuVJjpJ5(n?{5);i6jfb-QYz*Aur9d<=
z;(gd`@T3MtJItGI5r80ZW&^M%u{^t=?P+0PxzEaKYCD@NXzCtshUY>ni@1-K!Y(Kx
zMcQWV0UDA9iBoHa#*L20Epr=y0WXBrvsAmHUW$5v%yZp&h<eluF)IV3z{DA@ZxKi9
z@nKs@a-nswy&OA(o(7Qt?tQ=?(@Tu5EzmT%pm{rZ{gQzJZN5xZojYhPTG?XYO99--
zz;)AY129W3`EOf5%@>T8>63vc1u(L}9T`-#*)1AaVn)P&i+~z++0nWu13v&@1bAFN
zNKB68gGdZ($IAniw*9O5iKWdCjd2kfkqmq>fP3}ytpFa_iL=f)P!J~r8&raT1c`&N
z6%xnt9w4l#E!Hku#5HJO?QDd$t<3$t7cemJHX71vL2-J3hNMB_L^NR(yp~kB48X#j
zNNwkhPwSfeK(>V~d14*8JZfO%aleS31@q_u8j=Qy16I+D77bv^*p~r#Wnc+3-VsM_
z0XVv_v;4#f;MD@iblwW;(ai@7q*nphYom8i$4h@@xcs=^l_ffP_b?@r28k2hYz@rT
zz?l)i(RPW<FTD_v)(r4yB!JsGB>li`_Uej_PW@gyFTAUAYa&VOBG-Z}uR>Xnp0}wH
zmm1oZWMI@%1MyJ#;sMkP@2#S@P^<ZR@kYRkTpyC!mkiw7>ka9q2QcwMXh$NEyK%@i
zb1jN{8LaJW%hbuh4M6OTiU1g4S0qkP9lh;h6m-Z%O)4wAojRl~$-sz}lsE`5ONaT#
zDG_iYaeA7A9CbwGK{7Dd*}Ri_0P@L0b7vv>p}<7rA>c&fbOD$xv|5=|x+cVLXh^q_
zsf<Vs%zAF*Qs)c+ZUy4Vrpy%#T;+kq-1H@%Kdpf!mP-KRLjVB};`)+y?5uRjz@(47
z=@n&Fbjpv8=WRiIaExSNsjOBF%pXm+9zj75?#OPm$zEu00UB*k0@%C$s1Jc?2Ij6f
z>u@_iPuzNQ>npqv-yk78hDF+l<RP-_>L=q1E$bO5>ROX-R9FXqv|G$A??Kdde1#tv
zna+Ee-2;Wk{7BurGHN(d7Mj;__L6TEdwyE$$fU)rG+i?A+7li?z3`rnN5C0b?qvXG
z4BYC^ZN1Zmcs<bm_-Y3Bj4-nB(OA(d^Ap}%?qvXO@B>Tl`D)jOB!6-l^giPwc3f=v
z4KMTbfT<Tm@(TUD)24O6NV%5*xPgJWf7g;3+O6VbU<DnhD{2Hp8ZeQvN6Wnoz~oNc
zM-F(*skz7ySDVDZ(t_|$GBCo#qad;jYk@eT+{*x55yale%k#kKFv@t3TVT{1@Kgih
zG_d<UnWvhV<$kjTrn}Vn&Bo5Q#akc&9B<Rt<ygM<{&7jk+tD?gHjKyh;z(t9<sybm
z03%lV@;C)Z8hk%5-w03lkoaEs=4JT#yro_SNf|PBxro^lz=)N;JdVYLlvzLE<G&Xe
z?tXAD&JJLk^-+^Q0^sTnlAcYn{$_2<YA!6#ebt+8={R;(sP!2r&n@PKqn+%<vlv)n
zN*-VP{R3^zxI4fL^mN|$YF)yA{}s1&$PZeXZve0bd}L5~alG)54qG!p7?}1gkFWhs
zbv2D6v3PHLe*Y~(MAkU1e@9QGS^!=ey?W4jJSkmmxE7b@CmG4g(=w`6H>BQP951}L
z!$lhyTC_6o8NmBrdKnnSi`CXg8CU{q0(f2ItP`U)nBxH~FXIsJK??)ZdZRP81K{Tv
zxPn#FdMzx3$`Wo2OIIfY@7{tI29{ZVSv8bnXaU-{mhlJ!FHIo~BLSHH4Pl{30DH27
z*I#RoRc~)_df_uOur5>fkO=l&`soP`JR^YlXRJ`~g#=Ord|n(cJRZO@q<S=PGBEk5
zpXHje^s>Z~$Re(1QO9SCR`5x)4XvveJ__b&FGLXwM;Dp5Q`g&usTi2EAfL)Dz1k}w
zG)?R=um!Mp0yvI=>CT+x2Y#&=!qSY|g3e>qrvQv-b;SLr>F%r9x3c9@zHk;I+6$rW
z)V-F0x78%`{qnyjfcx*#dEmHvC$0>d^6%(k?r|@~(*SOr?h$Q@=IODk7w!QQ4M#L^
zWoYXx1V86MS>4;cL+i@pJ+6Vj0l?ZjY@YkiTQGXzy`6s2{lZSH<oD$}v)gTC=HK-+
zFlAut6dcmN#~7GO0;>P+*1#xRYKuKdyCQjd?COOhor}itJOn-ATvH=j8m%vl_ZS0T
z4PX=i2-qaUTKOY+diC?ddpi5dH1yP3gtkTNIvoRBi#5cJcG5`BYjIMZ602$qEV<iS
z0PH=o-QvzeJN=vDO~=4@1DMYQ2zaG5RLdiS!i(dDe-j8t+VUs^k5v5Wv>w1LE$<Bg
zB>d_2&r<%Q3_ObwvL5fXKr--q`z~u9eH!h~)o1ozT3}hPl-Dl9uEh;+4Q98b1zIdX
z0L)%?qhH==yfYVZ%BZCg8Tap6fP9Z5j)e=gCyf6ttnO?1;av#rg_YLZ$=?zm8G?KV
zs^0m^|HjSe7M@NIn?&m2`^MolB_Xp&+UpwIqq(Xt^CYt%@IAiq^(`~co7&+%E%lcf
z27&NjwhzjZSH^Pzd}ZO8cUoZ70tw(z3ugL9Esy|y)cjfas0CmE^Kaia?rkjV0`Ei4
z{6ixHdns>Phje?~JbQk?5z%im_k#)G=*D|~)#&ni2HDJ=rG1~xVzF;01>KDn^Wy4(
z2|dR6c4J2m4$q!{l7X)TQ8MuMIAgbLpo74(=K|pR&pjJsA?<3JIoVe7;RVd0${@xa
z74VrpEkF+QBzO}J@3X*qoHD`tzOKs}ms5}Rt?2-bl(Hc~b+-k6m+Ke-;6?nrcQ@|p
z@~j2Yn+Nj@3qRC;<yLZ#%M2~_YGB=!zvZ_^TwHh6v$dR={PCV0lYv`%m&EU7V4jY4
zk_H}14pw^FoEpyq0XG57Un3=6&yo6h3c#v=GVln1jhRa`x(50he>D66;I)3OGb05j
z+72GCXAoFQK&wYG@Cbm7O#+X(YIp^U_WOw)87O)Bs~A`+#{#J|lX!!)hl!JcM*uv)
zz`QfH-?i!8i{C3B`1Z3^j>Xi{Ou`3g>)J~qg=F9n0AI+!v~wkm>@l{*%wCfvW}Sh7
zKMc)5oDA&srV-xbh2YGn{m!S;7RJ_ONgWiPCYG30V)VNiSaQ`S1CIbWfPpQIi!h<Z
zj33Y=UJb+xVGRmtfpvujP6i$TtCVzvfwfa*C_{UUTszy#&ubUrg`jfAatV%V;AG%v
z01q%QdN|$lQjCU+04DA7yeSk^bxm9I)cn;WJAJ8v13^5(z@8U@gTQk^d5nyf*W-oo
zT!LJCkL>jE86h?B0HAwz;ylLm{JxbOB`<}w(DJ+%lK+@$PETvodTE2r8-$)8__Z4N
z^IU)Zj&jd`2QX?Tjbz{v&APF*u=5tBfqMprw%z=v8F<?}&_KOEdc53%uHe4{#E}eK
zwPY(pbMW$oPEUS__k+rR&9;AD1CKJVmOcv1GcmBX^L8}@dk2NA!SJVd;<R1dvxYp%
zk0|g;S`@i(=`o@guCkqSaHl7~9tPGnHLOh$MDuDplGP4V?!>t=VNerC$%;q@_7*r6
z(^=cbn#@7+vo0xkJBU(yM*P69JB_wY|Es2@TCZx`Z500gZd%us9W1{QMjp|?mLFKt
zj-J*;HXV?gGZF)P-VtQM<_%Jfk*&dYxK=;XnUQIC5SHhtu4d%ky7w?J_p?f_q2BsL
zr5o`Qw8{c6zNfLL1TfMO6x93yixyWKQkKVjQYUx^W=6`rI_=0#S?j_~i;voGDgdjp
zfn1+%0jDb`n3ld87@2>(1*QUUOY<l=4_f#H_OlFG9mHFJH%+zFE92g4fvEtz%K`?v
zn;1CCJ8^Fp{_WDH0&q)LEMJ3P54?V4h4oW3-SY48hot8xsaooiai6om6n<cW#ap}%
zo;F6i!+KBy`9KU>&fW3C9ts&)(V_Nx&1tlQ*MTzUx)Ad^d135bEH8{q7ldAVDct%(
z5!wMg<zAg;rY|pfc6^k9we4V!A=PlMmHBhL&H<nb3{+0^FmM@0d&|8JqIJ^J@p^1K
zUP?JNzIs@FO?P^%g#8`O=TmQ~omP5kCrco{hJiWjP)7AMaFM_(;~ri#EV&}-BN$j?
zHV?#BIy8)yQPXJUO5wDen$F9o4AlZf9l&<jHfbu~-hPyUH+B)g72)rdKriNd+O95O
z_kLO#m@|&YU_1L3#^%hrufTVPtIV~7tib3DV13xocJX|)dhB35=Bw3*ZazsfhV;7n
zE8c~W<N@_IXx<09{k#r&Wy}^>sQEOUm1xz#oQ)6$lUR(V^YXOV)MH@EoCpKA#^LPh
zX>X~%b20Gd8FOx6Xj)fUm}#1J^t|vJ85q%)76V&Mj-=yj0EyA<uhSoScp447yV7?5
z?ly%B{@xm2lL_ARe_R|DKQSU3Xuhose5$LV52bP>?b*t}5=(0Jk{H<1(pNLEq@^cg
z;IX@JCq`A|!0B|Gvi<B0f>s8Wf#NOU_6M9tG;n1)u1WR9X;Ii5uq~Rn$e*JI|6T@G
z?y_-L8(sLR0Q>bp;eitgA7NmG33YIlkWVX72G-&uW$d#RT`cZ?^%gB{%`C|5#>;v=
z18)a&wiQ8nPigTscz$4wp+Py(%fOOWL<S6HG>uUuhNa$)RtDx8)nZ_6h8gt(TYmFt
zG_a;+CI4*&XPKRZGY)HJ6vQR!8W%i6;eo1`fq6P~zOXbVudAk25zmKKzt7*f4j<9U
z8|SS4BF_s!%i7Y;^o@+39k>$%pL&uova%CLWl78SaxVkZDOq;o%R@(FZmAxcx8O<!
z{?lFvjqRj!zaBH5F<kD<Nq^UvA1R}kfsX*jAdG5e%kN9uWU)RnLwK`+wp%CJOk#D-
z{!?mTjR7r2J|0SUWQ2Q*xt`2yJK)pGz*LJCJ$u|?vj&aEoGm+V=ot*&E@=l$@+T()
zlVdJBOO^lIuVm|B^;nZ@=N7pj<=x7_n#VxWcC<W;eLXM4K2Y`?J<aVgu%(eTU2Cx{
z%D~g?#CbblbW=k+6LDhTbz!#cp>Myh1K@(I_jfU{<+VT<xPZ9+>%mw4aG<2AE2CSd
z-y;3MuQ&^Fk`ux~oBg1N$GOMwgKJGWK-7|B6a#B|5z)#B19KMkAZ+PWi_tAzER|`^
zNT>D6OsCP{^Sp+3J)KsnjLVsLwM5J5HWb9Y49xfXr5(1jgs5lF_W#n;Xs4$ISclKT
zz*4)s(`Zwl2j&NDHu+#|GN1rE#bY-)_$jwL&O&(lvPEla+R<ZJ&whwM*2^O*+-u9D
zJ8_(ePx9f!z`M6#_y4Xuq-fr4QPH4*QRBBVFq-ev@vL@9=X9;pW4-Y`;BNi;^w;WJ
zud**wp|Sghb^h@(b}RE@Wn`>7EbuG?54`uF8K-L9EnK(&>Ulx#FnpE~V}WVjh1icc
z7MVchL`+jZxiGo07UW+ZimO596l;Mg0F0c0K+il#3o|eOSd(UMcUoWy0MiDa4x10_
z-R0WxK{v-~-sLEiyiPH1<lWiDJ!Ki~(%KvSchG)Q0T|kWQ~P7RL2!Y$K`nBr@Zp&U
z^81U0iP<i#y;uF+w&PR)mVnZA8jWvi1fBmq*DsoZd49a}M#E7yM$6H_#l8F6ie{a$
zjC3NC>mZ&Qz@B#P4M)4tjTg$m+F;oCsbsl=hP$nyD`#LP(LlPoIi+_ss=e$74-{D@
zgLv8-8Qk0lCT5zJdlwGd#trX0G<5MAHIRXM=SKhD)Hu?v3O21i3yy_B#M2#^mB&B0
zotk9XqkiBfo6_f@-1EI{=XzV~L415o#<t6;pwT*aG`yjehndBzPjydL=B--Tm>EQH
zdou|shcx9i4BTM;8>1!z7g;mPz}g@X7KTiIyo!NuL?%|$B^uacyxwrENlUC*8Tc?*
zN_&!l8~XK9FT|so_q5{J7g7htYglMDY2akwAsBWizJ!7KwCQO>Kx?)(khjYNv8icE
z;ocxE^zR&QJ9;CMfm=KG5I;}@i=Eft2i67?xTAG6gU~J$#D)eI?PY9Ec$+Axfrk*w
z`Z;nZu3>tHTvFU?(a>&aFc_{jZDF^$juilV;7twO(1}pgKnC`v*U@mOJvGwZe&B{}
z=w#rgp0p!hqJew844R*qERfKqLtY5tt!VY@nhQJ+%&CFVZUo{*F|fyYUN{OSph;Yd
zYddj=cmaN3^fX&CFxrVgyeJ0t7|#nw!2~p^WJR?-u<d&n0}Bh%^g^JWD#m*O1CM$k
zrefgp;xBjNMgSbez$Sx6Y2t>4iVV!tqh1J-&O8v*rhRL!$-oW$dX5^!z<k=KkHoD2
z_FP+DcvCyk^T5Wz9g+Esg{G;2jq|`Wy${@E;~64{GOz$*4gzzB3`mdK4D!c%j2RVf
zY<lEb2((AFc!3N&T9wfB-ga&jIE{Qj?VcJqwBs|gyDg9!_->15d7&0q?!<j0kAAxr
zpDt{*5?b%fEG@8Dpa6JrUMGkX6YsOY0^o|@2oM7wd4Hdkvc}U|U;}U@h&4Ilfje?0
zh!~6!vTDY9c>PeY(ElxxtI<xMUOfQ#Y7l!GIZBJq2%4D&gVzrm4kk4ut^WzYSAy6Z
z`N_a>YY_{3UO&8=fhqk*Gom;0qsyC=K*AQxz3ub*;q?qGX_yFbc_Tj=I2jnx&r}2d
Y2PMNWz8ZN*QUCw|07*qoM6N<$f+ZW)KmY&$

delta 5194
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
Ef-RE!%m4rY


From 8b89d41e699551caa2dcca4adb2365d8568029b5 Mon Sep 17 00:00:00 2001
From: David Peer <david.peer@outlook.com>
Date: Wed, 5 Jan 2022 11:51:16 +0100
Subject: [PATCH 34/45] Minor changes

---
 apps/lcars/lcars.app.js   |  21 ++++++++++-----------
 apps/lcars/screenshot.png | Bin 5630 -> 5835 bytes
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/apps/lcars/lcars.app.js b/apps/lcars/lcars.app.js
index 727ef6bae..1be2cfd43 100644
--- a/apps/lcars/lcars.app.js
+++ b/apps/lcars/lcars.app.js
@@ -195,12 +195,13 @@ function drawState(){
   }
 
   g.clearRect(20, 93, 75, 170);
-  g.setColor(cWhite);
-  var bat = E.getBattery();
-  var current = new Date();
-  var hours = current.getHours();
+  g.setFontAlign(0, 0, 0);
+  g.setFontAntonioMedium();
 
   if(!isAlarmEnabled()){
+    var bat = E.getBattery();
+    var current = new Date();
+    var hours = current.getHours();
     var iconImg =
         Bangle.isCharging() ? iconCharging :
         bat < 30 ? iconNoBattery :
@@ -209,18 +210,16 @@ function drawState(){
         hours % 4 == 1 ? iconMars :
         hours % 4 == 2 ? iconMoon :
         iconEarth;
-
-    // g.drawRect(25, 104, 25+50, 104+50);
-    g.drawImage(iconImg, 24, 104);
+    g.drawImage(iconImg, 23, 118);
+    g.setColor(cWhite);
+    g.drawString("STATUS", 23+25, 108);
   } else {
     // Alarm within symbol
-    g.setFontAntonioMedium();
-    g.setFontAlign(0, 0, 0);
     g.setColor(cOrange);
-    g.drawString("ALARM", 24+25, 108);
+    g.drawString("ALARM", 23+25, 108);
     g.setColor(cWhite);
     g.setFontAntonioLarge();
-    g.drawString(getAlarmMinutes(), 24+25, 108+35);
+    g.drawString(getAlarmMinutes(), 23+25, 108+35);
   }
 
   g.setFontAlign(-1, -1, 0);
diff --git a/apps/lcars/screenshot.png b/apps/lcars/screenshot.png
index bbc25abc30d9da3b1bf35a62698083c1d0eca781..8531913133233045e6ce34b5b99d4dc491432603 100644
GIT binary patch
literal 5835
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
V6U{I?5Ptvw002ovPDHLkV1nnu{g40v

literal 5630
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
Y2PMNWz8ZN*QUCw|07*qoM6N<$f+ZW)KmY&$


From 5e00b6d13658122ea7c645f25cff77704af7690e Mon Sep 17 00:00:00 2001
From: David Peer <david.peer@outlook.com>
Date: Wed, 5 Jan 2022 11:54:56 +0100
Subject: [PATCH 35/45] Minor changes

---
 apps/lcars/lcars.app.js   |   4 ++--
 apps/lcars/screenshot.png | Bin 5835 -> 6073 bytes
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/lcars/lcars.app.js b/apps/lcars/lcars.app.js
index 1be2cfd43..57e56d76c 100644
--- a/apps/lcars/lcars.app.js
+++ b/apps/lcars/lcars.app.js
@@ -251,7 +251,7 @@ function drawPosition0(){
   var currentDate = new Date();
   var timeStr = locale.time(currentDate,1);
   g.setFontAntonioLarge();
-  g.drawString(timeStr, 28, 10);
+  g.drawString(timeStr, 29, 10);
 
   // Write date
   g.setColor(cWhite);
@@ -259,7 +259,7 @@ function drawPosition0(){
   var dayStr = locale.dow(currentDate, true).toUpperCase();
   dayStr += " " + currentDate.getDate();
   dayStr += " " + currentDate.getFullYear();
-  g.drawString(dayStr, 29, 56);
+  g.drawString(dayStr, 32, 56);
 
   // Draw data
   g.setFontAlign(-1, -1, 0);
diff --git a/apps/lcars/screenshot.png b/apps/lcars/screenshot.png
index 8531913133233045e6ce34b5b99d4dc491432603..c749e14517cb8b47035dc15128c5b2ada0ac6061 100644
GIT binary patch
literal 6073
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

literal 5835
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
V6U{I?5Ptvw002ovPDHLkV1nnu{g40v


From cf41ff2bc683c1da8664a3db06d6350512920a38 Mon Sep 17 00:00:00 2001
From: Richard de Boer <git@tubul.net>
Date: Wed, 5 Jan 2022 12:09:21 +0100
Subject: [PATCH 36/45] weather: fix widget icon

---
 apps.json              |  2 +-
 apps/weather/ChangeLog |  1 +
 apps/weather/lib.js    | 75 ++++++++++++++++++++++++++----------------
 apps/weather/widget.js |  4 +--
 4 files changed, 50 insertions(+), 32 deletions(-)

diff --git a/apps.json b/apps.json
index f116049dc..ed5deec79 100644
--- a/apps.json
+++ b/apps.json
@@ -845,7 +845,7 @@
   {
     "id": "weather",
     "name": "Weather",
-    "version": "0.14",
+    "version": "0.15",
     "description": "Show Gadgetbridge weather report",
     "icon": "icon.png",
     "screenshots": [{"url":"screenshot.png"}],
diff --git a/apps/weather/ChangeLog b/apps/weather/ChangeLog
index 910cd4658..101da48e1 100644
--- a/apps/weather/ChangeLog
+++ b/apps/weather/ChangeLog
@@ -11,3 +11,4 @@
 0.12: Allow hiding the widget
 0.13: Tweak Bangle.js 2 light theme colors
 0.14: Use weather condition code for icon selection
+0.15: Fix widget icon
diff --git a/apps/weather/lib.js b/apps/weather/lib.js
index 8afdfe6df..1d48116e1 100644
--- a/apps/weather/lib.js
+++ b/apps/weather/lib.js
@@ -53,6 +53,16 @@ exports.get = function() {
 
 scheduleExpiry(storage.readJSON('weather.json')||{});
 
+/**
+ *
+ * @param cond Weather condition, as one of:
+ *             {number} code: (Preferred form) https://openweathermap.org/weather-conditions#Weather-Condition-Codes-2
+ *             {string} weather description (in English: breaks for other languages!)
+ *             {object} use cond.code if present, or fall back to cond.txt
+ * @param x Left
+ * @param y Top
+ * @param r Icon Size
+ */
 exports.drawIcon = function(cond, x, y, r) {
   var palette;
 
@@ -249,32 +259,35 @@ exports.drawIcon = function(cond, x, y, r) {
     g.setColor(g.theme.fg).setFontAlign(0, 0).setFont('Vector', r*2).drawString("?", x+r/10, y+r/6);
   }
 
-  function chooseIcon(condition) {
-    if (!condition) return () => {};
-    condition = condition.toLowerCase();
-    if (condition.includes("thunderstorm")) return drawThunderstorm;
-    if (condition.includes("freezing")||condition.includes("snow")||
-      condition.includes("sleet")) {
+  /*
+  * Choose weather icon to display based on weather description
+  */
+  function chooseIconByTxt(txt) {
+    if (!txt) return () => {};
+    txt = txt.toLowerCase();
+    if (txt.includes("thunderstorm")) return drawThunderstorm;
+    if (txt.includes("freezing")||txt.includes("snow")||
+      txt.includes("sleet")) {
       return drawSnow;
     }
-    if (condition.includes("drizzle")||
-      condition.includes("shower")) {
+    if (txt.includes("drizzle")||
+      txt.includes("shower")) {
       return drawRain;
     }
-    if (condition.includes("rain")) return drawShowerRain;
-    if (condition.includes("clear")) return drawSun;
-    if (condition.includes("few clouds")) return drawFewClouds;
-    if (condition.includes("scattered clouds")) return drawCloud;
-    if (condition.includes("clouds")) return drawBrokenClouds;
-    if (condition.includes("mist") ||
-      condition.includes("smoke") ||
-      condition.includes("haze") ||
-      condition.includes("sand") ||
-      condition.includes("dust") ||
-      condition.includes("fog") ||
-      condition.includes("ash") ||
-      condition.includes("squalls") ||
-      condition.includes("tornado")) {
+    if (txt.includes("rain")) return drawShowerRain;
+    if (txt.includes("clear")) return drawSun;
+    if (txt.includes("few clouds")) return drawFewClouds;
+    if (txt.includes("scattered clouds")) return drawCloud;
+    if (txt.includes("clouds")) return drawBrokenClouds;
+    if (txt.includes("mist") ||
+      txt.includes("smoke") ||
+      txt.includes("haze") ||
+      txt.includes("sand") ||
+      txt.includes("dust") ||
+      txt.includes("fog") ||
+      txt.includes("ash") ||
+      txt.includes("squalls") ||
+      txt.includes("tornado")) {
       return drawMist;
     }
     return drawUnknown;
@@ -298,7 +311,6 @@ exports.drawIcon = function(cond, x, y, r) {
           case 531: return drawShowerRain;
           default: return drawRain;
         }
-        break;
       case 6: return drawSnow;
       case 7: return drawMist;
       case 8:
@@ -308,16 +320,21 @@ exports.drawIcon = function(cond, x, y, r) {
           case 802: return drawCloud;
           default: return drawBrokenClouds;
         }
-        break;
       default: return drawUnknown;
     }
   }
 
-  if (cond.code && cond.code > 0) {
-    chooseIconByCode(cond.code)(x, y, r);
-  } else {
-    chooseIcon(cond.txt)(x, y, r);
+  function chooseIcon(cond) {
+    if (typeof (cond)==="object") {
+      if ("code" in cond) return chooseIconByCode(cond.code);
+      if ("txt" in cond) return chooseIconByTxt(cond.txt);
+    } else if (typeof (cond)==="number") {
+      return chooseIconByCode(cond.code);
+    } else if (typeof (cond)==="string") {
+      return chooseIconByTxt(cond.txt);
+    }
+    return drawUnknown;
   }
-
+  chooseIcon(cond)(x, y, r);
 
 };
diff --git a/apps/weather/widget.js b/apps/weather/widget.js
index f2ddf0b5b..2905d776b 100644
--- a/apps/weather/widget.js
+++ b/apps/weather/widget.js
@@ -52,8 +52,8 @@
       if (!w) return;
       g.reset();
       g.clearRect(this.x, this.y, this.x+this.width-1, this.y+23);
-      if (w.txt) {
-        weather.drawIcon(w.txt, this.x+10, this.y+8, 7.5);
+      if (w.code||w.txt) {
+        weather.drawIcon(w, this.x+10, this.y+8, 7.5);
       }
       if (w.temp) {
         let t = require('locale').temp(w.temp-273.15);  // applies conversion

From e0130c451025ecbd6ef04dba4ddbcaa08f6d5004 Mon Sep 17 00:00:00 2001
From: David Peer <david.peer@outlook.com>
Date: Wed, 5 Jan 2022 12:30:31 +0100
Subject: [PATCH 37/45] Minor changes.

---
 apps/lcars/lcars.app.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/lcars/lcars.app.js b/apps/lcars/lcars.app.js
index 57e56d76c..0b8c814cd 100644
--- a/apps/lcars/lcars.app.js
+++ b/apps/lcars/lcars.app.js
@@ -210,16 +210,16 @@ function drawState(){
         hours % 4 == 1 ? iconMars :
         hours % 4 == 2 ? iconMoon :
         iconEarth;
-    g.drawImage(iconImg, 23, 118);
+    g.drawImage(iconImg, 24, 118);
     g.setColor(cWhite);
-    g.drawString("STATUS", 23+25, 108);
+    g.drawString("STATUS", 24+25, 108);
   } else {
     // Alarm within symbol
     g.setColor(cOrange);
-    g.drawString("ALARM", 23+25, 108);
+    g.drawString("ALARM", 24+25, 108);
     g.setColor(cWhite);
     g.setFontAntonioLarge();
-    g.drawString(getAlarmMinutes(), 23+25, 108+35);
+    g.drawString(getAlarmMinutes(), 24+25, 108+35);
   }
 
   g.setFontAlign(-1, -1, 0);

From 793e8c82468a5e9349f3d5d53ba0b92ed264e68d Mon Sep 17 00:00:00 2001
From: David Peer <david.peer@outlook.com>
Date: Wed, 5 Jan 2022 14:30:43 +0100
Subject: [PATCH 38/45] Show battery grey

---
 apps/lcars/lcars.app.js   |   3 ++-
 apps/lcars/screenshot.png | Bin 6073 -> 5918 bytes
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/lcars/lcars.app.js b/apps/lcars/lcars.app.js
index 0b8c814cd..49d32dbe9 100644
--- a/apps/lcars/lcars.app.js
+++ b/apps/lcars/lcars.app.js
@@ -24,6 +24,7 @@ let cOrange = "#FF9900";
 let cPurple = "#FF00DC";
 let cWhite = "#FFFFFF";
 let cBlack = "#000000";
+let cGrey = "#9E9E9E";
 
 /*
  * Global lcars variables
@@ -240,7 +241,7 @@ function drawPosition0(){
   var bat = E.getBattery() / 100.0;
   var batX2 = parseInt((172 - 35) * bat + 35);
   drawHorizontalBgLine(cOrange, 35, batX2, 171, 5);
-  drawHorizontalBgLine(cPurple, batX2+10, 172, 171, 5);
+  drawHorizontalBgLine(cGrey, batX2+10, 172, 171, 5);
 
   // Draw logo
   drawLock();
diff --git a/apps/lcars/screenshot.png b/apps/lcars/screenshot.png
index c749e14517cb8b47035dc15128c5b2ada0ac6061..fea3ebb78a5d48859e2d27f622a0c10e34270cd0 100644
GIT binary patch
literal 5918
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
ARsaA1

literal 6073
zcmV;q7e?rbP)<h;3K|Lk000e1NJLTq006K6006KE1^@s6ueao000001b5ch_0Itp)
z=>Py1b4f%&RCr$PUE7wWDh!<d|BvojTSP<5rGim$H}i1L>Me2!MNx!+KmY#y`~Bzr
z`~Cg*?`KUp|6eTjCOa&Z_5S_7uU!O|O6%U)s8@mOmcal3_@yLOd87sKOB?e#X1oQw
zpRNS}{4w5L^+_z}2;d3ccgX_?3;=*%+V3rZuWkgy1fEu#&!+`;3+w<+1urn-XD>_(
zBv_yTc!D><lrxJbEb#O1_xCq%)jpZ`iB9~>W&Zs8&@Z$Q0Q|sH<NjqVJ<|5cz>k=H
z7Mf*&$-r5bocTOrfyuy+n0*$SWr1NC__Ma8|9*b@7l@g8Nrvb7Bc0RJ9;uw3e31IR
zCC#u5oC&(jyuJ~@3srmqV-$|4&#AYHCtdhv-BpnCq0iBLKIuH#8j^uCnI<zYjg{_T
zV6BV{2Cm?ez#@TH0y|H~L9FFNL5hOBnVCoO16x3dc2s6w-gNqU02>U<nN?$24nB>c
z>+e!Nd?xT_hEKI0XJEAR5ddfA<$;zyf0E@9yLfFu7`QSjWl{=Klz}NT^K!kvrFJ~7
zfippunU~k;cLMn8*~DTx4OCo4L>YJ`{YHCF24<cM4TKr2^;G~~7hskKo(!y@N%9c%
zPRW^hO$II&Ko~gUr9d<=;(e(7^SA~^-BP`***h3U0k9{FdhOEAAZ0a#FtFTT`}?Ry
z)?9Ad`|4~uk{6;@G81&Yc}3ofq>T)W!hrUf+Y|r;UI@z{OSLQNrKka9p6hP<fdv2{
zogM*YB<&dhf9ie3rcA^O;W4lzJFEqp$NZk0c-#vys)UGu(ql>5Mr8143&hI+9Ax0S
z>9)<7?0w0rAq^7G>+lLc@LvP)r@bhMkwqz*m&N=M29`7`;=e^ejVu^>J0=5z-VqCU
z5eDuBa0Tim5+cCB*3KM1*<)>5ShB)%*)=oTh$k{4)3>K7d-ICC7X>g1Vw&%z06yUd
zwqhLUX2)dU&Tz^I5WT^mJ=XxNferz%#<Zg{u(qwt{k~E<&bUDa2JS}d?b*)vGC`M_
zR|LRZn?`|mD}aSFks64&2G$l@-U3bXR`f-qA(#7g0<rhCOweWKl?h;vg(dk=Iz2DY
zpL-FcI9(4^+5+(G!p`y&GYvc$xObpw?k)+Ok%44^^a=ob?e_w8y!WqsE?@3<Wr;xE
zk<RwA%goCw%X%KE$7ldP)9$O^ov{#CTX@ZX0{9w3Pe1TAc0J^Z0@#xX-t*q(NLm*;
z7G!x9q=nk@+xj2RPmHu>GB9GLgft@q*juP=i#@?xA)RT<0ySdx$-sz}64DF};7W^Y
zNTs!1TsJ4IGi@lSy>y7#Cj%o^N=SnM7?B4^nrL;A7=%a+1iAy~r9;{=85prrLYkog
z%rq$iR!Pf7-<u2!01E+*luhJ4gcXtedh)p<8Vxz}E-la`f3dY-qni~-=%mz7lYx~%
zfB<e^+#F9$cw5Pzcab!}7~PWef?3=4^%&B6k85S`2)-54Y1v?E;0fTv!A)^S0$g8{
zfmh2#*w16A-n=63A!&Qlc<rOlvlv*GRL6s#9s_H4pjjc9-WfPvx5>bhfzugyi%%ea
zV{OxdgE<;CJ2mh?07lprS?D48&@|dY%iAflLME*MAng>hcYsq~#0~h33}m`RJ1H|S
ztxTkhEZ}A3(*T&A$T;hTm<-%`6#lF`3>_3aodjU&Wk3LqmVF6;*#a%<&yAj_K)fEP
zJ*EamE#;)sK&-viz2Lecpgq9AmTL{!(Obp}P#)SXQv;)xN(68(cuVJBcOt_&i)Nih
zo(#;uapjatr}iZ5ZrPwLJRE?Tx1jfWDCF`IiGf!IV}9m9oyq3iXt^-9Kzs(cwU$>h
zuywBk1)1mHje0LMP$NAvqy|PRKGWn{;H*D3w>Efgc^cULo(x{8nQ~eHwZM>vI?>9{
zbkhP8z!L-i%GcgM7hKDc2=zHN6;JD>k;?GOMY?7J7_riqrzt?v;QMh7$cN#!Yona!
z+XC?4?^a3~GIqI$*(ZPzD}8wyiwP;Sejv{OE->7E(_Wf7OfuNF%o-10Emhq@)WwAS
zX8DS}tz8X|z3&w_kiNlyxW2qJ-t#kK%wk}PDS3MB?+>(gz!s?Q058zfc^_-h&u`h-
zOZnGR83e2pAjpl6y+FL;JtR*rjraU)=OGMC`<AEI{-(N`rjb~@w+%nP3j@m<C;EFd
z7+C@)XEP31?Qd!TJ}4*vtjz>zFd>H3%A=nIu<C8SZw=mzjgegf$n;Yg_z2+rmtF?$
z!3*z?VHkKBt?L$!1URpgCxDTmCa1ZRfoTnTW^4h#V=!<9u%`9S09a#sZj9a-jLE>h
zH-T#D4DDO{?r{d@;F180FtWwKX8=rR294vs1HiH)4e{S19tG|v&S2lAZ=Tk`BLbLz
z&dSr8-vQt}4J-}x$-wL$1;mZ!x#lzpfh-g~Hs+ED&C^?Ode3{5aJB}n3q#3s@pT$l
zV_@&2epdk412h5-4zP%Jr?$|f%XI+GV_>>-XZeA@!V7U0z|!=N`j$OFM%`+NR=4u>
z!0A2r+M~`IMl3{+2DWzVw4J)%x(}s+x0R*fPUDP(03j+N&NA@30c<lcUE-bHi7OJL
z{P*l)ZYVFr(*TZ6_mbzs8)(|V^VrpU-pgQBuP*f#qS4O8InX@4-MilUPX;EI%K)%;
zVV}2%^W=*6ycYmFfNNOHF-9R0ji$vqaK=rGMteFIq8i?semOI9-Hc5A2mpEkY_TJf
zr^l||^E2S33{3Nhco3vmV9w}>mhNfC5DZKKNvB}$X+Slt1{yxSd%#CPuhpFoOe7XU
ztKZcC?g7rhcB`hX0gh+2En24`G_VB%L^FEYSz>U>K$2_D1ATNh=<$%C0}1W)Z%Q{b
z16$ybz-EP7B0%H=srMZ^V30xKrSYDB6Ck5)8HRzQ6(1?R2QW(tNrNV9Mj6RQSJh=0
z2EM9+GvDvFz+~X>?%%I(T`B`-?5upf#b*OkEwFg4H9uZYNq4zVdg?ac`92E}0Jl3a
z`+?>7?-@}>-)HLCqAM&wZi7!doV?U?GVvANHS^>aXzqp3_PnE~lfNZBGL!I=24`lj
zZ?W5*?KoU)lBtK^&KJlmGVS$jFRM56OlCpgyT`Ro=8dnFGML)ETIw$|3<BZ5Y@cVj
zx0LPzc!WyMI!p^_7MK8@*m$)CCV*eveY5f~fcdv?d+r1DKIF_lG{V1{GymT1goZy!
zmC<h_+ua0kcH=$2YIb=&gKXr^;_dP5`QhhpCk5S&mUH83<0+X8+%o9d!Q$C-0q_O=
zc(&e|?+Y6lxklDLiYKYJZ#Q=Kj4&CPxzRGG8^pMC2{J8k)&eA$Cy#k2c+Ymrd>^&I
z8csREiyCaE8_NO(z)3=XGVfTO`xk2SvmD1rio-xw#ouI9Yt8WH!JN4k>Rq^^_A6)N
zCIfekD{JO@^I*=Jkuz}R*>N&(7j(-@SqxnB(K?Gi_ZYI~!_#?SsHX7VL+UFrDDs{J
zdaK^IGO%{RN91A<?e<5GL+KlB#j#%^ouzx$Y98J<F}992X09HvSe^cndG)!+kd14J
z$wQ=GG=FPQY191Yed)cLuO$z(!Ku~bHU_pp8Ue5eJ_<tQ9x|_Ni=fXiumnQdN#1i_
zFAfgxZ?s)}&`5(wVti|`@$_E1>l#f0@ofwoxn|U3*)yLN@ahq{NbigWrqij!Oy2VY
zfLBeUfy0}=X?_v|TQUX(b(IIv^!z<q*V`Ewxn}e=0Iot<@ZzAWXsV@A4XlAzk{KF<
zj>N!GdDH^<CNG4?e40L`zgrp=kqc58NWHYqKEuEg<5`-LcCsfQq(Siw4E$kYKFB8n
zvqfD<LJY>hl9tS3V9V=rRs+9^f%zh=Wg_20puK;VfvtLt%)oRZNf}(ztWhrnXMSnn
zYH3<)rm?iYwz>8g19K_Rvk<ec+V2H0QZE(212C}W^2+i;NDC;<Ppl25YClBAATGj3
zH1O7lb;_0)&jaCA0PY3x2pU)eMJ5A#AdY$!Jgsl-;62K~9*8{vBMUw6Lok-cwFZd9
z!e{)z&D6Rwd5;%D+Z@PZ;5+=lkysoK{^9+=sFwf%|F?M|tR1r~21Yg=dKuW03&^(e
z<6a0VB@hs542rxP0Wh+tdzyhQ&3QEgTdq3KtDwbdAWS?Q16u&rwt0K>GnX&ghDt<6
zJgtHM8Ust(d1wZ<0L(%Bml+rdoIwI<xVOOC*?WS4hm3_l7+8xOLl<nd42fMejSWeN
zglM!PYsxKk-s+q`x8BRvz<d!a$rmq*O_Mc9-0;xRXz28=rPI6<hy-~m8ZE;MVfj@x
zd4t4gpz**wN-XLJw$>07)Mh+zjmy@Y^_jnOuw;JO-CNu>&TnQBuU?uBvNUj}jhlhN
zW(WklbVfj!5m|Vh$;aC{++v@vGU7Mqo8^TV%|<9QUI|`wuuTAuhMrlUkOd}yL*|-^
zN3*~L@Mt|U>l3oT1aQb)Gx2B^xGfeUyWt<tK|Og)|G(eonqA^CKkGsb<O4C+*RZdI
zw2MMcxF1ma-L@0gXUg`i3fc<N^7o#mMrxMd=s~rN(lr3fd7~Y0P0h~bI?|VyJUb50
zz#7xazn5LDyO_C`f%$vt4jf@H+L6)sQI}MOJ<VSOP&qrZJDShb&--4SRsW$Gm^1F7
zp#`nmWhD*o{;XiGX5Oq2?M|J|ET+;szH~kRC#9$P*XLT9*83id@w!OmT4{>iTf6q;
zVa*#_8-`=x7~>Z3?u^SBxc+@)=5v#5dAo;!D|79DEIH`_EK*2I&-0`0s`ZNwS&4zA
zaxA9i3{4^4tFa%AM(Y90&cG{RK4AU#vjC^vhL)ph+TfiX%w^__c599XuFS+4HOj!=
z`@Ecp{VnD{N`;cM#lW>}Zx-?DDA{Nj2F93I*SH(liLBU`ajVSuV0L}HX=Tr7*7GYF
zSkss&gImn(wRuzqmS(D<G;rn7ZEdhxx&e0+0%gQAu3?JYOF=<gxx?#F?fDrEj54Uk
zUe@~>%k#XDb|K~5#lTWI12Av_A;Q302W*VGyUH}LL<MPexwQ<uGkOn*GZ<J05&Z&B
zOaoKxD``<pbJw~c3{3Nt#Ml)Yczg!l7Gy=DQc!9gU9>P|;@$gD7RJJ6<C^@eoH)b4
zv^|=Bta_g^kEfxze)ZBzc8z)vC`)S^S!zQMX>eOT&cG4otzg_`KxOXrRKseKBd9%w
z?_=UK4BT$Cv|b2_K~XP+r;!nD9Q6Zlr;?dBMe|qpdLf2m;KfU@ue25vNt+OrDa*=h
zCtNNEj+$1|$j5O{?pk5q4Vxp*FfgJmEe7T_)AGw=V9BfD<<0GL)(bI|21b~-iE*Ib
z1)_ny%?@5pbwfzyQ;m&GZ)X^|mr+0U@|cZkQjd{!31R!6X+0<dTmD|2&f9^Lo*yN|
z;#AG~PF&Qrst4pC@IlhpUJ9B+4-029aAg;d)vQ+cuq3L1d-DDh49po(8<if@M&BEa
zfh%)qUW4OSK?^<2D{wUfTiev$O!0aK-rP3p>ByhYl2Scfjxa7y)4J%iD7IxfWFZR3
zhhDB^V5zk}So9q+&+pvKM&<iU%Rf)6TXouHhMZTlM+e!7W79gQZTU`{H+t=OVZI}G
z2EelZ(mFQEh=|vq0Hyr*=#p!HNAg4bz!jWa%kv>5%?!O>h~Z-)B)>1jgoHkiF%mnM
z)Na;BepCl%GO!N#0)Za(<qSyMjpS#Qi|+PGK4r^pTHk2(eZUW_2i|O6hb>@-`e&{8
zq-ZmsoGmt@4awXf@2pDCcp)r5a66sL%zB*ibx3MjR2|4loUc_cuH7wWjxz9z;(>`~
zT|vCCz_z0%nf$lWuRG>6*NTt_*_mrt3IebU1C-%Bc8%)9jPyMWnNhBkho`Y`XJGkQ
zkg_|`gicy6F)uFI+lgy;^k@{D)iFH`d{swh<{M>5Z#~lU+ym}5OFsLxdJf83t(}S6
z>0JJO85G;e3*D*B1A0V0C*BA|e`f+`<`uWVV+?%QA!8?4BRh3_jD*g#)P=SW3i$*F
zs)6I?o^NDZKnT^!F2bIKmnBMb5VNSl_TRchAnEq!e9M#iFsp#x-`8p*#SQ2Br0=xr
z-zn<>0Job95vJu{iYW8SfkM)my1wYNzXO|bTKWKh7tUq(Hb|QrY_nl=*2`7iBe!-&
zu3;W+T<|e|n0Ln({pRip{_0I}-yH`8$C?=Ja=OmzTKG9=zXt%^&%oSwD)~|u&?3=l
z<__TDEWV637T(!*j^(`^8N5}~`8)%I@f7H7J3atl+IelutYbfDmv8PDa)5I;bp2X1
z3w#hWM*!Htz#Q}-)9_g6R-f~F?178>`9c<CxtLySW6h5|=ds(1&4hG~ElIt^b{g-C
z<sCcf0RTrBm|ae?ZEo1r_O-6(7nT;10?MNdtflurY`&)rBK2k$e&$M05bME#rd|RV
zYrV|+10XfQZO?`epGt1M3tLDE^~JJpAQW&`n;)69@!gUgHtCGrfq?3Suw;J)1M|-G
z7>u;DVNCKK2a)%8FLOc+Y%q7Vr#Kje8AFsE$3D5;58Q?{`b^lm*l7BC@YDOhpoz(#
zK6OgDmw|a_dV|FTr8g)5P>HKp&U^p^hd@p=wh3+_9jWg?47}Hh$L214xXy@6T$V?U
z2dBmk;#$hV@4G!f*_UcSVZj4wz6Tf>(v|>NMJ5N{JH^1qzIlv+t+Q#zyUzR@dAj_`
zhnspp@545;w}(u_UI<7-60d;B+))Ph7FOH~!KZg&VJ9-E_MV{GQ3e(ko<lHjg9o<u
z;IrGNftPjMdPkb%Mpo{XP`_$fRj*6$%!{JAh&)*UY0*RtTst2cG#bdsA_0;M#^7u0
zhHBs;7`Su_#+dSE#_?VVPfN2aSPy>U&YicY1`fHH1g}Q}`r4U>7s5<$=rB!Y>^nTf
zg=R=DPp+7Q$!k}!&j1XpMUNft_odo+*Tic>R_{dhHt=ocBa^q9+m1N~z;p<#vxGV@
zjjKhnyEHgRMgOkhwGhiO{K}?W;F)>t1YB&6T_4cEZ6me#VEZn!K20ovxFHp2+9$d6
zGH}XfhBxhMS`}D0YW4FNSY%X9qjz{A#?!z=;~g%iI3Bd50OSl@pB*nlX_<CUM;y#c
zUwf_%iK;qw;zSvNmK|8-i<=N+fdOqk2(C0}!A9(<xd7j;feEaP+bOjh)>{TXGV891
zTW<%yL#<Q$ZsYDIFNCON$>7&EIm~*Z8dw|L#$Yn*^Hp95iGeqc+z*Sd8*Up>k{z}K
z^BSHouAx`;tf@`l_b3B<E-#}<b9y!yPt?fXjH78_O+Fd17vImo#V9ea1m<-(cq<M&
zaOl*n04u72&CWy_u_M4Hs=2-NrbgCw@C?n4`hf-6^RO2J)0KR?w;>fF>a0nBh^6q@
z2O!=p$z2R=_+>ZO><SRgHRZXqL~X8Z;~HKHuRf=C;)aNY@Bku3tI0R%P=>AHh8*l|
zznx@UUiB;n_F^L-f2px!W@>1mKTMDb@xsu;POv>BFNTgrv%##LB9^sml_G7Po7qA;
zY~CQ_3#e!;1Wz9TA78y|gNRSJqcE_@^Z}P3>zc>?z&=zWjLhzLxCFG?LPi7SfwtK(
zBw$wXK<a5$-^gtWb7r~wq=s#u0W~mUZ5rrX)6*S2B#(?VQ4O3?<{fz$?b2dDvVRBt
z@-JZEJ34HZ@m34Gl!4!B?pg0_3zVS5B>D%`Tz36uet+BoYgBEXFrOg)<A}Ps`E}(}
zZum}M;;R?_H``|xH@F2h09X8GfcOwtwwB_7J8KYW<^T2HJ^L37tbr#31D9UC+5q@!
z5PR|>ON(DQ2;V#iJo|6`Kez#DI}QN862u+@Oa{)8alJF(S1>T0IkFkiV}R`P1}Bn~
zHAiGd@a+FJ3@pi?3~)^bzLsG<FnjiYBLn{je|gHyLwm(}00000NkvXXu0mjfi;170


From f1c923d4b52187856bf2dce4fe6de640ae990246 Mon Sep 17 00:00:00 2001
From: "Dirk Hillbrecht (home)" <dirk@hillbrecht.de>
Date: Wed, 29 Dec 2021 07:30:47 +0100
Subject: [PATCH 39/45] Puzzle15: First playable version of the 15-puzzle

---
 apps/puzzle15/ChangeLog            |   1 +
 apps/puzzle15/README.md            |  18 ++
 apps/puzzle15/puzzle15.app-icon.js |   1 +
 apps/puzzle15/puzzle15.app.js      | 361 +++++++++++++++++++++++++++++
 apps/puzzle15/puzzle15.app.png     | Bin 0 -> 2313 bytes
 apps/puzzle15/screenshot.png       | Bin 0 -> 1161 bytes
 6 files changed, 381 insertions(+)
 create mode 100644 apps/puzzle15/ChangeLog
 create mode 100644 apps/puzzle15/README.md
 create mode 100644 apps/puzzle15/puzzle15.app-icon.js
 create mode 100644 apps/puzzle15/puzzle15.app.js
 create mode 100644 apps/puzzle15/puzzle15.app.png
 create mode 100644 apps/puzzle15/screenshot.png

diff --git a/apps/puzzle15/ChangeLog b/apps/puzzle15/ChangeLog
new file mode 100644
index 000000000..2f5d93cad
--- /dev/null
+++ b/apps/puzzle15/ChangeLog
@@ -0,0 +1 @@
+0.01: Initial version, UI mechanics ready, no real game play so far
diff --git a/apps/puzzle15/README.md b/apps/puzzle15/README.md
new file mode 100644
index 000000000..540646f97
--- /dev/null
+++ b/apps/puzzle15/README.md
@@ -0,0 +1,18 @@
+# Puzzle15 - A 15-puzzle for the Bangle.js 2
+
+Puzzle15 implements a 15-puzzle on the screen of the Bangle.js 2 smart watch.
+A "15-puzzle" is a single-player game. 15 "stones" are numbered from 1 to 15 and placed randomly on a 4 by 4 playing field.
+So, one place on the field is free.
+The target of the game is to move the stones around (using the "gap" on the playing field) to bring them in natural order.
+
+_This is work in progress!_
+
+## How to play
+
+After starting the game, the playing field is shown with the stones in the corrct order.
+Push the stones around with drag gestures (left to right, right to left, top to bottom, bottom to top) to shuffle them.
+Then, use the same gestures to restore the order.
+
+So far, there are no other capabililties or options.
+
+Have fun!
diff --git a/apps/puzzle15/puzzle15.app-icon.js b/apps/puzzle15/puzzle15.app-icon.js
new file mode 100644
index 000000000..04fb4a665
--- /dev/null
+++ b/apps/puzzle15/puzzle15.app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwgn/AC3+7oAD7e7AAW8BQndBQe79/9DomgHocH74KD/RJE34Xax4XDtvoC4fJ54XDluAC4f2z4XDzm/C4ett4XD34OBF4e/I4m+C4f8r4XChHuC5U98oXEF4cP7/AC5O9mYXC/2/F4cGtwvE/SsBC4Ws7gvD7YCBL4ULO4i/u1QAD7QED1e6AoetCAnf/YeE1wpD/lgBQcKIAgXG14LD/twC5kL3Z+BC4P+LgIXBg272wXD7wXEh7eCC4PWzIXChHtOoIXB/WX54XDh3KmAXC1oLBI4UD+AXC+/rdIIvD5wvD3O4C4cJ4AXC/dUI4kJhgMBC4Ov+AXDh9QC4X2/gvEhvvoAXC81dC4duR4f8wSncC6v8u4AD3ndAAXcy4KDtYKD7vf/oGE2wRDvPNBQfLFAnP/o2EVIIACg7yBAATZBAAe/C7P9g4XCx+wn/6C4Op//AC4MK+cI/+QC4X2/fPC4PM2HKh8H7vpewIXBhvThV5+AXC+/5C4UL2HHC4Pf/P/AIJHB6cAj2wC4X+3AXPhADBF4fX94XB1va1vOC4PXAIX6hfrxvb0CPD7p3C1e6hW2C4LOBAIIXB3eJ3YXEX78GM4IAC9QXG1QAD7QEDJYIFD14oE//7DwgME/twBQcPC70G6EG5dQ1/8VYPtC4ObgfM5IXHr/whvO4Gvy6LBtX9vfugnr3AXHkXggGOC4P97/43X9ukOgnv6BfIC4Oe2AXC6+nI4MOgfI9QXJhssF4f91AXCgnA9IXHr3u1HusGv3Ob//s/t693l3xHJX9v+3YAD7oAE5YKD34XFAC4="))
diff --git a/apps/puzzle15/puzzle15.app.js b/apps/puzzle15/puzzle15.app.js
new file mode 100644
index 000000000..9a5864b9a
--- /dev/null
+++ b/apps/puzzle15/puzzle15.app.js
@@ -0,0 +1,361 @@
+// A 15-puzzle game for the Bangle.js 2 clock
+// (C) Dirk Hillbrecht 2022
+// Released unter the terms of the MIT license
+
+// *** Global settings
+// Note: These could be changed by settings later...
+
+// Minimum number of pixels to interpret it as drag gesture
+const dragThreshold = 10;
+
+// Number of steps in button move animation
+const animationSteps = 5;
+
+// Milliseconds to wait between move animation steps
+const animationWaitMillis = 70;
+
+// Size of the playing field
+const buttonsPerLine = 4;
+
+// *** Global settings derived by device characteristics
+
+// Total width of the playing field (full screen width)
+const fieldw = g.getWidth();
+
+// Total height of the playing field (screen height minus widget zones)
+const fieldh = g.getHeight() - 48;
+
+// Size of one button
+const buttonsize = Math.floor(Math.min(fieldw / (buttonsPerLine + 1), fieldh / buttonsPerLine)) - 2;
+
+// Actual left start of the playing field (so that it is centered)
+const leftstart = (fieldw - ((buttonsPerLine + 1) * buttonsize + 8)) / 2;
+
+// Actual top start of the playing field (so that it is centered)
+const topstart = 24 + ((fieldh - (buttonsPerLine * buttonsize + 6)) / 2);
+
+// *** Low level helper classes
+
+// One node of a first-in-first-out storage
+class FifoNode {
+  constructor(payload) {
+    this.payload = payload;
+    this.next = null;
+  }
+}
+
+// Simple first-in-first-out (fifo) storage
+// Needed to keep the stone movements in order
+class Fifo {
+  // Initialize an empty Fifo
+  constructor() {
+    this.first = null;
+    this.last = null;
+  }
+  // Add an element to the end of the internal fifo queue
+  add(payload) {
+    if (this.last === null) { // queue is empty
+      this.first = new FifoNode(payload);
+      this.last = this.first;
+    } else {
+      let newlast = new FifoNode(payload);
+      this.last.next = newlast;
+      this.last = newlast;
+    }
+  }
+  // Returns the first element in the queue, null if it is empty
+  remove() {
+    if (this.first === null)
+      return null;
+    oldfirst = this.first;
+    this.first = this.first.next;
+    if (this.first === null)
+      this.last = null;
+    return oldfirst.payload;
+  }
+  // Returns if the fifo is empty, i.e. it does not hold any elements
+  isEmpty() {
+    return (this.first === null);
+  }
+}
+
+// Helper class to keep track of tasks
+// Executes tasks given by addTask.
+// Tasks must call Worker.endTask() when they are finished, for this they get the worker passed as parameter.
+// If a task is given with addTask() while another task is still running,
+// it is queued and executed once the currently running task and all
+// previously scheduled tasks have finished.
+// Tasks must be functions with the Worker as first and only parameter.
+class Worker {
+  // Create an empty worker
+  constructor() {
+    this.tasks = new Fifo();
+    this.busy = false;
+  }
+  // Add a task to the worker
+  addTask(task) {
+    if (this.busy) // other task is running: Queue this task
+      this.tasks.add(task);
+    else { // No other task is running: Execute directly
+      this.busy = true;
+      task(this);
+    }
+  }
+  // Called by the task once it finished
+  endTask() {
+    if (this.tasks.isEmpty()) // No more tasks queued: Become idle
+      this.busy = false;
+    else // Call the next task immediately
+      this.tasks.remove()(this);
+  }
+}
+
+// *** Mid-level game mechanics
+
+// Representation of a position where a stone is set.
+// Stones can be moved from field to field.
+// The playing field consists of a fixed set of fields forming a square.
+// During an animation, a series of interim field instances is generated
+// which represents the locations of a stone during the animation.
+class Field {
+  // Generate a field with a left and a top coordinate.
+  // Note that these coordinates are "cooked", i.e. they contain all offsets
+  // needed place the elements globally correct on the screen
+  constructor(left, top) {
+    this.left = left;
+    this.top = top;
+    this.centerx = (left + buttonsize / 2) + 1;
+    this.centery = (top + buttonsize / 2) + 2;
+  }
+  // Generate a field for the given playing field index.
+  // Playing field indexes start at top left with "0"
+  // and go from left to right line by line from top to bottom.
+  static forIndex(index) {
+    return new Field(leftstart + (index % buttonsPerLine) * (buttonsize + 2),
+      topstart + (Math.floor(index / buttonsPerLine)) * (buttonsize + 2));
+  }
+}
+
+// Representation of a moveable stone of the game.
+// Stones are moved from field to field to solve the puzzle
+// Stones are numbered from 0 to the maximum number ot stones.
+// Stone "0" represents the gap on the playing field.
+// The main knowledge of a Stone instance is how to draw itself.
+class Stone {
+  // Create stone with the given number
+  // The constructor creates the "draw()" function which is used to draw the stone
+  constructor(number, targetindex) {
+    this.number = number;
+    this.targetindex = targetindex;
+    // gap: Does not draw anything
+    if (number === 0)
+      this.draw = function(field) {};
+    else if ((number + (buttonsPerLine % 2 == 0 ? (Math.floor((number - 1) / buttonsPerLine)) : 0)) % 2 == 0) {
+      // Black stone
+      this.draw = function(field) {
+        g.setFont("Vector", 20).setFontAlign(0, 0).setColor(0, 0, 0);
+        g.fillRect(field.left, field.top, field.left + buttonsize, field.top + buttonsize);
+        g.setColor(1, 1, 1).drawString(number, field.centerx, field.centery);
+      };
+    } else {
+      // White stone
+      this.draw = function(field) {
+        g.setFont("Vector", 20).setFontAlign(0, 0).setColor(0, 0, 0);
+        g.drawRect(field.left, field.top, field.left + buttonsize, field.top + buttonsize);
+        g.drawString(number, field.centerx, field.centery);
+      };
+    }
+  }
+  // Returns whether this stone is on its target index
+  isOnTarget(index) {
+    return index === this.targetindex;
+  }
+}
+
+// Helper class which knows how to clear the rectangle opened up by the two given fields
+class Clearer {
+  // Create a clearer for the area between the two given fields
+  constructor(startfield, endfield) {
+    this.minleft = Math.min(startfield.left, endfield.left);
+    this.mintop = Math.min(startfield.top, endfield.top);
+    this.maxleft = Math.max(startfield.left, endfield.left);
+    this.maxtop = Math.max(startfield.top, endfield.top);
+  }
+  // Clear the area defined by this clearer
+  clearArea() {
+    g.setColor(1, 1, 1);
+    g.fillRect(this.minleft, this.mintop,
+      this.maxleft + buttonsize, this.maxtop + buttonsize);
+  }
+}
+
+// Helper class which moves a stone between two fields
+class Mover extends Clearer {
+  // Create a mover which moves the given stone from startfield to endfield
+  // and animate the move in the given number of steps
+  constructor(stone, startfield, endfield, steps) {
+    super(startfield, endfield);
+    this.stone = stone;
+    this.startfield = startfield;
+    this.endfield = endfield;
+    this.steps = steps;
+  }
+  // Create the coordinate between start and end for the given step
+  // Computation uses sinus for a smooth movement
+  stepCoo(start, end, step) {
+    return start + ((end - start) * ((1 + Math.sin((step / this.steps) * Math.PI - (Math.PI / 2))) / 2));
+  }
+  // Compute the interim field for the stone to place during the animation
+  stepField(step) {
+    return new Field(
+      (this.minleft === this.maxleft ? this.minleft :
+        this.stepCoo(this.startfield.left, this.endfield.left, step)),
+      (this.mintop === this.maxtop ? this.mintop :
+        this.stepCoo(this.startfield.top, this.endfield.top, step)));
+  }
+  // Perform one animation step
+  animateStep(step, worker) {
+    this.clearArea();
+    this.stone.draw(this.stepField(step));
+    if (step < this.steps)  // still steps left: Issue next step
+      setTimeout(function(t) {
+        t.animateStep(step + 1, worker);
+      }, animationWaitMillis, this);
+    else  // all steps done: Inform the worker
+      worker.endTask();
+  }
+  // Start the animation, this method is called by the worker
+  animate(worker) {
+    this.animateStep(1, worker);
+  }
+}
+
+// Representation of the playing field
+// Knows to draw the field and to move a stone into a gap
+// TODO: More game mechanics (shuffling, solving,...)
+class Board {
+  // Generates the actual playing field with all fields and buttons
+  constructor() {
+    this.fields = [];
+    this.buttons = [];
+    for (i = 0; i < (buttonsPerLine * buttonsPerLine); i++) {
+      this.fields[i] = Field.forIndex(i);
+      this.buttons[i] = new Stone((i + 1) % (buttonsPerLine * buttonsPerLine),i);
+    }
+  }
+  // Draws the complete playing field
+  draw() {
+    new Clearer(this.fields[0], this.fields[this.fields.length - 1]).clearArea();
+    for (i = 0; i < this.fields.length; i++)
+      this.buttons[i].draw(this.fields[i]);
+  }
+  // returns the index of the field left of the field with the given index,
+  // -1 if there is none (index indicates already a leftmost field on the board)
+  leftOf(index) {
+    return (index % buttonsPerLine === 0 ? -1 : index - 1);
+  }
+  rightOf(index) {
+    return (index % buttonsPerLine === (buttonsPerLine - 1) ? -1 : index + 1);
+  }
+  topOf(index) {
+    return (index >= buttonsPerLine ? index - buttonsPerLine : -1);
+  }
+  bottomOf(index) {
+    return (index < (buttonsPerLine - 1) * buttonsPerLine ? index + buttonsPerLine : -1);
+  }
+  // Return the index of the gap in the field, -1 if there is none (should never happel)
+  indexOf0() {
+    for (i = 0; i < this.buttons.length; i++)
+      if (this.buttons[i].number === 0)
+        return i;
+    return -1;
+  }
+  // Moves the stone at the field with the index found by the startfunc operation
+  // into the gap field.
+  moveTo0(startfunc, animator) {
+    let endidx = this.indexOf0(); // Target field (the gap)
+    if (endidx === -1) {
+      animator.endTask();
+      return;
+    }
+    let startidx = startfunc(endidx);  // Start field (relative to the gap)
+    if (startidx === -1) {
+      animator.endTask();
+      return;
+    }
+    let moved = this.buttons[startidx];
+    this.buttons[startidx] = this.buttons[endidx];
+    this.buttons[endidx] = moved;
+    new Mover(moved, this.fields[startidx], this.fields[endidx], animationSteps).animate(animator);
+  }
+  // Move the stone right fro the gap into the gap
+  moveRight(animator) {
+    this.moveTo0(this.leftOf, animator);
+  }
+  moveLeft(animator) {
+    this.moveTo0(this.rightOf, animator);
+  }
+  moveUp(animator) {
+    this.moveTo0(this.bottomOf, animator);
+  }
+  moveDown(animator) {
+    this.moveTo0(this.topOf, animator);
+  }
+  // Check if the board is solved (all stones at the right position)
+  isSolved() {
+    for (i = 0; i < this.buttons.length; i++)
+      if (!this.buttons[i].isOnTarget(i))
+        return false;
+    return true;
+  }
+}
+
+// *** Main program
+
+// We need a worker...
+var worker = new Worker();
+// ...and the board
+var board = new Board();
+
+// UI: Accumulation of current drag operation
+var currentdrag = {
+  x: 0,
+  y: 0
+};
+
+// Handle a drag event
+function handledrag(e) {
+  if (e.b === 0) { // Drag event ended: Evaluate drag and start move operation
+    if (Math.abs(currentdrag.x) > Math.abs(currentdrag.y)) { // Horizontal drag
+      if (currentdrag.x > dragThreshold)
+        worker.addTask(e => board.moveRight(e));
+      else if (currentdrag.x < -dragThreshold)
+        worker.addTask(e => board.moveLeft(e));
+    } else { // Vertical drag
+      if (currentdrag.y > dragThreshold)
+        worker.addTask(e => board.moveDown(e));
+      else if (currentdrag.y < -dragThreshold)
+        worker.addTask(e => board.moveUp(e));
+    }
+    currentdrag.x = 0; // Clear the drag accumulator
+    currentdrag.y = 0;
+  } else { // Drag still running: Accumulate drag shifts
+    currentdrag.x += e.dx;
+    currentdrag.y += e.dy;
+  }
+}
+
+// Clear the screen once, at startup
+g.clear();
+// Drop mode as this is a game
+Bangle.setUI(undefined);
+// Load widgets
+Bangle.loadWidgets();
+Bangle.drawWidgets();
+
+// Draw the board initially
+board.draw();
+// Start the interaction
+Bangle.on("drag", handledrag);
+
+// end of file
\ No newline at end of file
diff --git a/apps/puzzle15/puzzle15.app.png b/apps/puzzle15/puzzle15.app.png
new file mode 100644
index 0000000000000000000000000000000000000000..f95366a4616cb5f6fde4f00694a5aaa1e1c7194c
GIT binary patch
literal 2313
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

literal 0
HcmV?d00001

diff --git a/apps/puzzle15/screenshot.png b/apps/puzzle15/screenshot.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a79a3ae64687fcd1afdbc160b4e0a9f3a912169
GIT binary patch
literal 1161
zcmV;41a|w0P)<h;3K|Lk000e1NJLTq004&o004&w1^@s6Jm*RZ00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_00b#XL_t(|+U=doj;k;b1q1T`|1x)T
zBQYp(Fz&ajq}gPWn6^*)VW8QL<2YUbAJ~}!KpcQLK#q2OVcRyhgE@|a@tw!-isRFp
zEbyEZ>?f=M;sC?}hyxG@AP&exlP<$N%E0TG)@9*!JkQfr=dow!p-E4SrzozkYaiRU
z?|;8;EfVSRT1HVoqOjtz?b~yo@Be8YS1**l|F><MnfK5br$sxUES@XUWiVRDvR9a#
zm61$9Rl>?DlQrteEPp^6w(eDhv6|Ni6;`58RP}1g!b3Jhp|@C8)k<%_XJ$TjgaPFf
zQm-v@uRQ0Qy^`T3t>^HnN`5Vp_j#rep5xbf1<MKQjiDu+b3Csa&NyYSB+3e9b<>!b
ziaACW5lGGpo&yjEAPztrfH(kgK%!E1^>Y-QqxnA%w0(lxo`e1v^ylb?6>sPd62pEH
zQlMG^!~uu{5C<R*h>7~eJ{Bcnv`Z7K*q{39^Jx7ss@YFi0X@&*wX^8mAERftg~zh6
zzufJRk-~|^4@cA1rg4BYY_qjpYs{wk%k{|Aqa>u-w%@s_ii8x@JXq8Cl~^=vyA#$d
z8@5F&oh58f-)b`AUWRoz)ynw@E6GKwc@z0mH$g5xjq6cEc#f+;tovqE?vLSZ|5VO#
zPCPx_X_WpLRqfv;Rcq~DqxHw|Z1Ekkl%>sd%qK@stw8LA6c7g>4gkafhyz?p*=nUB
z_MeV}{v2@IbI>1y{v6$~LVt|4?I$4x!~uu{5C<R*KpYSo)%#X7OUyf^pY$dBqt|Cj
zU(af7f0Go&^>s;+jC@z`Ijc`aGWr?meG3o!!{23}?QvnAq6m|7TwUh*Pivw^UFo)M
zfBt4CeDrhD3u|qE%b;wFFpymo8g_@TR<d2)?kNmPSum+|M8wg%9S?FR^;3OFt3R&0
zqA*6*s?83JFzSgywOT<i`GqmP&w&WyGqXmj32CI3kJf!dGF2sM6VhMj39b_%-8bad
z`J?OcjJ{vm{<~w`S+iYZ;k><uci)gIgx@}Yx|mWT$hJee)b=^}fj9th0OA0|0f+<Q
zm9q55U@zqLqCW?Wcn<nw)ND8_7FN8WKL!aYAPztrfH(kg03Z$!DrK|v$B_E$i2ZlJ
zJ45N*o=nWs_gePHkY0!tH<DZQN#QYJNy5sVM_~6{@9bmDpL|YITqBPFudw6Vqz%=W
zl&8O5sbg7nYrRFE7zts_oKTywU+Wq3A;XH);#y8pq-V^}B;@RK6iH&2Oh~f{BU+_3
zn~;|i$EU@znw;K!t6IXT<h9s72RqN<opgQk2v*@HThi&`IackDQOW+t+vidHV_112
zEBniNj@A2PRIy)eht#V-hV=J%+fTIuhyxG@APztrfH(k#OWA1q1Yo!h^ydJ=3Lp+Z
b9ALmd>npgoHXhUX00000NkvXXu0mjfBDE|A

literal 0
HcmV?d00001


From d5a4e7b93e6b5344e732f4a1de1f34a1dd853b99 Mon Sep 17 00:00:00 2001
From: "Dirk Hillbrecht (home)" <dirk@hillbrecht.de>
Date: Tue, 4 Jan 2022 23:12:45 +0100
Subject: [PATCH 40/45] Puzzle15: v0.01, initial integration into the app
 loader

---
 apps.json | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/apps.json b/apps.json
index 5cc311413..7aeae8749 100644
--- a/apps.json
+++ b/apps.json
@@ -5389,5 +5389,22 @@
     "storage": [
       {"name":"touchmenu.boot.js","url":"touchmenu.boot.js"}
     ]
+  },
+  {
+    "id": "puzzle15",
+    "name": "15 puzzle",
+    "version": "0.01",
+    "description": "A 15 puzzle game with drag gesture interface",
+    "readme":"README.md",
+    "icon": "puzzle15.app.png",
+    "screenshots": [{"url":"screenshot.png"}],
+    "type": "app",
+    "tags": "game",
+    "supports": ["BANGLEJS2"],
+    "allow_emulator": true,
+    "storage": [
+      {"name":"puzzle15.app.js","url":"puzzle15.app.js"},
+      {"name":"puzzle15.img","url":"puzzle15.app-icon.js","evaluate":true}
+    ]
   }
 ]

From 43e87247d7803efafd3216cb77eb9a9f2cf0062b Mon Sep 17 00:00:00 2001
From: "Dirk Hillbrecht (home)" <dirk@hillbrecht.de>
Date: Sat, 1 Jan 2022 19:03:35 +0100
Subject: [PATCH 41/45] Puzzle15: v0.02 with shuffled board init, menu-based
 control flow etc.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Now it actually starts making sense…
---
 apps.json                     |   2 +-
 apps/puzzle15/ChangeLog       |   1 +
 apps/puzzle15/puzzle15.app.js | 326 ++++++++++++++++++++++++++++------
 3 files changed, 274 insertions(+), 55 deletions(-)

diff --git a/apps.json b/apps.json
index 7aeae8749..4a3d8c7c8 100644
--- a/apps.json
+++ b/apps.json
@@ -5393,7 +5393,7 @@
   {
     "id": "puzzle15",
     "name": "15 puzzle",
-    "version": "0.01",
+    "version": "0.02",
     "description": "A 15 puzzle game with drag gesture interface",
     "readme":"README.md",
     "icon": "puzzle15.app.png",
diff --git a/apps/puzzle15/ChangeLog b/apps/puzzle15/ChangeLog
index 2f5d93cad..bc5a4422b 100644
--- a/apps/puzzle15/ChangeLog
+++ b/apps/puzzle15/ChangeLog
@@ -1 +1,2 @@
 0.01: Initial version, UI mechanics ready, no real game play so far
+0.02: Lots of enhancements, menu system not yet functional, but packaging should be now...
diff --git a/apps/puzzle15/puzzle15.app.js b/apps/puzzle15/puzzle15.app.js
index 9a5864b9a..801cdf759 100644
--- a/apps/puzzle15/puzzle15.app.js
+++ b/apps/puzzle15/puzzle15.app.js
@@ -8,14 +8,14 @@
 // Minimum number of pixels to interpret it as drag gesture
 const dragThreshold = 10;
 
+// Maximum number of pixels to interpret a click from a drag event series
+const clickThreshold = 3;
+
 // Number of steps in button move animation
-const animationSteps = 5;
+const animationSteps = 6;
 
 // Milliseconds to wait between move animation steps
-const animationWaitMillis = 70;
-
-// Size of the playing field
-const buttonsPerLine = 4;
+const animationWaitMillis = 30;
 
 // *** Global settings derived by device characteristics
 
@@ -25,14 +25,29 @@ const fieldw = g.getWidth();
 // Total height of the playing field (screen height minus widget zones)
 const fieldh = g.getHeight() - 48;
 
+// Size of the playing field
+var buttonsPerLine;
+
 // Size of one button
-const buttonsize = Math.floor(Math.min(fieldw / (buttonsPerLine + 1), fieldh / buttonsPerLine)) - 2;
+var buttonsize;
 
 // Actual left start of the playing field (so that it is centered)
-const leftstart = (fieldw - ((buttonsPerLine + 1) * buttonsize + 8)) / 2;
+var leftstart;
 
 // Actual top start of the playing field (so that it is centered)
-const topstart = 24 + ((fieldh - (buttonsPerLine * buttonsize + 6)) / 2);
+var topstart;
+
+// Number of buttons on the board (needed at several occasions)
+var buttonsPerBoard;
+
+// Set the buttons per line globally and all derived values, too
+function setButtonsPerLine(bPL) {
+  buttonsPerLine = bPL;
+  buttonsize = Math.floor(Math.min(fieldw / (buttonsPerLine + 1), fieldh / buttonsPerLine)) - 2;
+  leftstart = (fieldw - ((buttonsPerLine + 1) * buttonsize + 8)) / 2;
+  topstart = 24 + ((fieldh - (buttonsPerLine * buttonsize + 6)) / 2);
+  buttonsPerBoard = (buttonsPerLine * buttonsPerLine);
+}
 
 // *** Low level helper classes
 
@@ -67,7 +82,7 @@ class Fifo {
   remove() {
     if (this.first === null)
       return null;
-    oldfirst = this.first;
+    let oldfirst = this.first;
     this.first = this.first.next;
     if (this.first === null)
       this.last = null;
@@ -110,6 +125,56 @@ class Worker {
   }
 }
 
+// Evaluate "drag" events from the UI and call handlers for drags or clicks
+// The UI sends a drag as a series of events indicating partial movements
+// of the finger.
+// This class combines such parts to a long drag from start to end
+// If the drag is short, it is interpreted as click,
+// otherwise as drag.
+// The approprate method is called with the data of the drag.
+class Dragger {
+  constructor(clickHandler, dragHandler, clickThreshold, dragThreshold) {
+    this.clickHandler = clickHandler;
+    this.dragHandler = dragHandler;
+    this.clickThreshold = (clickThreshold === undefined ? 3 : clickThreshold);
+    this.dragThreshold = (dragThreshold === undefined ? 10 : dragThreshold);
+    this.dx = 0;
+    this.dy = 0;
+    this.enabled = true;
+  }
+  // Enable or disable the Dragger
+  setEnabled(b) {
+    this.enabled = b;
+  }
+  // Handle a raw drag event from the UI
+  handleRawDrag(e) {
+    if (!this.enabled)
+      return;
+    this.dx += e.dx; // Always accumulate
+    this.dy += e.dy;
+    if (e.b === 0) { // Drag event ended: Evaluate full drag
+      if (Math.abs(this.dx) < this.clickThreshold && Math.abs(this.dy) < this.clickThreshold)
+        this.clickHandler({
+          x: e.x - this.dx,
+          y: e.y - this.dy
+        }); // take x and y from the drag start
+      else if (Math.abs(this.dx) > this.dragThreshold || Math.abs(this.dy) > this.dragThreshold)
+        this.dragHandler({
+          x: e.x - this.dx,
+          y: e.y - this.dy,
+          dx: this.dx,
+          dy: this.dy
+        });
+      this.dx = 0; // Clear the drag accumulator
+      this.dy = 0;
+    }
+  }
+  // Attach the drag evaluator to the UI
+  attach() {
+    Bangle.on("drag", e => this.handleRawDrag(e));
+  }
+}
+
 // *** Mid-level game mechanics
 
 // Representation of a position where a stone is set.
@@ -127,6 +192,11 @@ class Field {
     this.centerx = (left + buttonsize / 2) + 1;
     this.centery = (top + buttonsize / 2) + 2;
   }
+  // Returns whether this field contains the given coordinate
+  contains(x, y) {
+    return (this.left < x && this.left + buttonsize > x &&
+      this.top < y && this.top + buttonsize > y);
+  }
   // Generate a field for the given playing field index.
   // Playing field indexes start at top left with "0"
   // and go from left to right line by line from top to bottom.
@@ -134,6 +204,16 @@ class Field {
     return new Field(leftstart + (index % buttonsPerLine) * (buttonsize + 2),
       topstart + (Math.floor(index / buttonsPerLine)) * (buttonsize + 2));
   }
+  // Special field for the result "stone"
+  static forResult() {
+    return new Field(leftstart + (buttonsPerLine * (buttonsize + 2)),
+      topstart + ((buttonsPerLine - 1) * (buttonsize + 2)));
+  }
+  // Special field for the menu
+  static forMenu() {
+    return new Field(leftstart + (buttonsPerLine * (buttonsize + 2)),
+      topstart);
+  }
 }
 
 // Representation of a moveable stone of the game.
@@ -217,11 +297,11 @@ class Mover extends Clearer {
   animateStep(step, worker) {
     this.clearArea();
     this.stone.draw(this.stepField(step));
-    if (step < this.steps)  // still steps left: Issue next step
+    if (step < this.steps) // still steps left: Issue next step
       setTimeout(function(t) {
         t.animateStep(step + 1, worker);
       }, animationWaitMillis, this);
-    else  // all steps done: Inform the worker
+    else // all steps done: Inform the worker
       worker.endTask();
   }
   // Start the animation, this method is called by the worker
@@ -232,22 +312,54 @@ class Mover extends Clearer {
 
 // Representation of the playing field
 // Knows to draw the field and to move a stone into a gap
-// TODO: More game mechanics (shuffling, solving,...)
+// TODO: More game mechanics (solving,...)
 class Board {
   // Generates the actual playing field with all fields and buttons
   constructor() {
     this.fields = [];
-    this.buttons = [];
-    for (i = 0; i < (buttonsPerLine * buttonsPerLine); i++) {
+    this.resultField = Field.forResult();
+    this.menuField = Field.forMenu();
+    for (i = 0; i < buttonsPerBoard; i++)
       this.fields[i] = Field.forIndex(i);
-      this.buttons[i] = new Stone((i + 1) % (buttonsPerLine * buttonsPerLine),i);
+    this.setShuffled();
+  }
+  // Set the board into the "solved" position
+  setSolved() {
+    this.buttons = [];
+    for (i = 0; i < buttonsPerBoard; i++)
+      this.buttons[i] = new Stone((i + 1) % buttonsPerBoard, i);
+    this.moveCount = 0;
+  }
+  setShuffled() {
+    let nrs = [];
+    for (i = 0; i < buttonsPerBoard; i++)
+      nrs[i] = i;
+    this.buttons = [];
+    let count = buttonsPerBoard;
+    for (i = 0; i < buttonsPerBoard; i++) {
+      let curridx = Math.floor(Math.random() * count);
+      let currnr = nrs[curridx];
+      this.buttons[i] = new Stone(currnr, (currnr + (buttonsPerBoard - 1)) % buttonsPerBoard);
+      for (j = curridx + 1; j < count; j++)
+        nrs[j - 1] = nrs[j];
+      count -= 1;
     }
+    if (!this.isSolvable()) {
+      let a = (this.buttons[0].number === 0 ? 2 : 0);
+      let b = (this.buttons[1].number === 0 ? 2 : 1);
+      let bx = this.buttons[a];
+      this.buttons[a] = this.buttons[b];
+      this.buttons[b] = bx;
+    }
+    this.moveCount = 0;
   }
   // Draws the complete playing field
   draw() {
     new Clearer(this.fields[0], this.fields[this.fields.length - 1]).clearArea();
     for (i = 0; i < this.fields.length; i++)
       this.buttons[i].draw(this.fields[i]);
+    this.drawResult(null);
+    this.drawMenu();
   }
   // returns the index of the field left of the field with the given index,
   // -1 if there is none (index indicates already a leftmost field on the board)
@@ -270,36 +382,44 @@ class Board {
         return i;
     return -1;
   }
+  // Returns the row in which the gap is, 0 is upmost
+  rowOf0() {
+    let idx = this.indexOf0();
+    if (idx < 0)
+      return -1;
+    return Math.floor(idx / buttonsPerLine);
+  }
   // Moves the stone at the field with the index found by the startfunc operation
   // into the gap field.
-  moveTo0(startfunc, animator) {
+  moveTo0(startfunc, worker) {
     let endidx = this.indexOf0(); // Target field (the gap)
     if (endidx === -1) {
-      animator.endTask();
+      worker.endTask();
       return;
     }
-    let startidx = startfunc(endidx);  // Start field (relative to the gap)
+    let startidx = startfunc(endidx); // Start field (relative to the gap)
     if (startidx === -1) {
-      animator.endTask();
+      worker.endTask();
       return;
     }
     let moved = this.buttons[startidx];
     this.buttons[startidx] = this.buttons[endidx];
     this.buttons[endidx] = moved;
-    new Mover(moved, this.fields[startidx], this.fields[endidx], animationSteps).animate(animator);
+    this.moveCount += 1;
+    new Mover(moved, this.fields[startidx], this.fields[endidx], animationSteps).animate(worker);
   }
   // Move the stone right fro the gap into the gap
-  moveRight(animator) {
-    this.moveTo0(this.leftOf, animator);
+  moveRight(worker) {
+    this.moveTo0(this.leftOf, worker);
   }
-  moveLeft(animator) {
-    this.moveTo0(this.rightOf, animator);
+  moveLeft(worker) {
+    this.moveTo0(this.rightOf, worker);
   }
-  moveUp(animator) {
-    this.moveTo0(this.bottomOf, animator);
+  moveUp(worker) {
+    this.moveTo0(this.bottomOf, worker);
   }
-  moveDown(animator) {
-    this.moveTo0(this.topOf, animator);
+  moveDown(worker) {
+    this.moveTo0(this.topOf, worker);
   }
   // Check if the board is solved (all stones at the right position)
   isSolved() {
@@ -308,54 +428,152 @@ class Board {
         return false;
     return true;
   }
+  // counts the inversions on the board
+  // see https://www.geeksforgeeks.org/check-instance-15-puzzle-solvable/
+  getInversionCount() {
+    let inversions = 0;
+    for (outer = 0; outer < buttonsPerBoard - 1; outer++) {
+      let outernr = this.buttons[outer].number;
+      if (outernr === 0)
+        continue;
+      for (inner = outer + 1; inner < buttonsPerBoard; inner++) {
+        let innernr = this.buttons[inner].number;
+        if (innernr > 0 && outernr > innernr)
+          inversions++;
+      }
+    }
+    return inversions;
+  }
+  // return whether the puzzle is solvable
+  // see https://www.geeksforgeeks.org/check-instance-15-puzzle-solvable/
+  isSolvable() {
+    let invs = this.getInversionCount();
+    if (buttonsPerLine % 2 !== 0) // odd number of rows/columns
+      return (invs % 2 === 0);
+    else {
+      return ((invs + this.rowOf0()) % 2 !== 0);
+    }
+  }
+  // draw the result field, pass null as argument if not called from worker
+  drawResult(worker) {
+    let field = this.resultField;
+    if (this.isSolved())
+      g.setColor(0, 1, 0);
+    else
+      g.setColor(1, 0, 0);
+    g.fillRect(field.left, field.top, field.left + buttonsize, field.top + buttonsize);
+    g.setColor(0, 0, 0);
+    g.drawRect(field.left, field.top, field.left + buttonsize, field.top + buttonsize);
+    g.setFont("Vector", 14).setFontAlign(0, 0).drawString(this.moveCount, field.centerx, field.centery);
+    if (worker !== null)
+      worker.endTask();
+  }
+  // draws the menu button
+  drawMenu() {
+    let field = this.menuField;
+    g.setColor(0.5, 0.5, 0.5);
+    g.fillRect(field.left, field.top, field.left + buttonsize, field.top + buttonsize);
+    g.setColor(0, 0, 0);
+    g.drawRect(field.left, field.top, field.left + buttonsize, field.top + buttonsize);
+    let l = field.left + 8;
+    let r = field.left + buttonsize - 8;
+    let t = field.top + 5;
+    for (i = 0; i < 3; i++)
+      g.fillRect(l, t + (i * 7), r, t + (i * 7) + 3);
+  }
 }
 
+/*
+// Main class, containing the complete game logic
+class Puzzle15 {
+  constructor() {
+    this.worker=new Worker();
+    this.board=new Board();
+  }
+}
+*/
+
 // *** Main program
 
 // We need a worker...
 var worker = new Worker();
+
+setButtonsPerLine(3);
 // ...and the board
 var board = new Board();
 
-// UI: Accumulation of current drag operation
-var currentdrag = {
-  x: 0,
-  y: 0
-};
+var dragger;
+
+function initGame(bpl) {
+  setButtonsPerLine(bpl);
+  board = new Board();
+  board.draw();
+  dragger.setEnabled(true);
+}
+
+function showMenu() {
+  var mainmenu = {
+    "": {
+      "title": "15 Puzzle"
+    },
+    "< Back": () => {
+      E.showMenu();
+      dragger.setEnabled(true);
+      board.draw();
+    }, // remove the menu
+    "Start 3x3": function() {
+      E.showMenu();
+      initGame(3);
+    },
+    "Start 4x4": function() {
+      E.showMenu();
+      initGame(4);
+    },
+    "Start 5x5": function() {
+      E.showMenu();
+      initGame(5);
+    }
+  };
+  dragger.setEnabled(false);
+
+  E.showMenu(mainmenu);
+}
+
+function handleclick(e) {
+  if (board.menuField.contains(e.x, e.y)) {
+    console.log("GGG - handleclick, dragger: " + dragger);
+    g.reset();
+    showMenu();
+    console.log("showing menu ended");
+  }
+}
 
 // Handle a drag event
 function handledrag(e) {
-  if (e.b === 0) { // Drag event ended: Evaluate drag and start move operation
-    if (Math.abs(currentdrag.x) > Math.abs(currentdrag.y)) { // Horizontal drag
-      if (currentdrag.x > dragThreshold)
-        worker.addTask(e => board.moveRight(e));
-      else if (currentdrag.x < -dragThreshold)
-        worker.addTask(e => board.moveLeft(e));
-    } else { // Vertical drag
-      if (currentdrag.y > dragThreshold)
-        worker.addTask(e => board.moveDown(e));
-      else if (currentdrag.y < -dragThreshold)
-        worker.addTask(e => board.moveUp(e));
-    }
-    currentdrag.x = 0; // Clear the drag accumulator
-    currentdrag.y = 0;
-  } else { // Drag still running: Accumulate drag shifts
-    currentdrag.x += e.dx;
-    currentdrag.y += e.dy;
-  }
+  worker.addTask(Math.abs(e.dx) > Math.abs(e.dy) ?
+    (e.dx > 0 ? e => board.moveRight(e) : e => board.moveLeft(e)) :
+    (e.dy > 0 ? e => board.moveDown(e) : e => board.moveUp(e)));
+  worker.addTask(e => board.drawResult(e));
 }
 
 // Clear the screen once, at startup
 g.clear();
-// Drop mode as this is a game
-Bangle.setUI(undefined);
+
+// Clock mode allows short-press on button to exit
+Bangle.setUI("clock");
 // Load widgets
 Bangle.loadWidgets();
 Bangle.drawWidgets();
 
 // Draw the board initially
 board.draw();
+
+dragger = new Dragger(handleclick, handledrag, clickThreshold, dragThreshold);
+
+showMenu();
 // Start the interaction
-Bangle.on("drag", handledrag);
+dragger.attach();
+
+console.log("GGG - main program, dragger: " + dragger);
 
 // end of file
\ No newline at end of file

From 46286e13b52127774ffe0f48ee7230e8b19bfdc7 Mon Sep 17 00:00:00 2001
From: "Dirk Hillbrecht (home)" <dirk@hillbrecht.de>
Date: Mon, 3 Jan 2022 18:12:04 +0100
Subject: [PATCH 42/45] Puzzle15: v0.03 with splash screen and working menu
 system

---
 apps.json                     |   2 +-
 apps/puzzle15/ChangeLog       |   1 +
 apps/puzzle15/README.md       |  27 ++++---
 apps/puzzle15/introscreen.png | Bin 0 -> 3717 bytes
 apps/puzzle15/puzzle15.app.js | 147 ++++++++++++++++++++++------------
 5 files changed, 116 insertions(+), 61 deletions(-)
 create mode 100644 apps/puzzle15/introscreen.png

diff --git a/apps.json b/apps.json
index 4a3d8c7c8..f6ef51546 100644
--- a/apps.json
+++ b/apps.json
@@ -5393,7 +5393,7 @@
   {
     "id": "puzzle15",
     "name": "15 puzzle",
-    "version": "0.02",
+    "version": "0.03",
     "description": "A 15 puzzle game with drag gesture interface",
     "readme":"README.md",
     "icon": "puzzle15.app.png",
diff --git a/apps/puzzle15/ChangeLog b/apps/puzzle15/ChangeLog
index bc5a4422b..d7458c968 100644
--- a/apps/puzzle15/ChangeLog
+++ b/apps/puzzle15/ChangeLog
@@ -1,2 +1,3 @@
 0.01: Initial version, UI mechanics ready, no real game play so far
 0.02: Lots of enhancements, menu system not yet functional, but packaging should be now...
+0.03: Menu logic now generally functioning, splash screen added. The first really playable version!
diff --git a/apps/puzzle15/README.md b/apps/puzzle15/README.md
index 540646f97..eddeb3b94 100644
--- a/apps/puzzle15/README.md
+++ b/apps/puzzle15/README.md
@@ -1,18 +1,27 @@
 # Puzzle15 - A 15-puzzle for the Bangle.js 2
 
-Puzzle15 implements a 15-puzzle on the screen of the Bangle.js 2 smart watch.
-A "15-puzzle" is a single-player game. 15 "stones" are numbered from 1 to 15 and placed randomly on a 4 by 4 playing field.
-So, one place on the field is free.
-The target of the game is to move the stones around (using the "gap" on the playing field) to bring them in natural order.
+This is a Bangle.js 2 adoption of the famous 15 puzzle.
 
-_This is work in progress!_
+## The game
+
+A board of n x n fields is filled with n²-1 numbered stones.
+Bring them in the correct order so that the gap is finally at the bottom right of the playing field.
+The less moves you need, the better you are.
 
 ## How to play
 
-After starting the game, the playing field is shown with the stones in the corrct order.
-Push the stones around with drag gestures (left to right, right to left, top to bottom, bottom to top) to shuffle them.
-Then, use the same gestures to restore the order.
+Select whether you want to play on a board with 3 x 3, 4 x 4, or 5 x 5 fields.
+Move the stones with drag gestures on the screen.
+If you want to move the stone below the gap upward, drag from the bottom of the screen upward.
+The drag gestures can be performed anywhere on the screen, there is no need to start or end them on the stone to be moved.
 
-So far, there are no other capabililties or options.
+If you managed to order the stones correctly, a success message appears.
+You can continue with another game, go to the game's main menu, or quit the game entirely.
+
+There is a menu button right of the board. It opens the game's main menu.
+
+## Implemenation notes
+
+The game engine always generates 15 puzzles which can be solved.
 
 Have fun!
diff --git a/apps/puzzle15/introscreen.png b/apps/puzzle15/introscreen.png
new file mode 100644
index 0000000000000000000000000000000000000000..766cd61fadbcf8afb58f5bbea090796c89df5eb1
GIT binary patch
literal 3717
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

literal 0
HcmV?d00001

diff --git a/apps/puzzle15/puzzle15.app.js b/apps/puzzle15/puzzle15.app.js
index 801cdf759..c5c60bb0f 100644
--- a/apps/puzzle15/puzzle15.app.js
+++ b/apps/puzzle15/puzzle15.app.js
@@ -5,6 +5,8 @@
 // *** Global settings
 // Note: These could be changed by settings later...
 
+const introscreen = E.toArrayBuffer(atob("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"));
+
 // Minimum number of pixels to interpret it as drag gesture
 const dragThreshold = 10;
 
@@ -322,28 +324,42 @@ class Board {
     for (i = 0; i < buttonsPerBoard; i++)
       this.fields[i] = Field.forIndex(i);
     this.setShuffled();
+    //this.setAlmostSolved(); // to test the game end
   }
-  // Set the board into the "solved" position
+  // Set the board into the "solved" position. Useful for showcasing
   setSolved() {
     this.buttons = [];
     for (i = 0; i < buttonsPerBoard; i++)
       this.buttons[i] = new Stone((i + 1) % buttonsPerBoard, i);
     this.moveCount = 0;
   }
+  // Initialize an almost solved playing field. Useful for tests and development
+  setAlmostSolved() {
+    this.setSolved();
+    b = this.buttons[this.buttons.length - 1];
+    this.buttons[this.buttons.length - 1] = this.buttons[this.buttons.length - 2];
+    this.buttons[this.buttons.length - 2] = b;
+  }
+  // Initialize a shuffled field. The fields are always solvable.
   setShuffled() {
-    let nrs = [];
+    let nrs = []; // numbers of the stones
     for (i = 0; i < buttonsPerBoard; i++)
       nrs[i] = i;
     this.buttons = [];
     let count = buttonsPerBoard;
     for (i = 0; i < buttonsPerBoard; i++) {
+      // Take a random number of the (remaining) numbers
       let curridx = Math.floor(Math.random() * count);
       let currnr = nrs[curridx];
+      // Initialize the next button with that random number
       this.buttons[i] = new Stone(currnr, (currnr + (buttonsPerBoard - 1)) % buttonsPerBoard);
+      // Remove the number just taken from the list of numbers
       for (j = curridx + 1; j < count; j++)
         nrs[j - 1] = nrs[j];
       count -= 1;
     }
+    // not solvable: Swap the first and second stone which are not the gap.
+    // This will always result in a solvable board.
     if (!this.isSolvable()) {
       let a = (this.buttons[0].number === 0 ? 2 : 0);
       let b = (this.buttons[1].number === 0 ? 2 : 1);
@@ -457,7 +473,8 @@ class Board {
   // draw the result field, pass null as argument if not called from worker
   drawResult(worker) {
     let field = this.resultField;
-    if (this.isSolved())
+    let solved = this.isSolved();
+    if (solved)
       g.setColor(0, 1, 0);
     else
       g.setColor(1, 0, 0);
@@ -467,6 +484,10 @@ class Board {
     g.setFont("Vector", 14).setFontAlign(0, 0).drawString(this.moveCount, field.centerx, field.centery);
     if (worker !== null)
       worker.endTask();
+    if (solved)
+      setTimeout(() => {
+        gameEnd(this.moveCount);
+      }, 500);
   }
   // draws the menu button
   drawMenu() {
@@ -479,22 +500,39 @@ class Board {
     let r = field.left + buttonsize - 8;
     let t = field.top + 5;
     for (i = 0; i < 3; i++)
-      g.fillRect(l, t + (i * 7), r, t + (i * 7) + 3);
+      g.fillRect(l, t + (i * 6), r, t + (i * 6) + 2);
   }
 }
 
-/*
-// Main class, containing the complete game logic
-class Puzzle15 {
-  constructor() {
-    this.worker=new Worker();
-    this.board=new Board();
-  }
+function framedText(text, x, y, textcol, framecol) {
+  g.setColor(framecol);
+  for (i = -2; i < 3; i++)
+    for (j = -2; j < 3; j++) {
+      if (i === 0 && j === 0)
+        continue;
+      g.drawString(text, x + i, y + j);
+    }
+  g.setColor(textcol).drawString(text, x, y);
+}
+
+function showSplash(afterSplash) {
+  g.reset();
+  g.drawImage(introscreen, 0, 0);
+  setTimeout(() => {
+    g.setFont("Vector", 40).setFontAlign(0, 0);
+    framedText("15", g.getWidth() / 2, g.getHeight() / 2 - g.getFontHeight() * 0.66, "#f00", "#fff");
+    setTimeout(() => {
+      g.setFont("Vector", 40).setFontAlign(0, 0);
+      framedText("Puzzle", g.getWidth() / 2, g.getHeight() / 2 + g.getFontHeight() * 0.66, "#f00", "#fff");
+      setTimeout(afterSplash, 2000);
+    }, 1000);
+  }, 2000);
 }
-*/
 
 // *** Main program
 
+g.reset();
+
 // We need a worker...
 var worker = new Worker();
 
@@ -504,48 +542,61 @@ var board = new Board();
 
 var dragger;
 
+// Initialize the game with an explicit number of stones per line
 function initGame(bpl) {
   setButtonsPerLine(bpl);
+  newGame();
+}
+
+// Start a new game with the same number of stones per line as before
+function newGame() {
   board = new Board();
+  continueGame();
+}
+
+// Continue the currently running game
+function continueGame() {
+  E.showMenu();
   board.draw();
   dragger.setEnabled(true);
 }
 
-function showMenu() {
+// Show message on game end, allows to restart new game
+function gameEnd(moveCount) {
+  dragger.setEnabled(false);
+  E.showPrompt("You solved the\n" + buttonsPerLine + "x" + buttonsPerLine + " puzzle in\n" + moveCount + " move" + (moveCount === 1 ? "" : "s") + ".", {
+    title: "Puzzle solved",
+    buttons: {
+      "Again": newGame,
+      "Menu": () => showMenu(false),
+      "Exit": load
+    }
+  }).then(v => {
+    E.showPrompt();
+    setTimeout(v, 10);
+  });
+}
+
+function showMenu(withContinue) {
   var mainmenu = {
     "": {
       "title": "15 Puzzle"
-    },
-    "< Back": () => {
-      E.showMenu();
-      dragger.setEnabled(true);
-      board.draw();
-    }, // remove the menu
-    "Start 3x3": function() {
-      E.showMenu();
-      initGame(3);
-    },
-    "Start 4x4": function() {
-      E.showMenu();
-      initGame(4);
-    },
-    "Start 5x5": function() {
-      E.showMenu();
-      initGame(5);
     }
   };
+  if (withContinue)
+    mainmenu.Continue = continueGame;
+  mainmenu["Start 3x3"] = () => initGame(3);
+  mainmenu["Start 4x4"] = () => initGame(4);
+  mainmenu["Start 5x5"] = () => initGame(5);
+  mainmenu.Exit = () => load();
   dragger.setEnabled(false);
-
+  g.clear(true);
   E.showMenu(mainmenu);
 }
 
 function handleclick(e) {
-  if (board.menuField.contains(e.x, e.y)) {
-    console.log("GGG - handleclick, dragger: " + dragger);
-    g.reset();
-    showMenu();
-    console.log("showing menu ended");
-  }
+  if (board.menuField.contains(e.x, e.y))
+    setTimeout(() => showMenu(true), 10);
 }
 
 // Handle a drag event
@@ -556,24 +607,18 @@ function handledrag(e) {
   worker.addTask(e => board.drawResult(e));
 }
 
-// Clear the screen once, at startup
-g.clear();
-
-// Clock mode allows short-press on button to exit
-Bangle.setUI("clock");
-// Load widgets
-Bangle.loadWidgets();
-Bangle.drawWidgets();
-
-// Draw the board initially
-board.draw();
-
 dragger = new Dragger(handleclick, handledrag, clickThreshold, dragThreshold);
 
-showMenu();
 // Start the interaction
 dragger.attach();
 
-console.log("GGG - main program, dragger: " + dragger);
+showSplash(() => {
+  // Clock mode allows short-press on button to exit
+  Bangle.setUI("clock");
+  // Load widgets
+  Bangle.loadWidgets();
+  Bangle.drawWidgets();
+  showMenu(false);
+}, 5000);
 
 // end of file
\ No newline at end of file

From 3633078a46a9526a15c023e58aeec3730692e8df Mon Sep 17 00:00:00 2001
From: "Dirk Hillbrecht (home)" <dirk@hillbrecht.de>
Date: Tue, 4 Jan 2022 17:35:52 +0100
Subject: [PATCH 43/45] Puzzle15: v0.04 with settings, formatting changes,
 about screen

---
 apps.json                          |   6 +-
 apps/puzzle15/ChangeLog            |   1 +
 apps/puzzle15/README.md            |  40 +++-
 apps/puzzle15/puzzle15.app.js      | 357 ++++++++++++++++++++---------
 apps/puzzle15/puzzle15.settings.js |  50 ++++
 5 files changed, 339 insertions(+), 115 deletions(-)
 create mode 100644 apps/puzzle15/puzzle15.settings.js

diff --git a/apps.json b/apps.json
index f6ef51546..3a390938d 100644
--- a/apps.json
+++ b/apps.json
@@ -5393,7 +5393,7 @@
   {
     "id": "puzzle15",
     "name": "15 puzzle",
-    "version": "0.03",
+    "version": "0.04",
     "description": "A 15 puzzle game with drag gesture interface",
     "readme":"README.md",
     "icon": "puzzle15.app.png",
@@ -5404,7 +5404,9 @@
     "allow_emulator": true,
     "storage": [
       {"name":"puzzle15.app.js","url":"puzzle15.app.js"},
+      {"name":"puzzle15.settings.js","url":"puzzle15.settings.js"},
       {"name":"puzzle15.img","url":"puzzle15.app-icon.js","evaluate":true}
-    ]
+    ],
+    "data": [{"name":"puzzle15.json"}]
   }
 ]
diff --git a/apps/puzzle15/ChangeLog b/apps/puzzle15/ChangeLog
index d7458c968..bd6af53d8 100644
--- a/apps/puzzle15/ChangeLog
+++ b/apps/puzzle15/ChangeLog
@@ -1,3 +1,4 @@
 0.01: Initial version, UI mechanics ready, no real game play so far
 0.02: Lots of enhancements, menu system not yet functional, but packaging should be now...
 0.03: Menu logic now generally functioning, splash screen added. The first really playable version!
+0.04: Settings dialog, about screen
diff --git a/apps/puzzle15/README.md b/apps/puzzle15/README.md
index eddeb3b94..16c0c4593 100644
--- a/apps/puzzle15/README.md
+++ b/apps/puzzle15/README.md
@@ -4,13 +4,16 @@ This is a Bangle.js 2 adoption of the famous 15 puzzle.
 
 ## The game
 
-A board of n x n fields is filled with n²-1 numbered stones.
+A board of _n_ by _n_ fields is filled with _n^2-1_ numbered stones. So, one field, the "gap", is left free.
+
 Bring them in the correct order so that the gap is finally at the bottom right of the playing field.
 The less moves you need, the better you are.
 
+If _n_ is 4, the number of stones is _16-1=15_. Hence the name of the game.
+
 ## How to play
 
-Select whether you want to play on a board with 3 x 3, 4 x 4, or 5 x 5 fields.
+If you start the game, it shows a splash screen and then generates a shuffled 4x4 board with a 15 puzzle.
 Move the stones with drag gestures on the screen.
 If you want to move the stone below the gap upward, drag from the bottom of the screen upward.
 The drag gestures can be performed anywhere on the screen, there is no need to start or end them on the stone to be moved.
@@ -18,10 +21,37 @@ The drag gestures can be performed anywhere on the screen, there is no need to s
 If you managed to order the stones correctly, a success message appears.
 You can continue with another game, go to the game's main menu, or quit the game entirely.
 
-There is a menu button right of the board. It opens the game's main menu.
+There is a grey menu button right of the board containing the well-known three-bar menu symbol ("Hamburger menu").
+It opens the game's main menu directly from within the game.
 
-## Implemenation notes
+## The main menu
 
-The game engine always generates 15 puzzles which can be solved.
+Puzzle15 has a main menu which can be reached from the in-game menu button or the end-of-game message window.
+It features the following options:
+
+* **Continue** - Continue the currently running game. _This option is only shown if the main menu is opened during an open game._
+* **Start 3x3**, **Start 4x4**, **Start 5x5** - Start a new game on a board with the respective dimension. Any currently open game is dropped.
+* **About** Show a small "About" info box.
+* **Exit** Exit Puzzle15 and return to the default watch face.
+
+## Game settings
+
+The game has some global settings which can be accessed on the usual way through the Bangle.js' app settings user interface.
+Currently it has the following options:
+
+* **Splash** - Define whether the game should open with a splash screen. **long** shows the splash screen for five seconds, **short** shows it for two seconds. **off** starts the app _without_ a splash screen, it directly comes up with whatever the "Start with" option says.
+* **Start with** - What should happen after the splash screen (or, if it is disabled, directly at app start): **3x3**, **4x4** and **5x5** start the game with a board of the respective dimension, **menu** shows the main menu which allows to select the board size.
+
+## Implementation notes
+
+The game engine always generates puzzles which can be solved.
+
+Solvability is detected by counting inversions,
+i.e. pairs of stones where the stone at the earlier field (row-wise, left to right, top to bottom) has a number _greater than_ the stone on the later field, with all pairs of stones compared.
+The algorithm is described at https://www.geeksforgeeks.org/check-instance-15-puzzle-solvable/ .
+
+## The splash screen
+
+The Splash screen shows a part of the illustration "The 14-15-puzzle in puzzleland" from Sam Loyd. Other than Puzzle15, it depicts a 15 puzzle with the stones "14" and "15" swapped. This puzzle is indeed *not* solvable.
 
 Have fun!
diff --git a/apps/puzzle15/puzzle15.app.js b/apps/puzzle15/puzzle15.app.js
index c5c60bb0f..e66f9b9bb 100644
--- a/apps/puzzle15/puzzle15.app.js
+++ b/apps/puzzle15/puzzle15.app.js
@@ -2,36 +2,37 @@
 // (C) Dirk Hillbrecht 2022
 // Released unter the terms of the MIT license
 
-// *** Global settings
-// Note: These could be changed by settings later...
-
+// The intro screen as large base-64-encoded binary data
 const introscreen = E.toArrayBuffer(atob("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"));
 
+// *** Global constants from which several other settings are derived
+
 // Minimum number of pixels to interpret it as drag gesture
 const dragThreshold = 10;
 
 // Maximum number of pixels to interpret a click from a drag event series
 const clickThreshold = 3;
 
-// Number of steps in button move animation
+// Number of steps in stone move animation
 const animationSteps = 6;
 
 // Milliseconds to wait between move animation steps
 const animationWaitMillis = 30;
 
-// *** Global settings derived by device characteristics
-
 // Total width of the playing field (full screen width)
 const fieldw = g.getWidth();
 
 // Total height of the playing field (screen height minus widget zones)
 const fieldh = g.getHeight() - 48;
 
-// Size of the playing field
-var buttonsPerLine;
 
-// Size of one button
-var buttonsize;
+// *** Global game characteristics
+
+// Size of the playing field
+var stonesPerLine;
+
+// Size of one field
+var stonesize;
 
 // Actual left start of the playing field (so that it is centered)
 var leftstart;
@@ -39,18 +40,51 @@ var leftstart;
 // Actual top start of the playing field (so that it is centered)
 var topstart;
 
-// Number of buttons on the board (needed at several occasions)
-var buttonsPerBoard;
+// Number of stones on the board (needed at several occasions)
+var stonesPerBoard;
 
-// Set the buttons per line globally and all derived values, too
-function setButtonsPerLine(bPL) {
-  buttonsPerLine = bPL;
-  buttonsize = Math.floor(Math.min(fieldw / (buttonsPerLine + 1), fieldh / buttonsPerLine)) - 2;
-  leftstart = (fieldw - ((buttonsPerLine + 1) * buttonsize + 8)) / 2;
-  topstart = 24 + ((fieldh - (buttonsPerLine * buttonsize + 6)) / 2);
-  buttonsPerBoard = (buttonsPerLine * buttonsPerLine);
+// Set the stones per line globally and all derived values, too
+function setStonesPreLine(bPL) {
+  stonesPerLine = bPL;
+  stonesize = Math.floor(Math.min(fieldw / (stonesPerLine + 1), fieldh / stonesPerLine)) - 2;
+  leftstart = (fieldw - ((stonesPerLine + 1) * stonesize + 8)) / 2;
+  topstart = 24 + ((fieldh - (stonesPerLine * stonesize + 6)) / 2);
+  stonesPerBoard = (stonesPerLine * stonesPerLine);
 }
 
+
+// *** Global app settings
+
+var SETTINGSFILE = "puzzle15.json";
+
+// variables defined from settings
+var splashMode;
+var startWith;
+
+/* For development purposes
+require('Storage').writeJSON(SETTINGSFILE, {
+  splashMode: "off",
+  startWith: "5x5",
+});
+/* */
+
+/* OR (also for development purposes)
+require('Storage').erase(SETTINGSFILE);
+/* */
+
+// Helper method for loading the settings
+function def(value, def) {
+  return (value !== undefined ? value : def);
+}
+
+// Load settings
+function loadSettings() {
+  var settings = require('Storage').readJSON(SETTINGSFILE, true) || {};
+  splashMode = def(settings.splashMode, "long");
+  startWith = def(settings.startWith, "4x4");
+}
+
+
 // *** Low level helper classes
 
 // One node of a first-in-first-out storage
@@ -64,11 +98,13 @@ class FifoNode {
 // Simple first-in-first-out (fifo) storage
 // Needed to keep the stone movements in order
 class Fifo {
+
   // Initialize an empty Fifo
   constructor() {
     this.first = null;
     this.last = null;
   }
+
   // Add an element to the end of the internal fifo queue
   add(payload) {
     if (this.last === null) { // queue is empty
@@ -80,6 +116,7 @@ class Fifo {
       this.last = newlast;
     }
   }
+
   // Returns the first element in the queue, null if it is empty
   remove() {
     if (this.first === null)
@@ -90,10 +127,12 @@ class Fifo {
       this.last = null;
     return oldfirst.payload;
   }
+
   // Returns if the fifo is empty, i.e. it does not hold any elements
   isEmpty() {
     return (this.first === null);
   }
+
 }
 
 // Helper class to keep track of tasks
@@ -104,11 +143,13 @@ class Fifo {
 // previously scheduled tasks have finished.
 // Tasks must be functions with the Worker as first and only parameter.
 class Worker {
+
   // Create an empty worker
   constructor() {
     this.tasks = new Fifo();
     this.busy = false;
   }
+
   // Add a task to the worker
   addTask(task) {
     if (this.busy) // other task is running: Queue this task
@@ -118,6 +159,7 @@ class Worker {
       task(this);
     }
   }
+
   // Called by the task once it finished
   endTask() {
     if (this.tasks.isEmpty()) // No more tasks queued: Become idle
@@ -125,6 +167,7 @@ class Worker {
     else // Call the next task immediately
       this.tasks.remove()(this);
   }
+
 }
 
 // Evaluate "drag" events from the UI and call handlers for drags or clicks
@@ -135,6 +178,7 @@ class Worker {
 // otherwise as drag.
 // The approprate method is called with the data of the drag.
 class Dragger {
+
   constructor(clickHandler, dragHandler, clickThreshold, dragThreshold) {
     this.clickHandler = clickHandler;
     this.dragHandler = dragHandler;
@@ -144,10 +188,12 @@ class Dragger {
     this.dy = 0;
     this.enabled = true;
   }
+
   // Enable or disable the Dragger
   setEnabled(b) {
     this.enabled = b;
   }
+
   // Handle a raw drag event from the UI
   handleRawDrag(e) {
     if (!this.enabled)
@@ -171,6 +217,7 @@ class Dragger {
       this.dy = 0;
     }
   }
+
   // Attach the drag evaluator to the UI
   attach() {
     Bangle.on("drag", e => this.handleRawDrag(e));
@@ -185,37 +232,43 @@ class Dragger {
 // During an animation, a series of interim field instances is generated
 // which represents the locations of a stone during the animation.
 class Field {
+
   // Generate a field with a left and a top coordinate.
   // Note that these coordinates are "cooked", i.e. they contain all offsets
   // needed place the elements globally correct on the screen
   constructor(left, top) {
     this.left = left;
     this.top = top;
-    this.centerx = (left + buttonsize / 2) + 1;
-    this.centery = (top + buttonsize / 2) + 2;
+    this.centerx = (left + stonesize / 2) + 1;
+    this.centery = (top + stonesize / 2) + 2;
   }
+
   // Returns whether this field contains the given coordinate
   contains(x, y) {
-    return (this.left < x && this.left + buttonsize > x &&
-      this.top < y && this.top + buttonsize > y);
+    return (this.left < x && this.left + stonesize > x &&
+      this.top < y && this.top + stonesize > y);
   }
+
   // Generate a field for the given playing field index.
   // Playing field indexes start at top left with "0"
   // and go from left to right line by line from top to bottom.
   static forIndex(index) {
-    return new Field(leftstart + (index % buttonsPerLine) * (buttonsize + 2),
-      topstart + (Math.floor(index / buttonsPerLine)) * (buttonsize + 2));
+    return new Field(leftstart + (index % stonesPerLine) * (stonesize + 2),
+      topstart + (Math.floor(index / stonesPerLine)) * (stonesize + 2));
+
   }
   // Special field for the result "stone"
   static forResult() {
-    return new Field(leftstart + (buttonsPerLine * (buttonsize + 2)),
-      topstart + ((buttonsPerLine - 1) * (buttonsize + 2)));
+    return new Field(leftstart + (stonesPerLine * (stonesize + 2)),
+      topstart + ((stonesPerLine - 1) * (stonesize + 2)));
   }
+
   // Special field for the menu
   static forMenu() {
-    return new Field(leftstart + (buttonsPerLine * (buttonsize + 2)),
+    return new Field(leftstart + (stonesPerLine * (stonesize + 2)),
       topstart);
   }
+
 }
 
 // Representation of a moveable stone of the game.
@@ -224,6 +277,7 @@ class Field {
 // Stone "0" represents the gap on the playing field.
 // The main knowledge of a Stone instance is how to draw itself.
 class Stone {
+
   // Create stone with the given number
   // The constructor creates the "draw()" function which is used to draw the stone
   constructor(number, targetindex) {
@@ -232,22 +286,23 @@ class Stone {
     // gap: Does not draw anything
     if (number === 0)
       this.draw = function(field) {};
-    else if ((number + (buttonsPerLine % 2 == 0 ? (Math.floor((number - 1) / buttonsPerLine)) : 0)) % 2 == 0) {
+    else if ((number + (stonesPerLine % 2 == 0 ? (Math.floor((number - 1) / stonesPerLine)) : 0)) % 2 == 0) {
       // Black stone
       this.draw = function(field) {
-        g.setFont("Vector", 20).setFontAlign(0, 0).setColor(0, 0, 0);
-        g.fillRect(field.left, field.top, field.left + buttonsize, field.top + buttonsize);
+        g.setFont("Vector", (stonesPerLine === 5 ? 16 : 20)).setFontAlign(0, 0).setColor(0, 0, 0);
+        g.fillRect(field.left, field.top, field.left + stonesize, field.top + stonesize);
         g.setColor(1, 1, 1).drawString(number, field.centerx, field.centery);
       };
     } else {
       // White stone
       this.draw = function(field) {
-        g.setFont("Vector", 20).setFontAlign(0, 0).setColor(0, 0, 0);
-        g.drawRect(field.left, field.top, field.left + buttonsize, field.top + buttonsize);
+        g.setFont("Vector", (stonesPerLine === 5 ? 16 : 20)).setFontAlign(0, 0).setColor(0, 0, 0);
+        g.drawRect(field.left, field.top, field.left + stonesize, field.top + stonesize);
         g.drawString(number, field.centerx, field.centery);
       };
     }
   }
+
   // Returns whether this stone is on its target index
   isOnTarget(index) {
     return index === this.targetindex;
@@ -256,6 +311,7 @@ class Stone {
 
 // Helper class which knows how to clear the rectangle opened up by the two given fields
 class Clearer {
+
   // Create a clearer for the area between the two given fields
   constructor(startfield, endfield) {
     this.minleft = Math.min(startfield.left, endfield.left);
@@ -263,16 +319,19 @@ class Clearer {
     this.maxleft = Math.max(startfield.left, endfield.left);
     this.maxtop = Math.max(startfield.top, endfield.top);
   }
+
   // Clear the area defined by this clearer
   clearArea() {
     g.setColor(1, 1, 1);
     g.fillRect(this.minleft, this.mintop,
-      this.maxleft + buttonsize, this.maxtop + buttonsize);
+      this.maxleft + stonesize, this.maxtop + stonesize);
   }
+
 }
 
 // Helper class which moves a stone between two fields
 class Mover extends Clearer {
+
   // Create a mover which moves the given stone from startfield to endfield
   // and animate the move in the given number of steps
   constructor(stone, startfield, endfield, steps) {
@@ -282,11 +341,13 @@ class Mover extends Clearer {
     this.endfield = endfield;
     this.steps = steps;
   }
+
   // Create the coordinate between start and end for the given step
   // Computation uses sinus for a smooth movement
   stepCoo(start, end, step) {
     return start + ((end - start) * ((1 + Math.sin((step / this.steps) * Math.PI - (Math.PI / 2))) / 2));
   }
+
   // Compute the interim field for the stone to place during the animation
   stepField(step) {
     return new Field(
@@ -295,6 +356,7 @@ class Mover extends Clearer {
       (this.mintop === this.maxtop ? this.mintop :
         this.stepCoo(this.startfield.top, this.endfield.top, step)));
   }
+
   // Perform one animation step
   animateStep(step, worker) {
     this.clearArea();
@@ -306,53 +368,60 @@ class Mover extends Clearer {
     else // all steps done: Inform the worker
       worker.endTask();
   }
+
   // Start the animation, this method is called by the worker
   animate(worker) {
     this.animateStep(1, worker);
   }
+
 }
 
 // Representation of the playing field
 // Knows to draw the field and to move a stone into a gap
-// TODO: More game mechanics (solving,...)
 class Board {
-  // Generates the actual playing field with all fields and buttons
+
+  // Generates the actual playing field with all fields and stones
   constructor() {
     this.fields = [];
     this.resultField = Field.forResult();
     this.menuField = Field.forMenu();
-    for (i = 0; i < buttonsPerBoard; i++)
+    for (i = 0; i < stonesPerBoard; i++)
       this.fields[i] = Field.forIndex(i);
     this.setShuffled();
     //this.setAlmostSolved(); // to test the game end
   }
+
+  /*
   // Set the board into the "solved" position. Useful for showcasing
   setSolved() {
-    this.buttons = [];
-    for (i = 0; i < buttonsPerBoard; i++)
-      this.buttons[i] = new Stone((i + 1) % buttonsPerBoard, i);
+    this.stones = [];
+    for (i = 0; i < stonesPerBoard; i++)
+      this.stones[i] = new Stone((i + 1) % stonesPerBoard, i);
     this.moveCount = 0;
   }
+
   // Initialize an almost solved playing field. Useful for tests and development
   setAlmostSolved() {
     this.setSolved();
-    b = this.buttons[this.buttons.length - 1];
-    this.buttons[this.buttons.length - 1] = this.buttons[this.buttons.length - 2];
-    this.buttons[this.buttons.length - 2] = b;
+    b = this.stones[this.stones.length - 1];
+    this.stones[this.stones.length - 1] = this.stones[this.stones.length - 2];
+    this.stones[this.stones.length - 2] = b;
   }
+  */
+
   // Initialize a shuffled field. The fields are always solvable.
   setShuffled() {
     let nrs = []; // numbers of the stones
-    for (i = 0; i < buttonsPerBoard; i++)
+    for (i = 0; i < stonesPerBoard; i++)
       nrs[i] = i;
-    this.buttons = [];
-    let count = buttonsPerBoard;
-    for (i = 0; i < buttonsPerBoard; i++) {
+    this.stones = [];
+    let count = stonesPerBoard;
+    for (i = 0; i < stonesPerBoard; i++) {
       // Take a random number of the (remaining) numbers
       let curridx = Math.floor(Math.random() * count);
       let currnr = nrs[curridx];
-      // Initialize the next button with that random number
-      this.buttons[i] = new Stone(currnr, (currnr + (buttonsPerBoard - 1)) % buttonsPerBoard);
+      // Initialize the next stone with that random number
+      this.stones[i] = new Stone(currnr, (currnr + (stonesPerBoard - 1)) % stonesPerBoard);
       // Remove the number just taken from the list of numbers
       for (j = curridx + 1; j < count; j++)
         nrs[j - 1] = nrs[j];
@@ -361,52 +430,68 @@ class Board {
     // not solvable: Swap the first and second stone which are not the gap.
     // This will always result in a solvable board.
     if (!this.isSolvable()) {
-      let a = (this.buttons[0].number === 0 ? 2 : 0);
-      let b = (this.buttons[1].number === 0 ? 2 : 1);
-      let bx = this.buttons[a];
-      this.buttons[a] = this.buttons[b];
-      this.buttons[b] = bx;
+      let a = (this.stones[0].number === 0 ? 2 : 0);
+      let b = (this.stones[1].number === 0 ? 2 : 1);
+      let bx = this.stones[a];
+      this.stones[a] = this.stones[b];
+      this.stones[b] = bx;
     }
     this.moveCount = 0;
   }
+
   // Draws the complete playing field
   draw() {
     new Clearer(this.fields[0], this.fields[this.fields.length - 1]).clearArea();
     for (i = 0; i < this.fields.length; i++)
-      this.buttons[i].draw(this.fields[i]);
+      this.stones[i].draw(this.fields[i]);
     this.drawResult(null);
     this.drawMenu();
   }
+
   // returns the index of the field left of the field with the given index,
   // -1 if there is none (index indicates already a leftmost field on the board)
   leftOf(index) {
-    return (index % buttonsPerLine === 0 ? -1 : index - 1);
+    return (index % stonesPerLine === 0 ? -1 : index - 1);
   }
+
+  // returns the index of the field right of the field with the given index,
+  // -1 if there is none (index indicates already a rightmost field on the board)
   rightOf(index) {
-    return (index % buttonsPerLine === (buttonsPerLine - 1) ? -1 : index + 1);
+    return (index % stonesPerLine === (stonesPerLine - 1) ? -1 : index + 1);
   }
+
+  // returns the index of the field top of the field with the given index,
+  // -1 if there is none (index indicates already a topmost field on the board)
   topOf(index) {
-    return (index >= buttonsPerLine ? index - buttonsPerLine : -1);
+    return (index >= stonesPerLine ? index - stonesPerLine : -1);
   }
+
+  // returns the index of the field bottom of the field with the given index,
+  // -1 if there is none (index indicates already a bottommost field on the board)
   bottomOf(index) {
-    return (index < (buttonsPerLine - 1) * buttonsPerLine ? index + buttonsPerLine : -1);
+    return (index < (stonesPerLine - 1) * stonesPerLine ? index + stonesPerLine : -1);
   }
+
   // Return the index of the gap in the field, -1 if there is none (should never happel)
   indexOf0() {
-    for (i = 0; i < this.buttons.length; i++)
-      if (this.buttons[i].number === 0)
+    for (i = 0; i < this.stones.length; i++)
+      if (this.stones[i].number === 0)
         return i;
     return -1;
   }
+
   // Returns the row in which the gap is, 0 is upmost
   rowOf0() {
     let idx = this.indexOf0();
     if (idx < 0)
       return -1;
-    return Math.floor(idx / buttonsPerLine);
+    return Math.floor(idx / stonesPerLine);
   }
-  // Moves the stone at the field with the index found by the startfunc operation
-  // into the gap field.
+
+  // Searches the gap on the field and then moves one of the adjacent stones into it.
+  // The stone is selected by the given startfunc which returns the index
+  // of the selected adjacent field.
+  // Startfunc is one of (left|right|top|bottom)Of.
   moveTo0(startfunc, worker) {
     let endidx = this.indexOf0(); // Target field (the gap)
     if (endidx === -1) {
@@ -418,58 +503,71 @@ class Board {
       worker.endTask();
       return;
     }
-    let moved = this.buttons[startidx];
-    this.buttons[startidx] = this.buttons[endidx];
-    this.buttons[endidx] = moved;
+    // Replace in the internal representation
+    let moved = this.stones[startidx];
+    this.stones[startidx] = this.stones[endidx];
+    this.stones[endidx] = moved;
     this.moveCount += 1;
+    // Move on screen using an animation effect.
     new Mover(moved, this.fields[startidx], this.fields[endidx], animationSteps).animate(worker);
   }
-  // Move the stone right fro the gap into the gap
+
+  // Move the stone right from the gap into the gap
   moveRight(worker) {
     this.moveTo0(this.leftOf, worker);
   }
+
+  // Move the stone left from the gap into the gap
   moveLeft(worker) {
     this.moveTo0(this.rightOf, worker);
   }
+
+  // Move the stone above the gap into the gap
   moveUp(worker) {
     this.moveTo0(this.bottomOf, worker);
   }
+
+  // Move the stone below the gap into the gap
   moveDown(worker) {
     this.moveTo0(this.topOf, worker);
   }
+
   // Check if the board is solved (all stones at the right position)
   isSolved() {
-    for (i = 0; i < this.buttons.length; i++)
-      if (!this.buttons[i].isOnTarget(i))
+    for (i = 0; i < this.stones.length; i++)
+      if (!this.stones[i].isOnTarget(i))
         return false;
     return true;
   }
+
   // counts the inversions on the board
   // see https://www.geeksforgeeks.org/check-instance-15-puzzle-solvable/
   getInversionCount() {
     let inversions = 0;
-    for (outer = 0; outer < buttonsPerBoard - 1; outer++) {
-      let outernr = this.buttons[outer].number;
+    for (outer = 0; outer < stonesPerBoard - 1; outer++) {
+      let outernr = this.stones[outer].number;
       if (outernr === 0)
         continue;
-      for (inner = outer + 1; inner < buttonsPerBoard; inner++) {
-        let innernr = this.buttons[inner].number;
+      for (inner = outer + 1; inner < stonesPerBoard; inner++) {
+        let innernr = this.stones[inner].number;
         if (innernr > 0 && outernr > innernr)
           inversions++;
       }
     }
     return inversions;
   }
+
   // return whether the puzzle is solvable
   // see https://www.geeksforgeeks.org/check-instance-15-puzzle-solvable/
   isSolvable() {
     let invs = this.getInversionCount();
-    if (buttonsPerLine % 2 !== 0) // odd number of rows/columns
+    if (stonesPerLine % 2 !== 0) // odd number of rows/columns
       return (invs % 2 === 0);
     else {
       return ((invs + this.rowOf0()) % 2 !== 0);
     }
   }
+
   // draw the result field, pass null as argument if not called from worker
   drawResult(worker) {
     let field = this.resultField;
@@ -478,9 +576,9 @@ class Board {
       g.setColor(0, 1, 0);
     else
       g.setColor(1, 0, 0);
-    g.fillRect(field.left, field.top, field.left + buttonsize, field.top + buttonsize);
+    g.fillRect(field.left, field.top, field.left + stonesize, field.top + stonesize);
     g.setColor(0, 0, 0);
-    g.drawRect(field.left, field.top, field.left + buttonsize, field.top + buttonsize);
+    g.drawRect(field.left, field.top, field.left + stonesize, field.top + stonesize);
     g.setFont("Vector", 14).setFontAlign(0, 0).drawString(this.moveCount, field.centerx, field.centery);
     if (worker !== null)
       worker.endTask();
@@ -489,21 +587,29 @@ class Board {
         gameEnd(this.moveCount);
       }, 500);
   }
+
   // draws the menu button
   drawMenu() {
     let field = this.menuField;
     g.setColor(0.5, 0.5, 0.5);
-    g.fillRect(field.left, field.top, field.left + buttonsize, field.top + buttonsize);
+    g.fillRect(field.left, field.top, field.left + stonesize, field.top + stonesize);
     g.setColor(0, 0, 0);
-    g.drawRect(field.left, field.top, field.left + buttonsize, field.top + buttonsize);
+    g.drawRect(field.left, field.top, field.left + stonesize, field.top + stonesize);
     let l = field.left + 8;
-    let r = field.left + buttonsize - 8;
+    let r = field.left + stonesize - 8;
     let t = field.top + 5;
     for (i = 0; i < 3; i++)
       g.fillRect(l, t + (i * 6), r, t + (i * 6) + 2);
   }
+
 }
 
+
+// *** Global helper methods
+
+// draw some text with some surrounding to increase contrast
+// text is drawn at given (x,y) position with textcol.
+// frame is drawn 2 pixels around (x,y) in each direction in framecol.
 function framedText(text, x, y, textcol, framecol) {
   g.setColor(framecol);
   for (i = -2; i < 3; i++)
@@ -515,36 +621,32 @@ function framedText(text, x, y, textcol, framecol) {
   g.setColor(textcol).drawString(text, x, y);
 }
 
+// Show the splash screen at program start, call afterSplash afterwards.
+// If spash mode is "off", call afterSplash directly.
 function showSplash(afterSplash) {
-  g.reset();
-  g.drawImage(introscreen, 0, 0);
-  setTimeout(() => {
-    g.setFont("Vector", 40).setFontAlign(0, 0);
-    framedText("15", g.getWidth() / 2, g.getHeight() / 2 - g.getFontHeight() * 0.66, "#f00", "#fff");
+  if (splashMode === "off")
+    afterSplash();
+  else {
+    g.reset();
+    g.drawImage(introscreen, 0, 0);
     setTimeout(() => {
       g.setFont("Vector", 40).setFontAlign(0, 0);
-      framedText("Puzzle", g.getWidth() / 2, g.getHeight() / 2 + g.getFontHeight() * 0.66, "#f00", "#fff");
-      setTimeout(afterSplash, 2000);
-    }, 1000);
-  }, 2000);
+      framedText("15", g.getWidth() / 2, g.getHeight() / 2 - g.getFontHeight() * 0.66, "#f00", "#fff");
+      setTimeout(() => {
+        g.setFont("Vector", 40).setFontAlign(0, 0);
+        framedText("Puzzle", g.getWidth() / 2, g.getHeight() / 2 + g.getFontHeight() * 0.66, "#f00", "#fff");
+        setTimeout(afterSplash, (splashMode === "long" ? 2000 : 1000));
+      }, (splashMode === "long" ? 1000 : 1));
+    }, (splashMode === "long" ? 2000 : 1000));
+  }
 }
 
-// *** Main program
 
-g.reset();
-
-// We need a worker...
-var worker = new Worker();
-
-setButtonsPerLine(3);
-// ...and the board
-var board = new Board();
-
-var dragger;
+// *** Global flow control
 
 // Initialize the game with an explicit number of stones per line
 function initGame(bpl) {
-  setButtonsPerLine(bpl);
+  setStonesPreLine(bpl);
   newGame();
 }
 
@@ -564,7 +666,7 @@ function continueGame() {
 // Show message on game end, allows to restart new game
 function gameEnd(moveCount) {
   dragger.setEnabled(false);
-  E.showPrompt("You solved the\n" + buttonsPerLine + "x" + buttonsPerLine + " puzzle in\n" + moveCount + " move" + (moveCount === 1 ? "" : "s") + ".", {
+  E.showPrompt("You solved the\n" + stonesPerLine + "x" + stonesPerLine + " puzzle in\n" + moveCount + " move" + (moveCount === 1 ? "" : "s") + ".", {
     title: "Puzzle solved",
     buttons: {
       "Again": newGame,
@@ -577,6 +679,17 @@ function gameEnd(moveCount) {
   });
 }
 
+// A tiny about screen
+function showAbout(doContinue) {
+  E.showAlert("Author: Dirk Hillbrecht\nLicense: MIT", "Puzzle15").then(() => {
+    if (doContinue)
+      continueGame();
+    else
+      showMenu(false);
+  });
+}
+
+// Show the in-game menu allowing to start a new game
 function showMenu(withContinue) {
   var mainmenu = {
     "": {
@@ -588,18 +701,20 @@ function showMenu(withContinue) {
   mainmenu["Start 3x3"] = () => initGame(3);
   mainmenu["Start 4x4"] = () => initGame(4);
   mainmenu["Start 5x5"] = () => initGame(5);
+  mainmenu.About = () => showAbout(withContinue);
   mainmenu.Exit = () => load();
   dragger.setEnabled(false);
   g.clear(true);
   E.showMenu(mainmenu);
 }
 
+// Handle a "click" event (only needed for menu button)
 function handleclick(e) {
   if (board.menuField.contains(e.x, e.y))
     setTimeout(() => showMenu(true), 10);
 }
 
-// Handle a drag event
+// Handle a drag event (moving the stones around)
 function handledrag(e) {
   worker.addTask(Math.abs(e.dx) > Math.abs(e.dy) ?
     (e.dx > 0 ? e => board.moveRight(e) : e => board.moveLeft(e)) :
@@ -607,18 +722,44 @@ function handledrag(e) {
   worker.addTask(e => board.drawResult(e));
 }
 
-dragger = new Dragger(handleclick, handledrag, clickThreshold, dragThreshold);
 
-// Start the interaction
+// *** Main program
+
+g.clear(true);
+
+// Load global app settings
+loadSettings();
+
+// We need a worker...
+var worker = new Worker();
+
+// Board will be initialized after the splash screen has been shown
+var board;
+
+// Dragger is needed for interaction during the game
+var dragger = new Dragger(handleclick, handledrag, clickThreshold, dragThreshold);
+
+// Disable dragger as board is not yet initialized
+dragger.setEnabled(false);
+
+// Nevertheless attach it so that it is ready once the game starts
 dragger.attach();
 
+// Start the game by handling the splash screen sequence
 showSplash(() => {
   // Clock mode allows short-press on button to exit
   Bangle.setUI("clock");
   // Load widgets
   Bangle.loadWidgets();
   Bangle.drawWidgets();
-  showMenu(false);
-}, 5000);
+  if (startWith === "3x3")
+    initGame(3);
+  else if (startWith === "4x4")
+    initGame(4);
+  else if (startWith === "5x5")
+    initGame(5);
+  else
+    showMenu(false);
+});
 
-// end of file
\ No newline at end of file
+// end of file
diff --git a/apps/puzzle15/puzzle15.settings.js b/apps/puzzle15/puzzle15.settings.js
new file mode 100644
index 000000000..352ec4315
--- /dev/null
+++ b/apps/puzzle15/puzzle15.settings.js
@@ -0,0 +1,50 @@
+// Settings menu for the Puzzle15 app
+
+(function(back) {
+  var FILE = "puzzle15.json";
+  // Load settings
+  var settings = Object.assign({
+    splashMode: "long",
+    startWith: "4x4"
+  }, require('Storage').readJSON(FILE, true) || {});
+
+  function writeSettings() {
+    require('Storage').writeJSON(FILE, settings);
+  }
+
+  // Helper method which uses int-based menu item for set of string values
+  function stringItems(startvalue, writer, values) {
+    return {
+      value: (startvalue === undefined ? 0 : values.indexOf(startvalue)),
+      format: v => values[v],
+      min: 0,
+      max: values.length - 1,
+      wrap: true,
+      step: 1,
+      onchange: v => {
+        writer(values[v]);
+        writeSettings();
+      }
+    };
+  }
+
+  // Helper method which breaks string set settings down to local settings object
+  function stringInSettings(name, values) {
+    return stringItems(settings[name], v => settings[name] = v, values);
+  }
+
+  var mainmenu = {
+    "": {
+      "title": "15 Puzzle"
+    },
+    "< Back": () => back(),
+    "Splash": stringInSettings("splashMode", ["long", "short", "off"]),
+    "Start with": stringInSettings("startWith", ["3x3", "4x4", "5x5", "menu"])
+  };
+
+  // Actually display the menu
+  E.showMenu(mainmenu);
+
+});
+
+// end of file
\ No newline at end of file

From cabb0c2d7d3529da1aa9810afbdb94678633aa84 Mon Sep 17 00:00:00 2001
From: "Dirk Hillbrecht (home)" <dirk@hillbrecht.de>
Date: Wed, 5 Jan 2022 09:52:06 +0100
Subject: [PATCH 44/45] Puzzle15: v0.05: Central game end function

---
 apps.json                     |  2 +-
 apps/puzzle15/ChangeLog       |  1 +
 apps/puzzle15/puzzle15.app.js | 20 +++++++++++++-------
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/apps.json b/apps.json
index 3a390938d..c213fdaa6 100644
--- a/apps.json
+++ b/apps.json
@@ -5393,7 +5393,7 @@
   {
     "id": "puzzle15",
     "name": "15 puzzle",
-    "version": "0.04",
+    "version": "0.05",
     "description": "A 15 puzzle game with drag gesture interface",
     "readme":"README.md",
     "icon": "puzzle15.app.png",
diff --git a/apps/puzzle15/ChangeLog b/apps/puzzle15/ChangeLog
index bd6af53d8..0950b7ae0 100644
--- a/apps/puzzle15/ChangeLog
+++ b/apps/puzzle15/ChangeLog
@@ -2,3 +2,4 @@
 0.02: Lots of enhancements, menu system not yet functional, but packaging should be now...
 0.03: Menu logic now generally functioning, splash screen added. The first really playable version!
 0.04: Settings dialog, about screen
+0.05: Central game end function
diff --git a/apps/puzzle15/puzzle15.app.js b/apps/puzzle15/puzzle15.app.js
index e66f9b9bb..eec21933c 100644
--- a/apps/puzzle15/puzzle15.app.js
+++ b/apps/puzzle15/puzzle15.app.js
@@ -391,23 +391,23 @@ class Board {
     //this.setAlmostSolved(); // to test the game end
   }
 
-  /*
-  // Set the board into the "solved" position. Useful for showcasing
+  /* Set the board into the "solved" position. Useful for showcasing and development
   setSolved() {
     this.stones = [];
     for (i = 0; i < stonesPerBoard; i++)
       this.stones[i] = new Stone((i + 1) % stonesPerBoard, i);
     this.moveCount = 0;
   }
+  /* */
 
-  // Initialize an almost solved playing field. Useful for tests and development
+  /* Initialize an almost solved playing field. Useful for tests and development
   setAlmostSolved() {
     this.setSolved();
     b = this.stones[this.stones.length - 1];
     this.stones[this.stones.length - 1] = this.stones[this.stones.length - 2];
     this.stones[this.stones.length - 2] = b;
   }
-  */
+  /* */
 
   // Initialize a shuffled field. The fields are always solvable.
   setShuffled() {
@@ -671,7 +671,7 @@ function gameEnd(moveCount) {
     buttons: {
       "Again": newGame,
       "Menu": () => showMenu(false),
-      "Exit": load
+      "Exit": exitGame
     }
   }).then(v => {
     E.showPrompt();
@@ -702,7 +702,7 @@ function showMenu(withContinue) {
   mainmenu["Start 4x4"] = () => initGame(4);
   mainmenu["Start 5x5"] = () => initGame(5);
   mainmenu.About = () => showAbout(withContinue);
-  mainmenu.Exit = () => load();
+  mainmenu.Exit = exitGame;
   dragger.setEnabled(false);
   g.clear(true);
   E.showMenu(mainmenu);
@@ -722,6 +722,12 @@ function handledrag(e) {
   worker.addTask(e => board.drawResult(e));
 }
 
+// exit the game, clear screen first to prevent ghost images
+function exitGame() {
+  g.clear(true);
+  setTimeout(load, 300);
+}
+
 
 // *** Main program
 
@@ -762,4 +768,4 @@ showSplash(() => {
     showMenu(false);
 });
 
-// end of file
+// end of file
\ No newline at end of file

From 9bd1127ebc73e53353b4d5b112139b14cfcd455a Mon Sep 17 00:00:00 2001
From: David Peer <david.peer@outlook.com>
Date: Wed, 5 Jan 2022 17:17:41 +0100
Subject: [PATCH 45/45] Design adaptions.

---
 apps/lcars/lcars.app.js   |   6 +++---
 apps/lcars/screenshot.png | Bin 5918 -> 5527 bytes
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/lcars/lcars.app.js b/apps/lcars/lcars.app.js
index 49d32dbe9..167adad2d 100644
--- a/apps/lcars/lcars.app.js
+++ b/apps/lcars/lcars.app.js
@@ -148,10 +148,10 @@ function printData(key, y, c){
   }
 
   g.setColor(c);
-  g.fillRect(79, y-2, 85 ,y+18);
+  g.fillRect(79, y-2, 87 ,y+18);
 
-  g.setFontAlign(0,-1,0);
-  g.drawString(value, 109, y);
+  g.setFontAlign(1,-1,0);
+  g.drawString(value, 131, y);
 
   g.setColor(c);
   g.setFontAlign(-1,-1,0);
diff --git a/apps/lcars/screenshot.png b/apps/lcars/screenshot.png
index fea3ebb78a5d48859e2d27f622a0c10e34270cd0..fba55a9f71739c35e4497386a75c51ea4e1eee3d 100644
GIT binary patch
literal 5527
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
Z{Rc&E;;+Q<OEv%i002ovPDHLkV1nc?Ut9nH

literal 5918
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
ARsaA1