Merge pull request #1254 from adamschmalhofer/widhwt-bjs2

Hand Wash Timer 0.02

apps.json

@@ -1893,13 +1893,15 @@
   {
     "id": "widhwt",
     "name": "Hand Wash Timer",
-    "version": "0.01",
+    "version": "0.02",
-    "description": "Swipe your wrist over the watch face to start your personal Bangle.js hand wash timer for 35 sec. Start washing after the short buzz and stop after the long buzz.",
+    "description": "On Bangle.js 1 swipe your wrist over the watch face to start your personal Bangle.js 1 hand wash timer. On Bangle.js2 the Pattern Launcher is recommended to start the timer. Start washing after the short buzz and stop after the long buzz 35sec. later.",
     "icon": "widget.png",
     "type": "widget",
     "tags": "widget,tool",
-    "supports": ["BANGLEJS"],
+    "allow_emulator": true,
+    "supports": ["BANGLEJS", "BANGLEJS2"],
     "storage": [
+      {"name":"widhwt.app.js","url":"app.js"},
       {"name":"widhwt.wid.js","url":"widget.js"}
     ]
   },

apps/widhwt/ChangeLog

@@ -1 +1,2 @@
 0.01: New Widget!
+0.02: Ported to Bangle.js2

apps/widhwt/app.js

@@ -0,0 +1,13 @@
+// Replace the "Loading..." box
+// with our own message
+g.clearRect(38, 68, 138, 108);
+g.drawRect(38, 68, 138, 108);
+g.setFontVector(13);
+g.setFontAlign(0, 0, 0);
+g.drawString("Wash...", g.getWidth()/2, g.getHeight()/2);
+
+Bangle.buzz();
+setTimeout(() => {
+  Bangle.buzz(1E3, 1);
+  setTimeout(() => load(), 2E3);
+}, 35E3);

apps/widhwt/widget.js

@@ -6,9 +6,7 @@
     g.reset().setColor(color).drawImage(require("heatshrink").decompress(atob("jEYwIKHgwCBhwCBh4CEggPCkACBmAXDBwVZ+EB+F4gEsjl8EgMP+EChk/gEMh+ehkA+YIBxwxBnF/4HggH/wEAj0AA==")), this.x + 1, 0);
   }
 
-  WIDGETS["widhwt"] = { area: "tr", width: 26, draw: draw };
+  function startTimer() {
-
-  Bangle.on('swipe', function() {
     color = 0x41f;
     Bangle.buzz();
     Bangle.drawWidgets();
@@ -17,6 +15,14 @@
       Bangle.buzz(1E3, 1);
       Bangle.drawWidgets();
     }, 35E3);
+  }
 
-  });
+  if (process.env.HWVERSION == 1) {
+      WIDGETS["widhwt"] = {
+          area: "tr",
+          width: 26,
+          draw: draw,
+      };
+      Bangle.on('swipe', startTimer);
+  }
 })();