Merge pull request #2695 from bobrippling/stopw-improvements

Improvements to the stopwatch clockinfo

apps/btadv/app.js

@@ -1,4 +1,3 @@
-"use strict";
 var __assign = Object.assign;
 var Layout = require("Layout");
 Bangle.loadWidgets();

apps/clkinfostopw/ChangeLog

@@ -1 +1,2 @@
 0.01: New clkinfo!
+0.02: Added format option, reduced battery usage

apps/clkinfostopw/clkinfo.js

@@ -1,8 +1,8 @@
-"use strict";
 (function () {
     var durationOnPause = "---";
     var redrawInterval;
     var startTime;
+    var _a = (require("Storage").readJSON("clkinfostopw.setting.json", true) || {}).format, format = _a === void 0 ? 0 : _a;
     var unqueueRedraw = function () {
         if (redrawInterval)
             clearInterval(redrawInterval);
@@ -11,7 +11,7 @@
     var queueRedraw = function () {
         var _this = this;
         unqueueRedraw();
-        redrawInterval = setInterval(function () { return _this.emit('redraw'); }, 100);
+        redrawInterval = setInterval(function () { return _this.emit('redraw'); }, 1000);
     };
     var pad2 = function (s) { return ('0' + s.toFixed(0)).slice(-2); };
     var duration = function (start) {
@@ -21,10 +21,14 @@
         var mins = seconds / 60;
         seconds %= 60;
         if (mins < 60)
-            return "".concat(pad2(mins), "m").concat(pad2(seconds), "s");
+            return format === 0
+                ? "".concat(pad2(mins), "m").concat(pad2(seconds), "s")
+                : "".concat(mins.toFixed(0), ":").concat(pad2(seconds));
         var hours = mins / 60;
         mins %= 60;
-        return "".concat(Math.round(hours), "h").concat(pad2(mins), "m").concat(pad2(seconds), "s");
+        return format === 0
+            ? "".concat(hours.toFixed(0), "h").concat(pad2(mins), "m").concat(pad2(seconds), "s")
+            : "".concat(hours.toFixed(0), ":").concat(pad2(mins), ":").concat(pad2(seconds));
     };
     var img = function () { return atob("GBiBAAAAAAB+AAB+AAAAAAB+AAH/sAOB8AcA4A4YcAwYMBgYGBgYGBg8GBg8GBgYGBgAGAwAMA4AcAcA4AOBwAH/gAB+AAAAAAAAAA=="); };
     return {
@@ -39,7 +43,14 @@
                         : durationOnPause,
                     img: img(),
                 }); },
-                show: queueRedraw,
+                show: function () {
+                    if (startTime) {
+                        queueRedraw.call(this);
+                    }
+                    else {
+                        this.emit('redraw');
+                    }
+                },
                 hide: unqueueRedraw,
                 run: function () {
                     if (startTime) {

apps/clkinfostopw/clkinfo.ts

@@ -2,6 +2,8 @@
   let durationOnPause = "---";
   let redrawInterval: number | undefined;
   let startTime: number | undefined;
+  let { format = StopWatchFormat.HMS }: StopWatchSettings
+    = require("Storage").readJSON("clkinfostopw.setting.json", true) || {};
 
   const unqueueRedraw = () => {
     if (redrawInterval) clearInterval(redrawInterval);
@@ -10,7 +12,7 @@
 
   const queueRedraw = function(this: ClockInfo.MenuItem) {
     unqueueRedraw();
-    redrawInterval = setInterval(() => this.emit('redraw'), 100);
+    redrawInterval = setInterval(() => this.emit('redraw'), 1000);
   };
 
   const pad2 = (s: number) => ('0' + s.toFixed(0)).slice(-2);
@@ -25,12 +27,16 @@
     seconds %= 60;
 
     if (mins < 60)
-      return `${pad2(mins)}m${pad2(seconds)}s`;
+      return format === StopWatchFormat.HMS
+        ? `${pad2(mins)}m${pad2(seconds)}s`
+        : `${mins.toFixed(0)}:${pad2(seconds)}`;
 
     let hours = mins / 60;
     mins %= 60;
 
-    return `${Math.round(hours)}h${pad2(mins)}m${pad2(seconds)}s`;
+    return format === StopWatchFormat.HMS
+      ? `${hours.toFixed(0)}h${pad2(mins)}m${pad2(seconds)}s`
+      : `${hours.toFixed(0)}:${pad2(mins)}:${pad2(seconds)}`;
   };
 
   const img = () => atob("GBiBAAAAAAB+AAB+AAAAAAB+AAH/sAOB8AcA4A4YcAwYMBgYGBgYGBg8GBg8GBgYGBgAGAwAMA4AcAcA4AOBwAH/gAB+AAAAAAAAAA==");
@@ -47,7 +53,13 @@
             : durationOnPause,
           img: img(),
         }),
-        show: queueRedraw,
+        show: function(this: ClockInfo.MenuItem) {
+          if(startTime){ // only queue if active
+            queueRedraw.call(this);
+          }else{
+            this.emit('redraw')
+          }
+        },
         hide: unqueueRedraw,
         run: function() { // tapped
           if (startTime) {

apps/clkinfostopw/metadata.json

@@ -1,7 +1,7 @@
 {
   "id": "clkinfostopw",
   "name": "Stop Watch Clockinfo",
-  "version":"0.01",
+  "version":"0.02",
   "description": "A simple stopwatch, shown via clockinfo",
   "icon": "app.png",
   "type": "clkinfo",
@@ -10,6 +10,7 @@
   "readme":"README.md",
   "allow_emulator": true,
   "storage": [
-    {"name":"stopw.clkinfo.js","url":"clkinfo.js"}
+    {"name":"stopw.clkinfo.js","url":"clkinfo.js"},
+    {"name":"stopw.settings.js","url":"settings.js"}
   ]
 }

apps/clkinfostopw/settings.js

@@ -0,0 +1,24 @@
+(function (back) {
+    var _a;
+    var SETTINGS_FILE = "clkinfostopw.setting.json";
+    var storage = require("Storage");
+    var settings = storage.readJSON(SETTINGS_FILE, true) || {};
+    (_a = settings.format) !== null && _a !== void 0 ? _a : (settings.format = 0);
+    var save = function () {
+        storage.writeJSON(SETTINGS_FILE, settings);
+    };
+    E.showMenu({
+        "": { "title": "stopwatch" },
+        "< Back": back,
+        "Format": {
+            value: settings.format,
+            min: 0,
+            max: 1,
+            format: function (v) { return v === 0 ? "12m34s" : "12:34"; },
+            onchange: function (v) {
+                settings.format = v;
+                save();
+            },
+        },
+    });
+});

apps/clkinfostopw/settings.ts

@@ -0,0 +1,34 @@
+const enum StopWatchFormat {
+  HMS,
+  Colon,
+}
+type StopWatchSettings = {
+  format: StopWatchFormat,
+};
+
+((back: () => void) => {
+  const SETTINGS_FILE = "clkinfostopw.setting.json";
+
+  const storage = require("Storage");
+  const settings: StopWatchSettings = storage.readJSON(SETTINGS_FILE, true) || {};
+  settings.format ??= StopWatchFormat.HMS;
+
+  const save = () => {
+    storage.writeJSON(SETTINGS_FILE, settings)
+  };
+
+  E.showMenu({
+    "": { "title": "stopwatch" },
+    "< Back": back,
+    "Format": {
+      value: settings.format,
+      min: StopWatchFormat.HMS,
+      max: StopWatchFormat.Colon,
+      format: v => v === StopWatchFormat.HMS ? "12m34s" : "12:34",
+      onchange: v => {
+        settings.format = v;
+        save();
+      },
+    },
+  });
+})

apps/widChargingStatus/widget.js

@@ -1,4 +1,3 @@
-"use strict";
 (function () {
     var icon = require('heatshrink').decompress(atob('ikggMAiEAgYIBmEAg4EB+EAh0AgPggEeCAIEBnwQBAgP+gEP//x///j//8f//k///H//4BYOP/4lBv4bDvwEB4EAvAEBwEAuA7DCAI7BgAQBhEAA'));
     var iconWidth = 18;

apps/widbtstates/widget.js

@@ -1,4 +1,3 @@
-"use strict";
 (function () {
     "ram";
     var _a;

tsconfig.json

@@ -15,6 +15,7 @@
     "declaration": false,
     "emitDeclarationOnly": false,
     "removeComments": true,
+    "noImplicitUseStrict": true, // disable "use strict"
 
     "newLine": "lf",
     "noEmitHelpers": true, // we link to specific banglejs implementations
@@ -35,7 +36,14 @@
     "noImplicitOverride": true,
     "exactOptionalPropertyTypes": true,
     "useUnknownInCatchVariables": true,
-    "strict": true,
+    //"strict": true, // can't have this with noImplicitUseStrict, instead:
+    "strictNullChecks": true,
+    "strictBindCallApply": true,
+    "strictFunctionTypes": true,
+    "strictPropertyInitialization": true,
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "useUnknownInCatchVariables": true,
 
     // simple type checking
     "noUnusedLocals": true,