✨ Unify gesture terminology across codebae

Author: mrkai77

Loop/Core/Observers/Helpers/SystemGestureManager.swift

@@ -195,15 +195,15 @@ final class SystemGestureManager {
     static func reconcile(
         enableGestures: Bool,
         disableConflicts: Bool,
-        bindings: [GestureBinding]
+        gestures: [Gesture]
     ) {
         var backups = Defaults[.systemGesturePreferenceBackups]
         var managedValues = Defaults[.systemGestureManagedValues]
 
         Self().reconcile(
             enableGestures: enableGestures,
             disableConflicts: disableConflicts,
-            bindings: bindings,
+            gestures: gestures,
             backups: &backups,
             managedValues: &managedValues
         )
@@ -215,7 +215,7 @@ final class SystemGestureManager {
     func reconcile(
         enableGestures: Bool,
         disableConflicts: Bool,
-        bindings: [GestureBinding],
+        gestures: [Gesture],
         backups: inout [String: SystemGesturePreferenceValue],
         managedValues: inout [String: SystemGesturePreferenceValue]
     ) {
@@ -227,7 +227,7 @@ final class SystemGestureManager {
             return
         }
 
-        let desiredValues = desiredValues(for: bindings, backups: backups, managedValues: managedValues)
+        let desiredValues = desiredValues(for: gestures, backups: backups, managedValues: managedValues)
         guard !desiredValues.isEmpty else {
             restoreAll(backups: &backups, managedValues: &managedValues)
             return
@@ -352,12 +352,12 @@ final class SystemGestureManager {
     }
 
     private func desiredValues(
-        for bindings: [GestureBinding],
+        for gestures: [Gesture],
         backups: [String: SystemGesturePreferenceValue],
         managedValues: [String: SystemGesturePreferenceValue]
     ) -> [SystemGesturePreferenceIdentifier: SystemGesturePreferenceValue] {
-        let hasThreeFingerGesture = bindings.contains { $0.fingerCount == 3 }
-        let hasFourFingerGesture = bindings.contains { $0.fingerCount == 4 }
+        let hasThreeFingerGesture = gestures.contains { $0.fingerCount == 3 }
+        let hasFourFingerGesture = gestures.contains { $0.fingerCount == 4 }
 
         guard hasThreeFingerGesture || hasFourFingerGesture else { return [:] }
 

Loop/Core/Observers/MultitouchTrigger.swift

@@ -72,7 +72,7 @@ extension Defaults.Keys {
 
     // Gestures
     static let enableGestures = Key<Bool>("enableGestures", default: false, iCloud: true)
-    static let gestureBindings = Key<[GestureBinding]>("gestureBindings", default: GestureBinding.defaultBindings, iCloud: true)
+    static let gestures = Key<[Gesture]>("gestures", default: Gesture.defaults, iCloud: true)
     static let disableConflictingSystemGestures = Key<Bool>("disableConflictingSystemGestures", default: true, iCloud: true)
     static let systemGesturePreferenceBackups = Key<[String: SystemGesturePreferenceValue]>("systemGesturePreferenceBackups", default: [:], iCloud: false)
     static let systemGestureManagedValues = Key<[String: SystemGesturePreferenceValue]>("systemGestureManagedValues", default: [:], iCloud: false)
@@ -148,7 +148,7 @@ extension Defaults.Keys {
     /// Reset with `defaults delete com.MrKai77.Loop triggerKeyTimeout`
     static let triggerKeyTimeout = Key<Double>("triggerKeyTimeout", default: 0, iCloud: true)
 
-    /// Height of the titlebar activation zone for gesture bindings, defined in points.
+    /// Height of the titlebar activation zone for gestures, defined in points.
     /// Gestures with the `.titlebar` activation zone will only trigger when the cursor is within this distance from the top of a window.
     /// Adjust with `defaults write com.MrKai77.Loop gestureTitlebarHeight -float x`
     /// Reset with `defaults delete com.MrKai77.Loop gestureTitlebarHeight`

Loop/Extensions/Defaults+Extensions.swift

@@ -624,6 +624,10 @@
         }
       }
     },
+    "2-finger gestures are restricted to the titlebar to avoid conflicting with system gestures." : {
+      "comment" : "A description of the restriction on 2-finger gestures.",
+      "isCommentAutoGenerated" : true
+    },
     "A single %@ action can only track one window. To stash\nmultiple windows, add additional %@ actions." : {
       "comment" : "Information in a popover displaying how a stash action can only keep track of a single window. Both %1$@ and %2$@ are replaced with the language's localization of the \"Stash\" action.",
       "localizations" : {
@@ -5059,8 +5063,8 @@
         }
       }
     },
-    "Customize this gesture binding." : {
-      "comment" : "A button that opens a popover for configuring a gesture binding.",
+    "Customize this gesture." : {
+      "comment" : "A tooltip that appears when a user touches a gesture configuration button.",
       "isCommentAutoGenerated" : true
     },
     "Customize this gesture's action." : {
@@ -8093,13 +8097,13 @@
         }
       }
     },
-    "Gesture Bindings" : {
-      "comment" : "Section header shown in gestures settings"
-    },
     "Gesture Type" : {
       "comment" : "A label describing the type of gesture.",
       "isCommentAutoGenerated" : true
     },
+    "Gestures" : {
+      "comment" : "Section header shown in gestures settings"
+    },
     "Go Back" : {
       "comment" : "Section header in the action picker of the Keybinds tab",
       "localizations" : {
@@ -18550,8 +18554,8 @@
         }
       }
     },
-    "No gesture bindings" : {
-      "comment" : "A message displayed when there are no gesture bindings configured.",
+    "No gestures" : {
+      "comment" : "A message displayed when there are no gestures.",
       "isCommentAutoGenerated" : true
     },
     "No keybinds" : {
@@ -24020,8 +24024,8 @@
         }
       }
     },
-    "Press \"Add\" to add a gesture binding" : {
-      "comment" : "A description displayed when there are no gesture bindings configured. It instructs the user to add one.",
+    "Press \"Add\" to add a gesture" : {
+      "comment" : "A description of the action to add a gesture.",
       "isCommentAutoGenerated" : true
     },
     "Press \"Add\" to add a keybind" : {
@@ -31118,6 +31122,10 @@
         }
       }
     },
