Merge pull request #3681 from bobrippling/feat/widbtstates-opt

widbtstates: generate better js indexing
espruino · Dec 3, 2024 · 615ab14 · 615ab14
2 parents d24aefc + 7a43101
commit 615ab14
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/apps/widbtstates/ChangeLog b/apps/widbtstates/ChangeLog
@@ -1 +1,2 @@
 0.01: New App!
+0.02: Improve generated JS
diff --git a/apps/widbtstates/metadata.json b/apps/widbtstates/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "widbtstates",
   "name": "Bluetooth States",
-  "version": "0.01",
+  "version": "0.02",
   "description": "If active, shows a white bluetooth icon, if connected, a blue one (nothing if sleeping)",
   "icon": "widget.png",
   "type": "widget",

diff --git a/apps/widbtstates/widget.js b/apps/widbtstates/widget.js
@@ -32,7 +32,7 @@
             if (state == 0)
                 return;
             g.reset();
-            g.setColor(colours[state]["".concat(g.theme.dark)]);
+            g.setColor(colours[state][g.theme.dark]);
             g.drawImage(atob("CxQBBgDgFgJgR4jZMawfAcA4D4NYybEYIwTAsBwDAA=="), this.x + 2, this.y + 2);
         },
         width: width(),

diff --git a/apps/widbtstates/widget.ts b/apps/widbtstates/widget.ts
@@ -48,7 +48,7 @@
 
 			g.reset();
 
-			g.setColor(colours[state][`${g.theme.dark}`]);
+			g.setColor(colours[state][g.theme.dark as unknown as `${boolean}`]);
 
 			g.drawImage(
 				atob("CxQBBgDgFgJgR4jZMawfAcA4D4NYybEYIwTAsBwDAA=="),