ptlaunch: Improve pattern detection code readability by PaddeK

apps.json

@@ -4861,7 +4861,7 @@
     "id": "ptlaunch",
     "name": "Pattern Launcher",
     "shortName": "Pattern Launcher",
-    "version": "0.11",
+    "version": "0.12",
     "description": "Directly launch apps from the clock screen with custom patterns.",
     "icon": "app.png",
     "screenshots": [{"url":"manage_patterns_light.png"}],

apps/ptlaunch/ChangeLog

@@ -2,4 +2,5 @@
 0.02: Turn on lcd when launching an app if the lock screen was disabled in the settings
 0.03: Make tap to confirm new pattern more reliable. Also allow for easier creation of single circle patterns.
 0.10: Improve the management of existing patterns: Draw the linked pattern on the left hand side of the app name within a scroller, similar to the default launcher. Slighlty clean up the code to make it less horrible.
-0.11: Respect theme colors. Fix: Do not pollute global space with internal variables ans functions in boot.js
+0.11: Respect theme colors. Fix: Do not pollute global space with internal variables ans functions in boot.js
+0.12: Improve pattern detection code readability by PaddeK http://forum.espruino.com/profiles/117930/

apps/ptlaunch/README.md

@@ -58,3 +58,10 @@ Make sure the watch is unlocked before you start drawing. If this bothers you, y
 3) I have done all that and still nothing happens!
 
 Please note that drawing on the clock screen will not visually show the pattern you drew. It will start the app as soon as the pattern was recognized - this might take 1 or 2 seconds! If still nothing happens, that might be a bug, sorry!
