Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2024-12-22 21:43:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix player

Browse Source
This commit is contained in:
Arkadiusz Fal 2022-12-20 23:21:37 +01:00
parent ce9c3fbd74
commit 32e98b6410
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Shared/Player/VideoPlayerView.swift
View File

@ -56,7 +56,7 @@ struct VideoPlayerView: View {
@State internal var orientationNotification: Any? @State internal var orientationNotification: Any?
#endif #endif
internal var player: PlayerModel! = PlayerModel.shared @ObservedObject internal var player = PlayerModel.shared
#if os(macOS) #if os(macOS)
@ObservedObject private var navigation = NavigationModel.shared @ObservedObject private var navigation = NavigationModel.shared
@ -119,7 +119,7 @@ struct VideoPlayerView: View {
} }
#if os(iOS) #if os(iOS)
.frame(width: playerWidth.isNil ? nil : Double(playerWidth!), height: playerHeight.isNil ? nil : Double(playerHeight!)) .frame(width: playerWidth.isNil ? nil : Double(playerWidth!), height: playerHeight.isNil ? nil : Double(playerHeight!))
.ignoresSafeArea(.all, edges: playerEdgesIgnoringSafeArea) .ignoresSafeArea(.all, edges: .bottom)
.onChange(of: player.presentingPlayer) { newValue in .onChange(of: player.presentingPlayer) { newValue in
if newValue { if newValue {
viewDragOffset = 0 viewDragOffset = 0
@ -271,18 +271,6 @@ struct VideoPlayerView: View {
let lockedPortrait = player.lockedOrientation?.contains(.portrait) ?? false let lockedPortrait = player.lockedOrientation?.contains(.portrait) ?? false
return fullScreenPlayer ? UIScreen.main.bounds.size.height - (OrientationTracker.shared.currentInterfaceOrientation.isPortrait || lockedPortrait ? (SafeArea.insets.top + SafeArea.insets.bottom) : 0) : nil return fullScreenPlayer ? UIScreen.main.bounds.size.height - (OrientationTracker.shared.currentInterfaceOrientation.isPortrait || lockedPortrait ? (SafeArea.insets.top + SafeArea.insets.bottom) : 0) : nil
} }
var playerEdgesIgnoringSafeArea: Edge.Set {
if let orientation = player.lockedOrientation, orientation.contains(.portrait) {
return []
}
if fullScreenPlayer, UIDevice.current.orientation.isLandscape {
return [.vertical]
}
return [.bottom]
}
#endif #endif
var content: some View { var content: some View {
@ -487,6 +475,10 @@ struct VideoPlayerView: View {
struct VideoPlayerView_Previews: PreviewProvider { struct VideoPlayerView_Previews: PreviewProvider {
static var previews: some View { static var previews: some View {
VideoPlayerView() ZStack {
Color.red
VideoPlayerView()
}
} }
} }