From a6a03ea98823927873e3f5971b888bf854fceec8 Mon Sep 17 00:00:00 2001 From: Ashik K Date: Fri, 17 Oct 2025 12:53:35 +0200 Subject: [PATCH] URGENT FIX: Video player back button now works MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changed all router.dismissCoordinator() calls to router.popLast() in video player: - Overlay.swift: Back button when confirming close - VideoPlayer.swift: Auto-exit when video ends - LoadingView.swift: Cancel button during loading dismissCoordinator() only works with .fullScreen/.modal presentations. Since we changed video player to .push navigation, we need popLast() instead. This fixes ESC/menu button not working during video playback. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude --- jellypig tvOS/Views/VideoPlayer/Components/LoadingView.swift | 2 +- jellypig tvOS/Views/VideoPlayer/Overlays/Overlay.swift | 2 +- jellypig tvOS/Views/VideoPlayer/VideoPlayer.swift | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jellypig tvOS/Views/VideoPlayer/Components/LoadingView.swift b/jellypig tvOS/Views/VideoPlayer/Components/LoadingView.swift index 74391c0a..e1aa7e9d 100644 --- a/jellypig tvOS/Views/VideoPlayer/Components/LoadingView.swift +++ b/jellypig tvOS/Views/VideoPlayer/Components/LoadingView.swift @@ -28,7 +28,7 @@ extension VideoPlayer { ProgressView() Button { - router.dismissCoordinator() + router.popLast() } label: { Text(L10n.cancel) .foregroundColor(.red) diff --git a/jellypig tvOS/Views/VideoPlayer/Overlays/Overlay.swift b/jellypig tvOS/Views/VideoPlayer/Overlays/Overlay.swift index 10360ec4..d741279d 100644 --- a/jellypig tvOS/Views/VideoPlayer/Overlays/Overlay.swift +++ b/jellypig tvOS/Views/VideoPlayer/Overlays/Overlay.swift @@ -110,7 +110,7 @@ extension VideoPlayer { if isPresentingOverlay && currentOverlayType == .confirmClose { proxy.stop() - router.dismissCoordinator() + router.popLast() } else if isPresentingOverlay && currentOverlayType == .smallMenu { currentOverlayType = .main } else { diff --git a/jellypig tvOS/Views/VideoPlayer/VideoPlayer.swift b/jellypig tvOS/Views/VideoPlayer/VideoPlayer.swift index 0c41f574..9caf91c8 100644 --- a/jellypig tvOS/Views/VideoPlayer/VideoPlayer.swift +++ b/jellypig tvOS/Views/VideoPlayer/VideoPlayer.swift @@ -60,7 +60,7 @@ struct VideoPlayer: View { { videoPlayerManager.selectNextViewModel() } else { - router.dismissCoordinator() + router.popLast() } } }