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

Controls fixes

Browse Source
This commit is contained in:
Arkadiusz Fal 2022-03-27 21:24:32 +02:00
parent fa91367b3d
commit cf3fa3871b
4 changed files with 59 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -148,6 +148,8 @@ final class MPVBackend: PlayerBackend {
} else {
replaceItem(nil)
}
startClientUpdates()
}
func play() {

29
Model/Player/PlayerControlsModel.swift
View File

@ -11,6 +11,8 @@ final class PlayerControlsModel: ObservableObject {
@Published var timer: Timer?
@Published var playingFullscreen = false
private var throttle = Throttle(interval: 1)
var player: PlayerModel!
var playbackTime: String {
@ -52,7 +54,13 @@ final class PlayerControlsModel: ObservableObject {
}
func show() {
player.backend.updateControls()
guard !(player?.currentItem.isNil ?? true) else {
return
}
guard !presentingControls else {
return
}
withAnimation(PlayerControls.animation) {
presentingControls = true
@ -60,16 +68,21 @@ final class PlayerControlsModel: ObservableObject {
}
func hide() {
player?.backend.stopControlsUpdates()
guard !(player?.currentItem.isNil ?? true) else {
return
}
guard presentingControls else {
return
}
withAnimation(PlayerControls.animation) {
presentingControls = false
}
}
func toggle() {
if !presentingControls {
player.backend.updateControls()
}
withAnimation(PlayerControls.animation) {
presentingControls.toggle()
}
@ -118,4 +131,10 @@ final class PlayerControlsModel: ObservableObject {
timer?.invalidate()
timer = nil
}
func update() {
throttle.execute { [weak self] in
self?.player?.backend.updateControls()
}
}
}

9
Shared/Player/PlayerGestures.swift
View File

@ -14,6 +14,9 @@ struct PlayerGestures: View {
},
doubleTapAction: {
player.backend.seek(relative: .secondsInDefaultTimescale(-10))
},
anyTapAction: {
model.update()
}
)
@ -25,6 +28,9 @@ struct PlayerGestures: View {
},
doubleTapAction: {
player.backend.togglePlay()
},
anyTapAction: {
model.update()
}
)
@ -36,6 +42,9 @@ struct PlayerGestures: View {
},
doubleTapAction: {
player.backend.seek(relative: .secondsInDefaultTimescale(10))
},
anyTapAction: {
model.update()
}
)
}

27
Shared/Player/TapRecognizerViewModifier.swift
View File

@ -6,11 +6,18 @@ struct TapRecognizerViewModifier: ViewModifier {
var tapSensitivity: Double
var singleTapAction: () -> Void
var doubleTapAction: () -> Void
var anyTapAction: () -> Void
init(tapSensitivity: Double, singleTapAction: @escaping () -> Void, doubleTapAction: @escaping () -> Void) {
init(
tapSensitivity: Double,
singleTapAction: @escaping () -> Void,
doubleTapAction: @escaping () -> Void,
anyTapAction: @escaping () -> Void
) {
self.tapSensitivity = tapSensitivity
self.singleTapAction = singleTapAction
self.doubleTapAction = doubleTapAction
self.anyTapAction = anyTapAction
}
func body(content: Content) -> some View {
@ -19,6 +26,8 @@ struct TapRecognizerViewModifier: ViewModifier {
private var singleTapGesture: some Gesture {
TapGesture(count: 1).onEnded {
anyTapAction()
singleTapIsTaped = true
DispatchQueue.main.asyncAfter(deadline: .now() + tapSensitivity) {
@ -42,7 +51,19 @@ struct TapRecognizerViewModifier: ViewModifier {
}
extension View {
func tapRecognizer(tapSensitivity: Double, singleTapAction: @escaping () -> Void, doubleTapAction: @escaping () -> Void) -> some View {
modifier(TapRecognizerViewModifier(tapSensitivity: tapSensitivity, singleTapAction: singleTapAction, doubleTapAction: doubleTapAction))
func tapRecognizer(
tapSensitivity: Double,
singleTapAction: @escaping () -> Void,
doubleTapAction: @escaping () -> Void,
anyTapAction: @escaping () -> Void = {}
) -> some View {
modifier(
TapRecognizerViewModifier(
tapSensitivity: tapSensitivity,
singleTapAction: singleTapAction,
doubleTapAction: doubleTapAction,
anyTapAction: anyTapAction
)
)
}
}