added shortcut ability to toggle notch open

TheBoredTeam · Nov 13, 2024 · 3a90344 · 3a90344
1 parent 0890fbe
commit 3a90344
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 0 deletions.
diff --git a/boringNotch/Shortcuts/ShortcutConstants.swift b/boringNotch/Shortcuts/ShortcutConstants.swift
@@ -14,4 +14,5 @@ extension KeyboardShortcuts.Name {
     static let decreaseBacklight = Self("decreaseBacklight", default: .init(.f1, modifiers: [.command]))
     static let increaseBacklight = Self("increaseBacklight", default: .init(.f2, modifiers: [.command]))
     static let toggleSneakPeek = Self("toggleSneakPeek", default: .init(.h, modifiers: [.command, .shift]))
+    static let toggleNotchOpen = Self("toggleNotchOpen", default: .init(.i, modifiers: [.command, .shift]))
 }
diff --git a/boringNotch/boringNotchApp.swift b/boringNotch/boringNotchApp.swift
@@ -85,6 +85,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     var whatsNewWindow: NSWindow?
     var timer: Timer?
     let calenderManager = CalendarManager()
+    var closeNotchWorkItem: DispatchWorkItem?
     private var previousScreens: [NSScreen]?
     @Environment(\.openWindow) var openWindow
 
@@ -126,6 +127,26 @@ class AppDelegate: NSObject, NSApplicationDelegate {
             )
         }
 
+        KeyboardShortcuts.onKeyDown(for: .toggleNotchOpen) { [weak self] in
+            guard let self = self else { return }
+            switch self.vm.notchState {
+                case .closed:
+                    self.vm.open()
+                    self.closeNotchWorkItem?.cancel()
+
+                    let workItem = DispatchWorkItem {
+                        self.vm.close()
+                    }
+                    self.closeNotchWorkItem = workItem
+
+                    DispatchQueue.main.asyncAfter(deadline: .now() + 3.0, execute: workItem)
+                case .open:
+                    self.closeNotchWorkItem?.cancel()
+                    self.closeNotchWorkItem = nil
+                    self.vm.close()
+            }
+        }
+
         window = BoringNotchWindow(
             contentRect: NSRect(x: 0, y: 0, width: sizing.size.opened.width! + 20, height: sizing.size.opened.height! + 30),
             styleMask: [.borderless, .nonactivatingPanel, .utilityWindow, .hudWindow],

diff --git a/boringNotch/components/Settings/SettingsView.swift b/boringNotch/components/Settings/SettingsView.swift
@@ -957,6 +957,9 @@ struct Shortcuts: View {
                     .foregroundStyle(.secondary)
                     .font(.caption)
             }
+            Section {
+                KeyboardShortcuts.Recorder("Toggle Notch Open:", name: .toggleNotchOpen)
+            }
         }
         .tint(Defaults[.accentColor])
         .navigationTitle("Shortcuts")