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

Minor UI changes

Browse Source
This commit is contained in:
Arkadiusz Fal
2022-06-25 01:39:29 +02:00
parent 19014cc540
commit 164e68e5a1
20 changed files with 247 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Model/NetworkStateModel.swift
View File

@@ -34,7 +34,7 @@ final class NetworkStateModel: ObservableObject {
var needsUpdates: Bool {
if let player = player {
return pausedForCache || player.isSeeking || player.isLoadingVideo
return pausedForCache || player.isSeeking || player.isLoadingVideo || player.controls.presentingControlsOverlay
}
return pausedForCache

2
Model/Player/Backends/AVPlayerBackend.swift
View File

@@ -589,5 +589,5 @@ final class AVPlayerBackend: PlayerBackend {
func stopControlsUpdates() {}
func setNeedsDrawing(_: Bool) {}
func setSize(_: Double, _: Double) {}
func setNeedsNetworkStateUpdates() {}
func setNeedsNetworkStateUpdates(_: Bool) {}
}

10
Model/Player/Backends/MPVBackend.swift
View File

@@ -28,7 +28,7 @@ final class MPVBackend: PlayerBackend {
}
self.controls?.isLoadingVideo = self.isLoadingVideo
self.setNeedsNetworkStateUpdates()
self.setNeedsNetworkStateUpdates(true)
if !self.isLoadingVideo {
DispatchQueue.main.asyncAfter(deadline: .now() + 2) { [weak self] in
@@ -476,7 +476,11 @@ final class MPVBackend: PlayerBackend {
}
}
func setNeedsNetworkStateUpdates() {
networkStateTimer.resume()
func setNeedsNetworkStateUpdates(_ needsUpdates: Bool) {
if needsUpdates {
networkStateTimer.resume()
} else {
networkStateTimer.suspend()
}
}
}

2
Model/Player/Backends/PlayerBackend.swift
View File

@@ -52,7 +52,7 @@ protocol PlayerBackend {
func startControlsUpdates()
func stopControlsUpdates()
func setNeedsNetworkStateUpdates()
func setNeedsNetworkStateUpdates(_ needsUpdates: Bool)
func setNeedsDrawing(_ needsDrawing: Bool)
func setSize(_ width: Double, _ height: Double)

6
Model/Player/PlayerControlsModel.swift
View File

@@ -6,7 +6,7 @@ final class PlayerControlsModel: ObservableObject {
@Published var isLoadingVideo = false
@Published var isPlaying = true
@Published var presentingControls = false { didSet { handlePresentationChange() } }
@Published var presentingControlsOverlay = false
@Published var presentingControlsOverlay = false { didSet { handleOverlayPresentationChange() } }
@Published var timer: Timer?
var player: PlayerModel!
@@ -40,6 +40,10 @@ final class PlayerControlsModel: ObservableObject {
}
}
func handleOverlayPresentationChange() {
player?.backend.setNeedsNetworkStateUpdates(presentingControlsOverlay)
}
func show() {
guard !(player?.currentItem.isNil ?? true) else {
return

2
Model/Player/PlayerModel.swift
View File

@@ -67,7 +67,7 @@ final class PlayerModel: ObservableObject {
@Published var returnYouTubeDislike = ReturnYouTubeDislikeAPI()
@Published var isSeeking = false { didSet {
backend.setNeedsNetworkStateUpdates()
backend.setNeedsNetworkStateUpdates(true)
}}
#if os(iOS)