From 5170c828b6a57175195b2fe53c908c6e40b8563f Mon Sep 17 00:00:00 2001 From: Ethan Pippin Date: Tue, 16 May 2023 17:36:41 -0600 Subject: [PATCH] fix overlay (#779) --- Shared/Coordinators/VideoPlayerCoordinator.swift | 3 --- Swiftfin tvOS/Views/VideoPlayer/VideoPlayer.swift | 11 ++--------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/Shared/Coordinators/VideoPlayerCoordinator.swift b/Shared/Coordinators/VideoPlayerCoordinator.swift index e93326ef..be7ea366 100644 --- a/Shared/Coordinators/VideoPlayerCoordinator.swift +++ b/Shared/Coordinators/VideoPlayerCoordinator.swift @@ -51,9 +51,6 @@ final class VideoPlayerCoordinator: NavigationCoordinatable { Group { if Defaults[.VideoPlayer.videoPlayerType] == .swiftfin { VideoPlayer(manager: self.videoPlayerManager) - .overlay { - VideoPlayer.Overlay() - } } else { NativeVideoPlayer(manager: self.videoPlayerManager) } diff --git a/Swiftfin tvOS/Views/VideoPlayer/VideoPlayer.swift b/Swiftfin tvOS/Views/VideoPlayer/VideoPlayer.swift index 63f77db4..50914b20 100644 --- a/Swiftfin tvOS/Views/VideoPlayer/VideoPlayer.swift +++ b/Swiftfin tvOS/Views/VideoPlayer/VideoPlayer.swift @@ -32,8 +32,6 @@ struct VideoPlayer: View { @State private var isScrubbing: Bool = false - private var overlay: () -> any View - @ViewBuilder private var playerView: some View { ZStack { @@ -64,7 +62,7 @@ struct VideoPlayer: View { } } - overlay() + VideoPlayer.Overlay() .eraseToAnyView() .environmentObject(videoPlayerManager) .environmentObject(videoPlayerManager.currentProgressHandler) @@ -110,12 +108,7 @@ extension VideoPlayer { init(manager: VideoPlayerManager) { self.init( currentProgressHandler: manager.currentProgressHandler, - videoPlayerManager: manager, - overlay: { EmptyView() } + videoPlayerManager: manager ) } - - func overlay(@ViewBuilder _ content: @escaping () -> any View) -> Self { - copy(modifying: \.overlay, with: content) - } }