From c4acfadabb7bed54f5825409f02db5f42e5ad483 Mon Sep 17 00:00:00 2001
From: Stefan Kuehnel <eska_2007@gmx.de>
Date: Mon, 9 Dec 2019 22:06:47 +0100
Subject: [PATCH 1/4] implemented simple version of a Berlin Clock

---
 apps/berlinc/add_to_apps.json     |  12 ++++++
 apps/berlinc/berlin-clock-icon.js |   1 +
 apps/berlinc/berlin-clock.js      |  65 ++++++++++++++++++++++++++++++
 apps/berlinc/berlin-clock.json    |   5 +++
 apps/berlinc/berlin-clock.png     | Bin 0 -> 1620 bytes
 5 files changed, 83 insertions(+)
 create mode 100644 apps/berlinc/add_to_apps.json
 create mode 100644 apps/berlinc/berlin-clock-icon.js
 create mode 100644 apps/berlinc/berlin-clock.js
 create mode 100644 apps/berlinc/berlin-clock.json
 create mode 100644 apps/berlinc/berlin-clock.png

diff --git a/apps/berlinc/add_to_apps.json b/apps/berlinc/add_to_apps.json
new file mode 100644
index 000000000..8e9815796
--- /dev/null
+++ b/apps/berlinc/add_to_apps.json
@@ -0,0 +1,12 @@
+// Create an entry in apps.json as follows:
+{ "id": "berlinc",
+  "name": "Berlin Clock",
+  "icon": "app.png",
+  "description": "Berlin Clock",
+  "tags": "",
+  "storage": [
+    {"name":"+berlinc","url":"app.json"},
+    {"name":"-berlinc","url":"app.js"},
+    {"name":"*berlinc","url":"app-icon.js","evaluate":true}
+  ]
+}
diff --git a/apps/berlinc/berlin-clock-icon.js b/apps/berlinc/berlin-clock-icon.js
new file mode 100644
index 000000000..52a11577f
--- /dev/null
+++ b/apps/berlinc/berlin-clock-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwJC/AH4A/AH4AgA=="));
diff --git a/apps/berlinc/berlin-clock.js b/apps/berlinc/berlin-clock.js
new file mode 100644
index 000000000..8c86ac5fc
--- /dev/null
+++ b/apps/berlinc/berlin-clock.js
@@ -0,0 +1,65 @@
+(() => {
+
+    // place your const, vars, functions or classes here
+    fields = [ 4 , 4 , 11 , 4 ];
+    width = g.getWidth();
+    height = g.getHeight();
+    rowHeight = height/4;
+    rowlights = [];
+
+    function drawBerlinClock() {
+        var now = new Date();
+        rowlights[0] = now.getHours() / 5;
+        rowlights[1] = now.getHours() % 5;
+        rowlights[2] = now.getMinutes() / 5;
+        rowlights[3] = now.getMinutes() % 5;
+    
+        g.clear();
+        
+        g.drawRect(0,0,width,height);
+        for (row = 0 ; row < 4 ; row++) {
+          nfields = fields[row];
+          boxWidth = width/nfields;
+          
+          for (col = 0 ; col < nfields ; col++) {
+            x1 = col*boxWidth;
+            y1 = row*rowHeight;
+            x2 = (col+1)*boxWidth;
+            y2 = (row+1)*rowHeight;
+            
+            g.setColor(1,1,1);
+            g.drawRect(x1,y1,x2,y2);
+            if (col<rowlights[row]) {
+              
+              if (row === 2 ) {
+                if (((col+1) % 3) === 0) {
+                  g.setColor(1,0,0);
+                } else {
+                  g.setColor(1,1,0);
+                }
+              } else {
+                  g.setColor(1,0,0);
+              }
+              
+              g.fillRect(x1+2,y1+2,x2-2,y2-2);
+            }
+          }
+        }
+    }
+
+    // special function to handle display switch on
+    Bangle.on('lcdPower', (on) => {
+        if (on) {
+        	drawWidgets();
+            // call your app function here
+            drawBerlinClock();
+    }});
+
+    // call your app function here 
+
+    // refesh every 15 sec
+    setInterval(drawBerlinClock, 15E3);
+
+    drawBerlinClock();
+
+})();
diff --git a/apps/berlinc/berlin-clock.json b/apps/berlinc/berlin-clock.json
new file mode 100644
index 000000000..e9e77aa1e
--- /dev/null
+++ b/apps/berlinc/berlin-clock.json
@@ -0,0 +1,5 @@
+{
+  "name":"Berlin Clock",
+  "icon":"*berlinc",
+  "src":"-berlinc"
+}
diff --git a/apps/berlinc/berlin-clock.png b/apps/berlinc/berlin-clock.png
new file mode 100644
index 0000000000000000000000000000000000000000..582cb2e0853a5a2899a3afbd7eb19cde2ee7f6a0
GIT binary patch
literal 1620
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
S(*#!l0000<MNUMnLSTZZAQ%w<

literal 0
HcmV?d00001


From c074be241f1afefc45a8926fa54b7f87d26e17b1 Mon Sep 17 00:00:00 2001
From: Stefan Kuehnel <eska_2007@gmx.de>
Date: Mon, 9 Dec 2019 22:42:29 +0100
Subject: [PATCH 2/4] Fixed bug. Corrected add_to_apps.json

---
 apps.json                     | 11 +++++++++++
 apps/berlinc/add_to_apps.json |  8 ++++----
 apps/berlinc/berlin-clock.js  |  4 ++--
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/apps.json b/apps.json
index 5507a76c9..78d3574ea 100644
--- a/apps.json
+++ b/apps.json
@@ -623,5 +623,16 @@
       {"name":"-blobclk","url":"clock-blob.js"},
       {"name":"*blobclk","url":"clock-blob-icon.js","evaluate":true}
     ]
