From 6acb5d23546d69ef636d710bc9b1b76d3d078ff3 Mon Sep 17 00:00:00 2001 From: Jordi Mas Date: Fri, 8 Mar 2024 22:38:50 +0100 Subject: [PATCH 1/4] Fixes typos and BTN1 to show launcher --- apps/rellotge/ChangeLog | 1 + apps/rellotge/metadata.json | 4 ++-- apps/rellotge/rellotge.js | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/rellotge/ChangeLog b/apps/rellotge/ChangeLog index 9e8598891..31c72eca2 100644 --- a/apps/rellotge/ChangeLog +++ b/apps/rellotge/ChangeLog @@ -3,3 +3,4 @@ 0.30: Redisseny de l'aplicatiu, text alineat a l'esquerra, font canviada, treiem dades innecessàries 0.40: Afegits suggeriments de l'usuari @bobrippling al codi 0.50: Fixing lint warnings for unused vars +0.60: Fixes typos and BTN1 to show launcher \ No newline at end of file diff --git a/apps/rellotge/metadata.json b/apps/rellotge/metadata.json index 9df8aae26..770c578d8 100644 --- a/apps/rellotge/metadata.json +++ b/apps/rellotge/metadata.json @@ -1,8 +1,8 @@ { "id": "rellotge", "name": "Rellotge en catala", "shortName":"Rellotge", - "version":"0.50", - "description": "A catalan clock with traditional naming of hous", + "version":"0.60", + "description": "A clock with traditional naming of hours in Catalan", "icon": "icona.js", "readme": "README.md", "type": "clock", diff --git a/apps/rellotge/rellotge.js b/apps/rellotge/rellotge.js index d1001c702..28084d8fa 100644 --- a/apps/rellotge/rellotge.js +++ b/apps/rellotge/rellotge.js @@ -9,7 +9,7 @@ const xyCenter = g.getWidth() /9; const yposTime = 55; const yposDate = 130; - const leshores = ["Les dotze","La una","Les dues","les tres","Les quatre","Les cinc","Les sis","Les set","Les vuit","Les nou","Les deu","Les onze","Les dotze","La una","Les dues","Les tres","Les quatre","Les cinc","Les sis","Les set","Les vuit","Les nou","Les deu","Les onze","Les dotze"]; + const leshores = ["Les dotze","La una","Les dues","Les tres","Les quatre","Les cinc","Les sis","Les set","Les vuit","Les nou","Les deu","Les onze","Les dotze","La una","Les dues","Les tres","Les quatre","Les cinc","Les sis","Les set","Les vuit","Les nou","Les deu","Les onze","Les dotze"]; const leshores2 = ["d\'una\r\nel mati","de dues\r\ndel mati","de tres\r\ndel mati","de quatre\r\ndel mati","de cinc\r\ndel mati","de sis\r\ndel mati","de set\r\ndel mati","de vuit\r\ndel mati","de nou\r\ndel mati","de deu\r\ndel mati","d'onze\r\ndel mati","de dotze\r\ndel mati","d'una\r\nde la tarda","de dues\r\nde la tarda","de tres\r\nde la tarda","de quatre\r\nde la tarda","de cinc\r\nde la tarda","de sis\r\nde la tarda","de set\r\nde la tarda","de vuit\r\nde la tarda","de nou\r\ndel vespre","de deu\r\ndel vespre","d'onze\r\ndel vespre","de dotze"]; function drawSimpleClock() { @@ -92,6 +92,7 @@ } } Bangle.on('lcdPower', onLcd); + Bangle.setUI("clock"); // clean app screen g.clear(); From aa5194a376b6ac050527897dee9ac69ccfced171 Mon Sep 17 00:00:00 2001 From: Jordi Mas Date: Fri, 8 Mar 2024 22:59:36 +0100 Subject: [PATCH 2/4] Add icon to the app --- apps/rellotge/ChangeLog | 2 +- apps/rellotge/icona.png | Bin 0 -> 2283 bytes apps/rellotge/metadata.json | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 apps/rellotge/icona.png diff --git a/apps/rellotge/ChangeLog b/apps/rellotge/ChangeLog index 31c72eca2..0ffefec44 100644 --- a/apps/rellotge/ChangeLog +++ b/apps/rellotge/ChangeLog @@ -3,4 +3,4 @@ 0.30: Redisseny de l'aplicatiu, text alineat a l'esquerra, font canviada, treiem dades innecessàries 0.40: Afegits suggeriments de l'usuari @bobrippling al codi 0.50: Fixing lint warnings for unused vars -0.60: Fixes typos and BTN1 to show launcher \ No newline at end of file +0.60: Fixes typos, BTN1 to show launcher and show app icon \ No newline at end of file diff --git a/apps/rellotge/icona.png b/apps/rellotge/icona.png new file mode 100644 index 0000000000000000000000000000000000000000..258cdecab0f71df470c851e6ddbcda7444bf0a3d GIT binary patch literal 2283 zcmds3`%}{S8vX!+9u;yE>>^U_o|Gc>Q0p-jalNEjY2LuwN^mT%DW(-7SzoH-re<{0 zY%J4N%NvN7#Jm(vZJu#cG!<7Z#YHnE0VTuI@_7D=ojLE!^FGhaGtZCDJ8yP?zYp4Y zt1$oo?R(HGXr0CXgArjX;+^6>zoUi>ToMistZ?jh-n`TP9^<^MGG+PAjW ze`_DF+3_;6yy3(Tk&bN3!4ns%GxUmcED;#ee#9V`YttRbMORD+A%1B9gL*%I8sOjmL0*bi;H-V;^T_M#<%Cw052?U~YF-4+mL=#C zh6%KE%n2%KxW2fiosg+c4QZ+Jhl$VlO11|;5#KQnZv&rNM$L2v#mI_b?9xqj{PSu* zCzdFc`>B+U=45)stNV9(zEY9Iv1jT{-Hycw(-ZwoiV08$6zJGudbRS z7>#?#5j`h60_)!;BKPlQlcYx@BA3Fc9jEY+eTd|$fx>|UlwcX)x zg)VP&K)K_01J$yPq~Yt9?^MEIZb-~@(=~+Foo`WJoZL%cf9Q4O73}ElVV*vjOP#r; z`QyQo_tBx3uao5qr6g^wb&PBPG5jHd^I!vHiAO0={U|g{fnvd0+?(7zL5q7BNH$CA zyFLt17u~N}9CpDmr;$IAx5Y^UVIUcMjpc*|3OqI7Kp7moA>yB>68~YqoE8oSX0@FX zvPWv2MdMU%!hcv+v{j-RM!fh0BBk@5>K;-@_IFL>h3YQKDM$}k^VMXe7dL}7q`e_G z(L}9MatmjD`8UBa_hdfX%CM1xB^su@ped|s3YQM?g8=W-jD@vaKU=$i7tl&frE&|Y zGlAqX@++1I6C3&;J#zc~RCX|v2X!zrlz*1n1Yd@ig0&3s>WYu3?o*C!R|bJo70^7m zi3N8W#Tgkc8!beI%QtB5ce#E|P&$2@yIa3gp!eJ6m{M?4C)fZ>KX3Uej0OXuxmD{- zgx1=do`isEoS*qlfcESgw6Q{C@s}`Fbob|dtrT=+j%p&)9;V%L9H10#N3O1BDjvl) z*;+J-6t-#P7&J1BKdjB(&BktqiK4NCtd3?sdIF-MJ zmYXk;WXYB*pA|_|-7Ztsy?Z&<((c{3aE^gg9&Ay;02bJQ%d~$*+6%^QbAoblVT=1z^4O&yA&pMkS%6y}%?^NsmZq}l)%do) z#-NDk4%x|k%J{v40)WEnF6vi_@pQsa{DSDXTPZ zlmk8GsccsKozKf=&^|{>W3vS@RxWw|GobVx00g31GYBXF(d)_%95vHV`Y>L~7||%Y zVk?zBwiB=ulk#4ImMq!W*}qB0A|lJkKs2dqj)H5O(x=?-WYK6coO_^TpL zSf)x)dXKjB?csc7d!XF|RpU2{V&}S08wX9!0-#780Ac%_U-u5cL$3}_<>_Bmam%Kj zw(Y$adgQU7^2^y*2q|9#Pbn$v4JieB(H@S{XZlRS@vLy(V%xL3oecSHxhY@yaD5ny{}1)G)(Pk$~H!f43l#GPe87me1WF6QFHB$0H4)nbL2@QXw;} z!E1WH#~hua!F9e)npT2ylLSzA>0=1Q>ukB@;LK)I=?bn50F7{2S(5ZfFi=PJ#|Ya4 zd46;StbDxOfVu8Bp$p@Q(veVx=FmtDZ_shC_w2~nM3EApExP(^Xi5v67HD{mL8zg8}g5LI%F z)I3xn&&NVG^L(D0UAkS`N5A}xW}dP`T9r{1iD7q;y3kR4-oIgrHIk9^f;rAO#a?{X z2ey7k=(r!K`EYQr8 Date: Sat, 9 Mar 2024 17:52:05 +0100 Subject: [PATCH 3/4] Load widgets after setUI() --- apps/rellotge/rellotge.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/rellotge/rellotge.js b/apps/rellotge/rellotge.js index 28084d8fa..57ec08196 100644 --- a/apps/rellotge/rellotge.js +++ b/apps/rellotge/rellotge.js @@ -85,7 +85,6 @@ // handle switch display on by pressing BTN1 function onLcd(on) { if (on) { - Bangle.loadWidgets(); Bangle.drawWidgets(); //drawSimpleClock(); Bangle.removeListener('lcdPower', onLcd); @@ -93,6 +92,7 @@ } Bangle.on('lcdPower', onLcd); Bangle.setUI("clock"); + Bangle.loadWidgets(); // clean app screen g.clear(); From e52d43cf78116b6ceda4975fa3313ff32e79b312 Mon Sep 17 00:00:00 2001 From: Jordi Mas Date: Sat, 9 Mar 2024 20:07:03 +0100 Subject: [PATCH 4/4] Enable to user to swipe down/up widgets --- apps/rellotge/rellotge.js | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/rellotge/rellotge.js b/apps/rellotge/rellotge.js index 57ec08196..437766167 100644 --- a/apps/rellotge/rellotge.js +++ b/apps/rellotge/rellotge.js @@ -93,6 +93,7 @@ Bangle.on('lcdPower', onLcd); Bangle.setUI("clock"); Bangle.loadWidgets(); + require("widget_utils").swipeOn(); // clean app screen g.clear();