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

Fix orientation on iOS 16

Browse Source
This commit is contained in:
Arkadiusz Fal 2022-08-26 10:25:07 +02:00
parent 653cca07fe
commit fc7052a7fa
4 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Model/Player/PlayerModel.swift
View File

@ -184,7 +184,7 @@ final class PlayerModel: ObservableObject {
private var currentArtwork: MPMediaItemArtwork? private var currentArtwork: MPMediaItemArtwork?
var onPresentPlayer: (() -> Void)? var onPresentPlayer = [() -> Void]()
private var remoteCommandCenterConfigured = false private var remoteCommandCenterConfigured = false
init( init(
@ -373,7 +373,7 @@ final class PlayerModel: ObservableObject {
#if os(iOS) #if os(iOS)
if !playingInPictureInPicture, showingPlayer { if !playingInPictureInPicture, showingPlayer {
onPresentPlayer = { [weak self] in onPresentPlayer.append { [weak self] in
changeBackendHandler?() changeBackendHandler?()
self?.playNow(video, at: time) self?.playNow(video, at: time)
} }

2
Model/Player/PlayerQueue.swift
View File

@ -12,7 +12,7 @@ extension PlayerModel {
videos.forEach { enqueueVideo($0, loadDetails: false) } videos.forEach { enqueueVideo($0, loadDetails: false) }
#if os(iOS) #if os(iOS)
onPresentPlayer = { [weak self] in self?.advanceToNextItem() } onPresentPlayer.append { [weak self] in self?.advanceToNextItem() }
#else #else
advanceToNextItem() advanceToNextItem()
#endif #endif

8
Shared/Player/VideoPlayerView.swift
View File

@ -183,8 +183,8 @@ struct VideoPlayerView: View {
.onAnimationCompleted(for: viewDragOffset) { .onAnimationCompleted(for: viewDragOffset) {
guard !dragGestureState else { return } guard !dragGestureState else { return }
if viewDragOffset == 0 { if viewDragOffset == 0 {
player.onPresentPlayer?() player.onPresentPlayer.forEach { $0() }
player.onPresentPlayer = nil player.onPresentPlayer = []
} else if viewDragOffset == Self.hiddenOffset { } else if viewDragOffset == Self.hiddenOffset {
player.hide(animate: false) player.hide(animate: false)
} }
@ -506,7 +506,9 @@ struct VideoPlayerView: View {
player.enterFullScreen(showControls: false) player.enterFullScreen(showControls: false)
} }
Orientation.lockOrientation(.allButUpsideDown, andRotateTo: currentOrientation) player.onPresentPlayer.append {
Orientation.lockOrientation(.allButUpsideDown, andRotateTo: currentOrientation)
}
} }
orientationObserver = NotificationCenter.default.addObserver( orientationObserver = NotificationCenter.default.addObserver(

12
iOS/Orientation.swift
View File

@ -32,5 +32,17 @@ struct Orientation {
UIDevice.current.setValue(rotateOrientation.rawValue, forKey: "orientation") UIDevice.current.setValue(rotateOrientation.rawValue, forKey: "orientation")
UINavigationController.attemptRotationToDeviceOrientation() UINavigationController.attemptRotationToDeviceOrientation()
if #available(iOS 16, *) {
guard let windowScene = SafeArea.scene else { return }
let rotateOrientationMask = rotateOrientation == .portrait ? UIInterfaceOrientationMask.portrait :
rotateOrientation == .landscapeLeft ? .landscapeLeft :
rotateOrientation == .landscapeRight ? .landscapeRight :
.allButUpsideDown
windowScene.requestGeometryUpdate(.iOS(interfaceOrientations: rotateOrientationMask)) { error in
print("denied rotation \(error)")
}
}
} }
} }