From d55417d90fc668ed5c3f6463b07f8235003fefcb Mon Sep 17 00:00:00 2001
From: hughbarney <hughbarney@googlemail.com>
Date: Fri, 1 Oct 2021 13:35:58 +0100
Subject: [PATCH 01/11] Gbridge added troubleshooting section to README

---
 apps/gbridge/README.md | 59 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/apps/gbridge/README.md b/apps/gbridge/README.md
index 867b736ab..03bf883d7 100644
--- a/apps/gbridge/README.md
+++ b/apps/gbridge/README.md
@@ -52,3 +52,62 @@ Activity reporting
 You'll need a Gadgetbridge release *after* version 0.50.0 for Actvity Reporting to be enabled.
 
 By default heart rate isn't reported, but it can be enabled from `Settings`, `App/Widget Settings`, `Gadgetbridge`, `Record HRM`
+
+
+## Troubleshooting
+
+1. Switch to using one of the stock watch faces like s7clk or wave on a Bangle 2.
+
+2. Check that the battery charge level is being seen by the Gadgetbridge App on the phone.  This proves that data is getting to your phone.
+
+### You can test the notifications on the Bangle
+
+First disconnect from Gadgetbridge on your phone. Then connect
+through the IDE and enter the following code.  You should get a pop
+up screen on your Bangle.  This proves that the watch is correctly
+setup for notifications.
+
+
+    GB({"t":"notify","id":1575479849,"src":"Hangouts","title":"A Name","body":"message contents"})
+
+
+NOTE: On a Bangle 2, this will fail if you have not installed 'Notifications Fullscreen'.
+
+### Check that notifications are getting through to your Bangle
+
+* Disconnect your Bangle from Gadgetbridge on your phone.
+* Connect through the IDE
+* Run the following bit of code
+
+        var log = [];
+        function GB(d) {
+          log.push(JSON.stringify(d));
+        }
+
+* Disconnect from the IDE
+* Connect your Bangle to Gadgetbridge
+* Call your phone to get a missed call
+* Disonnect your Bangle to Gadgetbridge
+* Connect through the IDE
+* Run the following bit of code
+
+        log;
+
+If notifications are getting through then you should see something like.
+
+
+        >log
+        =[
+          "{\"t\":\"call\",\"cmd\"" ... "r\":\"0191xxxxxxx\"}",
+          "{\"t\":\"call\",\"cmd\"" ... "r\":\"0191xxxxxxx\"}"
+         ]
+
+
+IMPORTANT: Now reset your Bangle using a BTN3 long press so that the GB() function is restored.
+
+## References
+
+[Bangle Gadgetbridge Page](https://www.espruino.com/Gadgetbridge)
+
+[Gadgetbridge Project Home](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Home)
+

From a78672662215a0807fb6d2b258e2927269f2ac91 Mon Sep 17 00:00:00 2001
From: Richard de Boer <git@tubul.net>
Date: Sat, 2 Oct 2021 14:54:25 +0200
Subject: [PATCH 02/11] barclock: use theme colors

---
 apps.json                       |   2 +-
 apps/barclock/ChangeLog         |   1 +
 apps/barclock/clock-bar.js      |  12 ++----------
 apps/barclock/screenshot.png    | Bin 2764 -> 7183 bytes
 apps/barclock/screenshot_pm.png | Bin 2595 -> 6495 bytes
 5 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/apps.json b/apps.json
index 11b1ea146..23b570203 100644
--- a/apps.json
+++ b/apps.json
@@ -1381,7 +1381,7 @@
   { "id": "barclock",
     "name": "Bar Clock",
     "icon": "clock-bar.png",
-    "version":"0.07",
+    "version":"0.08",
     "description": "A simple digital clock showing seconds as a bar",
     "tags": "clock",
     "type":"clock",
diff --git a/apps/barclock/ChangeLog b/apps/barclock/ChangeLog
index 9589a1902..314ef89f2 100644
--- a/apps/barclock/ChangeLog
+++ b/apps/barclock/ChangeLog
@@ -5,3 +5,4 @@
 0.05: Clock does not start if app Languages is not installed
 0.06: Improve accuracy
 0.07: Update to use Bangle.setUI instead of setWatch
+0.08: Use theme colors
\ No newline at end of file
diff --git a/apps/barclock/clock-bar.js b/apps/barclock/clock-bar.js
index 5069faa39..396c2984a 100644
--- a/apps/barclock/clock-bar.js
+++ b/apps/barclock/clock-bar.js
@@ -28,7 +28,6 @@ const screen = {
 // hardcoded "settings"
 const settings = {
   time: {
-    color: -1,
     font: '6x8',
     size: (is12Hour && locale.hasMeridian) ? 6 : 8,
     middle: screen.middle,
@@ -40,14 +39,12 @@ const settings = {
     },
   },
   date: {
-    color: -1,
     font: 'Vector',
     size: 20,
     middle: screen.height - 20, // at bottom of screen
     center: screen.center,
   },
   bar: {
-    color: -1,
     top: 155, // just below time
     thickness: 6, // matches 24h time "pixel" size
   },
@@ -82,13 +79,11 @@ const dateText = function (date) {
 
 const drawDateTime = function (date) {
   const t = settings.time
-  g.setColor(t.color)
   g.setFont(t.font, t.size)
   g.setFontAlign(0, 0) // centered
   g.drawString(timeText(date), t.center, t.middle, true)
   if (is12Hour && locale.hasMeridian) {
     const a = settings.time.ampm
-    g.setColor(a.color)
     g.setFont(a.font, a.size)
     g.setFontAlign(1, -1) // right top
     // at right edge of screen, aligned with time bottom
@@ -98,7 +93,6 @@ const drawDateTime = function (date) {
   }
 
   const d = settings.date
-  g.setColor(d.color)
   g.setFont(d.font, d.size)
   g.setFontAlign(0, 0) // centered
   g.drawString(dateText(date), d.center, d.middle, true)
@@ -113,14 +107,12 @@ const drawBar = function (date) {
   }
   const fraction = seconds / SECONDS_PER_MINUTE,
     width = fraction * screen.width
-  g.setColor(b.color)
-  g.fillRect(0, b.top, width, b.top + b.thickness)
+  g.setColor(g.theme.fg2).fillRect(0, b.top, width, b.top + b.thickness)
 }
 
 const clearScreen = function () {
-  g.setColor(0)
   const timeTop = settings.time.middle - (settings.time.size * 4)
-  g.fillRect(0, timeTop, screen.width, screen.height)
+  g.clearRect(0, timeTop, screen.width, screen.height)
 }
 
 let lastSeconds, tTick
diff --git a/apps/barclock/screenshot.png b/apps/barclock/screenshot.png
index d37ee9cae2680e73889600e8eb29f87ba2956f87..9c2b7a50f707be2ca5ddcc2bf88fd9b000d5a960 100644
GIT binary patch
literal 7183
zcmbVRRa6{Gn;cw%!w@XEy9amoK(N7rI|<I<7Cblv8DxUHyE_E;;O-XOVRQH2yL<QS
zKJ3|tYCCoMJ5|;F(jBg*B8!engbDxv(B<W%)c^Fq{{k}NpH@WkARYj~&++`I<Dzct
zPX5K|vxT*tIk^k?i#fTuhqVO&;IVj;rt3r{93Q;q7{L#Fv%{w|`he*CbWb8*oV&Q>
zX}EaImLwOUWC4p!N_r}m_T2F*u<LjCU89KhB35rK*{`Z^SCFmP=cVp(->x<0b`9*)
zyJocdo{Y?66;&v7Z+yyVz<pJ9t^Id<2(i)H`|IoQiVEDO7~C~KaqYRIYjAAqS=OzA
zcShmKp0q=qH|e2AhE+R8t0efjKgL*C^<l{yoP(8@)Ts8`7wPS>Pw6;vps&HcXO`@{
z9uLWFSJc&I%!?y4`0e4V)$uuBjEV2$9Y(2VIj`r3E$fdjo}%7who2&_*?b=Y6xZ6w
zL|C^(jrhEy2K}D1(X{<i#*S_wn&S)O$DSin+#Oi1K_{yP8=c~VJ<p)sg5T*L2B)f9
z1&a=J3`TB?UE?mJ;2(Zbkq%9#(Mz}B<{_+{Ke~>esXusDglwi~Z4BXxp5EbrbfEFW
z2Ms6z4bKBQ%WV!V^XW=X3p;!>f-1XrKiT|7&P1NveMk5;D4gnjdm|jd8)?S$&Ys)!
zIGbZkpAQi4o-Y+To`cD<6%eP<oy`MRqWAEqnm+$ReLo(sg)^>-!mlxR1Roq`ONY1x
zOIW$^b-TKz?{SmFv6Q-y%Zcm<nOSGv_S>K<j^JbE^Vy?C?}A3JQdJSJHuU##VR%mT
z+xcHrs!f#E3wlvQJW(0)6W8lLD%%w8#hR+{@5M_ywFToSGBzcuD>Ai(5ZM+tC4+2B
z+V1h!J7=7j%IfDlZ}Xj@V@(2oVkPtq#+D@lCw`D6_JPeJv`hmh>sqG!+yn8st1cKz
z%IhE8EPC(+Pirq(TTbgAVQlFj9#caF5YNQ}GF>n8>(DGeD%;Z}9zU+Ut)H@U9`lJ8
zB42ScsCS~G?)L{hJ|F^Wwa4sSIXul(_-jTr@P@bsbC*+g5;@cf8ZHkSW0rk}myLEt
zb04(9mwrDX9}ZtcIW6T@V!)5`bIA|Ot%P31Y8-U|hg+8hE$4M5Mc1!a_gT2l&Ocr+
zaK9OD7SWsl@)~Qq(V!Z&3@sL>L_rQ8%8ZJV4vdH5yauC9^qMA5Lyf3L2}85OEdmOO
zMrTP@RH#OX;!|yJXSW2fq|VN-TD^V>R``^wY!nk7Op?pKF9{86CG!%u0)O*xTC8V9
z{B#%121NbBbX5n}tL;*BOu}q-6riG!3YYp}c%dprc#hxt9zetQYjp0!jmQ0>skioE
zc*4uxR3dyxlF3ypz_yGd(!H)M2|7?@h<d(#tW{>|;Bhn|y~%L>yEuQ=Bk(A}SA+28
zxaqz}VHJy`?Z-2|FdKo7c+jRqyVt&L`NjM`)hvSc_e$I?f{8<V`bFN$knN+Hyb{IB
z+U%oO5AdbF(e&Y024(}y3?8t!9G1!wZu051@3%+tgfVE`-r`tM*PNs1feVPWQ<E7g
zrI~kn-=6WpFI__<#UM%yKa!p)izqSI?Y1?;VZkRnI=f-_2}jSc=~tV|@4@p_LK=f!
zWyN@YQ7rPXEE#KGUM0|d2Czb0&#LX6Q=ipdCPl{1`&Uj0$MLk2l%$a~ajHHVY8SO4
zUK@;relb5U|Bd}nv9)`i`6wDP;>!z1Fb*sM3973MUX9~pZF@Q;0_h=YgoJ_of?J6;
z@qSFhT<P=E2v{=3!A{losD`kZVQlB=z>5t;8~@Fk8%w^#H8Is5buIsE0Ce&4*zxyQ
zoFPsi$X$vf#=)X2C>$jFCW8xYPepHr(z=ExMq1&Z!5Y{rPDp{g#r3UziXJ?w&pW*!
zoPzssU~EU+P|Q1Dc|v4q)`!0$;>7@I9QgPiLGd%4KjbL*Yo4HB9tt16%{GMT@!)6Q
znbRV3B1PRZd~cl7RR}E3BV~^dJN`p^mLOMM$Uq^-f`k6pYBFB0ULyA#W;}gi6454z
zf=L&}8q0Pib2kQFBINsS&I$osG+TBPCfDU**c80N^kU=JRR7Ix$4+COJ%QV1-To-m
z*d)|t^R5c2Xds@Qs+tx@3B=*8R&Xpe8R$}u6it;;T!u)WnnRbyx&ebuW|uGZJ1Q$Q
zFzi>g2)WEO6OnzP3k*1kp@f{z;HSUOrq8Kmuh8WI5!-<r*o6RUj(JZ=KrFM8ETH@K
zDxttREuH;}KS*6b0EI+309^-hSs{CAp~?o^cVk#5#B5MEHMJ@mAN!*k;NrJ0e|NkY
zse1H7ZB#l4k5!&fdXo_abs`x^#)Cn7>UHHoH#M0xqhF<z+1q1JHzw+6t}<|Jt{USK
zjS-$LH0fLL_9r+4F&CPmT#Z;rFM<@y+}-b}BF6*KZ-otb<xq+9FXEn22ojqK9Pn%!
ziDMKo8oXKEiCD4w5ef@;Up*_^%tRM%jz0U&!_V$6mj7G-4gx*WeXV3oU`nuh^+ygP
z1yPnb$&H3hQyD;H1Vz2)a)u8H;mdOF$xEBq5#j@X>jK<@$n&>1Uve@;;;PAyzlZ?j
zQF2Xhi{7#b;&-ryI}pq;3ML$*(VoI0WQfd@x35foAKK%s#6h+lG0v2$XYkOYf3q%(
z^}?XK;5uXztA=$DdMwKUUC9J>NB<JKm65`Oh)I`b#iP)5xWGk_c{C3%%~<BVn|zb$
zLbk4{O0hB%rCPo=#o;BeAB}=n5x-zRi-C>*#JF#7NE@8PbZ`XebcB7yJ(RatxX3>F
zR)=J*s@gu$lN5UfJ9xoo8$WNb-2GkIEQB&ynh??5`R6{115qTL2k{pPTvz-Dgue9~
za?{+!7~pU{d)I!0ffzMkY7a0-w12I05ud_yO!}Z(&vcQezy^5Ct4RbzXRKa1kzovZ
zV|d66C-XzDKy&zGlnTOEhtbSN6{*WRb|Q;%b(bQ?n-PDyFwxA@Z*DDoCdVg-)HPG*
z+y;wF8n2*7n4yiL*Gh-y9Q4eG+XI8wOMJ~!9X%DIA|A~<q-G3WjCJS;5%OrUj_f=%
zUx=o4S|Ev5c8bD+Rk?6k*!Xz&N<nJTwv(a_33BE?z_n_0kwgc$b~D-1%MgOYL8#B(
z3S+I>eR4ebG$Uy@?dgf=0maoo{smqS-mOC;5F6c6c5_9dM4L9lz8!0vDCb#tVbwBz
zpjD;!n=1IQ2Jf3YPVYyF#CgXbux<I|dU!2;`I5h1+Vm92I3w<%cAAlBIWJDd@+}&%
z(I%F;)LX@(@z>_lWr|FWXe5@rG-nRc!x9_XWTm<+r9<eXM`w4B(Yw@!j&~+f))hIK
zrrr&eK3ggNLMbfwU6$KNP|mAfaYRVKB9U?K+-}Og6qVJf2p#{y{gT|77{xcsLOewm
zni1mPpMzgh&(H%}$SPQ2$OsU17WGcf5wBwv8+-dif`W2duHY}=09L}JqMH&m{OM`N
zeuuZ^dh$tncZr!Wkhm@gv54XO8pv#TRu%JQDd|&p3jnti@t(bTd7HRe3^_TZ*2v)J
z`@NDp4h>FXn+&@C0+wT~jNX8yh7?X=wJzG3b2oY=EX+z=L;B=(E^(<ZErI$Dhi3xM
z6(&|6+ki6KOUa?d4X1JX<Fgrap!gh^ENvQRQq7B=%o!)yWO6L@_DGR4<TN^n0VP@F
zcZtrxtB?!-Ceyh?s@)S<Wq2?4+@W&vJ{2z6FQWd(n0LfBr2go;``Wn=u}1FewX;MO
zu&VFZlkb*4lPAt}*e~_3SQG+;p=LAlRVaB|{aw+Za(fB2fhEs~-kOVj=QbI*_g4PV
zu*v}jr_+?gqqLtsRSM3Ci6?9k;`bGNM^8P${vlV@O`-v-?vA~-JR0$>NhJ>|8l86?
zB9TB<P>hN*A(N9UoCE{q8}ca(wX63Z{CYoA*4l;4e@<E->5G{3lXBM0o<!G!8FVxM
zWAsib&6lM7tyEU<eHeyhwOgBXH;)k=)K$G2%jvL@8Wjma5ws_Ej#lU}OYa;#Vf?a9
z%6OX}CNyCdP@VPsuGvTm14#^uWi#^{H6gs>h1rTBkp2Y?jnl!yO^HLI0b5w5-AljA
zlkh2(h{#;`X~@FN-rTP<J8uZ;mWS>gDpM)rd`TN87!1*&^!~n!m>*vN%#~?4Bxa~*
zmmSOmrmFXxUkB5`@A48b!=g!|ON1#U;G`PcZ>k`obp5E8jACNV4GHb*F7;tYqlS)B
zKt4%QbFbJfcqCqJRWn2$RS%fXd~Hxoy$73=JFx6p63&$`I{8Vt)?^q;D(xS4sTIkw
z%slTaNKb$;>0xO_G$C-C<JNuv^`QlxG~WiCph9~O+hO38Wj}9wYy?VN4z?p?@KYim
zB)rp3r)lB)oSg;D{C=1GC{`O?OcYgyoMzO=^mF2x8b(Cy1Voyp5JyaqzHFuO%4O2q
zFD^3G&oZ|}C`KeKJ=s6}sc%9#y7ahR1dsgBlIDceZj#6J^g+GEEsu5eBO3bKFqSXI
z=I}!-17S9u?%|#FvWk?q0GmpAZhDF-$@FVo;>p!jA#IW}MfKpGYcCqKuxzZ)a4p1n
zDQWp=@o!iH`C6uO8{~9S@ecM*7LAYRT;OZgS%1fPm>eS;Fj~;cm6T}OFif2O9IUeD
z7+xt39!Th-oW?6;v0)4dfEpm7rCA9S>n+)qFFOp1v(lG<G8ruI$(qe%tnG6Qe{pg`
zH`z^#hd0W%?7y)5Fz-c8M3=xhACKjyR0LYy$t{E5f+xoEKMNV=xw7H`8<i(bqO1B?
zy9u5r3gua4Y=Bn~xC^-JpcAn;SZcE0zv$(sI%v#uY7y*_l4m2xo+7Mq^96P-fQnN~
z>b%&(n3g<?c6gR`k}2j-Htn@(rr<emD+%{eSugb8uHYFXbz>)Z$Yxl7aAIZ1{RgE)
zNv_~X=WMQctwgJI5i@(nQwK-Q#^81F!%UFpK0E;V8qQ<_=c{b9d>O)aS`i!N-knJj
zvScY6p)iO>B`SiN9$2SSeuv5O!zq)eyzFLaV{K=0S?1=vu3OIvBad8Qm8lhH5rgd(
zv@r{^nMD0OBe0AerwUtqo@GN+u4j;?h<0o=lQ!rI;~ZH)Eq;oF^s=E&w3F1%Q~Eh8
z?M!qPM_YX(o@QOE8c;Qr2^_#|7Cdja8H}NqD5Z^17mpI<7suVd{+35}WJ8;F1J)w;
zi5qTs*X^yvJTdtFBSC%ZJ~w8;%L9OsJ>1kN=#DoyH2n)cX88#7v!OHPBH6X3;pu9U
z4*lB~WUV7Q&7+0ZU*lI;c{>`3BUyoW4IJElsGGPw57F64F76flg*X(<jVBQwNJ3j8
z87>oDBTdO1pTI*^M!so<rjF$i&ne1l3Jn^Q@4IUz9<7LOaq^AWv%56dS|QWM0)|Ws
z=pn5_Up?JbuS^?<`S<5vN`)Zb^<QJbqN3f)k}_*-;+IP#z9U=0-z;&`x;cNN<0(wG
zvlkZW<F#{GiHhBb9Utad3UB9BIS1eGP+(&Cr4L<Z!s4>KBaYwsMRr!)QITWza^Jt<
zaMm-uTcNlOW8-_0r;WL{2l~WxR}eh;r^K7G{xl?btc1_PxO=%|qkl>izEoKI%)gHW
zKgBQ7btW+^#NZ1(>Y7u$Xp6huDtPOb#hD+Rs!I51+-o#!;e*-4R%_W!W_9w}di*K#
z_9gRX<P3av_Ge<*wncoBYIK>&%Uv~yR=u^&X*jr*oo-ZiukZcN1J%w$QaC_Wl6VcJ
zi*jd2&CMH}O?VzfY~4D!M7Xp4o>7p7201l>#aXO_($tk|U<#ca{;?K9c^<=cm+Yw4
zMo)FF%Ok@VeLtRm=eHByU%83SQYB)ZCg>q$Etp;cXEwIJ#~#ZGT-A8ztNA`|7Y5J0
z(sf?5@J(^IGzBm-D8w_Dv=%XJ3Hfd<Gb#(6=1_Rf?IbPt>aM$!cKwxi4YkW$trTI3
zyuwGFrOt|~-DdK99aEgt2i=t~<7SHi6YbW`m0W#31&PWha=SbX)VpW!td}Foq&Q0V
zk!kSMwcLR~NBpk9-(J=<#veUc6;5l~y)+l;O#LoXtrO=9)g0~6u<{C3tfIa>o2*ff
z4^%nFW_&dr_ls!BbqJ}Hz-<r)*?a?YE6#P85mVik90nxOd&(r6X;f#VLzeqiNK2fs
zA}noILV(n+Kd0|EyC<Pe?8Z{GZhp~in!@gN@V)?I4md%Uv4~^p+g@mC6&LTYR==)2
z$iqn{(f#nZKc4UR&aAI!g0zV}jLPopA59N*R(3F?$AC+*wx<s<sZJj<!DG>9@ywsQ
zQMAq0$CGhM*C#o=QtHn7wMm^<>}_Zz`QYG%;ci&JY)(8Jf@W3pQM0@5@E?z#dbcp`
zJT83*s@eRaB^UA}ZN!Y3?a97tTx%*ZNS5iA*L3;o3~lV#k+;kVBT{bpG8Vg8Yt}91
z^xdsToK6ic!j;lRjS`yi&-YjJ5O5lMyR=Zruv&P_(@I~6vk;sBut9bNx^-SdWYeKG
zot4`?J3ky6>1#72OzF`*GX?s(xHwRzTx#2=v5$G;Og0TKNW;U_2y{xOTBAs72+sFa
z2-`)=cppOQv*`RMgk0f>lCk^p;r$<EZsg5qeT&qw1(mb4=BV?>;D{<4Q@*tb?pEuh
zJAG_{xotKc|FpHFZ*Mc&<~mSW=x~4Orky7{@vt=lazIe9L|So)vm!1V$#ac`VrwP(
zwJY*pv8{{{NA9|ww$r0=Z%?E6>@S`evUFm5sk5itC0kZyQ}R|Pm7=T`1A<KPbA#`9
zm8`@JN!+y~Hu8c6E6j!uEyS?UG61}OpHDAekWUv2x3Uo$_wB6<TVhN&E;t%Nbwp>i
z9|&r_Fk_>&t|{ArnU~3@>DmMCba%*p9kh4?dwd}2fDA_DGNO%ky~Z}{H`Za^plKF-
zYT$RlY66MKNsR6EyzC+O$EhEYokFD%)sey8P!k(mD%vu08E*KbkDsOw+&}@GQn;{M
z%+2R2I2tywNCQ&FA0Q&vlV<l-NBRwsmv3iR^*3RzIm~Y&Pi<zf)=2=mQifry_Mg_u
z)~ffY8e~{d#-#kSiJ86!t(l^OF2~w&!#)UY;%p==8BD_R`q+jK(XjAK&{IWiFkhoQ
zUFrvy!%gR#<FAnBFglx?xg^eY<=0~*xB=e@<(dOm7~`BVS)mqTdJ64k10;$Q&l&rj
zV9to$Y5ZCrVdBRX;to%@K1&unkg<7=yrrp=%bWKu<2F3t4`j_v;)0{A$wI)^38+Ra
zZWkChjFD1Yl#1SpAzdiEVqrX3sUEnWAiq(5)T=`N<0y8~0Se$q(qg=lu4MtSMY`F2
zYi3(%)@`U?40I5d&wx?pvLLA?lJ8k=q|K-;fD*4+o2PEO#7@0|sMVH&Hxj3gb_uMM
z4MHIpIW4C8)XLD6bko|P<zXhFuO``1dyc8O5-9pow@GR*vsCXA+^FKy1wADr7b&01
zJZEI4et=TWhVI~g$u+>ms^(fdikI-)(}`l^)iNo-?u$fbMp^CO(0_4#E9`TaU9MS%
z5g(jLwIV28i$W&>s2C5|H(qwNT?sd-Wgq!IQET9Sv(#F5nA@kW;HjM39}Vq{ZH_}_
z5uxwMI9!f?(fEPi78q!W3@7Q;EtbQq^iHM2Sd7Gl+HLwlZ$|4ai{2Y6Vfa}|8xZXL
zrgmosA(7XmY{{I#Zyok4n0lxq(1vT^t9pk&8p?<jW@M!}0|E?OZT*~~Jt{IwqF+f;
zx22r@O5M>d(ar6+lV9iH6PaB6Ss%sWo+JPO6J#wZsU|Ne`S)}6pGRtlPn@t^j~Gdx
zk%lw_Fw_mpaZoLTSq|tp!-xl!C<KCB*_*E3q;XR-uto>kc6G({6$eGulw*_!lHb8>
z?(XL9Q_{S!G1P{guQ!sNoeH0>!bsHo<Swy<op4zi$&EK*?O?oVqlAYsrpAg(H6M{z
zCu-k1B86#R?E@#jHi-`SgDMHIu)-}<jTd`~d#BUuyTDm|KYvy$c&i9GOd*7mHI;ij
z^*3!-cXH)e@N%h=(BLZ?l)7**r4yawIV#P%{Cw*~S^{a{vz-;NT}$X-*PqZ%Zc=fE
zXJ9r#!I7db%n4+)>$RShuZo2}=f?Q`x>np)AJl}Q8i2K#AaC*gEqb?7rU_B<kl&!5
zc--V8%Mn{+ov`5>yRF))Rq<cv`jY4VR7cBxDesw+(--aEWxu}JoWtPNxr4!eWj2_9
ztRS8yQH9)^HTixgV2}k1bm?h(wsi$FsIGlLyuOY_!1Up!dA#MZ#q04_silML<Ev9T
zYE6^DpHBot6Gd4m!0Vq8fQ!!i@=u5IMNZcl0C<D@7hnKs5Q0C8NG|fq(nvd~uxQ*^
zeWr&>005k!yp;IIKOYRs!wxy@0I?4m;EmT;5L@hivAUG9l>&(<pCvyy%CWIdBc7Ea
zm<1sDz==TqNvzY~U;GbXVBla8{{lSPUqB|nV*d+&5&l;aGQt0w1OpTF&vJk7ME>cY
z<^GSPo{`O2x<OlCPp^ogLm0^OYuT*G%R-$<hbLJFkiZW54_SB+L!{GZfuq!gik>mw
z4413>2H5}7%=^cS>;R8z0h6=&bDNm)Tc3(izq38<v#kc$AQtZb@*yCQ@4<CsZtL^2
z&vFad>&n1q1VlZnf7poNcm+rBEU<b!VD$J{Sr^lBd#)GIg-`UCx_>DY>x!Rmy%y?R
zt=PI3Dc`c?_hn-LCGijM>2)NK)2#ta|FHjWKSI1Bpch$?fFnz5P9&{=Sk^gkA4&2F
z;or0SS2TZ@`&WK{Z}6W1|98^gr{F)L`TG?7Pm<W%&371_7590M1u4G5H|J|I0;?TS
zUZSFPF|NJ*K=zgAN`dBzPI#rg7BqOFs3`@`OU48f0rZCj-p9TAR*RBKf9w08;(k-C
z-xEtSISDWOH`;zhS4AGODN9q!!mGEZXY&R!4+CB!trlneZM3kN2k_mtCU1l%yp+y8
zl}kH=GU>I9E5iM&lKSw|s=9&oK##(N##>xB(RO#k3(uQnu8|C&NB6B+OqR)^@s8lb
z4~ep>Q&9xBtK~;B43@ny)R85vGQ)n)9lkMAFP9e8uWb$}6n6PArT=~n{#OIO91=I0
W0$kbz>U96Qnex&qQsok#0{;y^kc`3r

literal 2764
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
G)xQ8u1KXki

diff --git a/apps/barclock/screenshot_pm.png b/apps/barclock/screenshot_pm.png
index a2a3f63fb30e157b24f6a281b4e42bdb9064aa66..983f17aaa92b2a530164393700aabe05a07deb1f 100644
GIT binary patch
literal 6495
zcmbVxbx<7L_U+*AHn_WF7~I|6HNhdcOK=+qgy0Zlu;4Pd+dzVc;7)K05ZpqLyyV{Z
z)w^};SFh^5Kh`;YPOa*__uAdnr&h;lYbxPjQeXlA02~!%dEGzr`Cp);{uw0=4pRXD
zqUk_=V;@~Be>x8@cY8+{J35~?9(Htg0gm<nK)}jLj-wZoNFwC-6>$i%8(?(DL*STl
z{Ne#gLYCRCs<E+Vcz@WKUHvlog?V^vEZWT4b3qvG-HXr?Lthis`Ld(?QSP>-d)=q2
z+0%{9tEZr_iDSawVIpUeJo1{%iHG-X*NabiSC_*`XOf?O2CmO9W*A%GK$2q4v>NkI
z9)5`{PYfRfkJQDig!aC!-n-Hst}eRoyujVN$(4$^q52Vaw<q7Ps`j02uw762`588e
zp86CscOo8kLNk;L-e6Ynf6-kYEz_%h7IOXE6wwR3fBO3L`YFj>3Mh5Ecz+$mePhSi
z8yrMGf_E^hBy{0Dd}t$oaSSnudgRYrJQJzTZz@>6sWH~Kc-uLIduHG6X?f{Gt0xJu
z*b3?>7%KmD%F1IA`m5g|hLmAJif6Z87LWBu5Y!4hK;_RxWdju+o0!+Pe#a*fx=p0X
zRau(B(F^tLN*AV<8X|OqpWF(`l^&3^3!qY9iC>n}-c`Q~JJ^}Xw*R<!918;)@tgBu
zUqPStc&G>`zPNkgJU(}SJCoW%tJs$5u&-6Gf4Jc1WqOQ&`8+|}wS*<<iOo&wP(cJC
zSWy@lcmX&nk*F5dT=bU1@lm3TN$kTBXpze1*x>zi{!T*Y=H54D(LwI%71NrZHH2kT
z%Oc%PkAyiL5TuxmKy%D0qy!lZ^D1ezDoycKqynkO%o*k-uh~m84Ffd<j4DmlU@i0O
z)@mMw{H~?*3#Mn&zM@CX^Br(+`+*ci8n92gjuK@EVnKGfdY;|Fvb}|8DT)TyOS}1b
z!;OB|Eb9YqGyi4ZwlzFsvBO<PB`uMg=2@xk+sh-Z0{B+T`K4)he&fSf?4t0o>Kh?~
z1kHiqm|<(&fbJ|bfDeDcJ%v}|zQ|R!drD#Q2;E@tjv**%>r=N}I+0}XUF<>V7kAAg
z_j~T=j00%LY1n6P+{LFKZSLKzT$5jq8(1;FmPrzXm~XUn8Fw+aJa5qacKlut^9&c_
zM`tUsQ83RlL2s0`BwG1gr}-$WVA7(}%Jq$94A79Z*(<!j=Fl}Yl<ef{6E-*`nk+5)
z5VGY<LEuRCy=;z!{$1R#meSp44Dt#Lk>}k8#_K#f=t}VVV`Az-w2iJn2Ek9M`Poqg
zyYfBFukTXcc;(eHj(hCkv^7^0qe29;2|M_1J63oc$P1wS4=s3Co9)Bd%2Ls@z>-AY
z1=61yx9ThOTmd4@nvx2o@-~)y2NQLyF#n+BH&o!%<3>^~(jgRs7P?GF4c{wUr?vc`
z&Zl?955Ww+YMAAjJ!9$3X<UKHyzIPA7C~+Ew!CHq9GF}g;d}AXYqnhmzm~Y!O2}1d
z9O_ygmnzysd0)lP*kc{<#uKTaA(<|)Te-0-iHZk#na!+`i*U0vU5+@<A!`U-r=&8B
zD5B;jkfhL2<IOl+SIFaofQ_ns2y)6~Utj_(UIed^n_~+JLlzn#K~7@cd|MFkw<5kc
zvh{BBZWx;TB#Qs50~`-?lf%L!UL<W@mLtz8%kPY2gv9GAOxK;-L&OAp!?U0{F3ygu
zNuI{(mSKMvYzjyI;Y!$A)^g_1=gg*^K+)_k#Ws3ptI{*ar%z0mISJ`O)C9SLpdBIL
z;C=Z_jR14C%RatW(S>9)%(@DDYCmF`)T_<S(|3aSC@0g-fkd1{E`O}=HH?rgpRlP!
zOjGOEz$VzS{VrdNT~y^uh^mhXK>{xhiFHmPK`NI@R%IX-wF^S+PcRGma;gNMy|9+Y
zgc@bnS(Kz`c!1&%QdBy0i0aC?Z<e+ZC3k`pZLd$6uHY;_ktYo|ZaX`?oWZI@#ImqC
zGW;!=++P-F?~UvijCb!lrfs@1OBpkx;4bkvU(?${D0^?LE8!i&98pF?lz3%_UF!Jp
z$giaJwO@!$yzi6=v}<?yxX<9U#P*doUgJEmPkGQP25N)|<~#Bg2FFrxl)(aR>J2PK
zSftTo%Vh<_X7IcjLhE(Ndn$-ZhzCzJ^OthsUt4ta8FH4N5C~usCj1H|&NU^*kxlz)
zz-7Op(qur%+);`3iufaS#VBNDDdL>ddK#;cv4)$#5e3@6v0y1&?QHx3JE$35JKGf8
zRN#aSmw%dJtV}TR2iCu4Zj9@nznV(N{YZTC_GoQs8e2vJjjSL_JX510+w~Lp)eE^v
z@5P7wAf(4%od}Q5sP|zaF}j;M6-xoHs(2Y7muhTmI`ZDIQQ6*K*ol_Vxu;y`1iG!9
z_5|lvM1TruBHgqRdM#3<i1zMx&FN+*;U*&*#&>hdK0`P7oF`vbMiZQijVX6zym0lo
z_M8eE5RvefKNwvwH6(E2i1GBk&5+S6Qm~5tep>^8$<(BztES7;?AWTwH)BNJFmzX)
z+R+=&dgjn9INDE78vXbr@ikm<ly%@DeoNF1Th5k&w9in?&B3K5w!uII&#VR6H2zkT
z7neYfe~yH8IgYSQ){vRPBrb)-9PkCbqgz<@mI(hz94ql{AOpXqb^0&1{T058O2cdK
z_0JKAjv>R~Qw_eWxdsc4Js;*7wP2;rXrmH5F)uRjdTn>e{tVI4g!Rjjdm)lu8;Nph
zuMb8wSO^5=gPnf4#I+3M(#j3`YY#vjA0eULjZSNcFW%KUeg<*I&1KVcCWY#AI=^`p
z_;B*kOD8`}^`9>RMLiD{l<IgR>(rF6QxZn;2~g{$Re1eLY<#s;6vtS|c=7ZNyQfX_
za&o|l2o0im*)$S-ii1*xxrd|#71`I)EBbOwR#|kGBbgO~jqmHN3(aF&=*)CAF`Oe$
z<(~vcH3W7p+UZtDC9u7HS{&$;gS|23mFMH}ovhi#Xr;)ulpNz1Mvy#T=Wr|+rm~u%
z!+{l)ag6#v`xy-uHE_ExQ#2;T^}8FB7fq@o<ud;e=hgmOn^f0WN=)TGH6{=22Cv9W
z6PJJ+&{+nLx9FG#(<}L@6ov``u^UcxWt#qg>U1m7O~@0g-aA33y?0OE+4PzN9~p_@
z;2WnsdnXlf52eUW@lqPu>QBg2fQY5K^mVKeu-aC+s)tBf&!~M6vFeFJqur&gO&-=Z
z*crQobI*qs^_XNR)K)RpWSDc4AW*S|a=iaWdoEFbxX-$%zvx`yTG1A7*NpX|O1=xG
zIJKJB#@;v9OkjP|j<=qamymxMd?hKunC$YZdlEV-)ffVjNab=7x~^y6^9-dNyvVA{
zRD{6uus>+PA$u~xLIPykC#+;<ozh`xiQ_A5)eZalqN<qlcE8o%d)x9Y8_~Qv3gL$_
zySmJ6<QP&M%~)utnOKs9JFcX#j^v+naTjvzGsocr?`5L3(%_Vc(Fkm)w=5E$?@(0G
zQyAtLD!_U1Vc!=C;sV~)#+ju`px*5oQjaV1u@szd>uSv<DAN_!Jh0(Z@Y3*6#rKVj
zciF099PpGa(2*5lV&KE0sZnrjQ$wix2i8#uF&vVa4*GX012`$9Iioy4HVV4Q;7uC2
z-V{OWxM=I6#vrfTkIZ`P`kLhL)n+3?ds+1EyfY!=aT3*DZ?*B(pzWhuO=#O#wS1qf
zZu>JI^m2XUM>Wv~xK?fK*^+fozu<(5bA@z@Jnux_)v5W(2>M3+EYxD&sVNb$l|pnN
zrNXwM*3-|&Z=gu@s7toR|MT@Qj%VH43@sd=L`e-IQw)UYV8gyKium>Ogs0DtR=3%U
zu&4RSTn@cN1Rv(eYMli`mxZ>$+C24*25jX112`zV5-OX@3xqt&#Rba5<HHs~D+B^b
z^cSgeK4#1T$%9BD_$nZPRwcz|wxlcXv^x~Y#g{YJz&Z*0tg~nATw*1ae(YpY;q81N
z@)3%e$*LBZ&+o7VbU=+-&LU+HdAGvz@k|p+=f2xY9se0ysOAwGM8s;VT9~NCp5%ww
z_jZa=4A9QN7Oxo0`>c%nDxVFO9oQmLEtOE7vXlHG*cPQ81|Muq<R$vy@4G_mW5gdR
z7Xg!Fke<b>*JBwx^F)a<R|%rFSE9y>mGPOvKy@}$w7rfl6>6YLdEi={-KqM`!R83&
zzPBz`dsVvO%lv*`%I!W)OfgJAuKHP*dm7c`<*gm*2i5p3kxw1UeomN;oUau_(heFb
z3{oq)W;adDin+Gd@JA3QJT9n*6IwN_A5hR3x}S=}z9TTS-ooKWF85K_H?x4g1!}}7
z+BVdfy`v}E(;sZbzJ<ZMvzYBGLjL>6XOw0e=7Gp4e)h`TkEI#COVdw@^kKt^r`7bc
zs|mK_5Z%BsuMPzJkSe@rpm2H1pL5TPPLtEy4@N()%wG9xbFT#{O5EF_jxm1O(TAbE
z3BI{;#yuk!-)WmB>WF!hl%sgC#FR-APTZVJQ^f9Gx$)YzSZL*>2MEu$Te+DT=H6Iu
zNI|p^KMeI?cCfJd4fgUzkYn{Px|@gV{KSZyXy1F!do`i3j1}>79}5-U^^98dAc-wW
ze~$J1`sjV%Bmg<|l;~M<DprZcLt-kh{_b5hs@NS?(v!kcFa+8a1%JD9iRJAsy!9T7
zZDtRtf^4(5>vUa6Jm3K`{LEnc?S;-kSl=3!Zo+279P3EO*^99LRiV%a5#w*P)0foS
zp#`_!>fW5)IZi(1-2GjI6-d$0cEZ!7LKT8=mt`>)2zN?*D_D@YkOdj2N7vb0E7Q~&
zbsFg~@O=!~HVbShprX_gi8SMGONazBs0Fc^qr)W&>Ur9*nYO`;B_R~^yEQ>1R~+JL
z4h&W%sjj(*VE8MuIvDa%%$3;j0=y;vNlWf`IgXAgFif9+@uj#>%F57q(F2#Vx{63F
z@OUDFEn7|^=U#o)GA_A4!(!lh%n&5ulI>1dqL?sH(}T^QL^HQusOS>yR8@JMY=C4y
zUbMOLv9JANk6pjdv-C)aqWGKskwBkeoM`k3lVmeBpl<X)wP;t*64_v<c~Rn88|vHu
zq6bxRUwqr7Qo8$EeS7qd&Ld<opHK#d#q3BaN3zzzx`#P%1e7l2n!<LLe))#Mxl$x~
z=<}G8YF&CN#*X6jOVr{@zHg<7s{-dvL0n=uzN$EDN#&0wsv(|><}P^=$v=EuS4(MU
z_10S>S!5RWK~F9f0hp8`b63_!g2F!h2?VJqKBa*5@wa0T(TY`0^d3F8bBSeLHJsU7
zUKcg$x|L5fEjERZI7lW$A9~sp6w)fm7YlzyW7Oxv$aO>}NbN@{IOHoya(~JX;;c2>
z1Yzp1e`_dQk|iEY_}TGE*^o?@t`E6>Np#|6-N*3kRu`%K3`!@%_|MWEZk$k05E-Uz
zo9kg>;D+Hcp912m{@Uxk*q$%ook%Q|U<D(R_@3S--I;~28Yeu@_urBNy~66Bh74Sm
z3z@3xuMX!{fMyXB@!|E(Fu_@AjOoN4PKP}xZ5|U^9Bq?M(@kT@_k3_LbjE&(LF6?R
zA26mOGUr5f3GpO8M+-%dH$VC6qsWof*ccF+N{hH9@1Gv0e|_SSXVK!6#4@wKZXZ#w
zzm|>JN}_AFYV}?-byD4f8BN_AsVZCbb!i+LKg8--&UK^Zv_9!;Q(!lhvd3iL)@kXE
zglm@8oYF`^WDAI6%rJ;Vp43?UllFj8b^G)S>Mrp{G^MHJ0(mfKSPVmXq>)?0LE1=K
zb6JQr1nNQNhl;Jc*cZ_%$<E3y09^sva8;|ZPwQrdxNLAPAMs)%W9dL+q<c)c+rIZ#
z;1AYQkH{^M-)=9__jbahw84ljQdnLnR94LkFB>IuVBvdSizoVQ^HC?_w+?G5-4vG<
z9vZNp)j3%vApGy9?8q(ra5BcRmB%^Y;Fw0c+sbym>%w@r+>`79MwQ16sM*t7XO)V(
zcRBwsf|rYMo?O{=kX>RoCW6@Z*3Oci|0+^~WxpY#6&JFP@hjFu!^Nh`^+L8r)1ROF
zvi?PDR#P#MbA_j|ka1Hy`?KnyJ;V<TQ5L^Daux&&S_O<V&8@lFa?a==-Sh?!9o~VZ
z2xw1Gij<WYw{eT<MJK-o#InYEVq{@DTcHR)h<{0K@m9T+kC7J1eI~?-$VRR<Smj>E
zVo^XvJ=_~Y=XGB7(E}R#4&GwkDxTmM53klDEgVa7Y(vC%n-nNs8KYaHv-i;u=C8PN
z@b(zdKUO=#{^;Hpqg>x=&@!h`7H>3LHXqy5SwVZu7v|*?<`?mu`P8sCoV*<g#veCV
zS#8pnD66k#`;4<hmozLun~(&F34r2Yr>H%hGqK~)=RD>RpxbVY1Td%$sPtB|apH1q
zwX9}pO*&WE)#ApfSG?yMkESo6l2IL)1;zI`ZE7gKu#;|OCUJdF3t@YCIFq79X~Ky2
zNNU>R>j}m&#5z8$Coe1k=?9Xa=kD@d94Q(GBABFM8@f8RQmrfm<$ZaPid1QIe%!d9
zL%Ks3Kp{vLV<gLSxL@g02|uZ(Vtb6PK^^6;CXRHycYB@0ge{c<jU*M$?QQT={n+&l
zvPGa0I?gG$s?>k>-pAIxLS7esLX9PBg9>e^(J8LgO5~b!^F&99X>2=5J;4RTah+bq
zTzjJ9S#hn>4=sJIQ%H`~$`(n*(bYo+fCm;jM)enimm(S@{3^C7oGSZI7V#lx+;`t(
zTi3=yh0bhjzY}YDvj37lCsHk08sq0#c@2~7LmM!>$^tCj4!za#No&59_OdfmpJ<)#
zaOqE|Tze{1jF<0WT74Ne4vhR!yKCWAPZNK*|BO`Ru66&$>y1AEfDq*<C#S6<C-;xJ
z_s7zMhNMU+f0m{iw9r#vCyDjL_Z-pA<5DK^oZ}!alC2;y^#yfYW99HOvGXKGI`{V{
z4OT_HYpTVqjimdDu)V)u@|}VC`2~CP+l$S1+Ot!M({%*drZN6%2gE6#)$x*4YaTeq
zZ4U!7f)x{fO19m&iY`U(&M^%_@A}}I%-<bS!{Mg&Kz#f-hit2r0m^~d+}8d#1;S%v
zjjF+#;%+l2akL$^0gpo+yN!K(#rA@HT2#!WYA<VicsX+^E{HwV=Y7V=ylASSZNkp;
zqRty>aFF?wQD%pxH!?eyH3p$PTSajshs%KDyh=lI(NjrM*wT&KuI`8d0^=~E(-d7-
z=(*I-HJAZZJwRoPY3gBHn6_AYgJ;S~c;c>Mr&%+6lh32n|FMMybfpqlTs)W<-tW4(
z-C4{Y)VGHVy0#rD`=Kh6Bin%9T`(=Q7cs((Z+aEze719qFrsU8NV&O*59HLj?VRj-
z=n8tcQ}2S)>i_o2#cb+$`NwiawN_J-2mJnX1>j>1zWOs^cqp5A0{~b=e}MqVfdc<*
zqWP$3D4^|OB4YF7l-b2(002ngD)KV=f9%+A{a#fdVEFWsRsVyOE9v;u`w8K>@S-@T
z3+Nuq7xe31?&yY8));B3lvWLZh>DDj4*Uyz5S`^;Nca6kcsK$=)E^-ICHzmM@Nk*`
zZxTM}Kg0cVr$3?oGu;0Z>EB8Bk*6^)k$o`U4c&Ka%@R9)GykjEPn-oL4Ea};_#o_I
zp6iz<Ya{Dt@VSfT+sB;$Q$ofvr1#4j?CaV*)lJh>N7qJ+f0UUR4bdN6{+;a4K))g_
zjuz*aPX3*@JZ<hXpoo9T^EYSB2CR_9huVFEVT+@tfzm{H%MNb@0uiuQoJdvU{N#jI
zD(vxLdO#?m9~pJM!%$OWVQyC<XMhEi)wct;S?K(|zF0mdV14?O^ebegL){V-5y8pQ
zg@Mfi@)#6o#=xfTg5Vo|0oc`rXjt|k$E0Nc?;icT1^*>nz$7tdh%3ijP{zbUAM$@_
z8Vq$WMgCjRKaKuJ`TuJ4KNbJ`Y50fqUs3)qB#o@zEtw%^`?b*geJS|Eqq~H}x_@F&
zmt+gAbCNTMWlm6&>YAY?V%bF#HuAUkMrpRY?0i~RR#QRc%Si=;%sHPB_s4{)DBw}y
zU6L9aJ>T`DCfD?T>32)ioK&|2^`5j@)IIRc#5s?*%P&Ini4c;m5kGlv6L%Int6v0a
zs&8squ$9#x$oC0n46^fwKsa59+N;Stk6$dETx2|^Ev|<o)%&rWhcDVr7Fau3U6wu<
z%ff8dLNU2~H&%sWITt68%a-Px_KbgD2`7dM-FO#Ze(}emugOGE|JR%GKdLT#jpbH{
Xg9(m$`{$1d0HC6vDPJpV8Tr2eWK!kI

literal 2595
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


From 346eb8f77b0038c8ee2a23c72a3dcf7d3e0087fb Mon Sep 17 00:00:00 2001
From: Richard de Boer <git@tubul.net>
Date: Sat, 2 Oct 2021 14:55:41 +0200
Subject: [PATCH 03/11] barclock: coding style (add semicolons)

---
 apps/barclock/clock-bar.js | 190 ++++++++++++++++++-------------------
 1 file changed, 95 insertions(+), 95 deletions(-)

diff --git a/apps/barclock/clock-bar.js b/apps/barclock/clock-bar.js
index 396c2984a..52affac5d 100644
--- a/apps/barclock/clock-bar.js
+++ b/apps/barclock/clock-bar.js
@@ -3,159 +3,159 @@
  * A simple digital clock showing seconds as a bar
  **/
 // Check settings for what type our clock should be
-const is12Hour = (require('Storage').readJSON('setting.json', 1) || {})['12hour']
-let locale = require('locale')
+const is12Hour = (require("Storage").readJSON("setting.json", 1) || {})["12hour"];
+let locale = require("locale");
 { // add some more info to locale
-  let date = new Date()
-  date.setFullYear(1111)
-  date.setMonth(1, 3) // februari: months are zero-indexed
-  const localized = locale.date(date, true)
-  locale.dayFirst = /3.*2/.test(localized)
+  let date = new Date();
+  date.setFullYear(1111);
+  date.setMonth(1, 3); // februari: months are zero-indexed
+  const localized = locale.date(date, true);
+  locale.dayFirst = /3.*2/.test(localized);
 
-  locale.hasMeridian = false
-  if(typeof locale.meridian === 'function') {  // function does not exists if languages  app is not installed
-    locale.hasMeridian = (locale.meridian(date) !== '')
+  locale.hasMeridian = false;
+  if (typeof locale.meridian==="function") {  // function does not exists if languages  app is not installed
+    locale.hasMeridian = (locale.meridian(date)!=="");
   }
 
 }
 const screen = {
   width: g.getWidth(),
   height: g.getWidth(),
-  middle: g.getWidth() / 2,
-  center: g.getHeight() / 2,
-}
+  middle: g.getWidth()/2,
+  center: g.getHeight()/2,
+};
 
 // hardcoded "settings"
 const settings = {
   time: {
-    font: '6x8',
+    font: "6x8",
     size: (is12Hour && locale.hasMeridian) ? 6 : 8,
     middle: screen.middle,
     center: screen.center,
     ampm: {
       color: -1,
-      font: '6x8',
+      font: "6x8",
       size: 2,
     },
   },
   date: {
-    font: 'Vector',
+    font: "Vector",
     size: 20,
-    middle: screen.height - 20, // at bottom of screen
+    middle: screen.height-20, // at bottom of screen
     center: screen.center,
   },
   bar: {
     top: 155, // just below time
     thickness: 6, // matches 24h time "pixel" size
   },
-}
+};
 
-const SECONDS_PER_MINUTE = 60
+const SECONDS_PER_MINUTE = 60;
 
-const timeText = function (date) {
+const timeText = function(date) {
   if (!is12Hour) {
-    return locale.time(date, true)
+    return locale.time(date, true);
   }
-  const date12 = new Date(date.getTime())
-  const hours = date12.getHours()
-  if (hours === 0) {
-    date12.setHours(12)
-  } else if (hours > 12) {
-    date12.setHours(hours - 12)
+  const date12 = new Date(date.getTime());
+  const hours = date12.getHours();
+  if (hours===0) {
+    date12.setHours(12);
+  } else if (hours>12) {
+    date12.setHours(hours-12);
   }
-  return locale.time(date12, true)
-}
-const ampmText = function (date) {
-  return is12Hour ? locale.meridian(date) : ''
-}
+  return locale.time(date12, true);
+};
+const ampmText = function(date) {
+  return is12Hour ? locale.meridian(date) : "";
+};
 
-const dateText = function (date) {
+const dateText = function(date) {
   const dayName = locale.dow(date, true),
     month = locale.month(date, true),
-    day = date.getDate()
-  const dayMonth = locale.dayFirst ? `${day} ${month}` : `${month} ${day}`
-  return `${dayName}  ${dayMonth}`
-}
+    day = date.getDate();
+  const dayMonth = locale.dayFirst ? `${day} ${month}` : `${month} ${day}`;
+  return `${dayName}  ${dayMonth}`;
+};
 
-const drawDateTime = function (date) {
-  const t = settings.time
-  g.setFont(t.font, t.size)
-  g.setFontAlign(0, 0) // centered
-  g.drawString(timeText(date), t.center, t.middle, true)
+const drawDateTime = function(date) {
+  const t = settings.time;
+  g.setFont(t.font, t.size);
+  g.setFontAlign(0, 0); // centered
+  g.drawString(timeText(date), t.center, t.middle, true);
   if (is12Hour && locale.hasMeridian) {
-    const a = settings.time.ampm
-    g.setFont(a.font, a.size)
-    g.setFontAlign(1, -1) // right top
+    const a = settings.time.ampm;
+    g.setFont(a.font, a.size);
+    g.setFontAlign(1, -1); // right top
     // at right edge of screen, aligned with time bottom
-    const left = screen.width - a.size * 2,
-      top = t.middle + t.size - a.size
-    g.drawString(ampmText(date), left, top, true)
+    const left = screen.width-a.size*2,
+      top = t.middle+t.size-a.size;
+    g.drawString(ampmText(date), left, top, true);
   }
 
-  const d = settings.date
-  g.setFont(d.font, d.size)
-  g.setFontAlign(0, 0) // centered
-  g.drawString(dateText(date), d.center, d.middle, true)
-}
+  const d = settings.date;
+  g.setFont(d.font, d.size);
+  g.setFontAlign(0, 0); // centered
+  g.drawString(dateText(date), d.center, d.middle, true);
+};
 
-const drawBar = function (date) {
-  const b = settings.bar
-  const seconds = date.getSeconds()
-  if (seconds === 0) {
+const drawBar = function(date) {
+  const b = settings.bar;
+  const seconds = date.getSeconds();
+  if (seconds===0) {
     // zero-size rect stills draws one line of pixels, we don't want that
-    return
+    return;
   }
-  const fraction = seconds / SECONDS_PER_MINUTE,
-    width = fraction * screen.width
-  g.setColor(g.theme.fg2).fillRect(0, b.top, width, b.top + b.thickness)
-}
+  const fraction = seconds/SECONDS_PER_MINUTE,
+    width = fraction*screen.width;
+  g.setColor(g.theme.fg2).fillRect(0, b.top, width, b.top+b.thickness);
+};
 
-const clearScreen = function () {
-  const timeTop = settings.time.middle - (settings.time.size * 4)
-  g.clearRect(0, timeTop, screen.width, screen.height)
-}
+const clearScreen = function() {
+  const timeTop = settings.time.middle-(settings.time.size*4);
+  g.clearRect(0, timeTop, screen.width, screen.height);
+};
 
-let lastSeconds, tTick
-const tick = function () {
-  g.reset()
-  const date = new Date()
-  const seconds = date.getSeconds()
-  if (lastSeconds > seconds) {
+let lastSeconds, tTick;
+const tick = function() {
+  g.reset();
+  const date = new Date();
+  const seconds = date.getSeconds();
+  if (lastSeconds>seconds) {
     // new minute
-    clearScreen()
-    drawDateTime(date)
+    clearScreen();
+    drawDateTime(date);
   }
   // the bar only gets larger, so drawing on top of the previous one is fine
-  drawBar(date)
-  lastSeconds = seconds
+  drawBar(date);
+  lastSeconds = seconds;
   // schedule next update
-  const millis = date.getMilliseconds()
-  tTick = setTimeout(tick, 1000-millis)
-}
+  const millis = date.getMilliseconds();
+  tTick = setTimeout(tick, 1000-millis);
+};
 
-const start = function () {
-  lastSeconds = 99 // force redraw
-  tick()
-}
-const stop = function () {
+const start = function() {
+  lastSeconds = 99; // force redraw
+  tick();
+};
+const stop = function() {
   if (tTick) {
-    clearTimeout(tTick)
-    tTick = undefined
+    clearTimeout(tTick);
+    tTick = undefined;
   }
-}
+};
 
 // clean app screen
-g.clear()
-Bangle.loadWidgets()
-Bangle.drawWidgets()
+g.clear();
+Bangle.loadWidgets();
+Bangle.drawWidgets();
 // Show launcher when button pressed
 Bangle.setUI("clock");
 
-Bangle.on('lcdPower', function (on) {
+Bangle.on("lcdPower", function(on) {
   if (on) {
-    start()
+    start();
   } else {
-    stop()
+    stop();
   }
-})
-start()
+});
+start();

From de3feaff456cc10fba5a87736b14f4a5ddbb638c Mon Sep 17 00:00:00 2001
From: Richard de Boer <git@tubul.net>
Date: Sat, 2 Oct 2021 15:11:32 +0200
Subject: [PATCH 04/11] barclock: simplify redraw logic

---
 apps/barclock/clock-bar.js | 37 ++++++++++---------------------------
 1 file changed, 10 insertions(+), 27 deletions(-)

diff --git a/apps/barclock/clock-bar.js b/apps/barclock/clock-bar.js
index 52affac5d..627028875 100644
--- a/apps/barclock/clock-bar.js
+++ b/apps/barclock/clock-bar.js
@@ -110,19 +110,17 @@ const drawBar = function(date) {
   g.setColor(g.theme.fg2).fillRect(0, b.top, width, b.top+b.thickness);
 };
 
-const clearScreen = function() {
-  const timeTop = settings.time.middle-(settings.time.size*4);
-  g.clearRect(0, timeTop, screen.width, screen.height);
-};
 
-let lastSeconds, tTick;
-const tick = function() {
+let lastSeconds;
+const draw = function(redraw) {
+  if (!Bangle.isLCDOn()) {return;}
   g.reset();
   const date = new Date();
   const seconds = date.getSeconds();
-  if (lastSeconds>seconds) {
-    // new minute
-    clearScreen();
+  if (redraw||lastSeconds>seconds) {
+    // force redraw at start of new minute
+    g.clear();
+    Bangle.drawWidgets();
     drawDateTime(date);
   }
   // the bar only gets larger, so drawing on top of the previous one is fine
@@ -130,32 +128,17 @@ const tick = function() {
   lastSeconds = seconds;
   // schedule next update
   const millis = date.getMilliseconds();
-  tTick = setTimeout(tick, 1000-millis);
+  setTimeout(draw, 1000-millis);
 };
 
-const start = function() {
-  lastSeconds = 99; // force redraw
-  tick();
-};
-const stop = function() {
-  if (tTick) {
-    clearTimeout(tTick);
-    tTick = undefined;
-  }
-};
 
-// clean app screen
-g.clear();
 Bangle.loadWidgets();
-Bangle.drawWidgets();
 // Show launcher when button pressed
 Bangle.setUI("clock");
 
 Bangle.on("lcdPower", function(on) {
   if (on) {
-    start();
-  } else {
-    stop();
+    draw(true);
   }
 });
-start();
+draw(true);

From 6817cafba4afac0d21c432c6f29587642ccb4c55 Mon Sep 17 00:00:00 2001
From: hughbarney <hughbarney@googlemail.com>
Date: Sat, 2 Oct 2021 14:13:20 +0100
Subject: [PATCH 05/11] Findphone - fix for Bangle 2

---
 apps.json                |  2 +-
 apps/findphone/ChangeLog |  1 +
 apps/findphone/README.md |  5 +++++
 apps/findphone/app.js    | 35 ++++++++++++++++++++++++++++-------
 4 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/apps.json b/apps.json
index 11b1ea146..832a480cf 100644
--- a/apps.json
+++ b/apps.json
@@ -2058,7 +2058,7 @@
     "name": "Find Phone",
     "shortName":"Find Phone",
     "icon": "app.png",
-    "version":"0.02",
+    "version":"0.03",
     "description": "Find your phone via Gadgetbridge. Click any button to let your phone ring. 📳  Note: The functionality is available even without this app, just go to Settings, App Settings, Gadgetbridge, Find Phone.",
     "tags": "tool,android",
     "readme": "README.md",
diff --git a/apps/findphone/ChangeLog b/apps/findphone/ChangeLog
index 86558abf5..29100f3c1 100644
--- a/apps/findphone/ChangeLog
+++ b/apps/findphone/ChangeLog
@@ -1,2 +1,3 @@
 0.01: First Version
 0.02: Remove HID requirement, update screen
+0.03: Fix for Bangle 2, toggle find with top half of screen, exit touch bottom half of screen
diff --git a/apps/findphone/README.md b/apps/findphone/README.md
index c655457a2..64e719d6a 100644
--- a/apps/findphone/README.md
+++ b/apps/findphone/README.md
@@ -6,3 +6,8 @@ Ring your phone via GadgetBridge if you lost it somewhere.
 2. Lose phone
 3. Open app
 4. Click any button or screen
+
+## On a Bangle 2
+
+- You can touch the top half of the screen to toggle Find / Stop
+- You can touch the bottom half of the screen to exit the app.
diff --git a/apps/findphone/app.js b/apps/findphone/app.js
index 34f729bc7..36c3f1884 100644
--- a/apps/findphone/app.js
+++ b/apps/findphone/app.js
@@ -1,13 +1,15 @@
 //notify your phone
 
+const fontSize = g.getWidth() / 8;
 var finding = false;
 
 function draw() {
   // show message
-  g.clear(1);
-  require("Font8x12").add(Graphics);
-  g.setFont("8x12",3);
+  g.clear(g.theme.bg); 
+  g.setColor(g.theme.fg);
+  g.setFont("Vector", fontSize);
   g.setFontAlign(0,0);
+  
   if (finding) {
     g.drawString("Finding...", g.getWidth()/2, (g.getHeight()/2)-20);
     g.drawString("Click to stop", g.getWidth()/2, (g.getHeight()/2)+20);
@@ -27,7 +29,26 @@ draw();
 
 //register all buttons and screen to find phone
 setWatch(find, BTN1, {repeat:true});
-setWatch(find, BTN2, {repeat:true});
-setWatch(find, BTN3, {repeat:true});
-setWatch(find, BTN4, {repeat:true});
-setWatch(find, BTN5, {repeat:true});
+
+if (process.env.HWVERSION == 1) {
+  setWatch(find, BTN2, {repeat:true});
+  setWatch(find, BTN3, {repeat:true});
+  setWatch(find, BTN4, {repeat:true});
+  setWatch(find, BTN5, {repeat:true});
+}
+
+if (process.env.HWVERSION == 2) {
+  Bangle.on('touch', function(button, xy) {
+   
+    // click top part of the screen to stop start
+    if (xy.y < g.getHeight() / 2) {
+      find();
+      return;
+    } else {
+      // exit app
+      Bluetooth.println("\n"+JSON.stringify({t:"findPhone", n:false}));
+      load();
+    }
+  });
+}
+

From eb8d9940ddd031f3fdce3829edcfa7a8a69c5413 Mon Sep 17 00:00:00 2001
From: hughbarney <hughbarney@googlemail.com>
Date: Sat, 2 Oct 2021 15:41:12 +0100
Subject: [PATCH 06/11] findphone tweak to code

---
 apps/findphone/app.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/apps/findphone/app.js b/apps/findphone/app.js
index 36c3f1884..e5e32739a 100644
--- a/apps/findphone/app.js
+++ b/apps/findphone/app.js
@@ -19,10 +19,14 @@ function draw() {
   g.flip();
 }
 
+function findPhone(v) {
+  Bluetooth.println(JSON.stringify({t:"findPhone", n:v}));
+}
+
 function find(){
   finding = !finding;
   draw();
-  Bluetooth.println("\n"+JSON.stringify({t:"findPhone", n:finding}));
+  findPhone(finding);
 }
 
 draw();
@@ -43,12 +47,9 @@ if (process.env.HWVERSION == 2) {
     // click top part of the screen to stop start
     if (xy.y < g.getHeight() / 2) {
       find();
-      return;
     } else {
-      // exit app
-      Bluetooth.println("\n"+JSON.stringify({t:"findPhone", n:false}));
-      load();
+      findPhone(false);
+      setTimeout(load, 100); // exit in 100ms
     }
   });
 }
-

From 3401dd99c407410955743acb753c3e4dba8a08b5 Mon Sep 17 00:00:00 2001
From: Richard de Boer <git@tubul.net>
Date: Sat, 2 Oct 2021 16:52:36 +0200
Subject: [PATCH 07/11] barclock: use Layout library

---
 apps/barclock/ChangeLog    |   2 +-
 apps/barclock/clock-bar.js | 150 ++++++++++++++-----------------------
 2 files changed, 56 insertions(+), 96 deletions(-)

diff --git a/apps/barclock/ChangeLog b/apps/barclock/ChangeLog
index 314ef89f2..c56967d3d 100644
--- a/apps/barclock/ChangeLog
+++ b/apps/barclock/ChangeLog
@@ -5,4 +5,4 @@
 0.05: Clock does not start if app Languages is not installed
 0.06: Improve accuracy
 0.07: Update to use Bangle.setUI instead of setWatch
-0.08: Use theme colors
\ No newline at end of file
+0.08: Use theme colors, Layout library
\ No newline at end of file
diff --git a/apps/barclock/clock-bar.js b/apps/barclock/clock-bar.js
index 627028875..c2b4bde12 100644
--- a/apps/barclock/clock-bar.js
+++ b/apps/barclock/clock-bar.js
@@ -13,46 +13,48 @@ let locale = require("locale");
   locale.dayFirst = /3.*2/.test(localized);
 
   locale.hasMeridian = false;
-  if (typeof locale.meridian==="function") {  // function does not exists if languages  app is not installed
+  if (typeof locale.meridian==="function") {  // function does not exist if languages  app is not installed
     locale.hasMeridian = (locale.meridian(date)!=="");
   }
-
 }
-const screen = {
-  width: g.getWidth(),
-  height: g.getWidth(),
-  middle: g.getWidth()/2,
-  center: g.getHeight()/2,
-};
+Bangle.loadWidgets();
+function renderBar(l) {
+  if (!this.fraction) {
+    // zero-size fillRect stills draws one line of pixels, we don't want that
+    return;
+  }
+  const width = this.fraction*l.w;
+  g.fillRect(l.x, l.y, width-1, l.y+l.height-1);
+}
 
-// hardcoded "settings"
-const settings = {
-  time: {
-    font: "6x8",
-    size: (is12Hour && locale.hasMeridian) ? 6 : 8,
-    middle: screen.middle,
-    center: screen.center,
-    ampm: {
-      color: -1,
-      font: "6x8",
-      size: 2,
+const Layout = require("Layout");
+const layout = new Layout({
+  type: "v", c: [
+    {
+      type: "h", c: [
+        {id: "time", label: "88:88", type: "txt", font: "6x8:5", bgCol: g.theme.bg}, // size updated below
+        {id: "ampm", label: "  ", type: "txt", font: "6x8:2", bgCol: g.theme.bg},
+      ],
     },
-  },
-  date: {
-    font: "Vector",
-    size: 20,
-    middle: screen.height-20, // at bottom of screen
-    center: screen.center,
-  },
-  bar: {
-    top: 155, // just below time
-    thickness: 6, // matches 24h time "pixel" size
-  },
-};
+    {id: "bar", type: "custom", fraction: 0, fillx: 1, height: 6, col: g.theme.fg2, render: renderBar},
+    {height: 40},
+    {id: "date", type: "txt", font: "10%", valign: 1},
+  ],
+}, false, {lazy: true});
+// adjustments based on screen size and whether we display am/pm
+let thickness; // bar thickness, same as time font "pixel block" size
+if (is12Hour) {
+  // Maximum font size = (<screen width> - <ampm: 2chars * (2*6)px>) / (5chars * 6px)
+  thickness = Math.floor((g.getWidth()-24)/(5*6));
+} else {
+  layout.ampm.label = "";
+  thickness = Math.floor(g.getWidth()/(5*6));
+}
+layout.bar.height = thickness+1;
+layout.time.font = "6x8:"+thickness;
+layout.update();
 
-const SECONDS_PER_MINUTE = 60;
-
-const timeText = function(date) {
+function timeText(date) {
   if (!is12Hour) {
     return locale.time(date, true);
   }
@@ -64,81 +66,39 @@ const timeText = function(date) {
     date12.setHours(hours-12);
   }
   return locale.time(date12, true);
-};
-const ampmText = function(date) {
-  return is12Hour ? locale.meridian(date) : "";
-};
-
-const dateText = function(date) {
+}
+function ampmText(date) {
+  return (is12Hour && locale.hasMeridian)? locale.meridian(date) : "";
+}
+function dateText(date) {
   const dayName = locale.dow(date, true),
     month = locale.month(date, true),
     day = date.getDate();
   const dayMonth = locale.dayFirst ? `${day} ${month}` : `${month} ${day}`;
   return `${dayName}  ${dayMonth}`;
-};
+}
 
-const drawDateTime = function(date) {
-  const t = settings.time;
-  g.setFont(t.font, t.size);
-  g.setFontAlign(0, 0); // centered
-  g.drawString(timeText(date), t.center, t.middle, true);
-  if (is12Hour && locale.hasMeridian) {
-    const a = settings.time.ampm;
-    g.setFont(a.font, a.size);
-    g.setFontAlign(1, -1); // right top
-    // at right edge of screen, aligned with time bottom
-    const left = screen.width-a.size*2,
-      top = t.middle+t.size-a.size;
-    g.drawString(ampmText(date), left, top, true);
-  }
-
-  const d = settings.date;
-  g.setFont(d.font, d.size);
-  g.setFontAlign(0, 0); // centered
-  g.drawString(dateText(date), d.center, d.middle, true);
-};
-
-const drawBar = function(date) {
-  const b = settings.bar;
-  const seconds = date.getSeconds();
-  if (seconds===0) {
-    // zero-size rect stills draws one line of pixels, we don't want that
-    return;
-  }
-  const fraction = seconds/SECONDS_PER_MINUTE,
-    width = fraction*screen.width;
-  g.setColor(g.theme.fg2).fillRect(0, b.top, width, b.top+b.thickness);
-};
-
-
-let lastSeconds;
-const draw = function(redraw) {
-  if (!Bangle.isLCDOn()) {return;}
-  g.reset();
+draw = function draw() {
+  if (!Bangle.isLCDOn()) {return;} // no drawing, also no new update scheduled
   const date = new Date();
-  const seconds = date.getSeconds();
-  if (redraw||lastSeconds>seconds) {
-    // force redraw at start of new minute
-    g.clear();
-    Bangle.drawWidgets();
-    drawDateTime(date);
-  }
-  // the bar only gets larger, so drawing on top of the previous one is fine
-  drawBar(date);
-  lastSeconds = seconds;
-  // schedule next update
+  layout.time.label = timeText(date);
+  layout.ampm.label = ampmText(date);
+  layout.date.label = dateText(date);
+  const SECONDS_PER_MINUTE = 60;
+  layout.bar.fraction = date.getSeconds()/SECONDS_PER_MINUTE;
+  layout.render();
+  // schedule update at start of next second
   const millis = date.getMilliseconds();
   setTimeout(draw, 1000-millis);
 };
 
-
-Bangle.loadWidgets();
 // Show launcher when button pressed
 Bangle.setUI("clock");
-
 Bangle.on("lcdPower", function(on) {
   if (on) {
-    draw(true);
+    draw();
   }
 });
-draw(true);
+g.reset().clear();
+Bangle.drawWidgets();
+draw();

From 97d5b1077365b9d08bee04e318499c601444bd97 Mon Sep 17 00:00:00 2001
From: Francisco Trigo <francisco.trigomijes@gmail.com>
Date: Sat, 2 Oct 2021 20:12:12 -0500
Subject: [PATCH 08/11] Fix translation slidingtext.locale.es.js

Fixed the words for 7, SEITO is now SIETE.
20, VEINTA is now VEINTE
---
 apps/slidingtext/slidingtext.locale.es.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/slidingtext/slidingtext.locale.es.js b/apps/slidingtext/slidingtext.locale.es.js
index e1f3bc18b..1b6f6d11b 100644
--- a/apps/slidingtext/slidingtext.locale.es.js
+++ b/apps/slidingtext/slidingtext.locale.es.js
@@ -7,7 +7,7 @@ const spanishNumberStr = [ ["ZERO"], // 0
     ["CUATRO",''], //4
     ["CINCO",''], //5
     ["SEIS",''], //6
-    ["SEITO",''], //7
+    ["SIETE",''], //7
     ["OCHO",''], //8
     ["NUEVE",''], // 9,
     ["DIEZ",''], // 10
@@ -20,7 +20,7 @@ const spanishNumberStr = [ ["ZERO"], // 0
     ["DIECI",'SIETE'], // 17
     ["DIECI",'OCHO'], // 18
     ["DIECI",'NEUVE'], // 19
-    ["VEINTA",''], // 20
+    ["VEINTE",''], // 20
     ["VEINTI",'UNO'], // 21
     ["VEINTI",'DOS'], // 22
     ["VEINTI",'TRES'], // 23
@@ -74,4 +74,4 @@ class SpanishDateFormatter extends DateFormatter {
     }
 }
 
-module.exports = SpanishDateFormatter;
\ No newline at end of file
+module.exports = SpanishDateFormatter;

From 5443fc760aef35e5a71c643be0befbcde921f8fa Mon Sep 17 00:00:00 2001
From: Richard de Boer <git@tubul.net>
Date: Sat, 2 Oct 2021 17:11:35 +0200
Subject: [PATCH 09/11] launch: small theme colour fix

---
 apps.json             | 2 +-
 apps/launch/ChangeLog | 1 +
 apps/launch/app.js    | 6 ++++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/apps.json b/apps.json
index 11b1ea146..df8bb0b7e 100644
--- a/apps.json
+++ b/apps.json
@@ -42,7 +42,7 @@
     "name": "Launcher (Default)",
     "shortName":"Launcher",
     "icon": "app.png",
-    "version":"0.06",
+    "version":"0.07",
     "description": "This is needed by Bangle.js to display a menu allowing you to choose your own applications. You can replace this with a customised launcher.",
     "tags": "tool,system,launcher,b2",
     "type":"launch",
diff --git a/apps/launch/ChangeLog b/apps/launch/ChangeLog
index b56c9f6bb..09569d8da 100644
--- a/apps/launch/ChangeLog
+++ b/apps/launch/ChangeLog
@@ -4,3 +4,4 @@
 0.04: Now displays widgets
 0.05: Use g.theme for colours
 0.06: Use Bangle.setUI for buttons
+0.07: Theme colours fix
\ No newline at end of file
diff --git a/apps/launch/app.js b/apps/launch/app.js
index ab1a89fc0..449e16e62 100644
--- a/apps/launch/app.js
+++ b/apps/launch/app.js
@@ -33,8 +33,10 @@ function drawMenu() {
     if (i+menuScroll==selected) {
       g.setColor(g.theme.bgH).fillRect(0,y,w-1,y+63);
       g.setColor(g.theme.fgH).drawRect(0,y,w-1,y+63);
-    } else
-      g.clearRect(0,y,w-1,y+63);
+    } else {
+      g.clearRect(0, y, w-1, y+63);
+      g.setColor(g.theme.fg);
+    }
     g.drawString(app.name,64,y+32);
     var icon=undefined;
     if (app.icon) icon = s.read(app.icon);

From 1bbb0cb0d603da2ea7ea9236d1577513960e21b3 Mon Sep 17 00:00:00 2001
From: hughbarney <hughbarney@googlemail.com>
Date: Mon, 4 Oct 2021 12:41:59 +0100
Subject: [PATCH 10/11] notifyfs - use theme for title and adjust font

---
 apps.json               | 2 +-
 apps/notifyfs/ChangeLog | 1 +
 apps/notifyfs/notify.js | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/apps.json b/apps.json
index 832a480cf..b6311a48f 100644
--- a/apps.json
+++ b/apps.json
@@ -107,7 +107,7 @@
     "name": "Fullscreen Notifications",
     "shortName":"Notifications",
     "icon": "notify.png",
-    "version":"0.11",
+    "version":"0.12",
     "description": "Provides a replacement for the `Notifications (default)` `notify` module.   This version is used by applications to display notifications fullscreen. This may not fully restore the screen after on some apps. See `Notifications (default)` for more information about the notify module.",
     "tags": "widget,b2",
     "type": "notify",
diff --git a/apps/notifyfs/ChangeLog b/apps/notifyfs/ChangeLog
index 1c39bcbd5..cf0a13866 100644
--- a/apps/notifyfs/ChangeLog
+++ b/apps/notifyfs/ChangeLog
@@ -9,3 +9,4 @@
 0.09: Add onHide callback
 0.10: Ensure dismissing a notification dismissal doesn't enter launcher if in clock mode
 0.11: Improvements to help notifications work with themes, Bangle.js 2 support
+0.12: More use of themes, title now uses theme highlight colors, font adjusts
diff --git a/apps/notifyfs/notify.js b/apps/notifyfs/notify.js
index a45d889f0..9cadbb124 100644
--- a/apps/notifyfs/notify.js
+++ b/apps/notifyfs/notify.js
@@ -1,7 +1,7 @@
 let oldg;
 let id = null;
 let hideCallback = null;
-
+const titleFont = g.getWidth() / 8;
 /**
  * See notify/notify.js
  */
@@ -63,8 +63,8 @@ exports.show = function(options) {
   // top bar
   if (options.title||options.src) {
     const title = options.title || options.src;
-    g.setColor(options.titleBgColor||"#333").fillRect(x, y, x+w-1, y+30);
-    g.setColor(g.theme.fg).setFontAlign(-1, -1, 0).setFont("6x8", 3);
+    g.setColor(options.titleBgColor||g.theme.bgH).fillRect(x, y, x+w-1, y+30);
+    g.setColor(g.theme.fgH).setFontAlign(-1, -1, 0).setFont("Vector", titleFont);
     g.drawString(title.trim().substring(0, 13), x+5, y+3);
     if (options.title && options.src) {
       g.setColor(g.theme.fg).setFontAlign(1, 1, 0).setFont("6x8", 2);

From 46ccfe86e352d9f4a3464b0a7bd2d587224e6d5f Mon Sep 17 00:00:00 2001
From: Ben Whittaker <ben@benw.ca>
Date: Mon, 4 Oct 2021 09:23:12 -0400
Subject: [PATCH 11/11] weather: Fix crash when weather.json is absent

---
 apps.json              | 2 +-
 apps/weather/ChangeLog | 3 ++-
 apps/weather/lib.js    | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps.json b/apps.json
index 10b37e5b1..83690cf3e 100644
--- a/apps.json
+++ b/apps.json
@@ -585,7 +585,7 @@
   { "id": "weather",
     "name": "Weather",
     "icon": "icon.png",
-    "version":"0.08",
+    "version":"0.09",
     "description": "Show Gadgetbridge weather report",
     "readme": "readme.md",
     "tags": "widget,outdoors",
diff --git a/apps/weather/ChangeLog b/apps/weather/ChangeLog
index fd5d4d146..09e159045 100644
--- a/apps/weather/ChangeLog
+++ b/apps/weather/ChangeLog
@@ -4,4 +4,5 @@
 0.05: Add wind direction.
 0.06: Use setUI for launcher.
 0.07: Add theme support and unknown icon.
-0.08: Refactor and reduce widget ram usage.
\ No newline at end of file
+0.08: Refactor and reduce widget ram usage.
+0.09: Fix crash when weather.json is absent.
\ No newline at end of file
diff --git a/apps/weather/lib.js b/apps/weather/lib.js
index f08df4a4a..299009e74 100644
--- a/apps/weather/lib.js
+++ b/apps/weather/lib.js
@@ -47,7 +47,7 @@ global.GB = (event) => {
 };
 
 exports.get = function() {
-  return storage.readJSON('weather.json').weather;
+  return (storage.readJSON('weather.json')||{}).weather;
 }
 
 scheduleExpiry(storage.readJSON('weather.json')||{});