From e3d503eff0c9bf885f0bc0348c5bf79b8124722d Mon Sep 17 00:00:00 2001 From: thyttan <6uuxstm66@mozmail.com⁩> Date: Mon, 31 Jul 2023 15:10:55 +0200 Subject: [PATCH] kbmulti:Compat with `backswipe` on newer firmwares --- apps/kbmulti/ChangeLog | 3 +++ apps/kbmulti/lib.js | 5 +++-- apps/kbmulti/metadata.json | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/apps/kbmulti/ChangeLog b/apps/kbmulti/ChangeLog index defae902b..28344678a 100644 --- a/apps/kbmulti/ChangeLog +++ b/apps/kbmulti/ChangeLog @@ -4,3 +4,6 @@ 0.04: Allow moving the cursor 0.05: Switch swipe directions for Caps Lock and moving cursor. 0.06: Add ability to auto-lowercase after a capital letter insertion. +0.07: Add compatability with `backswipe` app by using `Bangle.prependListener()` and `E.stopEventPropagation`- requires fw 2v19 or cutting + edge versions of 2v18. Falls back on `Bangle.on()` for backwards + compatability. diff --git a/apps/kbmulti/lib.js b/apps/kbmulti/lib.js index 505132040..f979e4473 100644 --- a/apps/kbmulti/lib.js +++ b/apps/kbmulti/lib.js @@ -154,6 +154,7 @@ exports.input = function(options) { displayText(false); } } + E.stopEventPropagation&&E.stopEventPropagation(); } function onHelp(resolve,reject) { @@ -161,7 +162,7 @@ exports.input = function(options) { E.showPrompt( helpMessage, {title: "Help", buttons : {"Ok":true}} ).then(function(v) { - Bangle.on('swipe', onSwipe); + if (Bangle.prependListener) {Bangle.prependListener('swipe', onSwipe);} else {Bangle.on('swipe', onSwipe);} generateLayout(resolve,reject); layout.render(); }); @@ -208,7 +209,7 @@ exports.input = function(options) { } else { generateLayout(resolve,reject); displayText(false); - Bangle.on('swipe', onSwipe); + if (Bangle.prependListener) {Bangle.prependListener('swipe', onSwipe);} else {Bangle.on('swipe', onSwipe);} layout.render(); } }); diff --git a/apps/kbmulti/metadata.json b/apps/kbmulti/metadata.json index 0b44b0306..210646a01 100644 --- a/apps/kbmulti/metadata.json +++ b/apps/kbmulti/metadata.json @@ -1,6 +1,6 @@ { "id": "kbmulti", "name": "Multitap keyboard", - "version":"0.06", + "version":"0.07", "description": "A library for text input via multitap/T9 style keypad", "icon": "app.png", "type":"textinput",