Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2025-10-11 09:58:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve seek gesture

Browse Source
This commit is contained in:
Arkadiusz Fal
2022-08-29 13:55:23 +02:00
parent d5f8ad4eec
commit e444dc3c79
14 changed files with 238 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
Model/Player/PlayerTimeModel.swift
View File

@@ -3,32 +3,11 @@ import Foundation
import SwiftUI
final class PlayerTimeModel: ObservableObject {
enum SeekType: Equatable {
case segmentSkip(String)
case segmentRestore
case userInteracted
case loopRestart
case backendSync
var presentable: Bool {
self != .backendSync
}
}
static let timePlaceholder = "--:--"
@Published var currentTime = CMTime.zero
@Published var duration = CMTime.zero
@Published var lastSeekTime: CMTime?
@Published var lastSeekType: SeekType?
@Published var restoreSeekTime: CMTime?
@Published var gestureSeek = 0.0
@Published var gestureStart = 0.0
@Published var seekOSDDismissed = true
var player: PlayerModel!
var forceHours: Bool {
@@ -55,70 +34,4 @@ final class PlayerTimeModel: ObservableObject {
guard let withoutSegmentsDuration = player?.playerItemDurationWithoutSponsorSegments?.seconds else { return Self.timePlaceholder }
return withoutSegmentsDuration.formattedAsPlaybackTime(forceHours: forceHours) ?? Self.timePlaceholder
}
var lastSeekPlaybackTime: String {
guard let time = lastSeekTime else { return 0.formattedAsPlaybackTime(allowZero: true, forceHours: forceHours) ?? Self.timePlaceholder }
return time.seconds.formattedAsPlaybackTime(allowZero: true, forceHours: forceHours) ?? Self.timePlaceholder
}
var restoreSeekPlaybackTime: String {
guard let time = restoreSeekTime else { return Self.timePlaceholder }
return time.seconds.formattedAsPlaybackTime(allowZero: true, forceHours: forceHours) ?? Self.timePlaceholder
}
var gestureSeekDestinationTime: Double {
min(duration.seconds, max(0, gestureStart + gestureSeek))
}
var gestureSeekDestinationPlaybackTime: String {
guard gestureSeek != 0 else { return Self.timePlaceholder }
return gestureSeekDestinationTime.formattedAsPlaybackTime(allowZero: true, forceHours: forceHours) ?? Self.timePlaceholder
}
func onSeekGestureStart(completionHandler: (() -> Void)? = nil) {
player.backend.getTimeUpdates()
player.backend.updateControls {
self.gestureStart = self.currentTime.seconds
completionHandler?()
}
}
func onSeekGestureEnd() {
player.backend.updateControls()
player.backend.seek(to: gestureSeekDestinationTime, seekType: .userInteracted)
}
func registerSeek(at time: CMTime, type: SeekType, restore restoreTime: CMTime? = nil) {
DispatchQueue.main.async { [weak self] in
withAnimation {
self?.lastSeekTime = time
self?.lastSeekType = type
self?.restoreSeekTime = restoreTime
}
}
}
func restoreTime() {
guard let time = restoreSeekTime else { return }
switch lastSeekType {
case .segmentSkip:
player.restoreLastSkippedSegment()
default:
player?.backend.seek(to: time, seekType: .userInteracted)
}
}
func resetSeek() {
withAnimation {
lastSeekTime = nil
lastSeekType = nil
}
}
func reset() {
currentTime = .zero
duration = .zero
resetSeek()
gestureSeek = 0
}
}