Merge branch 'msgtwistscroll' into app-loader

Author: thyttan

apps/msgtwscr/boot.js

@@ -4,35 +4,45 @@
     onTwistEmitDrag();
   }
 
-  // If Fastload Utils is installed this is used:
-  Bangle.on("message", (_, msg)=>{if (Bangle.CLOCK && msg.new) {
+  let attachAfterTimeout = ()=>{
     setTimeout(()=>{
       if (global.__FILE__=="messagegui.new.js") {
         onTwistEmitDrag();
       }
-    },1000)
+    },700)
     // It feels like there's a more elegant solution than checking the filename
-    // after 1000 milliseconds. But this at least seems to work w/o sometimes
+    // after 700 milliseconds. But this at least seems to work w/o sometimes
     // activating when it shouldn't.
     // Maybe we could add events for when fast load and/or Bangle.uiRemove occurs?
     // Then that could be used similarly to boot code and/or the `kill` event.
+  }
+
+  // If Fastload Utils is installed this is used:
+  Bangle.on("message", (_, msg)=>{if (Bangle.CLOCK && msg.new) {
+    attachAfterTimeout();
   }});
 
   // twistThreshold How much acceleration to register a twist of the watch strap? Can be negative for opposite direction. default = 800
   // twistMaxY Maximum acceleration in Y to trigger a twist (low Y means watch is facing the right way up). default = -800
   // twistTimeout How little time (in ms) must a twist take from low->high acceleration? default = 1000
   function onTwistEmitDrag() {
     Bangle.setOptions({twistThreshold:2500, twistMaxY:-800, twistTimeout:400});
+    let isTwistDragging = false;
     let twistHandler = ()=>{
-      Bangle.setLocked(false);
-      Bangle.setLCDPower(true);
-      Bangle.emit("swipe",0,-1);
-      let i = 25;
-      const int = setInterval(() => {
-        Bangle.emit("drag", {dy:-3})
-        i--;
-        if (i<1) clearInterval(int);
-      }, 10);
+      if (!isTwistDragging) {
+        isTwistDragging = true;
+        Bangle.setLocked(false);
+        Bangle.setLCDPower(true);
+        let i = 25;
+        const int = setInterval(() => {
+          Bangle.emit("drag", {dy:-3, b:i===0?0:1})
+          i--;
+          if (i<0) {
+            clearInterval(int);
+            isTwistDragging = false;
+          }
+        }, 10);
+      }
     }
     Bangle.on("twist", twistHandler);
     // Give messagegui some extra time to add its remove function to
@@ -43,10 +53,10 @@
         Bangle.uiRemove = function () {
           Bangle.removeListener("twist", twistHandler)
           showMessageUIRemove();
+          // Reset twist drag logic if we go to next message.
+          attachAfterTimeout();
         }
       }},
-      500
-    )
-
+      800)
   }
 }