Skip to content

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

merge main into notch design

altic-dev395472ea183c
diff --cc Sources/Fluid/Services/CommandModeService.swift
index 785656e5,ce5e8449..c72470e4
--- a/Sources/Fluid/Services/CommandModeService.swift
+++ b/Sources/Fluid/Services/CommandModeService.swift
@@@ -282,11 -278,6 +282,10 @@@ final class CommandModeService: Observa
/// Sync conversation history to NotchContentState
private func syncToNotchState() {
+ guard self.shouldSyncCommandNotchState else {
- NotchContentState.shared.clearCommandOutput()
+ return
+ }
+
NotchContentState.shared.clearCommandOutput()
for msg in self.conversationHistory {
diff --cc Sources/Fluid/Services/NotchOverlayManager.swift
index 464f0c43,c631eb7c..af51cea5
--- a/Sources/Fluid/Services/NotchOverlayManager.swift
+++ b/Sources/Fluid/Services/NotchOverlayManager.swift
@@@ -205,12 -187,7 +206,11 @@@ final class NotchOverlayManager
}
/// Show notch overlay (original behavior)
- private func showNotchOverlay(audioLevelPublisher: AnyPublisher<CGFloat, Never>, mode: OverlayMode) {
- let targetScreen = self.preferredPresentationScreen()
+ private func showNotchOverlay(audioLevelPublisher: AnyPublisher<CGFloat, Never>, mode: OverlayMode, screen: NSScreen?) {
++ let targetScreen = screen ?? self.preferredPresentationScreen()
+ self.presentationPolicyScreen = targetScreen
+ self.refreshNotchPresentationPolicy(for: targetScreen)
+ self.currentAudioPublisher = audioLevelPublisher
-
// Hide bottom overlay if it was visible
if self.isBottomOverlayVisible {
BottomOverlayWindowController.shared.hide()
@@@ -451,7 -408,11 +451,11 @@@
self.commandOutputNotch = newNotch
- await newNotch.expand()
- if let screen = OverlayScreenResolver.screenForCurrentPointer() {
++ if let screen = self.presentationPolicyScreen ?? OverlayScreenResolver.screenForCurrentPointer() {
+ await newNotch.expand(on: screen)
+ } else {
+ await newNotch.expand()
+ }
guard self.commandOutputGeneration == currentGeneration else { return }
self.commandOutputState = .visible
@@@ -519,51 -478,6 +523,55 @@@
}
}
+ var canShowExpandedCommandOutput: Bool {
+ self.refreshNotchPresentationPolicy()
+ return self.currentNotchPresentationPolicy.allowsExpandedCommandOutput
+ }
+
+ var canHandleNotchCommandTap: Bool {
+ self.refreshNotchPresentationPolicy()
+ return self.currentNotchPresentationPolicy.allowsCommandExpansion &&
+ self.currentNotchPresentationPolicy.allowsCommandActions
+ }
+
+ var allowsCommandNotchActions: Bool {
+ self.refreshNotchPresentationPolicy()
+ return self.currentNotchPresentationPolicy.allowsCommandActions
+ }
+
+ var supportsCommandNotchUI: Bool {
+ self.refreshNotchPresentationPolicy()
+ return self.currentNotchPresentationPolicy.allowsCommandExpansion ||
+ self.currentNotchPresentationPolicy.allowsExpandedCommandOutput ||
+ self.currentNotchPresentationPolicy.allowsCommandActions
+ }
+
+ var shouldShowOrTrackLivePreviewText: Bool {
+ guard SettingsStore.shared.enableStreamingPreview else { return false }
+ if SettingsStore.shared.overlayPosition == .bottom {
+ return true
+ }
+
+ self.refreshNotchPresentationPolicy()
+ return self.currentNotchPresentationPolicy.showsStreamingPreview
+ }
+
+ var shouldSyncCommandConversationToNotch: Bool {
++ if SettingsStore.shared.overlayPosition == .bottom {
++ return true
++ }
++
+ guard self.enableNotchFeatures else { return false }
+
+ self.refreshNotchPresentationPolicy()
+ return self.currentNotchPresentationPolicy.allowsExpandedCommandOutput ||
+ self.currentNotchPresentationPolicy.allowsCommandActions
+ }
+
+ private var enableNotchFeatures: Bool {
+ SettingsStore.shared.overlayPosition == .top || self.supportsCommandNotchUI
+ }
+
/// Check if any notch (regular or expanded) is visible
var isAnyNotchVisible: Bool {
return self.state == .visible || self.state == .showing || self.isCommandOutputExpanded