From 62686795a559bebfc702e84ebbe0babe5bc54faf Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Fri, 24 Nov 2023 16:46:22 +0000
Subject: [PATCH] Add clock info clock widget

---
 apps/clkinfoclk/ChangeLog      |   1 +
 apps/clkinfoclk/app.png        | Bin 0 -> 929 bytes
 apps/clkinfoclk/clkinfo.js     |  27 +++++++++++++++++++++++++++
 apps/clkinfoclk/metadata.json  |  13 +++++++++++++
 apps/clkinfoclk/screenshot.png | Bin 0 -> 3116 bytes
 apps/widclkinfo/ChangeLog      |   3 ++-
 apps/widclkinfo/metadata.json  |   2 +-
 apps/widclkinfo/widget.js      |   2 +-
 8 files changed, 45 insertions(+), 3 deletions(-)
 create mode 100644 apps/clkinfoclk/ChangeLog
 create mode 100644 apps/clkinfoclk/app.png
 create mode 100644 apps/clkinfoclk/clkinfo.js
 create mode 100644 apps/clkinfoclk/metadata.json
 create mode 100644 apps/clkinfoclk/screenshot.png

diff --git a/apps/clkinfoclk/ChangeLog b/apps/clkinfoclk/ChangeLog
new file mode 100644
index 000000000..2286a7f70
--- /dev/null
+++ b/apps/clkinfoclk/ChangeLog
@@ -0,0 +1 @@
+0.01: New App!
\ No newline at end of file
diff --git a/apps/clkinfoclk/app.png b/apps/clkinfoclk/app.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf057046be6eca51564a213bc3e7307271464009
GIT binary patch
literal 929
zcmV;S177@zP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00006VoOIv0RI60
z0RN!9r;`8x16D~yK~!jg?U}nzR6!KRf8vUPwGeSl1bYg>hL^4Q9~j~`7LX9JB(!Q`
zf!g{&{RcFW&Q~mny+EQd5wRkG(GU|*v#i00#krWf=gz{s+-Te{nPTqF`ObG{=bo84
z7wV|v|Hht3JPkk}FaUG|9Y7m!Ao=|p@Bx?yW`SwoCGazne{UQEt^-TJmSbB2t^w^e
zR}HiRcY*JgVs~m~;0|!8R^p4mY6RiBtpaENr0^Uv>(vCT0r!Cspcg0r`;t~jo{azx
zfb|`CCKF##(F8oL;_xjnl#FrV8%ADg6Xz30z8#UnEWQMc5jI;nU_9Z{{Eq{<f8(Bk
zd>QD8L7t!&STXpy9ZFm@kj^1Fem7{l-O!eBYr8>b)d^b3W}9W~#A6U*g95Oi>^=c4
z)~Zv`8K;EXvhfK3pp)!7am&FTkR7(HNX8sFd;<WusBAZ||K|ZY9_Uo*nh`<*$di4k
zui6?nkUiTBISPQV002gn{bHhRSDaLaYxr#{p#d}lUld2L9%PE>l<Gf2)?lqs0-md9
z1A34t0G(-G#8TveY1PkUK~n%7s{bmQ9Cv8nTALA{sa$u5J)MWX0{}-9$EuByzN9pI
zI@bXdJvjC&j<StWtN=C@&nE6ccm)t^2^9$s!fOe=QAT|Z4mCo9(0kHrJ;0QO-l_fx
zOJ^ob0q1}psb@Ll>S+^%_N}!U1DH{Ly|K9>B#6_hueBM`PvzgXPMrIx>vGBiU)6Z4
z<GkrGHyj{5jcP%38pd8w<E#&JAQiK;@jUTL9Xg0BhB0}h6q(jA;o_v7?1g6BTXGiL
zL72n?TvooFFEk+KzBEY*!*MnM$E!T=B73F0>Epn3sb9fkCLB-z-YcKpmwJ#|r9RWl
zC5~dFfRx^~zcZo4lLpcS%$dU%U1Vo|3%C)3JcraOHF*iC9^?bK^S~v{rNu|U-T>|j
zG$FN0?PUAC7)9=|wrEE3yiS#A@zILA+sGlcN|VDa<O2Q>IFIb+1>`8+h@2|>kwB-&
z?yx%JM4NdN29eBAO@MFvNQ4*G7A;7*Pj7ZUZ3CJ0gS8T$MjKKwTeK9b&o&dl(GUSK
zKeKitb(<cfdeBbgXVzsT{mvlel3D(O&#ZOS@vq|-a;EMy)Uy^*00000NkvXXu0mjf
DaWAHL

literal 0
HcmV?d00001

diff --git a/apps/clkinfoclk/clkinfo.js b/apps/clkinfoclk/clkinfo.js
new file mode 100644
index 000000000..f98edb5e7
--- /dev/null
+++ b/apps/clkinfoclk/clkinfo.js
@@ -0,0 +1,27 @@
+(function() {
+  return {
+    name: "Bangle",
+    items: [
+      { name : "Clock",
+        get : () => {
+          return {
+            text : require("locale").time(new Date(),1),
+            img : atob("FhaBAAAAAAPwAD/wA8DwHADgYMGDAwMMDAxgMBmAwGYDAZgOBmAcGYA4YwBjDAAMGABgcAOA8DwA/8AA/AAAAAA=")
+          };
+        },
+        show : function() {
+          this.interval = setTimeout(()=>{
+            this.emit("redraw");
+            this.interval = setInterval(()=>{
+              this.emit("redraw");
+            }, 60000);
+          }, 60000 - (Date.now() % 60000));
+        },
+       hide : function() {
+          clearInterval(this.interval);
+          this.interval = undefined;
+        }
+      }
+    ]
+  };
+})
diff --git a/apps/clkinfoclk/metadata.json b/apps/clkinfoclk/metadata.json
new file mode 100644
index 000000000..8d676d0e0
--- /dev/null
+++ b/apps/clkinfoclk/metadata.json
@@ -0,0 +1,13 @@
+{ "id": "clkinfoclk",
+  "name": "Clockinfo Clock",
+  "version":"0.01",
+  "description": "This displays a clock *inside* a ClockInfo. This can be really handy for the [Clock Info Widget](https://banglejs.com/apps/?id=widclkinfo) where you might want the option to show a clock in the top bar of a non-clock app.",
+  "icon": "app.png",
+  "screenshots": [{"url":"screenshot.png"}],
+  "type": "clkinfo",
+  "tags": "clkinfo",
+  "supports" : ["BANGLEJS2"],
+  "storage": [
+    {"name":"clkinfoclk.clkinfo.js","url":"clkinfo.js"}
+  ]
+}
diff --git a/apps/clkinfoclk/screenshot.png b/apps/clkinfoclk/screenshot.png
new file mode 100644
index 0000000000000000000000000000000000000000..00f4c0c9a4a2a45ef8515ac03fe2f37e0be9f64c
GIT binary patch
literal 3116
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
GLSTXkg6IbT

literal 0
HcmV?d00001

diff --git a/apps/widclkinfo/ChangeLog b/apps/widclkinfo/ChangeLog
index 6c3b85b00..d621e012a 100644
--- a/apps/widclkinfo/ChangeLog
+++ b/apps/widclkinfo/ChangeLog
@@ -1,3 +1,4 @@
 0.01: New Widget!
 0.02: Now use an app ID (to avoid conflicts with clocks that also use ClockInfo)
-0.03: Fix widget clearing too far down
\ No newline at end of file
+0.03: Fix widget clearing too far down
+0.04: If a small font is needed, use 6x8 but twice as high
\ No newline at end of file
diff --git a/apps/widclkinfo/metadata.json b/apps/widclkinfo/metadata.json
index 4ba9b2444..628388f55 100644
--- a/apps/widclkinfo/metadata.json
+++ b/apps/widclkinfo/metadata.json
@@ -1,6 +1,6 @@
 { "id": "widclkinfo",
   "name": "Clock Info Widget",
-  "version":"0.03",
+  "version":"0.04",
   "description": "Use 'Clock Info' in the Widget bar. Tap on the widget to select, then drag up/down/left/right to choose what information is displayed.",
   "icon": "widget.png",
   "screenshots" : [ { "url":"screenshot.png" }],
diff --git a/apps/widclkinfo/widget.js b/apps/widclkinfo/widget.js
index a802ba872..d51f0563f 100644
--- a/apps/widclkinfo/widget.js
+++ b/apps/widclkinfo/widget.js
@@ -42,7 +42,7 @@ if (!require("clock_info").loadCount) { // don't load if a clock_info was alread
         var availableWidth = o.x+clockInfoMenu.w - (x+2);
         g.setFont("6x8:2").setFontAlign(-1,0);
         if (g.stringWidth(clockInfoInfo.text) > availableWidth)
-          g.setFont("6x8");
+          g.setFont("6x8:1x2");
         g.drawString(clockInfoInfo.text, x+2,o.y+12); // draw the text
       }
     }