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

Update reversible swipe gestures

Browse source
This commit is contained in:
Hariharan Mudaliar 2026-01-01 00:29:29 +05:30
commit 01c0a5a775
No known key found for this signature in database
GPG key ID: 025583EB0BE5640E
3 changed files with 64 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

38
DynamicIsland/ContentView.swift
View file

@ -232,7 +232,7 @@ struct ContentView: View {
}
}
}
.conditionalModifier(Defaults[.closeGestureEnabled] && Defaults[.enableGestures] && interactionsEnabled) { view in
.conditionalModifier((Defaults[.closeGestureEnabled] || Defaults[.reverseScrollGestures]) && Defaults[.enableGestures] && interactionsEnabled) { view in
view
.panGesture(direction: .up) { translation, phase in
handleUpGesture(translation: translation, phase: phase)
@ -883,6 +883,26 @@ struct ContentView: View {
// MARK: - Gesture Handling
private func handleDownGesture(translation: CGFloat, phase: NSEvent.Phase) {
handleScrollGesture(isDownward: true, translation: translation, phase: phase)
}
private func handleUpGesture(translation: CGFloat, phase: NSEvent.Phase) {
handleScrollGesture(isDownward: false, translation: translation, phase: phase)
}
private func handleScrollGesture(isDownward: Bool, translation: CGFloat, phase: NSEvent.Phase) {
let reverse = Defaults[.reverseScrollGestures]
let shouldOpen = isDownward ? !reverse : reverse
if shouldOpen {
handleOpenScrollGesture(translation: translation, phase: phase)
} else {
guard Defaults[.closeGestureEnabled] else { return }
handleCloseScrollGesture(translation: translation, phase: phase)
}
}
private func handleOpenScrollGesture(translation: CGFloat, phase: NSEvent.Phase) {
guard vm.notchState == .closed else { return }
withAnimation(.smooth) {
@ -906,8 +926,9 @@ struct ContentView: View {
}
}
private func handleUpGesture(translation: CGFloat, phase: NSEvent.Phase) {
if vm.notchState == .open && !vm.isHoveringCalendar && !vm.isScrollGestureActive {
private func handleCloseScrollGesture(translation: CGFloat, phase: NSEvent.Phase) {
guard vm.notchState == .open, !vm.isHoveringCalendar, !vm.isScrollGestureActive else { return }
withAnimation(.smooth) {
gestureProgress = (translation / Defaults[.gestureSensitivity]) * -20
}
@ -930,7 +951,6 @@ struct ContentView: View {
}
}
}
}
private func handleSkipGesture(direction: MusicManager.SkipDirection, translation: CGFloat, phase: NSEvent.Phase) {
if phase == .ended {
@ -944,13 +964,19 @@ struct ContentView: View {
}
if skipGestureActiveDirection == nil && translation > Defaults[.gestureSensitivity] {
skipGestureActiveDirection = direction
let effectiveDirection: MusicManager.SkipDirection
if Defaults[.reverseSwipeGestures] {
effectiveDirection = direction == .forward ? .backward : .forward
} else {
effectiveDirection = direction
}
skipGestureActiveDirection = effectiveDirection
if Defaults[.enableHaptics] {
triggerHapticIfAllowed()
}
musicManager.handleSkipGesture(direction: direction)
musicManager.handleSkipGesture(direction: effectiveDirection)
}
}

10
DynamicIsland/components/Settings/SettingsView.swift
View file

@ -577,6 +577,8 @@ struct SettingsView: View {
SettingsSearchEntry(tab: .general, title: "Hide Dynamic Island during screenshots & recordings", keywords: ["privacy", "screenshot", "recording"], highlightID: SettingsTab.general.highlightID(for: "Hide Dynamic Island during screenshots & recordings")),
SettingsSearchEntry(tab: .general, title: "Enable gestures", keywords: ["gestures", "trackpad"], highlightID: SettingsTab.general.highlightID(for: "Enable gestures")),
SettingsSearchEntry(tab: .general, title: "Close gesture", keywords: ["pinch", "swipe"], highlightID: SettingsTab.general.highlightID(for: "Close gesture")),
SettingsSearchEntry(tab: .general, title: "Reverse swipe gestures", keywords: ["reverse", "swipe", "media"], highlightID: SettingsTab.general.highlightID(for: "Reverse swipe gestures")),
SettingsSearchEntry(tab: .general, title: "Reverse scroll gestures", keywords: ["reverse", "scroll", "open", "close"], highlightID: SettingsTab.general.highlightID(for: "Reverse scroll gestures")),
SettingsSearchEntry(tab: .general, title: "Extend hover area", keywords: ["hover", "cursor"], highlightID: SettingsTab.general.highlightID(for: "Extend hover area")),
SettingsSearchEntry(tab: .general, title: "Enable haptics", keywords: ["haptic", "feedback"], highlightID: SettingsTab.general.highlightID(for: "Enable haptics")),
SettingsSearchEntry(tab: .general, title: "Open notch on hover", keywords: ["hover to open", "auto open"], highlightID: SettingsTab.general.highlightID(for: "Open notch on hover")),
@ -845,6 +847,8 @@ struct GeneralSettings: View {
@Default(.enableMinimalisticUI) var enableMinimalisticUI
@Default(.enableHorizontalMusicGestures) var enableHorizontalMusicGestures
@Default(.musicGestureBehavior) var musicGestureBehavior
@Default(.reverseSwipeGestures) var reverseSwipeGestures
@Default(.reverseScrollGestures) var reverseScrollGestures
private func highlightID(_ title: String) -> String {
SettingsTab.general.highlightID(for: title)
@ -1003,6 +1007,9 @@ struct GeneralSettings: View {
Text(musicGestureBehavior.description)
.font(.caption)
.foregroundStyle(.secondary)
Defaults.Toggle("Reverse swipe gestures", key: .reverseSwipeGestures)
.settingsHighlight(id: highlightID("Reverse swipe gestures"))
}
Defaults.Toggle("Close gesture", key: .closeGestureEnabled)
@ -1015,6 +1022,9 @@ struct GeneralSettings: View {
.foregroundStyle(.secondary)
}
}
Defaults.Toggle("Reverse open/close scroll gestures", key: .reverseScrollGestures)
.settingsHighlight(id: highlightID("Reverse scroll gestures"))
}
} header: {
HStack {

2
DynamicIsland/models/Constants.swift
View file

@ -520,6 +520,8 @@ extension Defaults.Keys {
static let gestureSensitivity = Key<CGFloat>("gestureSensitivity", default: 200.0)
static let enableHorizontalMusicGestures = Key<Bool>("enableHorizontalMusicGestures", default: true)
static let musicGestureBehavior = Key<MusicSkipBehavior>("musicGestureBehavior", default: .track)
static let reverseSwipeGestures = Key<Bool>("reverseSwipeGestures", default: false)
static let reverseScrollGestures = Key<Bool>("reverseScrollGestures", default: false)
// MARK: Media playback
static let coloredSpectrogram = Key<Bool>("coloredSpectrogram", default: true)