Fastest and only macOS Dictation app with on-device STT and custom trained AI enhancement model. Windows, iOS testflight! Android, Linux waitlist open! A local Wispr Flow alternative. Follow https://x.com/fluidvoiceapp for more
Add toggle to command mode and write mode
grohith3272c53fa1ad577
diff --git a/Sources/Fluid/ContentView.swift b/Sources/Fluid/ContentView.swiftindex 23f8fb00..34a76a14 100644--- a/Sources/Fluid/ContentView.swift+++ b/Sources/Fluid/ContentView.swift@@ -52,6 +52,8 @@ struct ContentView: View {@State private var hotkeyShortcut: HotkeyShortcut = SettingsStore.shared.hotkeyShortcut@State private var commandModeHotkeyShortcut: HotkeyShortcut = SettingsStore.shared.commandModeHotkeyShortcut@State private var rewriteModeHotkeyShortcut: HotkeyShortcut = SettingsStore.shared.rewriteModeHotkeyShortcut+ @State private var isCommandModeShortcutEnabled: Bool = SettingsStore.shared.commandModeShortcutEnabled+ @State private var isRewriteModeShortcutEnabled: Bool = SettingsStore.shared.rewriteModeShortcutEnabled@State private var isRecordingForRewrite: Bool = false // Track if current recording is for rewrite mode@State private var isRecordingForCommand: Bool = false // Track if current recording is for command mode@State private var isRecordingShortcut = false@@ -460,6 +462,39 @@ struct ContentView: View {.onChange(of: selectedProviderID) { newValue inSettingsStore.shared.selectedProviderID = newValue}+ .onChange(of: isCommandModeShortcutEnabled) { newValue in+ SettingsStore.shared.commandModeShortcutEnabled = newValue+ hotkeyManager?.updateCommandModeShortcutEnabled(newValue)++ if !newValue {+ isRecordingCommandModeShortcut = false++ if isRecordingForCommand {+ if asr.isRunning {+ asr.stopWithoutTranscription()+ }+ isRecordingForCommand = false+ menuBarManager.setOverlayMode(.dictation)+ }+ }+ }+ .onChange(of: isRewriteModeShortcutEnabled) { newValue in+ SettingsStore.shared.rewriteModeShortcutEnabled = newValue+ hotkeyManager?.updateRewriteModeShortcutEnabled(newValue)++ if !newValue {+ isRecordingRewriteShortcut = false++ if isRecordingForRewrite {+ if asr.isRunning {+ asr.stopWithoutTranscription()+ }+ isRecordingForRewrite = false+ rewriteModeService.clearState()+ menuBarManager.setOverlayMode(.dictation)+ }+ }+ }.onReceive(NotificationCenter.default.publisher(for: NSApplication.didBecomeActiveNotification)) { _ inlet trusted = AXIsProcessTrusted()if trusted != accessibilityEnabled {@@ -817,6 +852,8 @@ struct ContentView: View {isRecordingCommandModeShortcut: $isRecordingCommandModeShortcut,rewriteShortcut: $rewriteModeHotkeyShortcut,isRecordingRewriteShortcut: $isRecordingRewriteShortcut,+ commandModeShortcutEnabled: $isCommandModeShortcutEnabled,+ rewriteShortcutEnabled: $isRewriteModeShortcutEnabled,hotkeyManagerInitialized: $hotkeyManagerInitialized,pressAndHoldModeEnabled: $pressAndHoldModeEnabled,enableStreamingPreview: $enableStreamingPreview,@@ -3155,6 +3192,8 @@ struct ContentView: View {shortcut: hotkeyShortcut,commandModeShortcut: commandModeHotkeyShortcut,rewriteModeShortcut: rewriteModeHotkeyShortcut,+ commandModeShortcutEnabled: isCommandModeShortcutEnabled,+ rewriteModeShortcutEnabled: isRewriteModeShortcutEnabled,startRecordingCallback: {self.startRecording()},diff --git a/Sources/Fluid/Persistence/SettingsStore.swift b/Sources/Fluid/Persistence/SettingsStore.swiftindex 3706a00e..99d39bd1 100644--- a/Sources/Fluid/Persistence/SettingsStore.swift+++ b/Sources/Fluid/Persistence/SettingsStore.swift@@ -48,12 +48,14 @@ final class SettingsStore: ObservableObjectstatic let commandModeHotkeyShortcut = "CommandModeHotkeyShortcut"static let commandModeConfirmBeforeExecute = "CommandModeConfirmBeforeExecute"static let commandModeLinkedToGlobal = "CommandModeLinkedToGlobal"+ static let commandModeShortcutEnabled = "CommandModeShortcutEnabled"// Rewrite Mode Keysstatic let rewriteModeHotkeyShortcut = "RewriteModeHotkeyShortcut"static let rewriteModeSelectedModel = "RewriteModeSelectedModel"static let rewriteModeSelectedProviderID = "RewriteModeSelectedProviderID"static let rewriteModeLinkedToGlobal = "RewriteModeLinkedToGlobal"+ static let rewriteModeShortcutEnabled = "RewriteModeShortcutEnabled"// Stats Keysstatic let userTypingWPM = "UserTypingWPM"@@ -369,6 +371,18 @@ final class SettingsStore: ObservableObject}}+ var commandModeShortcutEnabled: Bool+ {+ get {+ let value = defaults.object(forKey: Keys.commandModeShortcutEnabled)+ return value as? Bool ?? true+ }+ set {+ objectWillChange.send()+ defaults.set(newValue, forKey: Keys.commandModeShortcutEnabled)+ }+ }+var commandModeHotkeyShortcut: HotkeyShortcut{get@@ -459,6 +473,18 @@ final class SettingsStore: ObservableObject}}+ var rewriteModeShortcutEnabled: Bool+ {+ get {+ let value = defaults.object(forKey: Keys.rewriteModeShortcutEnabled)+ return value as? Bool ?? true+ }+ set {+ objectWillChange.send()+ defaults.set(newValue, forKey: Keys.rewriteModeShortcutEnabled)+ }+ }+// MARK: - Stats Settings/// User's typing speed in words per minute (for time saved calculation)diff --git a/Sources/Fluid/Services/GlobalHotkeyManager.swift b/Sources/Fluid/Services/GlobalHotkeyManager.swiftindex 91e00a5c..0c8a4522 100644--- a/Sources/Fluid/Services/GlobalHotkeyManager.swift+++ b/Sources/Fluid/Services/GlobalHotkeyManager.swift@@ -10,6 +10,8 @@ final class GlobalHotkeyManager: NSObjectprivate var shortcut: HotkeyShortcutprivate var commandModeShortcut: HotkeyShortcutprivate var rewriteModeShortcut: HotkeyShortcut+ private var commandModeShortcutEnabled: Bool+ private var rewriteModeShortcutEnabled: Boolprivate var startRecordingCallback: (() async -> Void)?private var stopAndProcessCallback: (() async -> Void)?private var commandModeCallback: (() async -> Void)?@@ -35,6 +37,8 @@ final class GlobalHotkeyManager: NSObjectshortcut: HotkeyShortcut,commandModeShortcut: HotkeyShortcut,rewriteModeShortcut: HotkeyShortcut,+ commandModeShortcutEnabled: Bool,+ rewriteModeShortcutEnabled: Bool,startRecordingCallback: (() async -> Void)? = nil,stopAndProcessCallback: (() async -> Void)? = nil,commandModeCallback: (() async -> Void)? = nil,@@ -45,6 +49,8 @@ final class GlobalHotkeyManager: NSObjectself.shortcut = shortcutself.commandModeShortcut = commandModeShortcutself.rewriteModeShortcut = rewriteModeShortcut+ self.commandModeShortcutEnabled = commandModeShortcutEnabled+ self.rewriteModeShortcutEnabled = rewriteModeShortcutEnabledself.startRecordingCallback = startRecordingCallbackself.stopAndProcessCallback = stopAndProcessCallbackself.commandModeCallback = commandModeCallback@@ -99,6 +105,24 @@ final class GlobalHotkeyManager: NSObjectDebugLogger.shared.info("Updated rewrite mode hotkey", source: "GlobalHotkeyManager")}+ func updateCommandModeShortcutEnabled(_ enabled: Bool)+ {+ commandModeShortcutEnabled = enabled+ if !enabled {+ isCommandModeKeyPressed = false+ }+ DebugLogger.shared.info("Command mode shortcut \(enabled ? "enabled" : "disabled")", source: "GlobalHotkeyManager")+ }++ func updateRewriteModeShortcutEnabled(_ enabled: Bool)+ {+ rewriteModeShortcutEnabled = enabled+ if !enabled {+ isRewriteKeyPressed = false+ }+ DebugLogger.shared.info("Rewrite mode shortcut \(enabled ? "enabled" : "disabled")", source: "GlobalHotkeyManager")+ }+func setCancelCallback(_ callback: @escaping () -> Bool){self.cancelCallback = callback@@ -243,7 +267,7 @@ final class GlobalHotkeyManager: NSObject}// Check command mode hotkey first- if matchesCommandModeShortcut(keyCode: keyCode, modifiers: eventModifiers)+ if commandModeShortcutEnabled && matchesCommandModeShortcut(keyCode: keyCode, modifiers: eventModifiers){if pressAndHoldMode {// Press and hold: start on keyDown, stop on keyUp@@ -266,7 +290,7 @@ final class GlobalHotkeyManager: NSObject}// Check dedicated rewrite mode hotkey- if matchesRewriteModeShortcut(keyCode: keyCode, modifiers: eventModifiers)+ if rewriteModeShortcutEnabled && matchesRewriteModeShortcut(keyCode: keyCode, modifiers: eventModifiers){if pressAndHoldMode {// Press and hold: start on keyDown, stop on keyUp@@ -308,7 +332,7 @@ final class GlobalHotkeyManager: NSObjectcase .keyUp:// Command mode key up (press and hold mode)- if pressAndHoldMode && isCommandModeKeyPressed && matchesCommandModeShortcut(keyCode: keyCode, modifiers: eventModifiers)+ if commandModeShortcutEnabled && pressAndHoldMode && isCommandModeKeyPressed && matchesCommandModeShortcut(keyCode: keyCode, modifiers: eventModifiers){isCommandModeKeyPressed = falseDebugLogger.shared.info("Command mode shortcut released (hold mode) - stopping", source: "GlobalHotkeyManager")@@ -317,7 +341,7 @@ final class GlobalHotkeyManager: NSObject}// Rewrite mode key up (press and hold mode)- if pressAndHoldMode && isRewriteKeyPressed && matchesRewriteModeShortcut(keyCode: keyCode, modifiers: eventModifiers)+ if rewriteModeShortcutEnabled && pressAndHoldMode && isRewriteKeyPressed && matchesRewriteModeShortcut(keyCode: keyCode, modifiers: eventModifiers){isRewriteKeyPressed = falseDebugLogger.shared.info("Rewrite mode shortcut released (hold mode) - stopping", source: "GlobalHotkeyManager")@@ -341,7 +365,7 @@ final class GlobalHotkeyManager: NSObject|| flags.contains(.maskShift)// Check command mode shortcut (if it's a modifier-only shortcut)- if commandModeShortcut.modifierFlags.isEmpty && keyCode == commandModeShortcut.keyCode+ if commandModeShortcutEnabled && commandModeShortcut.modifierFlags.isEmpty && keyCode == commandModeShortcut.keyCode{if isModifierPressed{@@ -371,7 +395,7 @@ final class GlobalHotkeyManager: NSObject}// Check rewrite mode shortcut (if it's a modifier-only shortcut)- if rewriteModeShortcut.modifierFlags.isEmpty && keyCode == rewriteModeShortcut.keyCode+ if rewriteModeShortcutEnabled && rewriteModeShortcut.modifierFlags.isEmpty && keyCode == rewriteModeShortcut.keyCode{if isModifierPressed{diff --git a/Sources/Fluid/UI/SettingsView.swift b/Sources/Fluid/UI/SettingsView.swiftindex 4c9b23c8..c27f2e11 100644--- a/Sources/Fluid/UI/SettingsView.swift+++ b/Sources/Fluid/UI/SettingsView.swift@@ -25,6 +25,8 @@ struct SettingsView: View {@Binding var isRecordingCommandModeShortcut: Bool@Binding var rewriteShortcut: HotkeyShortcut@Binding var isRecordingRewriteShortcut: Bool+ @Binding var commandModeShortcutEnabled: Bool+ @Binding var rewriteShortcutEnabled: Bool@Binding var hotkeyManagerInitialized: Bool@Binding var pressAndHoldModeEnabled: Bool@Binding var enableStreamingPreview: Bool@@ -291,33 +293,51 @@ struct SettingsView: View {Divider()- shortcutRow(- icon: "terminal.fill",- iconColor: .secondary,- title: "Command Mode",- description: "Execute voice commands",- shortcut: commandModeShortcut,- isRecording: isRecordingCommandModeShortcut,- onChangePressed: {- DebugLogger.shared.debug("Starting to record new command mode shortcut", source: "SettingsView")- isRecordingCommandModeShortcut = true- }- )+ VStack(alignment: .leading, spacing: 6) {+ shortcutRow(+ icon: "terminal.fill",+ iconColor: .secondary,+ title: "Command Mode",+ description: "Execute voice commands",+ shortcut: commandModeShortcut,+ isRecording: isRecordingCommandModeShortcut,+ isEnabled: commandModeShortcutEnabled,+ onChangePressed: {+ DebugLogger.shared.debug("Starting to record new command mode shortcut", source: "SettingsView")+ isRecordingCommandModeShortcut = true+ }+ )++ Toggle("Enable Command Mode shortcut", isOn: $commandModeShortcutEnabled)+ .font(.caption)+ .controlSize(.mini)+ .toggleStyle(.switch)+ .tint(theme.palette.accent)+ }Divider()- shortcutRow(- icon: "pencil.and.outline",- iconColor: .secondary,- title: "Write Mode",- description: "Select text and speak how to rewrite, or write new content",- shortcut: rewriteShortcut,- isRecording: isRecordingRewriteShortcut,- onChangePressed: {- DebugLogger.shared.debug("Starting to record new write mode shortcut", source: "SettingsView")- isRecordingRewriteShortcut = true- }- )+ VStack(alignment: .leading, spacing: 6) {+ shortcutRow(+ icon: "pencil.and.outline",+ iconColor: .secondary,+ title: "Write Mode",+ description: "Select text and speak how to rewrite, or write new content",+ shortcut: rewriteShortcut,+ isRecording: isRecordingRewriteShortcut,+ isEnabled: rewriteShortcutEnabled,+ onChangePressed: {+ DebugLogger.shared.debug("Starting to record new write mode shortcut", source: "SettingsView")+ isRecordingRewriteShortcut = true+ }+ )++ Toggle("Enable Write Mode shortcut", isOn: $rewriteShortcutEnabled)+ .font(.caption)+ .controlSize(.mini)+ .toggleStyle(.switch)+ .tint(theme.palette.accent)+ }}.padding(12).background(@@ -698,6 +718,7 @@ struct SettingsView: View {description: String,shortcut: HotkeyShortcut,isRecording: Bool,+ isEnabled: Bool = true,onChangePressed: @escaping () -> Void) -> some View {HStack(spacing: 10) {@@ -716,7 +737,17 @@ struct SettingsView: View {Spacer()- if isRecording {+ if !isEnabled {+ Text("Shortcut disabled")+ .font(.caption.weight(.medium))+ .foregroundStyle(.secondary)+ .padding(.horizontal, 8)+ .padding(.vertical, 4)+ .background(+ RoundedRectangle(cornerRadius: 5, style: .continuous)+ .fill(.quaternary.opacity(0.4))+ )+ } else if isRecording {Text("Press shortcut...").font(.caption.weight(.medium)).foregroundStyle(.orange)@@ -746,8 +777,9 @@ struct SettingsView: View {}.buttonStyle(.bordered).controlSize(.small)- .disabled(isRecording)+ .disabled(isRecording || !isEnabled)}+ .opacity(isEnabled ? 1 : 0.7)}}