swipeinv: (WIP) Add inversion of drag events. Refactor to hijack and modify the

	events instead of the handling of them. This should add compatibility with
	most apps, even if Bangle.setUI is not used.

Author: thyttan

apps/swipeinv/ChangeLog

@@ -1,2 +1,5 @@
 0.01: New app!
 0.02: Minor code improvements
+0.03: (WIP) Add inversion of drag events. Refactor to hijack and modify the
+	events instead of the handling of them. This should add compatibility with
+	most apps, even if Bangle.setUI is not used.

apps/swipeinv/boot.js

@@ -1,32 +1,39 @@
 {
-  // TODO: Should the global case just hijack the swipe and drag events, modifying them before passing on to other listeners?
-  //   - That could be a new separate bootloader app instead though?
-
   const settings = Object.assign({
     global: false,
     apps: []
   }, require("Storage").readJSON("swipeinv.json", true) || {});
 
-  if (settings.global || settings.apps.length > 0) {
-    const setURIOrig = Bangle.setUI;
-    Bangle.setUI = (mode, callback) => {
-      if (typeof mode === "object" && mode.swipe) {
+  setTimeout(() => { // Timeout so we prepend listeners late, hopefully after all other listerners were added.
+    if (settings.global || settings.apps.length > 0) {
+
+      let swipeInverter = (dirLR, dirUD, obj) => {
         if (settings.global ^ settings.apps.includes(global.__FILE__)) {
-          const origSwipeCb = mode.swipe;
-          mode.swipe = (dirLR, dirUD) => origSwipeCb(dirLR * -1, dirUD * -1);
+          if (!(obj && obj.inverted)) {
+            E.stopEventPropagation();
+            obj = Object.assign({inverted:true}, obj);
+
+            Bangle.emit("swipe", dirLR * -1, dirUD * -1, obj)
+          }
         }
       }
-      if (typeof mode === "object" && mode.drag) {
+
+      let dragInverter = (e) => {
         if (settings.global ^ settings.apps.includes(global.__FILE__)) {
-          const origDragCb = mode.drag;
-          mode.drag = (e) => {
+          if (!e.inverted) {
+            E.stopEventPropagation();
+            e.inverted = true;
+
             e.dx *= -1;
             e.dy *= -1;
-            origDragCb(e);
+            Bangle.emit("drag", e);
           }
         }
       }
-      return setURIOrig(mode, callback);
-    };
-  }
+
+      Bangle.prependListener("swipe", swipeInverter);
+      Bangle.prependListener("drag", dragInverter);
+
+    }
+  }, 0)
 }

apps/swipeinv/metadata.json

@@ -3,7 +3,7 @@
   "name": "Swipe inversion",
   "shortName":"Swipe inv.",
   "icon": "app.png",
-  "version": "0.02",
+  "version": "0.03",
   "description": "Inverts swipe direction globally or per app, see settings. If global inversion is enabled, you can unselect the inversion per app and vice versa.",
   "readme":"README.md",
   "type": "bootloader",