+
+
+## Authors
+
+Initial creation: [crazysaem](https://github.com/crazysaem)
+
+Improve pattern detection code readability: [PaddeK](http://forum.espruino.com/profiles/117930/)

apps/ptlaunch/app.js

@@ -114,7 +114,6 @@ var showMainMenu = () => {
   E.showMenu(mainmenu);
 };
 
-var positions = [];
 var recognizeAndDrawPattern = () => {
   return new Promise((resolve) => {
     E.showMenu();
@@ -137,148 +136,53 @@ var recognizeAndDrawPattern = () => {
     setWatch(() => finishHandler(), BTN);
     setTimeout(() => Bangle.on("tap", finishHandler), 250);
 
-    positions = [];
+    var positions = [];
+    var getPattern = (positions) => {
+      var circles = [
+        { x: 25, y: 25, i: 0 },
+        { x: 87, y: 25, i: 1 },
+        { x: 150, y: 25, i: 2 },
+        { x: 25, y: 87, i: 3 },
+        { x: 87, y: 87, i: 4 },
+        { x: 150, y: 87, i: 5 },
+        { x: 25, y: 150, i: 6 },
+        { x: 87, y: 150, i: 7 },
+        { x: 150, y: 150, i: 8 },
+      ];
+      return positions.reduce((pattern, p, i, arr) => {
+        var idx = circles.findIndex((c) => {
+          var dx = p.x > c.x ? p.x - c.x : c.x - p.x;
+          if (dx > CIRCLE_RADIUS) {
+            return false;
+          }
+          var dy = p.y > c.y ? p.y - c.y : c.y - p.y;
+          if (dy > CIRCLE_RADIUS) {
+            return false;
+          }
+          if (dx + dy <= CIRCLE_RADIUS) {
+            return true;
+          }
+          return dx * dx + dy * dy <= CIRCLE_RADIUS_2;
+        });
+        if (idx >= 0) {
+          pattern += circles[idx].i;
+          circles.splice(idx, 1);
+        }
+        if (circles.length === 0) {
+          arr.splice(1);
+        }
+        return pattern;
+      }, "");
+    };
     var dragHandler = (position) => {
-      log(position);
       positions.push(position);
-
+      if (position.b === 0 || positions.length >= 200) {
-      debounce().then(() => {
+        pattern = getPattern(positions).split("");
-        if (isFinished) {
-          return;
-        }
-
-        // This might actually be a 'tap' event.
-        // Use this check in addition to the actual tap handler to make it more reliable
-        if (pattern.length > 0 && positions.length === 2) {
-          if (
-            positions[0].x === positions[1].x &&
-            positions[0].y === positions[1].y
-          ) {
-            finishHandler();
-            positions = [];
-            return;
-          }
-        }
-
-        E.showMessage("Calculating...");
-        var t0 = Date.now();
-
-        log(positions.length);
-
-        var circlesClone = cloneCirclesArray();
-        pattern = [];
-
-        var step = Math.floor(positions.length / 100) + 1;
-
-        var p, a, b, circle;
-
-        for (var i = 0; i < positions.length; i += step) {
-          p = positions[i];
-
-          circle = circlesClone[0];
-          if (circle) {
-            a = p.x - circle.x;
-            b = p.y - circle.y;
-            if (CIRCLE_RADIUS_2 - (a * a + b * b) >= 0) {
-              pattern.push(circle.i);
-              circlesClone.splice(0, 1);
-            }
-          }
-
-          circle = circlesClone[1];
-          if (circle) {
-            a = p.x - circle.x;
-            b = p.y - circle.y;
-            if (CIRCLE_RADIUS_2 - (a * a + b * b) >= 0) {
-              pattern.push(circle.i);
-              circlesClone.splice(1, 1);
-            }
-          }
-
-          circle = circlesClone[2];
-          if (circle) {
-            a = p.x - circle.x;
-            b = p.y - circle.y;
-            if (CIRCLE_RADIUS_2 - (a * a + b * b) >= 0) {
-              pattern.push(circle.i);
-              circlesClone.splice(2, 1);
-            }
-          }
-
-          circle = circlesClone[3];
-          if (circle) {
-            a = p.x - circle.x;
-            b = p.y - circle.y;
-            if (CIRCLE_RADIUS_2 - (a * a + b * b) >= 0) {
-              pattern.push(circle.i);
-              circlesClone.splice(3, 1);
-            }
-          }
-
-          circle = circlesClone[4];
-          if (circle) {
-            a = p.x - circle.x;
-            b = p.y - circle.y;
-            if (CIRCLE_RADIUS_2 - (a * a + b * b) >= 0) {
-              pattern.push(circle.i);
-              circlesClone.splice(4, 1);
-            }
-          }
-
-          circle = circlesClone[5];
-          if (circle) {
-            a = p.x - circle.x;
-            b = p.y - circle.y;
-            if (CIRCLE_RADIUS_2 - (a * a + b * b) >= 0) {
-              pattern.push(circle.i);
-              circlesClone.splice(5, 1);
-            }
-          }
-
-          circle = circlesClone[6];
-          if (circle) {
-            a = p.x - circle.x;
-            b = p.y - circle.y;
-            if (CIRCLE_RADIUS_2 - (a * a + b * b) >= 0) {
-              pattern.push(circle.i);
-              circlesClone.splice(6, 1);
-            }
-          }
-          circle = circlesClone[7];
-          if (circle) {
-            a = p.x - circle.x;
-            b = p.y - circle.y;
-            if (CIRCLE_RADIUS_2 - (a * a + b * b) >= 0) {
-              pattern.push(circle.i);
-              circlesClone.splice(7, 1);
-            }
-          }
-
-          circle = circlesClone[8];
-          if (circle) {
-            a = p.x - circle.x;
-            b = p.y - circle.y;
-            if (CIRCLE_RADIUS_2 - (a * a + b * b) >= 0) {
-              pattern.push(circle.i);
-              circlesClone.splice(8, 1);
-            }
-          }
-        }
-        var tx = Date.now();
-        log(tx - t0);
-        positions = [];
-        var t1 = Date.now();
-        log(t1 - t0);
-
-        log("pattern:");
-        log(pattern);
-
-        log("redrawing");
         g.clear();
         drawCirclesWithPattern(pattern);
-      });
+        positions = [];
+      }
     };
-
     Bangle.on("drag", dragHandler);
   });
 };
@@ -461,18 +365,6 @@ var getStoredPatternsArray = () => {
 var CIRCLE_RADIUS = 25;
 var CIRCLE_RADIUS_2 = CIRCLE_RADIUS * CIRCLE_RADIUS;
 
-var CIRCLES = [
-  { x: 25, y: 25, i: 0 },
-  { x: 87, y: 25, i: 1 },
-  { x: 150, y: 25, i: 2 },
-  { x: 25, y: 87, i: 3 },
-  { x: 87, y: 87, i: 4 },
-  { x: 150, y: 87, i: 5 },
-  { x: 25, y: 150, i: 6 },
-  { x: 87, y: 150, i: 7 },
-  { x: 150, y: 150, i: 8 },
-];
-
 var drawCircle = (circle, drawBuffer, scale) => {
   if (!drawBuffer) {
     drawBuffer = g;
@@ -563,16 +455,6 @@ var drawCirclesWithPattern = (pattern, options) => {
   g.drawImage(image, offset.x, offset.y);
 };
 
-var cloneCirclesArray = () => {
-  var circlesClone = Array(CIRCLES.length);
-
-  for (var i = 0; i < CIRCLES.length; i++) {
-    circlesClone[i] = CIRCLES[i];
-  }
-
-  return circlesClone;
-};
-
 //////
 // misc lib functions
 //////
@@ -583,20 +465,6 @@ var log = (message) => {
   }
 };
 
-var debounceTimeoutId;
-var debounce = (delay) => {
-  if (debounceTimeoutId) {
-    clearTimeout(debounceTimeoutId);
-  }
-
-  return new Promise((resolve) => {
-    debounceTimeoutId = setTimeout(() => {
-      debounceTimeoutId = undefined;
-      resolve();
-    }, delay || 500);
-  });
-};
-
 //////
 // run main function
 //////

apps/ptlaunch/boot.js

@@ -5,131 +5,54 @@
       console.log(JSON.stringify(message));
     }
   };
-  
+
   var storedPatterns;
+  var CIRCLE_RADIUS = 25;
+  var CIRCLE_RADIUS_2 = Math.pow(CIRCLE_RADIUS, 2);
   var positions = [];
+  var getPattern = (positions) => {
+    var circles = [
+      { x: 25, y: 25, i: 0 },
+      { x: 87, y: 25, i: 1 },
+      { x: 150, y: 25, i: 2 },
+      { x: 25, y: 87, i: 3 },
+      { x: 87, y: 87, i: 4 },
+      { x: 150, y: 87, i: 5 },
+      { x: 25, y: 150, i: 6 },
+      { x: 87, y: 150, i: 7 },
+      { x: 150, y: 150, i: 8 },
+    ];
+    return positions.reduce((pattern, p, i, arr) => {
+      var idx = circles.findIndex((c) => {
+        var dx = p.x > c.x ? p.x - c.x : c.x - p.x;
+        if (dx > CIRCLE_RADIUS) {
+          return false;
+        }
+        var dy = p.y > c.y ? p.y - c.y : c.y - p.y;
+        if (dy > CIRCLE_RADIUS) {
+          return false;
+        }
+        if (dx + dy <= CIRCLE_RADIUS) {
+          return true;
+        }
+        return dx * dx + dy * dy <= CIRCLE_RADIUS_2;
+      });
+      if (idx >= 0) {
+        pattern += circles[idx].i;
+        circles.splice(idx, 1);
+      }
+      if (circles.length === 0) {
+        arr.splice(1);
+      }
+      return pattern;
+    }, "");
+  };
   var dragHandler = (position) => {
     positions.push(position);
-  
+    if (position.b === 0 || positions.length >= 200) {
-    debounce().then(() => {
+      var pattern = getPattern(positions);
-      log(positions.length);
+      log(pattern);
-  
+
-      var CIRCLE_RADIUS = 25;
-      var CIRCLE_RADIUS_2 = CIRCLE_RADIUS * CIRCLE_RADIUS;
-  
-      var circles = [
-        { x: 25, y: 25, i: 0 },
-        { x: 87, y: 25, i: 1 },
-        { x: 150, y: 25, i: 2 },
-        { x: 25, y: 87, i: 3 },
-        { x: 87, y: 87, i: 4 },
-        { x: 150, y: 87, i: 5 },
-        { x: 25, y: 150, i: 6 },
-        { x: 87, y: 150, i: 7 },
-        { x: 150, y: 150, i: 8 },
-      ];
-      var pattern = [];
-  
-      var step = Math.floor(positions.length / 100) + 1;
-  
-      var p, a, b, circle;
-  
-      for (var i = 0; i < positions.length; i += step) {
-        p = positions[i];
-  
-        circle = circles[0];
-        if (circle) {
-          a = p.x - circle.x;
-          b = p.y - circle.y;
-          if (CIRCLE_RADIUS_2 - (a * a + b * b) >= 0) {
-            pattern.push(circle.i);
-            circles.splice(0, 1);
-          }
-        }
-  
-        circle = circles[1];
-        if (circle) {
-          a = p.x - circle.x;
-          b = p.y - circle.y;
-          if (CIRCLE_RADIUS_2 - (a * a + b * b) >= 0) {
-            pattern.push(circle.i);
-            circles.splice(1, 1);
-          }
-        }
-  
-        circle = circles[2];
-        if (circle) {
-          a = p.x - circle.x;
-          b = p.y - circle.y;
-          if (CIRCLE_RADIUS_2 - (a * a + b * b) >= 0) {
-            pattern.push(circle.i);
-            circles.splice(2, 1);
-          }
-        }
-  
-        circle = circles[3];
-        if (circle) {
-          a = p.x - circle.x;
-          b = p.y - circle.y;
-          if (CIRCLE_RADIUS_2 - (a * a + b * b) >= 0) {
-            pattern.push(circle.i);
-            circles.splice(3, 1);
-          }
-        }
-  
-        circle = circles[4];
-        if (circle) {
-          a = p.x - circle.x;
-          b = p.y - circle.y;
-          if (CIRCLE_RADIUS_2 - (a * a + b * b) >= 0) {
-            pattern.push(circle.i);
-            circles.splice(4, 1);
-          }
-        }
-  
-        circle = circles[5];
-        if (circle) {
-          a = p.x - circle.x;
-          b = p.y - circle.y;
-          if (CIRCLE_RADIUS_2 - (a * a + b * b) >= 0) {
-            pattern.push(circle.i);
-            circles.splice(5, 1);
-          }
-        }
-  
-        circle = circles[6];
-        if (circle) {
-          a = p.x - circle.x;
-          b = p.y - circle.y;
-          if (CIRCLE_RADIUS_2 - (a * a + b * b) >= 0) {
-            pattern.push(circle.i);
-            circles.splice(6, 1);
-          }
-        }
-        circle = circles[7];
-        if (circle) {
-          a = p.x - circle.x;
-          b = p.y - circle.y;
-          if (CIRCLE_RADIUS_2 - (a * a + b * b) >= 0) {
-            pattern.push(circle.i);
-            circles.splice(7, 1);
-          }
-        }
-  
-        circle = circles[8];
-        if (circle) {
-          a = p.x - circle.x;
-          b = p.y - circle.y;
-          if (CIRCLE_RADIUS_2 - (a * a + b * b) >= 0) {
-            pattern.push(circle.i);
-            circles.splice(8, 1);
-          }
-        }
-      }
-      positions = [];
-  
-      pattern = pattern.join("");
-  
       if (pattern) {
         if (storedPatterns[pattern]) {
           var app = storedPatterns[pattern].app;
@@ -139,27 +62,15 @@
                 Bangle.setLCDPower(true);
               }
             }
-  
+
             Bangle.removeListener("drag", dragHandler);
             load(app.src);
           }
         }
       }
-    });
+
-  };
+      positions = [];
-  
-  var debounceTimeoutId;
-  var debounce = (delay) => {
-    if (debounceTimeoutId) {
-      clearTimeout(debounceTimeoutId);
     }
-  
-    return new Promise((resolve) => {
-      debounceTimeoutId = setTimeout(() => {
-        debounceTimeoutId = undefined;
-        resolve();
-      }, delay || 500);
-    });
   };
 
   var sui = Bangle.setUI;