Refactor: Extract mini recorder shortcuts to separate manager for better modularity
This commit is contained in:
Beingpax
parent
90eaa5642c
commit
888cc5125b
@ -5,18 +5,6 @@ import AppKit
|
||||
|
||||
extension KeyboardShortcuts.Name {
|
||||
static let toggleMiniRecorder = Self("toggleMiniRecorder")
|
||||
static let escapeRecorder = Self("escapeRecorder")
|
||||
static let toggleEnhancement = Self("toggleEnhancement")
|
||||
// Power Mode selection shortcuts
|
||||
static let selectPowerMode1 = Self("selectPowerMode1")
|
||||
static let selectPowerMode2 = Self("selectPowerMode2")
|
||||
static let selectPowerMode3 = Self("selectPowerMode3")
|
||||
static let selectPowerMode4 = Self("selectPowerMode4")
|
||||
static let selectPowerMode5 = Self("selectPowerMode5")
|
||||
static let selectPowerMode6 = Self("selectPowerMode6")
|
||||
static let selectPowerMode7 = Self("selectPowerMode7")
|
||||
static let selectPowerMode8 = Self("selectPowerMode8")
|
||||
static let selectPowerMode9 = Self("selectPowerMode9")
|
||||
}
|
||||
|
||||
@MainActor
|
||||
@ -39,7 +27,7 @@ class HotkeyManager: ObservableObject {
|
||||
|
||||
private var whisperState: WhisperState
|
||||
private var currentKeyState = false
|
||||
private var visibilityTask: Task<Void, Never>?
|
||||
private var miniRecorderShortcutManager: MiniRecorderShortcutManager
|
||||
|
||||
// Change from single monitor to separate local and global monitors
|
||||
private var globalEventMonitor: Any?
|
||||
@ -57,11 +45,6 @@ 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"
|
||||
@ -100,10 +83,9 @@ class HotkeyManager: ObservableObject {
|
||||
self.isPushToTalkEnabled = UserDefaults.standard.bool(forKey: "isPushToTalkEnabled")
|
||||
self.pushToTalkKey = PushToTalkKey(rawValue: UserDefaults.standard.string(forKey: "pushToTalkKey") ?? "") ?? .rightCommand
|
||||
self.whisperState = whisperState
|
||||
self.miniRecorderShortcutManager = MiniRecorderShortcutManager(whisperState: whisperState)
|
||||
|
||||
updateShortcutStatus()
|
||||
setupEnhancementShortcut()
|
||||
setupVisibilityObserver()
|
||||
}
|
||||
|
||||
private func resetKeyStates() {
|
||||
@ -112,22 +94,6 @@ class HotkeyManager: ObservableObject {
|
||||
isHandsFreeMode = false
|
||||
}
|
||||
|
||||
private func setupVisibilityObserver() {
|
||||
visibilityTask = Task { @MainActor in
|
||||
for await isVisible in whisperState.$isMiniRecorderVisible.values {
|
||||
if isVisible {
|
||||
setupEscapeShortcut()
|
||||
KeyboardShortcuts.setShortcut(.init(.e, modifiers: .command), for: .toggleEnhancement)
|
||||
setupPowerModeShortcuts()
|
||||
} else {
|
||||
removeEscapeShortcut()
|
||||
removeEnhancementShortcut()
|
||||
removePowerModeShortcuts()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func setupKeyMonitor() {
|
||||
removeKeyMonitor()
|
||||
|
||||
@ -253,128 +219,6 @@ 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 }
|
||||
|
||||
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() {
|
||||
KeyboardShortcuts.onKeyDown(for: .toggleEnhancement) { [weak self] in
|
||||
Task { @MainActor in
|
||||
guard let self = self,
|
||||
await self.whisperState.isMiniRecorderVisible,
|
||||
let enhancementService = await self.whisperState.getEnhancementService() else { return }
|
||||
enhancementService.isEnhancementEnabled.toggle()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func setupPowerModeShortcuts() {
|
||||
// Set up Command+1 through Command+9 shortcuts with proper key definitions
|
||||
KeyboardShortcuts.setShortcut(.init(.one, modifiers: .command), for: .selectPowerMode1)
|
||||
KeyboardShortcuts.setShortcut(.init(.two, modifiers: .command), for: .selectPowerMode2)
|
||||
KeyboardShortcuts.setShortcut(.init(.three, modifiers: .command), for: .selectPowerMode3)
|
||||
KeyboardShortcuts.setShortcut(.init(.four, modifiers: .command), for: .selectPowerMode4)
|
||||
KeyboardShortcuts.setShortcut(.init(.five, modifiers: .command), for: .selectPowerMode5)
|
||||
KeyboardShortcuts.setShortcut(.init(.six, modifiers: .command), for: .selectPowerMode6)
|
||||
KeyboardShortcuts.setShortcut(.init(.seven, modifiers: .command), for: .selectPowerMode7)
|
||||
KeyboardShortcuts.setShortcut(.init(.eight, modifiers: .command), for: .selectPowerMode8)
|
||||
KeyboardShortcuts.setShortcut(.init(.nine, modifiers: .command), for: .selectPowerMode9)
|
||||
|
||||
// Setup handlers for each shortcut
|
||||
setupPowerModeHandler(for: .selectPowerMode1, index: 0)
|
||||
setupPowerModeHandler(for: .selectPowerMode2, index: 1)
|
||||
setupPowerModeHandler(for: .selectPowerMode3, index: 2)
|
||||
setupPowerModeHandler(for: .selectPowerMode4, index: 3)
|
||||
setupPowerModeHandler(for: .selectPowerMode5, index: 4)
|
||||
setupPowerModeHandler(for: .selectPowerMode6, index: 5)
|
||||
setupPowerModeHandler(for: .selectPowerMode7, index: 6)
|
||||
setupPowerModeHandler(for: .selectPowerMode8, index: 7)
|
||||
setupPowerModeHandler(for: .selectPowerMode9, index: 8)
|
||||
}
|
||||
|
||||
private func setupPowerModeHandler(for shortcutName: KeyboardShortcuts.Name, index: Int) {
|
||||
KeyboardShortcuts.onKeyDown(for: shortcutName) { [weak self] in
|
||||
Task { @MainActor in
|
||||
guard let self = self,
|
||||
await self.whisperState.isMiniRecorderVisible else { return }
|
||||
|
||||
let powerModeManager = PowerModeManager.shared
|
||||
|
||||
if powerModeManager.isPowerModeEnabled {
|
||||
let availableConfigurations = powerModeManager.getAllAvailableConfigurations()
|
||||
if index < availableConfigurations.count {
|
||||
let selectedConfig = availableConfigurations[index]
|
||||
powerModeManager.setActiveConfiguration(selectedConfig)
|
||||
await ActiveWindowService.shared.applyConfiguration(selectedConfig)
|
||||
}
|
||||
} else {
|
||||
guard let enhancementService = await self.whisperState.getEnhancementService() else { return }
|
||||
|
||||
let availablePrompts = enhancementService.allPrompts
|
||||
if index < availablePrompts.count {
|
||||
if !enhancementService.isEnhancementEnabled {
|
||||
enhancementService.isEnhancementEnabled = true
|
||||
}
|
||||
|
||||
enhancementService.setActivePrompt(availablePrompts[index])
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func removePowerModeShortcuts() {
|
||||
// Remove Command+1 through Command+9 shortcuts
|
||||
KeyboardShortcuts.setShortcut(nil, for: .selectPowerMode1)
|
||||
KeyboardShortcuts.setShortcut(nil, for: .selectPowerMode2)
|
||||
KeyboardShortcuts.setShortcut(nil, for: .selectPowerMode3)
|
||||
KeyboardShortcuts.setShortcut(nil, for: .selectPowerMode4)
|
||||
KeyboardShortcuts.setShortcut(nil, for: .selectPowerMode5)
|
||||
KeyboardShortcuts.setShortcut(nil, for: .selectPowerMode6)
|
||||
KeyboardShortcuts.setShortcut(nil, for: .selectPowerMode7)
|
||||
KeyboardShortcuts.setShortcut(nil, for: .selectPowerMode8)
|
||||
KeyboardShortcuts.setShortcut(nil, for: .selectPowerMode9)
|
||||
}
|
||||
|
||||
private func removeEnhancementShortcut() {
|
||||
KeyboardShortcuts.setShortcut(nil, for: .toggleEnhancement)
|
||||
}
|
||||
|
||||
func updateShortcutStatus() {
|
||||
isShortcutConfigured = KeyboardShortcuts.getShortcut(for: .toggleMiniRecorder) != nil
|
||||
if isShortcutConfigured {
|
||||
@ -385,7 +229,6 @@ class HotkeyManager: ObservableObject {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private func setupShortcutHandler() {
|
||||
KeyboardShortcuts.onKeyUp(for: .toggleMiniRecorder) { [weak self] in
|
||||
Task { @MainActor in
|
||||
@ -409,12 +252,8 @@ class HotkeyManager: ObservableObject {
|
||||
}
|
||||
|
||||
deinit {
|
||||
visibilityTask?.cancel()
|
||||
Task { @MainActor in
|
||||
removeKeyMonitor()
|
||||
removeEscapeShortcut()
|
||||
removeEnhancementShortcut()
|
||||
removePowerModeShortcuts()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
182
VoiceInk/MiniRecorderShortcutManager.swift
Normal file
182
VoiceInk/MiniRecorderShortcutManager.swift
Normal file
@ -0,0 +1,182 @@
|
||||
import Foundation
|
||||
import KeyboardShortcuts
|
||||
import AppKit
|
||||
|
||||
extension KeyboardShortcuts.Name {
|
||||
static let escapeRecorder = Self("escapeRecorder")
|
||||
static let toggleEnhancement = Self("toggleEnhancement")
|
||||
// Power Mode selection shortcuts
|
||||
static let selectPowerMode1 = Self("selectPowerMode1")
|
||||
static let selectPowerMode2 = Self("selectPowerMode2")
|
||||
static let selectPowerMode3 = Self("selectPowerMode3")
|
||||
static let selectPowerMode4 = Self("selectPowerMode4")
|
||||
static let selectPowerMode5 = Self("selectPowerMode5")
|
||||
static let selectPowerMode6 = Self("selectPowerMode6")
|
||||
static let selectPowerMode7 = Self("selectPowerMode7")
|
||||
static let selectPowerMode8 = Self("selectPowerMode8")
|
||||
static let selectPowerMode9 = Self("selectPowerMode9")
|
||||
}
|
||||
|
||||
@MainActor
|
||||
class MiniRecorderShortcutManager: ObservableObject {
|
||||
private var whisperState: WhisperState
|
||||
private var visibilityTask: Task<Void, Never>?
|
||||
|
||||
// Add double-press Escape handling properties
|
||||
private var escFirstPressTime: Date? = nil
|
||||
private let escSecondPressThreshold: TimeInterval = 1.5 // seconds
|
||||
private var isEscapeHandlerSetup = false
|
||||
|
||||
init(whisperState: WhisperState) {
|
||||
self.whisperState = whisperState
|
||||
setupVisibilityObserver()
|
||||
setupEnhancementShortcut()
|
||||
}
|
||||
|
||||
private func setupVisibilityObserver() {
|
||||
visibilityTask = Task { @MainActor in
|
||||
for await isVisible in whisperState.$isMiniRecorderVisible.values {
|
||||
if isVisible {
|
||||
setupEscapeShortcut()
|
||||
KeyboardShortcuts.setShortcut(.init(.e, modifiers: .command), for: .toggleEnhancement)
|
||||
setupPowerModeShortcuts()
|
||||
} else {
|
||||
removeEscapeShortcut()
|
||||
removeEnhancementShortcut()
|
||||
removePowerModeShortcuts()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
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 }
|
||||
|
||||
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() {
|
||||
KeyboardShortcuts.onKeyDown(for: .toggleEnhancement) { [weak self] in
|
||||
Task { @MainActor in
|
||||
guard let self = self,
|
||||
await self.whisperState.isMiniRecorderVisible,
|
||||
let enhancementService = await self.whisperState.getEnhancementService() else { return }
|
||||
enhancementService.isEnhancementEnabled.toggle()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func setupPowerModeShortcuts() {
|
||||
// Set up Command+1 through Command+9 shortcuts with proper key definitions
|
||||
KeyboardShortcuts.setShortcut(.init(.one, modifiers: .command), for: .selectPowerMode1)
|
||||
KeyboardShortcuts.setShortcut(.init(.two, modifiers: .command), for: .selectPowerMode2)
|
||||
KeyboardShortcuts.setShortcut(.init(.three, modifiers: .command), for: .selectPowerMode3)
|
||||
KeyboardShortcuts.setShortcut(.init(.four, modifiers: .command), for: .selectPowerMode4)
|
||||
KeyboardShortcuts.setShortcut(.init(.five, modifiers: .command), for: .selectPowerMode5)
|
||||
KeyboardShortcuts.setShortcut(.init(.six, modifiers: .command), for: .selectPowerMode6)
|
||||
KeyboardShortcuts.setShortcut(.init(.seven, modifiers: .command), for: .selectPowerMode7)
|
||||
KeyboardShortcuts.setShortcut(.init(.eight, modifiers: .command), for: .selectPowerMode8)
|
||||
KeyboardShortcuts.setShortcut(.init(.nine, modifiers: .command), for: .selectPowerMode9)
|
||||
|
||||
// Setup handlers for each shortcut
|
||||
setupPowerModeHandler(for: .selectPowerMode1, index: 0)
|
||||
setupPowerModeHandler(for: .selectPowerMode2, index: 1)
|
||||
setupPowerModeHandler(for: .selectPowerMode3, index: 2)
|
||||
setupPowerModeHandler(for: .selectPowerMode4, index: 3)
|
||||
setupPowerModeHandler(for: .selectPowerMode5, index: 4)
|
||||
setupPowerModeHandler(for: .selectPowerMode6, index: 5)
|
||||
setupPowerModeHandler(for: .selectPowerMode7, index: 6)
|
||||
setupPowerModeHandler(for: .selectPowerMode8, index: 7)
|
||||
setupPowerModeHandler(for: .selectPowerMode9, index: 8)
|
||||
}
|
||||
|
||||
private func setupPowerModeHandler(for shortcutName: KeyboardShortcuts.Name, index: Int) {
|
||||
KeyboardShortcuts.onKeyDown(for: shortcutName) { [weak self] in
|
||||
Task { @MainActor in
|
||||
guard let self = self,
|
||||
await self.whisperState.isMiniRecorderVisible else { return }
|
||||
|
||||
let powerModeManager = PowerModeManager.shared
|
||||
|
||||
if powerModeManager.isPowerModeEnabled {
|
||||
let availableConfigurations = powerModeManager.getAllAvailableConfigurations()
|
||||
if index < availableConfigurations.count {
|
||||
let selectedConfig = availableConfigurations[index]
|
||||
powerModeManager.setActiveConfiguration(selectedConfig)
|
||||
await ActiveWindowService.shared.applyConfiguration(selectedConfig)
|
||||
}
|
||||
} else {
|
||||
guard let enhancementService = await self.whisperState.getEnhancementService() else { return }
|
||||
|
||||
let availablePrompts = enhancementService.allPrompts
|
||||
if index < availablePrompts.count {
|
||||
if !enhancementService.isEnhancementEnabled {
|
||||
enhancementService.isEnhancementEnabled = true
|
||||
}
|
||||
|
||||
enhancementService.setActivePrompt(availablePrompts[index])
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func removePowerModeShortcuts() {
|
||||
// Remove Command+1 through Command+9 shortcuts
|
||||
KeyboardShortcuts.setShortcut(nil, for: .selectPowerMode1)
|
||||
KeyboardShortcuts.setShortcut(nil, for: .selectPowerMode2)
|
||||
KeyboardShortcuts.setShortcut(nil, for: .selectPowerMode3)
|
||||
KeyboardShortcuts.setShortcut(nil, for: .selectPowerMode4)
|
||||
KeyboardShortcuts.setShortcut(nil, for: .selectPowerMode5)
|
||||
KeyboardShortcuts.setShortcut(nil, for: .selectPowerMode6)
|
||||
KeyboardShortcuts.setShortcut(nil, for: .selectPowerMode7)
|
||||
KeyboardShortcuts.setShortcut(nil, for: .selectPowerMode8)
|
||||
KeyboardShortcuts.setShortcut(nil, for: .selectPowerMode9)
|
||||
}
|
||||
|
||||
private func removeEnhancementShortcut() {
|
||||
KeyboardShortcuts.setShortcut(nil, for: .toggleEnhancement)
|
||||
}
|
||||
|
||||
deinit {
|
||||
visibilityTask?.cancel()
|
||||
Task { @MainActor in
|
||||
removeEscapeShortcut()
|
||||
removeEnhancementShortcut()
|
||||
removePowerModeShortcuts()
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user