live tv coordinator fix

jellyfin · Aug 16, 2023 · c03b66f · c03b66f
1 parent e2d9f05
commit c03b66f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 39 deletions.
diff --git a/Shared/Coordinators/LiveTVChannelsCoordinator.swift b/Shared/Coordinators/LiveTVChannelsCoordinator.swift
@@ -25,20 +25,8 @@ final class LiveTVChannelsCoordinator: NavigationCoordinatable {
     #endif
 
     #if os(tvOS)
-    func makeVideoPlayer(manager: VideoPlayerManager) -> NavigationViewCoordinator<BasicNavigationViewCoordinator> {
-        BasicNavigationViewCoordinator {
-            Group {
-                if Defaults[.VideoPlayer.videoPlayerType] == .swiftfin {
-                    VideoPlayer(manager: manager)
-                        .overlay {
-                            VideoPlayer.Overlay()
-                        }
-                } else {
-                    NativeVideoPlayer(manager: manager)
-                }
-            }
-        }
-        .inNavigationViewCoordinator()
+    func makeVideoPlayer(manager: VideoPlayerManager) -> NavigationViewCoordinator<VideoPlayerCoordinator> {
+        NavigationViewCoordinator(VideoPlayerCoordinator(manager: manager))
     }
     #endif
 

diff --git a/Shared/Coordinators/LiveTVProgramsCoordinator.swift b/Shared/Coordinators/LiveTVProgramsCoordinator.swift
@@ -26,20 +26,8 @@ final class LiveTVProgramsCoordinator: NavigationCoordinatable {
     #endif
 
     #if os(tvOS)
-    func makeVideoPlayer(manager: VideoPlayerManager) -> NavigationViewCoordinator<BasicNavigationViewCoordinator> {
-        BasicNavigationViewCoordinator {
-            Group {
-                if Defaults[.VideoPlayer.videoPlayerType] == .swiftfin {
-                    VideoPlayer(manager: manager)
-                        .overlay {
-                            VideoPlayer.Overlay()
-                        }
-                } else {
-                    NativeVideoPlayer(manager: manager)
-                }
-            }
-        }
-        .inNavigationViewCoordinator()
+    func makeVideoPlayer(manager: VideoPlayerManager) -> NavigationViewCoordinator<VideoPlayerCoordinator> {
+        NavigationViewCoordinator(VideoPlayerCoordinator(manager: manager))
     }
     #endif
 

diff --git a/Swiftfin tvOS/Views/VideoPlayer/Overlays/Overlay.swift b/Swiftfin tvOS/Views/VideoPlayer/Overlays/Overlay.swift
@@ -33,17 +33,17 @@ extension VideoPlayer {
         var body: some View {
             ZStack {
 
-//                MainOverlay()
-//                    .visible(currentOverlayType == .main)
-//
-//                ConfirmCloseOverlay()
-//                    .visible(currentOverlayType == .confirmClose)
-//
-//                SmallMenuOverlay()
-//                    .visible(currentOverlayType == .smallMenu)
-//
-//                ChapterOverlay()
-//                    .visible(currentOverlayType == .chapters)
+                MainOverlay()
+                    .visible(currentOverlayType == .main)
+
+                ConfirmCloseOverlay()
+                    .visible(currentOverlayType == .confirmClose)
+
+                SmallMenuOverlay()
+                    .visible(currentOverlayType == .smallMenu)
+
+                ChapterOverlay()
+                    .visible(currentOverlayType == .chapters)
             }
             .visible(isPresentingOverlay)
             .animation(.linear(duration: 0.1), value: currentOverlayType)