mirror of
https://github.com/yattee/yattee.git
synced 2024-12-22 21:43:41 +00:00
Fix player
This commit is contained in:
parent
ce9c3fbd74
commit
32e98b6410
@ -56,7 +56,7 @@ struct VideoPlayerView: View {
|
||||
@State internal var orientationNotification: Any?
|
||||
#endif
|
||||
|
||||
internal var player: PlayerModel! = PlayerModel.shared
|
||||
@ObservedObject internal var player = PlayerModel.shared
|
||||
|
||||
#if os(macOS)
|
||||
@ObservedObject private var navigation = NavigationModel.shared
|
||||
@ -119,7 +119,7 @@ struct VideoPlayerView: View {
|
||||
}
|
||||
#if os(iOS)
|
||||
.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
|
||||
if newValue {
|
||||
viewDragOffset = 0
|
||||
@ -271,18 +271,6 @@ struct VideoPlayerView: View {
|
||||
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
|
||||
}
|
||||
|
||||
var playerEdgesIgnoringSafeArea: Edge.Set {
|
||||
if let orientation = player.lockedOrientation, orientation.contains(.portrait) {
|
||||
return []
|
||||
}
|
||||
|
||||
if fullScreenPlayer, UIDevice.current.orientation.isLandscape {
|
||||
return [.vertical]
|
||||
}
|
||||
|
||||
return [.bottom]
|
||||
}
|
||||
#endif
|
||||
|
||||
var content: some View {
|
||||
@ -487,6 +475,10 @@ struct VideoPlayerView: View {
|
||||
|
||||
struct VideoPlayerView_Previews: PreviewProvider {
|
||||
static var previews: some View {
|
||||
ZStack {
|
||||
Color.red
|
||||
VideoPlayerView()
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user