From b3f40e868d14d9b4d764f2d846e959d5a0a967ce Mon Sep 17 00:00:00 2001
From: deirdreobyrne <deirdre.dub@gmail.com>
Date: Sat, 27 Aug 2022 22:25:28 +0100
Subject: [PATCH 1/9] Works - except that date_utils is gone?!

---
 apps/bigdclock/ChangeLog        |  1 +
 apps/bigdclock/bigdclock.app.js | 12 ++++++++----
 apps/bigdclock/metadata.json    |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/apps/bigdclock/ChangeLog b/apps/bigdclock/ChangeLog
index 09cc978fb..60a8f703f 100644
--- a/apps/bigdclock/ChangeLog
+++ b/apps/bigdclock/ChangeLog
@@ -3,3 +3,4 @@
 0.03: Internationalisation; bug fix - battery icon responds promptly to charging state
 0.04: bug fix
 0.05: proper fix for the race condition in queueDraw()
+0.06: Better battery graphic - now has green, yellow and red sections
diff --git a/apps/bigdclock/bigdclock.app.js b/apps/bigdclock/bigdclock.app.js
index c013c6188..dba60183c 100644
--- a/apps/bigdclock/bigdclock.app.js
+++ b/apps/bigdclock/bigdclock.app.js
@@ -29,7 +29,8 @@ function draw() {
     const level = E.getBattery();
     const width = level + (level/2);
     var is12Hour = (require("Storage").readJSON("setting.json", 1) || {})["12hour"];
-    var dows = require("date_utils").dows(0,1);
+//    var dows = require("date_utils").dows(0,1);
+    var dows = ["SU","MO","TU","WE","TH","FR","SA"];
 
     g.reset();
     g.clear();
@@ -53,12 +54,15 @@ function draw() {
     g.fillRect(167,163,170,167);
     if (Bangle.isCharging()) {
       g.setColor(1,1,0);
-    } else if (level > 40) {
-      g.setColor(0,1,0);
+      g.fillRect(12,162,12+width,168);
     } else {
       g.setColor(1,0,0);
+      g.fillRect(12,162,57,168);
+      g.setColor(1,1,0);
+      g.fillRect(58,162,72,168);
+      g.setColor(0,1,0);
+      g.fillRect(73,162,162,168);
     }
-    g.fillRect(12,162,12+width,168);
     if (level < 100) {
       g.setColor(g.theme.bg);
       g.fillRect(12+width+1,162,162,168);
diff --git a/apps/bigdclock/metadata.json b/apps/bigdclock/metadata.json
index 7359bcf20..ce91d921e 100644
--- a/apps/bigdclock/metadata.json
+++ b/apps/bigdclock/metadata.json
@@ -1,7 +1,7 @@
 { "id": "bigdclock",
   "name": "Big digit clock containing just the essentials",
   "shortName":"Big digit clk",
-  "version":"0.05",
+  "version":"0.06",
   "description": "A clock containing just the essentials, made as easy to read as possible for those of us that need glasses. It contains the time, the day-of-week, the day-of-month, and the current battery state-of-charge.",
   "icon": "bigdclock.png",
   "type": "clock",

From 91cfd487a325ea701258f4b80bc8481c744a57ab Mon Sep 17 00:00:00 2001
From: deirdreobyrne <deirdre.dub@gmail.com>
Date: Thu, 22 Sep 2022 23:36:08 +0100
Subject: [PATCH 2/9] Now only checks battery every 15 minutes

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

diff --git a/apps/bigdclock/bigdclock.app.js b/apps/bigdclock/bigdclock.app.js
index dba60183c..a3691539b 100644
--- a/apps/bigdclock/bigdclock.app.js
+++ b/apps/bigdclock/bigdclock.app.js
@@ -11,6 +11,8 @@ Graphics.prototype.setFontOpenSans = function(scale) {
 };
 
 var drawTimeout;
+var lastBattCheck = 0;
+var width = 0;
 
 function queueDraw(millis_now) {
     if (drawTimeout) clearTimeout(drawTimeout);
@@ -26,12 +28,16 @@ function draw() {
         m = date.getMinutes();
     var d = date.getDate(),
         w = date.getDay(); // d=1..31; w=0..6
-    const level = E.getBattery();
-    const width = level + (level/2);
     var is12Hour = (require("Storage").readJSON("setting.json", 1) || {})["12hour"];
 //    var dows = require("date_utils").dows(0,1);
     var dows = ["SU","MO","TU","WE","TH","FR","SA"];
 
+    if (date.getTime() >= lastBattCheck + 15*60000) {
+      lastBattcheck = date.getTime();
+      width = E.getBattery();
+      width += width/2;
+    }
+
     g.reset();
     g.clear();
 
@@ -63,7 +69,7 @@ function draw() {
       g.setColor(0,1,0);
       g.fillRect(73,162,162,168);
     }
-    if (level < 100) {
+    if (width < 150) {
       g.setColor(g.theme.bg);
       g.fillRect(12+width+1,162,162,168);
     }

From 1963eea12c97b33d1a91c29e642b43f173e2dce4 Mon Sep 17 00:00:00 2001
From: deirdreobyrne <deirdre.dub@gmail.com>
Date: Thu, 22 Sep 2022 23:47:11 +0100
Subject: [PATCH 3/9] Bar across the middle of the screen colour

The bar across the middle of the screen will now also indicate the battery state of charge. BUT NOTE that the "date_utils" library seems to be missing from my watch!
---
 apps/bigdclock/bigdclock.app.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/apps/bigdclock/bigdclock.app.js b/apps/bigdclock/bigdclock.app.js
index a3691539b..b71a6b0a3 100644
--- a/apps/bigdclock/bigdclock.app.js
+++ b/apps/bigdclock/bigdclock.app.js
@@ -32,7 +32,7 @@ function draw() {
 //    var dows = require("date_utils").dows(0,1);
     var dows = ["SU","MO","TU","WE","TH","FR","SA"];
 
-    if (date.getTime() >= lastBattCheck + 15*60000) {
+    if ((date.getTime() >= lastBattCheck + 15*60000) || Bangle.isCharging()) {
       lastBattcheck = date.getTime();
       width = E.getBattery();
       width += width/2;
@@ -74,7 +74,15 @@ function draw() {
       g.fillRect(12+width+1,162,162,168);
     }
 
-    g.setColor(0, 1, 0);
+    if (Bangle.isCharging()) {
+      g.setColor(1,1,0);
+    } else if (width <= 45) {
+      g.setColor(1,0,0);
+    } else if (width <= 60) {
+      g.setColor(1,1,0);
+    } else {
+      g.setColor(0, 1, 0);
+    }
     g.fillRect(0, 90, g.getWidth(), 94);
 
     // widget redraw

From b239fa69b5a0a06aad20451892d08d96ee595d39 Mon Sep 17 00:00:00 2001
From: deirdreobyrne <deirdre.dub@gmail.com>
Date: Fri, 23 Sep 2022 20:14:51 +0100
Subject: [PATCH 4/9] Fix for various locale methods

Someone may or may not have a locale set up, and also it seems that date_utils aren't available when a locale is set???
---
 apps/bigdclock/bigdclock.app.js | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/apps/bigdclock/bigdclock.app.js b/apps/bigdclock/bigdclock.app.js
index b71a6b0a3..75e66397c 100644
--- a/apps/bigdclock/bigdclock.app.js
+++ b/apps/bigdclock/bigdclock.app.js
@@ -26,12 +26,19 @@ function draw() {
     var date = new Date();
     var h = date.getHours(),
         m = date.getMinutes();
-    var d = date.getDate(),
-        w = date.getDay(); // d=1..31; w=0..6
+    var d = date.getDate();
     var is12Hour = (require("Storage").readJSON("setting.json", 1) || {})["12hour"];
-//    var dows = require("date_utils").dows(0,1);
-    var dows = ["SU","MO","TU","WE","TH","FR","SA"];
-
+    var dow;
+    
+    try {
+      dow = require("locale").dow(date,1);
+    } catch (e) {
+      try {
+        dow = require("date_utils").dows(0,1)[date.getDay()];
+      } catch (e) {
+        dow = ["SU","MO","TU","WE","TH","FR","SA"][date.getDay()];
+      }
+    }
     if ((date.getTime() >= lastBattCheck + 15*60000) || Bangle.isCharging()) {
       lastBattcheck = date.getTime();
       width = E.getBattery();
@@ -54,7 +61,7 @@ function draw() {
     g.drawString(d, g.getWidth() -6, 98);
     g.setFont('Vector', 52);
     g.setFontAlign(-1, -1);
-    g.drawString(dows[w].slice(0,2).toUpperCase(), 6, 103);
+    g.drawString(dow.slice(0,2).toUpperCase(), 6, 103);
 
     g.fillRect(9,159,166,171);
     g.fillRect(167,163,170,167);

From b952599c6e73bcaf986917934094b7bbb1828e9f Mon Sep 17 00:00:00 2001
From: deirdreobyrne <deirdre.dub@gmail.com>
Date: Fri, 23 Sep 2022 20:20:37 +0100
Subject: [PATCH 5/9] Update screenshot.png

---
 apps/bigdclock/screenshot.png | Bin 3180 -> 3053 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/apps/bigdclock/screenshot.png b/apps/bigdclock/screenshot.png
index 8a12b266e71005631235cacc50750f08c59e247d..acac53ea90176de276c693e957cc44a8d0da134f 100644
GIT binary patch
delta 3035
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

delta 3163
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


From bb823639d59c08cda1c7d1a590807824f894d430 Mon Sep 17 00:00:00 2001
From: deirdreobyrne <deirdre.dub@gmail.com>
Date: Fri, 23 Sep 2022 20:22:22 +0100
Subject: [PATCH 6/9] Update ChangeLog

---
 apps/bigdclock/ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/bigdclock/ChangeLog b/apps/bigdclock/ChangeLog
index 60a8f703f..a5441d6d1 100644
--- a/apps/bigdclock/ChangeLog
+++ b/apps/bigdclock/ChangeLog
@@ -3,4 +3,4 @@
 0.03: Internationalisation; bug fix - battery icon responds promptly to charging state
 0.04: bug fix
 0.05: proper fix for the race condition in queueDraw()
-0.06: Better battery graphic - now has green, yellow and red sections
+0.06: Better battery graphic - now has green, yellow and red sections; battery status reflected in the bar across the middle of the screen; better handling of locale

From 181157eedf1f2d50b86f203885694651fea9f232 Mon Sep 17 00:00:00 2001
From: deirdreobyrne <deirdre.dub@gmail.com>
Date: Fri, 23 Sep 2022 20:36:32 +0100
Subject: [PATCH 7/9] Incorporate @thyttan commit

Incorporate https://github.com/espruino/BangleApps/commit/5b1b3553c5a028c595845434762147b28de317a6
---
 apps/bigdclock/ChangeLog        | 3 ++-
 apps/bigdclock/bigdclock.app.js | 3 ++-
 apps/bigdclock/metadata.json    | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/apps/bigdclock/ChangeLog b/apps/bigdclock/ChangeLog
index a5441d6d1..e9791dab8 100644
--- a/apps/bigdclock/ChangeLog
+++ b/apps/bigdclock/ChangeLog
@@ -3,4 +3,5 @@
 0.03: Internationalisation; bug fix - battery icon responds promptly to charging state
 0.04: bug fix
 0.05: proper fix for the race condition in queueDraw()
-0.06: Better battery graphic - now has green, yellow and red sections; battery status reflected in the bar across the middle of the screen; better handling of locale
+0.06: Tell clock widgets to hide.
+0.07: Better battery graphic - now has green, yellow and red sections; battery status reflected in the bar across the middle of the screen; better handling of locale
diff --git a/apps/bigdclock/bigdclock.app.js b/apps/bigdclock/bigdclock.app.js
index 75e66397c..2f8b7cd4d 100644
--- a/apps/bigdclock/bigdclock.app.js
+++ b/apps/bigdclock/bigdclock.app.js
@@ -110,7 +110,8 @@ Bangle.on('charging', (charging) => {
     draw();
 });
 
+Bangle.setUI("clock");
+
 Bangle.loadWidgets();
 draw();
 
-Bangle.setUI("clock");
diff --git a/apps/bigdclock/metadata.json b/apps/bigdclock/metadata.json
index ce91d921e..30352ca1a 100644
--- a/apps/bigdclock/metadata.json
+++ b/apps/bigdclock/metadata.json
@@ -1,7 +1,7 @@
 { "id": "bigdclock",
   "name": "Big digit clock containing just the essentials",
   "shortName":"Big digit clk",
-  "version":"0.06",
+  "version":"0.07",
   "description": "A clock containing just the essentials, made as easy to read as possible for those of us that need glasses. It contains the time, the day-of-week, the day-of-month, and the current battery state-of-charge.",
   "icon": "bigdclock.png",
   "type": "clock",

From a90b58bc0d67e0b6729d037cde07ee21f175bf31 Mon Sep 17 00:00:00 2001
From: deirdreobyrne <deirdre.dub@gmail.com>
Date: Mon, 26 Sep 2022 16:01:23 +0100
Subject: [PATCH 8/9] Implementing locale fix

---
 apps/bigdclock/ChangeLog        |  2 +-
 apps/bigdclock/bigdclock.app.js | 13 ++-----------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/apps/bigdclock/ChangeLog b/apps/bigdclock/ChangeLog
index e9791dab8..98b232467 100644
--- a/apps/bigdclock/ChangeLog
+++ b/apps/bigdclock/ChangeLog
@@ -4,4 +4,4 @@
 0.04: bug fix
 0.05: proper fix for the race condition in queueDraw()
 0.06: Tell clock widgets to hide.
-0.07: Better battery graphic - now has green, yellow and red sections; battery status reflected in the bar across the middle of the screen; better handling of locale
+0.07: Better battery graphic - now has green, yellow and red sections; battery status reflected in the bar across the middle of the screen; better handling of locale; current battery state checked only once every 15 minutes, leading to longer-lasting battery charge
diff --git a/apps/bigdclock/bigdclock.app.js b/apps/bigdclock/bigdclock.app.js
index 2f8b7cd4d..a8e2b38df 100644
--- a/apps/bigdclock/bigdclock.app.js
+++ b/apps/bigdclock/bigdclock.app.js
@@ -28,17 +28,8 @@ function draw() {
         m = date.getMinutes();
     var d = date.getDate();
     var is12Hour = (require("Storage").readJSON("setting.json", 1) || {})["12hour"];
-    var dow;
-    
-    try {
-      dow = require("locale").dow(date,1);
-    } catch (e) {
-      try {
-        dow = require("date_utils").dows(0,1)[date.getDay()];
-      } catch (e) {
-        dow = ["SU","MO","TU","WE","TH","FR","SA"][date.getDay()];
-      }
-    }
+    var dow = require("date_utils").dows(0,1)[date.getDay()];
+
     if ((date.getTime() >= lastBattCheck + 15*60000) || Bangle.isCharging()) {
       lastBattcheck = date.getTime();
       width = E.getBattery();

From 43c522565e0bf1cf7cac1985714a92a7268abbce Mon Sep 17 00:00:00 2001
From: deirdreobyrne <deirdre.dub@gmail.com>
Date: Mon, 26 Sep 2022 16:18:46 +0100
Subject: [PATCH 9/9] Update ChangeLog

Removing unnecessary note about locale!
---
 apps/bigdclock/ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/bigdclock/ChangeLog b/apps/bigdclock/ChangeLog
index 98b232467..c92d139bb 100644
--- a/apps/bigdclock/ChangeLog
+++ b/apps/bigdclock/ChangeLog
@@ -4,4 +4,4 @@
 0.04: bug fix
 0.05: proper fix for the race condition in queueDraw()
 0.06: Tell clock widgets to hide.
-0.07: Better battery graphic - now has green, yellow and red sections; battery status reflected in the bar across the middle of the screen; better handling of locale; current battery state checked only once every 15 minutes, leading to longer-lasting battery charge
+0.07: Better battery graphic - now has green, yellow and red sections; battery status reflected in the bar across the middle of the screen; current battery state checked only once every 15 minutes, leading to longer-lasting battery charge