Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2025-08-06 10:44:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve player transitions

Browse Source
This commit is contained in:
Arkadiusz Fal
2022-08-08 20:02:46 +02:00
parent fb40f42c6c
commit bcc1d5aeaa
8 changed files with 137 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
Model/Player/PlayerModel.swift
View File

@@ -40,7 +40,7 @@ final class PlayerModel: ObservableObject {
var mpvPlayerView = MPVPlayerView()
@Published var presentingPlayer = false { didSet { handlePresentationChange() } }
@Published var presentingPlayer = true { didSet { handlePresentationChange() } }
@Published var activeBackend = PlayerBackendType.mpv
var avPlayerBackend: AVPlayerBackend!
@@ -149,6 +149,7 @@ final class PlayerModel: ObservableObject {
@Default(.pauseOnHidingPlayer) private var pauseOnHidingPlayer
@Default(.closePiPOnNavigation) var closePiPOnNavigation
@Default(.closePiPOnOpeningPlayer) var closePiPOnOpeningPlayer
@Default(.resetWatchedStatusOnPlaying) var resetWatchedStatusOnPlaying
#if !os(macOS)
@Default(.closePiPAndOpenPlayerOnEnteringForeground) var closePiPAndOpenPlayerOnEnteringForeground
@@ -202,7 +203,7 @@ final class PlayerModel: ObservableObject {
#endif
DispatchQueue.main.async { [weak self] in
withAnimation {
withAnimation(.linear(duration: 0.25)) {
self?.presentingPlayer = true
}
}
@@ -214,11 +215,12 @@ final class PlayerModel: ObservableObject {
}
func hide() {
withAnimation(.linear(duration: 0.25)) {
presentingPlayer = false
}
DispatchQueue.main.async { [weak self] in
self?.playingFullScreen = false
withAnimation {
self?.presentingPlayer = false
}
}
#if os(iOS)
@@ -742,22 +744,22 @@ final class PlayerModel: ObservableObject {
pause()
}
}
func enterFullScreen(showControls: Bool = true) {
guard !playingFullScreen else { return }
logger.info("entering fullscreen")
toggleFullscreen(false, showControls: showControls)
}
func exitFullScreen(showControls: Bool = true) {
guard playingFullScreen else { return }
logger.info("exiting fullscreen")
toggleFullscreen(true, showControls: showControls)
}
#endif
func enterFullScreen(showControls: Bool = true) {
guard !playingFullScreen else { return }
logger.info("entering fullscreen")
toggleFullscreen(false, showControls: showControls)
}
func exitFullScreen(showControls: Bool = true) {
guard playingFullScreen else { return }
logger.info("exiting fullscreen")
toggleFullscreen(true, showControls: showControls)
}
func updateNowPlayingInfo() {
guard let video = currentItem?.video else {
return
@@ -818,25 +820,10 @@ final class PlayerModel: ObservableObject {
controls.presentingControls = showControls && isFullScreen
#if os(macOS)
if isFullScreen {
Windows.player.toggleFullScreen()
}
#endif
#if os(iOS)
withAnimation(.linear(duration: 0.2)) {
playingFullScreen = !isFullScreen
}
#else
playingFullScreen = !isFullScreen
Windows.player.toggleFullScreen()
#endif
#if os(macOS)
if !isFullScreen {
DispatchQueue.main.asyncAfter(deadline: .now() + 0.25) {
Windows.player.toggleFullScreen()
}
}
#endif
playingFullScreen = !isFullScreen
#if os(iOS)
if !playingFullScreen {