From c2358be92ce88d32b8c40a1a9ec7107ffebe5565 Mon Sep 17 00:00:00 2001
From: Steven Lageveen <stevenmax888@gmail.com>
Date: Sun, 5 Oct 2025 00:51:15 +0200
Subject: [PATCH] Don't block left to right after start

---
 lib/config/interactive_page_transition.dart | 56 ++++-----------------
 1 file changed, 11 insertions(+), 45 deletions(-)

diff --git a/lib/config/interactive_page_transition.dart b/lib/config/interactive_page_transition.dart
index d0e014624..ad0d9ad2f 100644
--- a/lib/config/interactive_page_transition.dart
+++ b/lib/config/interactive_page_transition.dart
@@ -1,10 +1,8 @@
-/// Swipe-to-pop page transition utilities used for iOS-style navigation.
 import 'dart:math' as math;
 
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/gestures.dart';
 import 'package:hermes/config/app_config.dart';
-import 'package:hermes/widgets/reply_swipeable.dart';
 
 /// A [Page] that wraps content in an iOS-style swipe-to-pop route.
 class SwipePopPage<T> extends Page<T> {
@@ -235,7 +233,6 @@ class _FullScreenPopGestureDetectorState<T>
     final size = context.size;
     if (size == null || size.width == 0) return;
     final delta = _convertToLogical((details.primaryDelta ?? 0) / size.width);
-    if (delta <= 0) return;
     _controller!.dragUpdate(delta);
   }
 
@@ -265,7 +262,7 @@ class _FullScreenPopGestureDetectorState<T>
   Widget build(BuildContext context) {
     return Listener(
       onPointerDown: _handlePointerDown,
-      behavior: HitTestBehavior.translucent,
+      behavior: HitTestBehavior.deferToChild,
       child: widget.child,
     );
   }
@@ -391,9 +388,17 @@ class _FullScreenPopGestureController<T> {
 
   /// Keep the navigator informed until the animation finishes.
   void _listenUntilSettled() {
+    bool isSettled(AnimationStatus status) =>
+        status == AnimationStatus.completed ||
+        status == AnimationStatus.dismissed;
+
+    if (!controller.isAnimating && isSettled(controller.status)) {
+      navigator.didStopUserGesture();
+      return;
+    }
+
     void listener(AnimationStatus status) {
-      if (status == AnimationStatus.completed ||
-          status == AnimationStatus.dismissed) {
+      if (isSettled(status)) {
         navigator.didStopUserGesture();
         controller.removeStatusListener(listener);
       }
@@ -409,42 +414,3 @@ class _FullScreenPopGestureController<T> {
     return Duration(milliseconds: ms);
   }
 }
-
-/// Prevents swipe-to-pop from triggering inside reply swipe regions.
-class BlockSwipeArea extends StatelessWidget {
-  /// Creates a region that blocks swipe-to-pop from the configured side.
-  const BlockSwipeArea({
-    super.key,
-    this.direction = ReplySwipeDirection.startToEnd,
-    required this.child,
-  });
-
-  final ReplySwipeDirection direction;
-  final Widget child;
-
-  /// Install a recognizer that absorbs pop gestures in the configured zone.
-  @override
-  Widget build(BuildContext context) {
-    return RawGestureDetector(
-      behavior: HitTestBehavior.opaque,
-      gestures: {
-        _SwipePopBlockRecognizer:
-            GestureRecognizerFactoryWithHandlers<_SwipePopBlockRecognizer>(
-          () => _SwipePopBlockRecognizer(debugOwner: this),
-          (recognizer) {
-            recognizer
-              ..onStart = (_) {}
-              ..onUpdate = (_) {}
-              ..onEnd = (_) {}
-              ..onCancel = () {}
-              ..gestureSettings = MediaQuery.maybeGestureSettingsOf(context)
-              ..textDirection = Directionality.of(context)
-              ..dragStartBehavior = DragStartBehavior.down
-              ..direction = direction;
-          },
-        ),
-      },
-      child: child,
-    );
-  }
-}