From a58b3f0b88fdad7c5251e98e2cde9d2eaa29439e Mon Sep 17 00:00:00 2001
From: Ethan Pippin <ethanpippin2343@gmail.com>
Date: Tue, 16 May 2023 16:03:26 -0600
Subject: [PATCH] Fix Video Player Overlay (#774)

---
 .../Coordinators/VideoPlayerCoordinator.swift |  3 --
 Swiftfin/Views/VideoPlayer/VideoPlayer.swift  | 31 +++++++------------
 2 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/Shared/Coordinators/VideoPlayerCoordinator.swift b/Shared/Coordinators/VideoPlayerCoordinator.swift
index e60e762b..e93326ef 100644
--- a/Shared/Coordinators/VideoPlayerCoordinator.swift
+++ b/Shared/Coordinators/VideoPlayerCoordinator.swift
@@ -33,9 +33,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/Views/VideoPlayer/VideoPlayer.swift b/Swiftfin/Views/VideoPlayer/VideoPlayer.swift
index f6036fc1..4cc3d188 100644
--- a/Swiftfin/Views/VideoPlayer/VideoPlayer.swift
+++ b/Swiftfin/Views/VideoPlayer/VideoPlayer.swift
@@ -101,7 +101,6 @@ struct VideoPlayer: View {
 
     private let gestureStateHandler: GestureStateHandler = .init()
     private let updateViewProxy: UpdateViewProxy = .init()
-    private var overlay: () -> any View
 
     @ViewBuilder
     private var playerView: some View {
@@ -155,19 +154,16 @@ struct VideoPlayer: View {
                             }
                         }
 
-                    Group {
-                        overlay()
-                            .eraseToAnyView()
-                    }
-                    .environmentObject(splitContentViewProxy)
-                    .environmentObject(videoPlayerManager)
-                    .environmentObject(videoPlayerManager.currentProgressHandler)
-                    .environmentObject(videoPlayerManager.currentViewModel!)
-                    .environmentObject(videoPlayerManager.proxy)
-                    .environment(\.aspectFilled, $isAspectFilled)
-                    .environment(\.isPresentingOverlay, $isPresentingOverlay)
-                    .environment(\.isScrubbing, $isScrubbing)
-                    .environment(\.playbackSpeed, $playbackSpeed)
+                    VideoPlayer.Overlay()
+                        .environmentObject(splitContentViewProxy)
+                        .environmentObject(videoPlayerManager)
+                        .environmentObject(videoPlayerManager.currentProgressHandler)
+                        .environmentObject(videoPlayerManager.currentViewModel!)
+                        .environmentObject(videoPlayerManager.proxy)
+                        .environment(\.aspectFilled, $isAspectFilled)
+                        .environment(\.isPresentingOverlay, $isPresentingOverlay)
+                        .environment(\.isScrubbing, $isScrubbing)
+                        .environment(\.playbackSpeed, $playbackSpeed)
                 }
             }
             .splitContent {
@@ -253,14 +249,9 @@ 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)
-    }
 }
 
 // MARK: Gestures