+  },
+  { "id": "berlinc",
+    "name": "Berlin Clock",
+    "icon": "app.png",
+    "description": "Berlin Clock",
+    "tags": "",
+    "storage": [
+      {"name":"+berlinc","url":"berlin-clock.json"},
+      {"name":"-berlinc","url":"berlin-clock.js"},
+      {"name":"*berlinc","url":"berlin-clock-icon.js","evaluate":true}
+    ]
   }
 ]
diff --git a/apps/berlinc/add_to_apps.json b/apps/berlinc/add_to_apps.json
index 8e9815796..4c92880a9 100644
--- a/apps/berlinc/add_to_apps.json
+++ b/apps/berlinc/add_to_apps.json
@@ -1,12 +1,12 @@
 // Create an entry in apps.json as follows:
 { "id": "berlinc",
   "name": "Berlin Clock",
-  "icon": "app.png",
+  "icon": "berlin-clock.png",
   "description": "Berlin Clock",
   "tags": "",
   "storage": [
-    {"name":"+berlinc","url":"app.json"},
-    {"name":"-berlinc","url":"app.js"},
-    {"name":"*berlinc","url":"app-icon.js","evaluate":true}
+    {"name":"+berlinc","url":"berlin-clock.json"},
+    {"name":"-berlinc","url":"berlin-clock.js"},
+    {"name":"*berlinc","url":"berlin-clock-icon.js","evaluate":true}
   ]
 }
