jake/vOOice
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved ESC key handling to double prevent accidental clicks

Browse Source
This commit is contained in:
Beingpax 2025-06-28 14:36:37 +05:45
parent d19d8f3248
commit 4c604d27fc
2 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
VoiceInk/HotkeyManager.swift
View File

@ -57,6 +57,11 @@ class HotkeyManager: ObservableObject {
private var fnDebounceTask: Task<Void, Never>?
private var pendingFnKeyState: Bool? = nil
// Add double-press Escape handling properties
private var escFirstPressTime: Date? = nil
private let escSecondPressThreshold: TimeInterval = 1.5 // seconds
private var isEscapeHandlerSetup = false
enum PushToTalkKey: String, CaseIterable {
case rightOption = "rightOption"
case leftOption = "leftOption"
@ -250,19 +255,41 @@ class HotkeyManager: ObservableObject {
private func setupEscapeShortcut() {
KeyboardShortcuts.setShortcut(.init(.escape), for: .escapeRecorder)
guard !isEscapeHandlerSetup else { return }
isEscapeHandlerSetup = true
KeyboardShortcuts.onKeyDown(for: .escapeRecorder) { [weak self] in
Task { @MainActor in
guard let self = self,
await self.whisperState.isMiniRecorderVisible else { return }
SoundManager.shared.playEscSound()
await self.whisperState.dismissMiniRecorder()
let now = Date()
if let firstTime = self.escFirstPressTime,
now.timeIntervalSince(firstTime) <= self.escSecondPressThreshold {
self.escFirstPressTime = nil
SoundManager.shared.playEscSound()
await self.whisperState.dismissMiniRecorder()
} else {
self.escFirstPressTime = now
SoundManager.shared.playEscSound()
NotificationManager.shared.showNotification(
title: "Press ESC again to cancel recording",
type: .info,
duration: self.escSecondPressThreshold
)
Task { [weak self] in
try? await Task.sleep(nanoseconds: UInt64((self?.escSecondPressThreshold ?? 1.5) * 1_000_000_000))
await MainActor.run {
self?.escFirstPressTime = nil
}
}
}
}
}
}
private func removeEscapeShortcut() {
KeyboardShortcuts.setShortcut(nil, for: .escapeRecorder)
escFirstPressTime = nil
}
private func setupEnhancementShortcut() {

10
VoiceInk/Whisper/WhisperState+UI.swift
View File

@ -55,17 +55,17 @@ extension WhisperState {
func dismissMiniRecorder() async {
logger.notice("📱 Dismissing \(self.recorderType) recorder")
await MainActor.run {
NotificationManager.shared.dismissNotification()
}
shouldCancelRecording = true
if isRecording {
await recorder.stopRecording()
}
// Hide recorder panel first before doing anything else
// Hide recorder panel first before doing anything else
hideRecorderPanel()
await MainActor.run {
@ -77,8 +77,6 @@ extension WhisperState {
isMiniRecorderVisible = false
}
try? await Task.sleep(nanoseconds: 150_000_000)
await cleanupModelResources()
}