Merge pull request #3245 from jordimas/rellotge-060

rellotge: Fixes typos and BTN1 to show launcher
espruino · Mar 10, 2024 · 3f87305 · 3f87305
2 parents 59b32f5 + e52d43c
commit 3f87305
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git 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, BTN1 to show launcher and show app icon
diff --git a/apps/rellotge/icona.png b/apps/rellotge/icona.png
diff --git a/apps/rellotge/metadata.json b/apps/rellotge/metadata.json
@@ -1,9 +1,9 @@
 { "id": "rellotge",
   "name": "Rellotge en catala",
   "shortName":"Rellotge",
-  "version":"0.50",
-  "description": "A catalan clock with traditional naming of hous",
-  "icon": "icona.js",
+  "version":"0.60",
+  "description": "A clock with traditional naming of hours in Catalan",
+  "icon": "icona.png",
   "readme": "README.md",
   "type": "clock",
   "tags": "",

diff --git 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() {
@@ -85,13 +85,15 @@
   // handle switch display on by pressing BTN1
   function onLcd(on) {
     if (on) {
-      Bangle.loadWidgets();
       Bangle.drawWidgets();
       //drawSimpleClock();
       Bangle.removeListener('lcdPower', onLcd);
     }
   }
   Bangle.on('lcdPower', onLcd);
+  Bangle.setUI("clock");
+  Bangle.loadWidgets();
+  require("widget_utils").swipeOn();
 
   // clean app screen
   g.clear();