diff --git a/apps/berlinc/berlin-clock.js b/apps/berlinc/berlin-clock.js
index 8c86ac5fc..875ae805e 100644
--- a/apps/berlinc/berlin-clock.js
+++ b/apps/berlinc/berlin-clock.js
@@ -9,9 +9,9 @@
 
     function drawBerlinClock() {
         var now = new Date();
-        rowlights[0] = now.getHours() / 5;
+        rowlights[0] = Math.floor(now.getHours() / 5);
         rowlights[1] = now.getHours() % 5;
-        rowlights[2] = now.getMinutes() / 5;
+        rowlights[2] = Math.floor(now.getMinutes() / 5);
         rowlights[3] = now.getMinutes() % 5;
     
         g.clear();

From d976cd2d94a94c3c1c49e6d4bc8a57ed56818d3a Mon Sep 17 00:00:00 2001
From: Stefan Kuehnel <eska_2007@gmx.de>
Date: Sat, 14 Dec 2019 19:14:07 +0100
Subject: [PATCH 3/4] Created icon as .png and .js files

---
 apps/berlinc/berlin-clock-icon.js |   5 ++++-
 apps/berlinc/berlin-clock.png     | Bin 1620 -> 199 bytes
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/berlinc/berlin-clock-icon.js b/apps/berlinc/berlin-clock-icon.js
index 52a11577f..2d5d0b439 100644
--- a/apps/berlinc/berlin-clock-icon.js
+++ b/apps/berlinc/berlin-clock-icon.js
@@ -1 +1,4 @@
-require("heatshrink").decompress(atob("mEwwJC/AH4A/AH4AgA=="));
+var img = {
+  width : 48, height : 48, bpp : 4,
+  buffer : require("heatshrink").decompress(atob("xAAWxOZAAeP/4ADApX4C/4X/C/4XvxAAWF4o1QI4wX/C/4X/C9OIAC2L3e7AQQvBzAEBFAP4FoYEFC/4X/C/4XvxAAWFIIADApYsBAAX4C/4X/C/4XXf54AH"))
+}
diff --git a/apps/berlinc/berlin-clock.png b/apps/berlinc/berlin-clock.png
index 582cb2e0853a5a2899a3afbd7eb19cde2ee7f6a0..abcb08df895da04ea48743b37ba1a8847f92e3da 100644
GIT binary patch
delta 183
zcmcb@bDVL4L_G^L0|UcSohMs>6n}tEh%1nO$H4F(1Q^aTFf8$x+X@t7FY)wsWq-`W
zC&Xzo?SEnnP)M}IHKHUqKdq!Zu_%=xA|Np{uSCH}&r;7YjCYwdP=URti(`mIZ*sx`
zRtZ+e22W0w2_CJ2I*tl!48CagByi4YxOu}sq9Y<krl)u26cLA4ibpu6DQLwiwr)K1
dVfq19hOCUFVi}F5??AH{JYD@<);T3K0RX#LJP`l@

delta 1615
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
N002ovPDHLkV1n_K9bf<e


From 5ca1cb8e0e3d66803b25479e496f0e3c1c8e6149 Mon Sep 17 00:00:00 2001
From: Stefan Kuehnel <eska_2007@gmx.de>
Date: Sat, 14 Dec 2019 19:22:52 +0100
Subject: [PATCH 4/4] Updated description and apps.json

---
 apps.json                     | 4 ++--
 apps/berlinc/add_to_apps.json | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps.json b/apps.json
index 78d3574ea..2e484574c 100644
--- a/apps.json
+++ b/apps.json
@@ -626,8 +626,8 @@
   },
   { "id": "berlinc",
     "name": "Berlin Clock",
-    "icon": "app.png",
-    "description": "Berlin Clock",
+    "icon": "berlin-clock.png",
+    "description": "Berlin Clock (see https://en.wikipedia.org/wiki/Mengenlehreuhr)",
     "tags": "",
     "storage": [
       {"name":"+berlinc","url":"berlin-clock.json"},
diff --git a/apps/berlinc/add_to_apps.json b/apps/berlinc/add_to_apps.json
index 4c92880a9..a3d2e84a8 100644
--- a/apps/berlinc/add_to_apps.json
+++ b/apps/berlinc/add_to_apps.json
@@ -2,7 +2,7 @@
 { "id": "berlinc",
   "name": "Berlin Clock",
   "icon": "berlin-clock.png",
-  "description": "Berlin Clock",
+  "description": "Berlin Clock (see https://en.wikipedia.org/wiki/Mengenlehreuhr)",
   "tags": "",
   "storage": [
     {"name":"+berlinc","url":"berlin-clock.json"},