bukovinafilip/Atoll
1
0
Fork 0
mirror of https://github.com/FBukovina/Atoll.git synced 2026-10-28 15:44:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add Gesture controls for media skip and forward

Browse source
This commit is contained in:
Hariharan Mudaliar 2025-12-24 14:50:36 +05:30
commit d70569e32f
No known key found for this signature in database
GPG key ID: 025583EB0BE5640E
9 changed files with 267 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

39
DynamicIsland/ContentView.swift
View file

@ -39,6 +39,7 @@ struct ContentView: View {
@Default(.enableReminderLiveActivity) var enableReminderLiveActivity
@Default(.enableTimerFeature) var enableTimerFeature
@Default(.timerDisplayMode) var timerDisplayMode
@Default(.enableHorizontalMusicGestures) var enableHorizontalMusicGestures
// Dynamic sizing based on view type and graph count with smooth transitions
var dynamicNotchSize: CGSize {
@ -64,6 +65,7 @@ struct ContentView: View {
@State private var lastHapticTime: Date = Date()
@State private var gestureProgress: CGFloat = .zero
@State private var skipGestureActiveDirection: MusicManager.SkipDirection?
@State private var isMusicControlWindowVisible = false
@State private var pendingMusicControlTask: Task<Void, Never>?
@State private var musicControlHideTask: Task<Void, Never>?
@ -212,6 +214,12 @@ struct ContentView: View {
.panGesture(direction: .down) { translation, phase in
handleDownGesture(translation: translation, phase: phase)
}
.panGesture(direction: .left) { translation, phase in
handleSkipGesture(direction: .forward, translation: translation, phase: phase)
}
.panGesture(direction: .right) { translation, phase in
handleSkipGesture(direction: .backward, translation: translation, phase: phase)
}
}
}
.conditionalModifier(Defaults[.closeGestureEnabled] && Defaults[.enableGestures] && interactionsEnabled) { view in
@ -910,6 +918,37 @@ struct ContentView: View {
}
}
private func handleSkipGesture(direction: MusicManager.SkipDirection, translation: CGFloat, phase: NSEvent.Phase) {
if phase == .ended {
skipGestureActiveDirection = nil
return
}
guard canPerformSkipGesture() else {
skipGestureActiveDirection = nil
return
}
if skipGestureActiveDirection == nil && translation > Defaults[.gestureSensitivity] {
skipGestureActiveDirection = direction
if Defaults[.enableHaptics] {
triggerHapticIfAllowed()
}
musicManager.handleSkipGesture(direction: direction)
}
}
private func canPerformSkipGesture() -> Bool {
enableHorizontalMusicGestures
&& vm.notchState == .open
&& coordinator.currentView == .home
&& (!musicManager.isPlayerIdle || musicManager.bundleIdentifier != nil)
&& !lockScreenManager.isLocked
&& !hasAnyActivePopovers()
}
private func handleMusicControlPlaybackChange(isPlaying: Bool) {
guard musicControlWindowEnabled else { return }