From 45c5e15f20b2e1765af3813a1bf81bdb9ba949e2 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Wed, 30 Nov 2022 09:55:02 +0000
Subject: [PATCH] fix https://github.com/espruino/BangleApps/issues/953 - new
 lock widget

---
 apps/widlock/ChangeLog           |   1 +
 apps/widlock/metadata.json       |   2 +-
 apps/widlock/widget.js           |  19 ++++++++-----------
 apps/widlockunlock/ChangeLog     |   1 +
 apps/widlockunlock/metadata.json |  13 +++++++++++++
 apps/widlockunlock/widget.js     |   6 ++++++
 apps/widlockunlock/widget.png    | Bin 0 -> 726 bytes
 7 files changed, 30 insertions(+), 12 deletions(-)
 create mode 100644 apps/widlockunlock/ChangeLog
 create mode 100644 apps/widlockunlock/metadata.json
 create mode 100644 apps/widlockunlock/widget.js
 create mode 100644 apps/widlockunlock/widget.png

diff --git a/apps/widlock/ChangeLog b/apps/widlock/ChangeLog
index bb84c2d44..665750150 100644
--- a/apps/widlock/ChangeLog
+++ b/apps/widlock/ChangeLog
@@ -4,3 +4,4 @@
 0.04: Set sortorder to -1 so that widget always takes up the furthest left position
 0.05: Set sortorder to -10 so that others can take -1 etc
 0.06: Set sortorder to -10 in widget code
+0.07: Remove check for .isLocked (extremely old firmwares), speed up widget loading
diff --git a/apps/widlock/metadata.json b/apps/widlock/metadata.json
index 8635a5434..db532851a 100644
--- a/apps/widlock/metadata.json
+++ b/apps/widlock/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "widlock",
   "name": "Lock Widget",
-  "version": "0.06",
+  "version": "0.07",
   "description": "On devices with always-on display (Bangle.js 2) this displays lock icon whenever the display is locked",
   "icon": "widget.png",
   "type": "widget",
diff --git a/apps/widlock/widget.js b/apps/widlock/widget.js
index 592361cd9..abcedde20 100644
--- a/apps/widlock/widget.js
+++ b/apps/widlock/widget.js
@@ -1,11 +1,8 @@
-(function(){
-  if (!Bangle.isLocked) return; // bail out on old firmware
-  Bangle.on("lock", function(on) {
-    WIDGETS["lock"].width = Bangle.isLocked()?16:0;
-    Bangle.drawWidgets();
-  });
-  WIDGETS["lock"]={area:"tl",sortorder:10,width:Bangle.isLocked()?16:0,draw:function(w) {
-    if (Bangle.isLocked())
-      g.reset().drawImage(atob("DhABH+D/wwMMDDAwwMf/v//4f+H/h/8//P/z///f/g=="), w.x+1, w.y+4);
-  }};
-})()
+Bangle.on("lock", function() {
+  WIDGETS["lock"].width = Bangle.isLocked()?16:0;
+  Bangle.drawWidgets();
+});
+WIDGETS["lock"]={area:"tl",sortorder:10,width:Bangle.isLocked()?16:0,draw:function(w) {
+  if (Bangle.isLocked())
+    g.reset().drawImage(atob("DhABH+D/wwMMDDAwwMf/v//4f+H/h/8//P/z///f/g=="), w.x+1, w.y+4);
+}};
diff --git a/apps/widlockunlock/ChangeLog b/apps/widlockunlock/ChangeLog
new file mode 100644
index 000000000..b4d1ae593
--- /dev/null
+++ b/apps/widlockunlock/ChangeLog
@@ -0,0 +1 @@
+0.01: First commit
diff --git a/apps/widlockunlock/metadata.json b/apps/widlockunlock/metadata.json
new file mode 100644
index 000000000..d701279b9
--- /dev/null
+++ b/apps/widlockunlock/metadata.json
@@ -0,0 +1,13 @@
+{
+  "id": "widlockunlock",
+  "name": "Lock/Unlock Widget",
+  "version": "0.01",
+  "description": "On devices with always-on display (Bangle.js 2) this displays lock icon whenever the display is locked, or an unlock icon otherwise",
+  "icon": "widget.png",
+  "type": "widget",
+  "tags": "widget,lock",
+  "supports": ["BANGLEJS","BANGLEJS2"],
+  "storage": [
+    {"name":"widlockunlock.wid.js","url":"widget.js"}
+  ]
+}
diff --git a/apps/widlockunlock/widget.js b/apps/widlockunlock/widget.js
new file mode 100644
index 000000000..0716a9edf
--- /dev/null
+++ b/apps/widlockunlock/widget.js
@@ -0,0 +1,6 @@
+Bangle.on("lockunlock", function() {
+  Bangle.drawWidgets();
+});
+WIDGETS["lockunlock"]={area:"tl",sortorder:10,width:14,draw:function(w) {
+  g.reset().drawImage(atob(Bangle.isLocked() ? "DBGBAAAA8DnDDCBCBP////////n/n/n//////z/A" : "DBGBAAAA8BnDDCBABP///8A8A8Y8Y8Y8A8A//z/A"), w.x+1, w.y+3);
+}};
diff --git a/apps/widlockunlock/widget.png b/apps/widlockunlock/widget.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a6b9816163709af76a5d9d7f748094e600df5c7
GIT binary patch
literal 726
zcmV;{0xA88P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00006VoOIv0RI60
z0RN!9r;`8x0*gsRK~!jg?U=!96G0Tlzc<}#pp`7?&D2YvCqa=_)Psi&fgVKDo5%bQ
z6*ax(R1iTA_99;OQao7j)|kyd5T&3Vj1UM0yd)%%9%{`z58YrAN_Mk5lNj9JDf4(U
z@B6av?T`Qw5&t)&@-WM?7ERO4N+~yp$O3Qy00a2W%oQQT+jhIXSE*EvRn=5xz_#ry
z5j_F0=8;-u<_C`B?5U``5cYsVp&*11+eEYjV8zFl6(YKqN~O-`ayh45E_0arp$!Nj
zwgKcP+(rOy)$8>$wOZ|csQO_x+qRtr@Mt7_1mHO{-!Keg*)WV{DdkN7I{<zSCNgv0
zw(YxNGz6Xj%d!^Z@%U#9_k4qyZ##~2aN3?sCUZqf`3}JOfpE3c>0Ast*nyvbX_{FK
zi$5AC9sr8P;zs~?F#IIe+_M4^*npIBV{lDGFUE=QQ!14{F!Rg77&A}b01;gs5%JpZ
zUS@tZ61o;tN0=c_4lbmWUnbc5Y1~<p5O|2w>GaV1yHqMEz195^>NWZ=5E+;?zWSCQ
zWA*m}o&i_~a89oz`~<MylgP&&qUx3GX}}eK03e}4-2}7@flIWB#<(QU7IMG&X^RJd
z#IeLvuOvS+u&zK%Ajn5;KL&L7{5axX33LAziVVz}$iS>IbR5b68f~C?cyd!FmVl(G
z_)jPoEe0BG;79lGy8n6AR9{O=3pEe@#Z;ihz-g_b>(`DJ1BoSnF%@W;fu!5(Ew^p@
zL#zWW1_&nut7B+KnfrSnGB9f*1GC1Dfv$IoHacDjehd^92nou*SAwU39$^bWQ;D3(
zX!QiPyplW(#O~v(A#j<2T}-E)x&Yqv1g^(6@oftAA|mFRKe3Rs5C*t-J^%m!07*qo
IM6N<$f_of9R{#J2

literal 0
HcmV?d00001