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

feat(sidebar): replace system toggle with sidebar-styled one

altic-dev1bc0cf2fae08
diff --git a/Sources/Fluid/ContentView.swift b/Sources/Fluid/ContentView.swift
index b1eb2499..372dad3f 100644
--- a/Sources/Fluid/ContentView.swift
+++ b/Sources/Fluid/ContentView.swift
@@ -391,6 +391,7 @@ struct ContentView: View {
@State private var savedProviders: [SettingsStore.SavedProvider] = []
@State private var selectedProviderID: String = SettingsStore.shared.selectedProviderID
@State private var columnVisibility: NavigationSplitViewVisibility = .all
+ @State private var isSidebarToggleHovered = false
var body: some View {
let layout = AnyView(
@@ -401,6 +402,10 @@ struct ContentView: View {
NavigationSplitView(columnVisibility: self.$columnVisibility) {
self.sidebarContent
.navigationSplitViewColumnWidth(min: 220, ideal: 250, max: 300)
+ // The system toggle draws dark glass over the sidebar; ours sits in the
+ // same spot without a glass backing so it blends into the sidebar color.
+ .toolbar(removing: .sidebarToggle)
+ .toolbar { self.sidebarToggleToolbarItem }
} detail: {
self.detailView
}
@@ -432,6 +437,11 @@ struct ContentView: View {
.onReceive(NotificationCenter.default.publisher(for: .dictationPromptShortcutsChanged)) { _ in
self.hotkeyManager?.updatePromptShortcutAssignments(SettingsStore.shared.dictationPromptShortcutAssignments())
}
+ // Local UI diagnostics, same defaults gate as GlobalHotkeyManager+DebugTrigger.
+ .onReceive(DistributedNotificationCenter.default().publisher(for: Notification.Name("com.FluidApp.debug.toggleSidebar"))) { _ in
+ guard UserDefaults.standard.bool(forKey: "FluidDebugRemoteToggleEnabled") else { return }
+ self.toggleSidebar()
+ }
.onReceive(NotificationCenter.default.publisher(for: .settingsBackupDidRestore)) { _ in
self.reloadSettingsStateAfterBackupRestore()
}
@@ -1835,6 +1845,50 @@ struct ContentView: View {
}
}
+ private var sidebarToggleButton: some View {
+ Button(action: self.toggleSidebar) {
+ Image(systemName: "sidebar.left")
+ }
+ .help(self.columnVisibility == .detailOnly ? "Show sidebar" : "Hide sidebar")
+ .accessibilityLabel(self.columnVisibility == .detailOnly ? "Show sidebar" : "Hide sidebar")
+ }
+
+ @ToolbarContentBuilder
+ private var sidebarToggleToolbarItem: some ToolbarContent {
+ if #available(macOS 26.0, *) {
+ // Keeps the toggle at the sidebar's trailing edge, where the system one sat.
+ ToolbarSpacer(.flexible)
+ ToolbarItem(placement: .automatic) {
+ // Same hover/press treatment as the sidebar's "Back to app" and entry buttons.
+ Button(action: self.toggleSidebar) {
+ Image(systemName: "sidebar.left")
+ .font(.fluidSystem(size: 14, weight: .medium))
+ .frame(width: 30, height: 26)
+ .contentShape(Rectangle())
+ }
+ .buttonStyle(SidebarChromeButtonStyle(
+ isHovered: self.isSidebarToggleHovered,
+ reduceMotion: self.accessibilityReduceMotion
+ ))
+ .opacity(self.isSidebarToggleHovered ? 1 : 0.7)
+ .onHover { self.isSidebarToggleHovered = $0 }
+ .help(self.columnVisibility == .detailOnly ? "Show sidebar" : "Hide sidebar")
+ .accessibilityLabel(self.columnVisibility == .detailOnly ? "Show sidebar" : "Hide sidebar")
+ }
+ .sharedBackgroundVisibility(.hidden)
+ } else {
+ ToolbarItem(placement: .automatic) {
+ self.sidebarToggleButton
+ }
+ }
+ }
+
+ private func toggleSidebar() {
+ withAnimation(self.accessibilityReduceMotion ? nil : .easeInOut(duration: 0.2)) {
+ self.columnVisibility = self.columnVisibility == .detailOnly ? .all : .detailOnly
+ }
+ }
+
private var windowSizing: FluidWindowSizing {
let window = self.theme.metrics.window
if self.settings.shouldShowOnboarding {