+    "There are other gestures that conflict with this gesture." : {
+      "comment" : "A tooltip that appears when a gesture has a conflicting gesture.",
+      "isCommentAutoGenerated" : true
+    },
     "There are other keybinds that conflict with this key combination." : {
       "localizations" : {
         "ar" : {

Loop/Localizable.xcstrings

@@ -9,25 +9,25 @@ import Luminare
 import SwiftUI
 
 struct GestureConfigPopoverView: View {
-    @State private var binding: GestureBinding
-    @Binding private var externalBinding: GestureBinding
+    @State private var gesture: Gesture
+    @Binding private var externalGesture: Gesture
 
-    init(binding: Binding<GestureBinding>) {
-        self.binding = binding.wrappedValue
-        self._externalBinding = binding
+    init(gesture: Binding<Gesture>) {
+        self.gesture = gesture.wrappedValue
+        self._externalGesture = gesture
     }
 
-    private var gestureTypeBinding: Binding<GestureBinding.GestureType> {
+    private var kindBinding: Binding<Gesture.Kind> {
         Binding(
-            get: { binding.gestureType },
-            set: { newType in
-                let oldType = binding.gestureType
-                binding.gestureType = newType
+            get: { gesture.kind },
+            set: { newKind in
+                let oldKind = gesture.kind
+                gesture.kind = newKind
 
-                if newType == .radialMenu {
-                    binding.action = .radialMenuActions
-                } else if oldType == .radialMenu {
-                    binding.action = .singleAction(.custom(.init(.noAction)))
+                if newKind == .radialMenu {
+                    gesture.action = .radialMenuActions
+                } else if oldKind == .radialMenu {
+                    gesture.action = .singleAction(.custom(.init(.noAction)))
                 }
             }
         )
@@ -36,46 +36,46 @@ struct GestureConfigPopoverView: View {
     var body: some View {
         LuminareSection {
             LuminareCompose("Gesture Type") {
-                Picker("", selection: gestureTypeBinding) {
-                    ForEach(Array(GestureBinding.GestureType.allCases.enumerated()), id: \.element) { _, type in
+                Picker("", selection: kindBinding) {
+                    ForEach(Array(Gesture.Kind.allCases.enumerated()), id: \.element) { _, kind in
                         HStack {
-                            type.image
+                            kind.image
                                 .frame(width: 12)
 
-                            Text(type.displayName)
+                            Text(kind.displayName)
                         }
-                        .tag(type)
+                        .tag(kind)
                     }
                 }
                 .labelsHidden()
             }
 
             LuminareCompose("Fingers") {
                 HStack {
-                    Text("\(binding.fingerCount)")
+                    Text("\(gesture.fingerCount)")
 
-                    Stepper("", value: $binding.fingerCount, in: 2...5)
+                    Stepper("", value: $gesture.fingerCount, in: 2...5)
                         .labelsHidden()
-                        .onChange(of: binding.fingerCount) { count in
-                            if count <= 2 { binding.activationZone = .titlebar }
+                        .onChange(of: gesture.fingerCount) { count in
+                            if count <= 2 { gesture.activationZone = .titlebar }
                         }
                 }
             }
 
             LuminareCompose("Activation Zone") {
-                Picker("", selection: $binding.activationZone) {
-                    ForEach(GestureBinding.ActivationZone.allCases, id: \.self) { zone in
+                Picker("", selection: $gesture.activationZone) {
+                    ForEach(Gesture.ActivationZone.allCases, id: \.self) { zone in
                         Label(zone.displayName, systemImage: zone.systemImage)
                             .tag(zone)
                     }
                 }
                 .labelsHidden()
-                .disabled(binding.fingerCount <= 2)
+                .disabled(gesture.fingerCount <= 2)
             }
-            .help(binding.fingerCount <= 2 ? "2-finger gestures are restricted to the titlebar to avoid conflicting with system gestures." : "")
+            .help(gesture.fingerCount <= 2 ? "2-finger gestures are restricted to the titlebar to avoid conflicting with system gestures." : "")
         }
         .frame(maxWidth: .infinity, alignment: .leading)
-        .onChange(of: binding) { externalBinding = $0 }
+        .onChange(of: gesture) { externalGesture = $0 }
         .luminareFilledStates(.none)
         .luminareBorderedStates(.none)
         .padding(8)

Loop/Settings Window/Settings/Gestures/GestureConfigPopoverView.swift

@@ -1,5 +1,5 @@
 //
-//  GestureBindingItemView.swift
+//  GestureItemView.swift
 //  Loop
 //
 //  Created by Kai Azim on 2026-04-16.
@@ -9,27 +9,27 @@ import Defaults
 import Luminare
 import SwiftUI
 
-struct GestureBindingItemView: View {
+struct GestureItemView: View {
     @Environment(\.luminareAnimation) var luminareAnimation
 
     @Default(.keybinds) private var keybinds
-    @Default(.gestureBindings) private var gestureBindings
+    @Default(.gestures) private var gestures
 
-    @State private var binding: GestureBinding
-    @Binding private var externalBinding: GestureBinding
+    @State private var gesture: Gesture
+    @Binding private var externalGesture: Gesture
 
     @State private var isActionPickerPresented = false
     @State private var isGestureConfigPresented = false
     @State private var isConfiguringCustom = false
     @State private var isConfiguringCycle = false
 
-    init(_ binding: Binding<GestureBinding>) {
-        self.binding = binding.wrappedValue
-        self._externalBinding = binding
+    init(_ gesture: Binding<Gesture>) {
+        self.gesture = gesture.wrappedValue
+        self._externalGesture = gesture
     }
 
     private var hasConflict: Bool {
-        GestureBinding.conflictingIDs(in: gestureBindings).contains(binding.id)
+        Gesture.conflictingIDs(in: gestures).contains(gesture.id)
     }
 
     var body: some View {
@@ -43,7 +43,7 @@ struct GestureBindingItemView: View {
                 }
             }
             .luminareToolTip(attachedTo: .topLeading, hidden: !hasConflict) {
-                Text("There are other gesture bindings that conflict with this gesture.")
+                Text("There are other gestures that conflict with this gesture.")
                     .padding(6)
             }
             .frame(maxWidth: .infinity, alignment: .leading)
@@ -60,7 +60,7 @@ struct GestureBindingItemView: View {
                 isConfiguringCycle = true
             }
         }
-        .onChange(of: binding) { externalBinding = $0 }
+        .onChange(of: gesture) { externalGesture = $0 }
     }
 
     private var gestureConfiguration: some View {
@@ -79,7 +79,7 @@ struct GestureBindingItemView: View {
         .luminareBorderedStates(.hovering)
         .luminareMinHeight(24)
         .opacity(hasConflict ? 0.5 : 1)
-        .help("Customize this gesture binding.")
+        .help("Customize this gesture.")
         .padding(.leading, -4)
         .luminarePopover(
             isPresented: $isGestureConfigPresented,
@@ -88,7 +88,7 @@ struct GestureBindingItemView: View {
             shouldHideAnchor: true,
             shouldAnimate: false
         ) {
-            GestureConfigPopoverView(binding: $binding)
+            GestureConfigPopoverView(gesture: $gesture)
                 .frame(width: 300)
         }
     }
@@ -114,7 +114,7 @@ struct GestureBindingItemView: View {
 
     private var actionIndicator: some View {
         HStack(spacing: 2) {
-            if case .radialMenuActions = binding.action {
+            if case .radialMenuActions = gesture.action {
                 HStack(spacing: 4) {
                     Image(.loop)
                     Text("Open Radial Menu")
@@ -208,16 +208,16 @@ struct GestureBindingItemView: View {
     }
 
     private var gestureConfigurationText: String {
-        switch binding.gestureType {
+        switch gesture.kind {
         case .radialMenu:
-            "\(binding.fingerCount)-finger Gesture"
+            "\(gesture.fingerCount)-finger Gesture"
         default:
-            "\(binding.fingerCount)-finger \(binding.gestureType.displayName)"
+            "\(gesture.fingerCount)-finger \(gesture.kind.displayName)"
         }
     }
 
     private var resolvedAction: WindowAction? {
-        switch binding.action {
+        switch gesture.action {
         case .radialMenuActions:
             nil
         case let .singleAction(actionType):
@@ -228,13 +228,13 @@ struct GestureBindingItemView: View {
     private var actionTypeBinding: Binding<RadialMenuAction.ActionType> {
         Binding(
             get: {
-                if case let .singleAction(actionType) = binding.action {
+                if case let .singleAction(actionType) = gesture.action {
                     return actionType
                 }
                 return .custom(.init(.noAction))
             },
             set: { newValue in
-                binding.action = .singleAction(newValue)
+                gesture.action = .singleAction(newValue)
             }
         )
     }
@@ -245,10 +245,10 @@ struct GestureBindingItemView: View {
                 resolvedAction ?? .init(.noAction)
             },
             set: { newAction in
-                if case let .singleAction(actionType) = binding.action {
+                if case let .singleAction(actionType) = gesture.action {
                     switch actionType {
                     case .custom:
-                        binding.action = .singleAction(.custom(newAction))
+                        gesture.action = .singleAction(.custom(newAction))
                     case let .keybindReference(id):
                         if let index = Defaults[.keybinds].firstIndex(where: { $0.id == id }) {
                             keybinds[index] = newAction