apps: pager: notifications: improve swipe handling

Currently the swipe handling added for the confirmation view has a number
of prolems: it does not work at all for multi-screen notifications, it
interferes with the haptic feedback if we keep swiping down and an up
swipe incorrectly dismisses whole notification app.

Fix these.

Signed-off-by: Daniel Thompson <daniel@redfelineninja.org.uk>

1 files changed, 11 insertions, 4 deletions

diff --git a/wasp/apps/pager.py b/wasp/apps/pager.py
index f9de947..2f74d0e 100644
--- a/wasp/apps/pager.py
+++ b/wasp/apps/pager.py
@@ -99,11 +99,18 @@ class NotificationApp(PagerApp):
         super().background()
 
     def swipe(self, event):
-        if event[0] == wasp.EventType.DOWN:
-            self.confirmation_view.active = True
-            self._draw()
-        super().swipe(event)
+        if self.confirmation_view.active:
+            if event[0] == wasp.EventType.UP:
+                self.confirmation_view.active = False
+                self._draw()
+                return
+        else:
+            if event[0] == wasp.EventType.DOWN and self._page == 0:
+                self.confirmation_view.active = True
+                self._draw()
+                return
 
+        super().swipe(event)
 
     def _draw(self):
         if self.confirmation_view.active: