ashikk
/
jellyflood
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix overlay (#779)

This commit is contained in:
Ethan Pippin 2023-05-16 17:36:41 -06:00 committed by GitHub
parent 84192c20d6
commit 5170c828b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Shared/Coordinators/VideoPlayerCoordinator.swift
View File

@ -51,9 +51,6 @@ final class VideoPlayerCoordinator: NavigationCoordinatable {
Group { Group {
if Defaults[.VideoPlayer.videoPlayerType] == .swiftfin { if Defaults[.VideoPlayer.videoPlayerType] == .swiftfin {
VideoPlayer(manager: self.videoPlayerManager) VideoPlayer(manager: self.videoPlayerManager)
.overlay {
VideoPlayer.Overlay()
}
} else { } else {
NativeVideoPlayer(manager: self.videoPlayerManager) NativeVideoPlayer(manager: self.videoPlayerManager)
} }

11
Swiftfin tvOS/Views/VideoPlayer/VideoPlayer.swift
View File

@ -32,8 +32,6 @@ struct VideoPlayer: View {
@State @State
private var isScrubbing: Bool = false private var isScrubbing: Bool = false
private var overlay: () -> any View
@ViewBuilder @ViewBuilder
private var playerView: some View { private var playerView: some View {
ZStack { ZStack {
@ -64,7 +62,7 @@ struct VideoPlayer: View {
} }
} }
overlay() VideoPlayer.Overlay()
.eraseToAnyView() .eraseToAnyView()
.environmentObject(videoPlayerManager) .environmentObject(videoPlayerManager)
.environmentObject(videoPlayerManager.currentProgressHandler) .environmentObject(videoPlayerManager.currentProgressHandler)
@ -110,12 +108,7 @@ extension VideoPlayer {
init(manager: VideoPlayerManager) { init(manager: VideoPlayerManager) {
self.init( self.init(
currentProgressHandler: manager.currentProgressHandler, currentProgressHandler: manager.currentProgressHandler,
videoPlayerManager: manager, videoPlayerManager: manager
overlay: { EmptyView() }
) )
} }
func overlay(@ViewBuilder _ content: @escaping () -> any View) -> Self {
copy(modifying: \.overlay, with: content)
}
} }