From 752dd852dfb2d95f2a92cf179c72a562333ec8dc Mon Sep 17 00:00:00 2001
From: thyttan <6uuxstm66@mozmail.com⁩>
Date: Wed, 2 Aug 2023 00:41:36 +0200
Subject: [PATCH] kbtouch: Compat w backswipe on newer firmwares

---
 apps/kbtouch/ChangeLog     | 2 ++
 apps/kbtouch/lib.js        | 3 +++
 apps/kbtouch/metadata.json | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/apps/kbtouch/ChangeLog b/apps/kbtouch/ChangeLog
index 5bd2159e6..cb8e5cda6 100644
--- a/apps/kbtouch/ChangeLog
+++ b/apps/kbtouch/ChangeLog
@@ -1,3 +1,5 @@
 0.01: New App!
 0.02: Introduced settings to customize the layout and functionality of the keyboard.
 0.03: Convert Yes/No On/Off in settings to checkboxes
+0.04: Catch and discard swipe events on fw2v19 and up (as well as some cutting
+	edge 2v18 ones), allowing compatability with the Back Swipe app.
diff --git a/apps/kbtouch/lib.js b/apps/kbtouch/lib.js
index db90440b9..4f064cfc7 100644
--- a/apps/kbtouch/lib.js
+++ b/apps/kbtouch/lib.js
@@ -161,8 +161,11 @@ function draw() {
     },back:()=>{
       clearInterval(flashInterval);
       Bangle.setUI();
+      Bangle.prependListener&&Bangle.removeListener('swipe', catchSwipe); // Remove swipe lister if it was added with `Bangle.prependListener()` (fw2v19 and up).
       g.clearRect(Bangle.appRect);
       resolve(text);
     }});
+    let catchSwipe = ()=>{E.stopEventPropagation&&E.stopEventPropagation();};
+    Bangle.prependListener&&Bangle.prependListener('swipe', catchSwipe); // Intercept swipes on fw2v19 and later. Should not break on older firmwares.
   });
 };
diff --git a/apps/kbtouch/metadata.json b/apps/kbtouch/metadata.json
index 31dc8c9a8..349726498 100644
--- a/apps/kbtouch/metadata.json
+++ b/apps/kbtouch/metadata.json
@@ -1,6 +1,6 @@
 { "id": "kbtouch",
   "name": "Touch keyboard",
-  "version":"0.03",
+  "version":"0.04",
   "description": "A library for text input via onscreen keyboard",
   "icon": "app.png",
   "type":"textinput",