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

style(ui): add adaptive theme picker

altic-devb616e7c85d04
diff --git a/Sources/Fluid/ContentView.swift b/Sources/Fluid/ContentView.swift
index 27bc1327..b4793066 100644
--- a/Sources/Fluid/ContentView.swift
+++ b/Sources/Fluid/ContentView.swift
@@ -239,8 +239,9 @@ struct ContentView: View {
let nav = env.onChange(of: self.menuBarManager.requestedNavigationDestination) { _, destination in
self.handleMenuBarNavigation(destination)
}
+ let sized = nav.fluidWindowSizing(self.windowSizing)
- return nav.onAppear {
+ return sized.onAppear {
self.appear = true
self.accessibilityEnabled = self.checkAccessibilityPermissions()
@@ -627,7 +628,9 @@ struct ContentView: View {
}
.toolbar {
if !self.settings.shouldShowOnboarding {
- ToolbarItem(placement: .primaryAction) {
+ ToolbarItemGroup(placement: .primaryAction) {
+ self.themePreferenceButton
+
Button(action: self.openIssueReportingPage) {
Image(systemName: "ladybug.fill")
}
@@ -975,6 +978,24 @@ struct ContentView: View {
}
}
+ private var themePreferenceButton: some View {
+ Button {
+ self.settings.themePreference = self.nextThemePreference(after: self.settings.themePreference)
+ } label: {
+ Image(systemName: self.settings.themePreference.systemImageName)
+ }
+ .help("Theme: \(self.settings.themePreference.displayName)")
+ .accessibilityLabel("Theme")
+ }
+
+ private func nextThemePreference(after preference: SettingsStore.ThemePreference) -> SettingsStore.ThemePreference {
+ switch preference {
+ case .system: return .light
+ case .light: return .dark
+ case .dark: return .system
+ }
+ }
+
private var detailView: some View {
ZStack {
Color(nsColor: .windowBackgroundColor)
@@ -1095,6 +1116,14 @@ struct ContentView: View {
}
}
+ private var windowSizing: FluidWindowSizing {
+ let window = self.theme.metrics.window
+ if self.settings.shouldShowOnboarding {
+ return .minimum(width: window.onboardingMinWidth, height: window.onboardingMinHeight)
+ }
+ return .minimum(width: window.mainMinWidth, height: window.mainMinHeight)
+ }
+
private var microphoneActionButton: some View {
Group {
if self.asr.micStatus == .notDetermined {
@@ -2120,7 +2149,7 @@ struct ContentView: View {
}
private func currentDictationOutputRouteForHotkeyStop() -> DictationOutputRoute {
- let onboardingPlaygroundStep = 4
+ let onboardingPlaygroundStep = 5
let isOnboardingPlayground = !self.settings.onboardingCompleted &&
self.settings.onboardingCurrentStep == onboardingPlaygroundStep
let isDictationMode = self.activeRecordingMode == .dictate || self.activeRecordingMode == .promptMode
diff --git a/Sources/Fluid/Persistence/SettingsStore.swift b/Sources/Fluid/Persistence/SettingsStore.swift
index 20abfeaf..50b7020d 100644
--- a/Sources/Fluid/Persistence/SettingsStore.swift
+++ b/Sources/Fluid/Persistence/SettingsStore.swift
@@ -1631,6 +1631,40 @@ final class SettingsStore: ObservableObject {
}
}
+ enum ThemePreference: String, CaseIterable, Identifiable, Codable {
+ case system
+ case light
+ case dark
+
+ var id: String {
+ self.rawValue
+ }
+
+ var displayName: String {
+ switch self {
+ case .system: return "System"
+ case .light: return "Light"
+ case .dark: return "Dark"
+ }
+ }
+
+ var systemImageName: String {
+ switch self {
+ case .system: return "circle.lefthalf.filled"
+ case .light: return "sun.max"
+ case .dark: return "moon"
+ }
+ }
+
+ var preferredColorScheme: ColorScheme? {
+ switch self {
+ case .system: return nil
+ case .light: return .light
+ case .dark: return .dark
+ }
+ }
+ }
+
enum TranscriptionStartSound: String, CaseIterable, Identifiable, Codable {
case none
case fluidSfx0 = "fluid_sfx_0"
@@ -1696,6 +1730,21 @@ final class SettingsStore: ObservableObject {
Color(hex: self.accentColorOption.hex) ?? Color(red: 0.227, green: 0.784, blue: 0.776)
}
+ var themePreference: ThemePreference {
+ get {
+ guard let raw = self.defaults.string(forKey: Keys.themePreference),
+ let preference = ThemePreference(rawValue: raw)
+ else {
+ return .system
+ }
+ return preference
+ }
+ set {
+ objectWillChange.send()
+ self.defaults.set(newValue.rawValue, forKey: Keys.themePreference)
+ }
+ }
+
var enableTranscriptionSounds: Bool {
get {
let value = self.defaults.object(forKey: Keys.enableTranscriptionSounds)
@@ -1904,11 +1953,11 @@ final class SettingsStore: ObservableObject {
var onboardingCurrentStep: Int {
get {
let raw = self.defaults.integer(forKey: Keys.onboardingCurrentStep)
- return max(0, min(4, raw))
+ return max(0, min(5, raw))
}
set {
objectWillChange.send()
- let clamped = max(0, min(4, newValue))
+ let clamped = max(0, min(5, newValue))
self.defaults.set(clamped, forKey: Keys.onboardingCurrentStep)
}
}
@@ -3857,6 +3906,7 @@ private extension SettingsStore {
static let launchAtStartup = "LaunchAtStartup"
static let showInDock = "ShowInDock"
static let accentColorOption = "AccentColorOption"
+ static let themePreference = "ThemePreference"
static let enableTranscriptionSounds = "EnableTranscriptionSounds"
static let transcriptionStartSound = "TranscriptionStartSound"
static let transcriptionSoundVolume = "TranscriptionSoundVolume"
diff --git a/Sources/Fluid/Services/MenuBarManager.swift b/Sources/Fluid/Services/MenuBarManager.swift
index 390455bc..928550ab 100644
--- a/Sources/Fluid/Services/MenuBarManager.swift
+++ b/Sources/Fluid/Services/MenuBarManager.swift
@@ -758,11 +758,11 @@ final class MenuBarManager: NSObject, ObservableObject, NSMenuDelegate {
/// Create and present a fresh main window hosting `ContentView`
private func createAndShowMainWindow() {
// Build the SwiftUI root view with required environment
- let rootView = ContentView()
- .environmentObject(self)
- .environmentObject(AppServices.shared)
- .appTheme(AppTheme.dark(accent: SettingsStore.shared.accentColor))
- .preferredColorScheme(.dark)
+ let rootView = AdaptiveAppTheme(accent: SettingsStore.shared.accentColor) {
+ ContentView()
+ .environmentObject(self)
+ .environmentObject(AppServices.shared)
+ }
// Host inside an AppKit window
let hostingController = NSHostingController(rootView: rootView)
@@ -774,7 +774,7 @@ final class MenuBarManager: NSObject, ObservableObject, NSMenuDelegate {
)
window.title = "FluidVoice"
window.animationBehavior = .none
- window.minSize = NSSize(width: 800, height: 500)
+ window.minSize = self.mainWindowMinimumSize
window.isReleasedWhenClosed = false
window.contentViewController = hostingController
window.setFrame(self.defaultWindowFrame(), display: false)
@@ -790,7 +790,7 @@ final class MenuBarManager: NSObject, ObservableObject, NSMenuDelegate {
private func ensureUsableMainWindow(_ window: NSWindow) {
// If the window is too small (e.g., height collapsed), reset to the default frame.
- let minSize = NSSize(width: 800, height: 500)
+ let minSize = self.mainWindowMinimumSize
window.minSize = minSize
let frame = window.frame
@@ -810,6 +810,11 @@ final class MenuBarManager: NSObject, ObservableObject, NSMenuDelegate {
return NSRect(origin: origin, size: size)
}
+ private var mainWindowMinimumSize: NSSize {
+ let window = AppTheme.dark.metrics.window
+ return NSSize(width: window.mainMinWidth, height: window.mainMinHeight)
+ }
+
private func bringToFront(_ window: NSWindow) {
// Keep ordering explicit to avoid "opened but behind other apps" behavior.
if window.alphaValue <= 0.01 {
diff --git a/Sources/Fluid/Theme/AppTheme.swift b/Sources/Fluid/Theme/AppTheme.swift
index 927ecc80..1ac927a5 100644
--- a/Sources/Fluid/Theme/AppTheme.swift
+++ b/Sources/Fluid/Theme/AppTheme.swift
@@ -21,6 +21,8 @@ struct AppTheme {
}
struct Typography {
+ let displayTitle: Font
+ let statement: Font
let title: Font
let titleIcon: Font
let sectionTitle: Font
@@ -41,6 +43,8 @@ struct AppTheme {
let chromeCaption: Font
static let standard = Typography(
+ displayTitle: .system(size: 32, weight: .bold),
+ statement: .system(size: 16, weight: .regular),
title: .system(size: 22, weight: .bold),
titleIcon: .system(size: 22, weight: .regular),
sectionTitle: .system(size: 15, weight: .semibold),
@@ -182,6 +186,16 @@ struct AppTheme {
}
struct OnboardingSurface {
+ struct Landing {
+ let contentWidth: CGFloat
+ let heroPadding: CGFloat
+ let heroIconSize: CGFloat
+ let heroIconFrame: CGFloat
+ let tileSpacing: CGFloat
+ let sectionSpacing: CGFloat
+ let heroCornerRadius: CGFloat
+ }
+
let normalFillOpacity: Double
let selectedFillOpacity: Double
let normalBorderOpacity: Double
@@ -193,6 +207,7 @@ struct AppTheme {
let optionCornerRadius: CGFloat
let compactOptionCornerRadius: CGFloat
let editorCornerRadius: CGFloat
+ let landing: Landing
static let standard = OnboardingSurface(
normalFillOpacity: 0.55,
@@ -205,7 +220,30 @@ struct AppTheme {
compactOptionPadding: 10,
optionCornerRadius: 12,
compactOptionCornerRadius: 10,
- editorCornerRadius: 8
+ editorCornerRadius: 8,
+ landing: Landing(
+ contentWidth: 820,
+ heroPadding: 28,
+ heroIconSize: 48,
+ heroIconFrame: 68,
+ tileSpacing: 12,
+ sectionSpacing: 16,
+ heroCornerRadius: 18
+ )
+ )
+ }
+
+ struct Window {
+ let mainMinWidth: CGFloat
+ let mainMinHeight: CGFloat
+ let onboardingMinWidth: CGFloat
+ let onboardingMinHeight: CGFloat
+
+ static let standard = Window(
+ mainMinWidth: 800,
+ mainMinHeight: 500,
+ onboardingMinWidth: 940,
+ onboardingMinHeight: 700
)
}
@@ -215,6 +253,7 @@ struct AppTheme {
let pickerControl: PickerControl
let cardSurface: CardSurface
let onboardingSurface: OnboardingSurface
+ let window: Window
let cardShadow: Shadow
let elevatedCardShadow: Shadow
}
@@ -233,6 +272,60 @@ struct AppTheme {
let metrics: Metrics
let materials: Materials
+ static func adaptive(accent: Color, colorScheme: ColorScheme) -> AppTheme {
+ switch colorScheme {
+ case .light:
+ return .light(accent: accent)
+ case .dark:
+ return .dark(accent: accent)
+ @unknown default:
+ return .dark(accent: accent)
+ }
+ }
+
+ /// Light theme using system colors so macOS accessibility contrast settings stay in control.
+ static func light(accent: Color) -> AppTheme {
+ AppTheme(
+ palette: Palette(
+ windowBackground: Color(nsColor: .windowBackgroundColor),
+ contentBackground: Color(nsColor: .controlBackgroundColor),
+ sidebarBackground: Color(nsColor: .windowBackgroundColor),
+ cardBackground: Color(nsColor: .controlBackgroundColor),
+ elevatedCardBackground: Color(nsColor: .windowBackgroundColor),
+ toolbarBackground: Color(nsColor: .windowBackgroundColor),
+
+ cardBorder: Color.black.opacity(0.12),
+ separator: Color(nsColor: .separatorColor),
+ primaryText: Color(nsColor: .labelColor),
+ secondaryText: Color(nsColor: .secondaryLabelColor),
+ tertiaryText: Color(nsColor: .tertiaryLabelColor),
+ accent: accent,
+ warning: Color(nsColor: .systemOrange),
+ success: accent
+ ),
+ typography: .standard,
+ metrics: Metrics(
+ spacing: .standard,
+ corners: .standard,
+ formRow: .standard,
+ pickerControl: .standard,
+ cardSurface: .defaults,
+ onboardingSurface: .standard,
+ window: .standard,
+ cardShadow: .subtle(color: .black, opacity: 0.18),
+ elevatedCardShadow: .subtle(color: .black, opacity: 0.22)
+ ),
+ materials: Materials(
+ window: .thinMaterial,
+ sidebar: .ultraThinMaterial,
+ card: .thinMaterial,
+ elevatedCard: .regularMaterial,
+ formRow: .ultraThinMaterial,
+ toolbar: .ultraThinMaterial
+ )
+ )
+ }
+
/// Default dark-forward theme tuned for macOS Sonoma / Sequoia aesthetics.
static func dark(accent: Color) -> AppTheme {
AppTheme(
@@ -261,6 +354,7 @@ struct AppTheme {
pickerControl: .standard,
cardSurface: .defaults,
onboardingSurface: .standard,
+ window: .standard,
cardShadow: .subtle(color: .black, opacity: 0.70),
elevatedCardShadow: .subtle(color: .black, opacity: 0.80)
),
@@ -275,6 +369,7 @@ struct AppTheme {
)
}
+ static let light = AppTheme.light(accent: .fluidGreen)
static let dark = AppTheme.dark(accent: .fluidGreen)
}
diff --git a/Sources/Fluid/Theme/Components/OnboardingComponents.swift b/Sources/Fluid/Theme/Components/OnboardingComponents.swift
index 44b5d30f..2bf816a8 100644
--- a/Sources/Fluid/Theme/Components/OnboardingComponents.swift
+++ b/Sources/Fluid/Theme/Components/OnboardingComponents.swift
@@ -1,5 +1,147 @@
import SwiftUI
+struct FluidOnboardingLandingHero<Actions: View>: View {
+ @Environment(\.theme) private var theme
+
+ let eyebrow: String
+ let title: String
+ let statement: String
+ let systemImage: String
+ let actions: Actions
+
+ init(
+ eyebrow: String,
+ title: String,
+ statement: String,
+ systemImage: String,
+ @ViewBuilder actions: () -> Actions
+ ) {
+ self.eyebrow = eyebrow
+ self.title = title
+ self.statement = statement
+ self.systemImage = systemImage
+ self.actions = actions()
+ }
+
+ var body: some View {
+ let landing = self.theme.metrics.onboardingSurface.landing
+ let shape = RoundedRectangle(cornerRadius: landing.heroCornerRadius, style: .continuous)
+
+ HStack(alignment: .center, spacing: self.theme.metrics.spacing.xl) {
+ ZStack {
+ Circle()
+ .fill(self.theme.palette.accent.opacity(0.14))
+ Image(systemName: self.systemImage)
+ .font(.system(size: landing.heroIconSize, weight: .regular))
+ .foregroundStyle(self.theme.palette.accent)
+ }
+ .frame(width: landing.heroIconFrame, height: landing.heroIconFrame)
+ .accessibilityHidden(true)
+
+ VStack(alignment: .leading, spacing: self.theme.metrics.spacing.md) {
+ Text(self.eyebrow)
+ .font(self.theme.typography.captionStrong)
+ .foregroundStyle(self.theme.palette.accent)
+ .textCase(.uppercase)
+
+ Text(self.title)
+ .font(self.theme.typography.displayTitle)
+ .foregroundStyle(self.theme.palette.primaryText)
+ .fixedSize(horizontal: false, vertical: true)
+
+ Text(self.statement)
+ .font(self.theme.typography.statement)
+ .foregroundStyle(.secondary)
+ .fixedSize(horizontal: false, vertical: true)
+
+ self.actions
+ .padding(.top, self.theme.metrics.spacing.sm)
+ }
+ }
+ .padding(landing.heroPadding)
+ .frame(maxWidth: .infinity, alignment: .leading)
+ .background(
+ shape
+ .fill(self.theme.palette.elevatedCardBackground.opacity(0.72))
+ .overlay(shape.stroke(self.theme.palette.cardBorder.opacity(0.26), lineWidth: 1))
+ )
+ }
+}
+
+struct FluidOnboardingValueTile: View {
+ @Environment(\.theme) private var theme
+
+ let systemImage: String
+ let title: String
+ let description: String
+
+ var body: some View {
+ VStack(alignment: .leading, spacing: self.theme.metrics.spacing.sm) {
+ Image(systemName: self.systemImage)
+ .font(self.theme.typography.titleIcon)
+ .foregroundStyle(self.theme.palette.accent)
+ .accessibilityHidden(true)
+
+ Text(self.title)
+ .font(self.theme.typography.bodyStrong)
+ .foregroundStyle(self.theme.palette.primaryText)
+
+ Text(self.description)
+ .font(self.theme.typography.caption)
+ .foregroundStyle(.secondary)
+ .fixedSize(horizontal: false, vertical: true)
+ }
+ .frame(maxWidth: .infinity, alignment: .topLeading)
+ .fluidOnboardingSelectableSurface(isSelected: false)
+ }
+}
+
+struct FluidOnboardingChecklistPanel<Rows: View>: View {
+ @Environment(\.theme) private var theme
+
+ let title: String
+ let rows: Rows
+
+ init(title: String, @ViewBuilder rows: () -> Rows) {
+ self.title = title
+ self.rows = rows()
+ }
+
+ var body: some View {
+ ThemedCard(style: .subtle) {
+ VStack(alignment: .leading, spacing: self.theme.metrics.spacing.md) {
+ Text(self.title)
+ .font(self.theme.typography.sectionTitle)
+ .foregroundStyle(self.theme.palette.primaryText)
+
+ self.rows
+ }
+ .padding(16)
+ }
+ }
+}
+
+struct FluidOnboardingChecklistRow: View {
+ @Environment(\.theme) private var theme
+
+ let systemImage: String
+ let text: String
+
+ var body: some View {
+ HStack(spacing: self.theme.metrics.spacing.sm) {
+ Image(systemName: self.systemImage)
+ .font(self.theme.typography.captionStrong)
+ .foregroundStyle(self.theme.palette.accent)
+ .frame(width: 18)
+ .accessibilityHidden(true)
+
+ Text(self.text)
+ .font(self.theme.typography.bodySmall)
+ .foregroundStyle(.secondary)
+ }
+ }
+}
+
private struct OnboardingSelectableSurfaceModifier: ViewModifier {
@Environment(\.theme) private var theme
let isSelected: Bool
diff --git a/Sources/Fluid/Theme/Components/WindowSizingComponents.swift b/Sources/Fluid/Theme/Components/WindowSizingComponents.swift
new file mode 100644
index 00000000..87146cdf
--- /dev/null
+++ b/Sources/Fluid/Theme/Components/WindowSizingComponents.swift
@@ -0,0 +1,120 @@
+import AppKit
+import SwiftUI
+
+struct FluidWindowSizing: Equatable {
+ let minWidth: CGFloat
+ let minHeight: CGFloat
+
+ var minSize: NSSize {
+ NSSize(width: self.minWidth, height: self.minHeight)
+ }
+
+ static func minimum(width: CGFloat, height: CGFloat) -> FluidWindowSizing {
+ FluidWindowSizing(minWidth: width, minHeight: height)
+ }
+}
+
+private struct FluidWindowSizingModifier: ViewModifier {
+ let sizing: FluidWindowSizing
+
+ func body(content: Content) -> some View {
+ content.background(FluidWindowSizingBridge(sizing: self.sizing))
+ }
+}
+
+private struct FluidWindowSizingBridge: NSViewRepresentable {
+ let sizing: FluidWindowSizing
+
+ func makeNSView(context _: Context) -> NSView {
+ FluidWindowSizingNSView(sizing: self.sizing)
+ }
+
+ func updateNSView(_ nsView: NSView, context _: Context) {
+ guard let sizingView = nsView as? FluidWindowSizingNSView else { return }
+ sizingView.sizing = self.sizing
+ }
+}
+
+private final class FluidWindowSizingNSView: NSView {
+ var sizing: FluidWindowSizing {
+ didSet {
+ self.applySizing()
+ }
+ }
+
+ private weak var observedWindow: NSWindow?
+ private var resizeObserver: NSObjectProtocol?
+ private var isApplyingSizing = false
+
+ init(sizing: FluidWindowSizing) {
+ self.sizing = sizing
+ super.init(frame: .zero)
+ }
+
+ @available(*, unavailable)
+ required init?(coder _: NSCoder) {
+ nil
+ }
+
+ deinit {
+ self.removeResizeObserver()
+ }
+
+ override func viewDidMoveToWindow() {
+ super.viewDidMoveToWindow()
+ self.observeWindowIfNeeded()
+ self.applySizing()
+ }
+
+ private func observeWindowIfNeeded() {
+ guard self.observedWindow !== self.window else { return }
+
+ self.removeResizeObserver()
+ self.observedWindow = self.window
+
+ guard let window else { return }
+ self.resizeObserver = NotificationCenter.default.addObserver(
+ forName: NSWindow.didResizeNotification,
+ object: window,
+ queue: .main
+ ) { [weak self] _ in
+ self?.applySizing()
+ }
+ }
+
+ private func removeResizeObserver() {
+ if let resizeObserver {
+ NotificationCenter.default.removeObserver(resizeObserver)
+ }
+ self.resizeObserver = nil
+ }
+
+ private func applySizing() {
+ guard !self.isApplyingSizing, let window else { return }
+
+ self.isApplyingSizing = true
+ defer { self.isApplyingSizing = false }
+
+ let minSize = self.sizing.minSize
+ window.minSize = minSize
+
+ let frame = window.frame
+ guard frame.width < minSize.width || frame.height < minSize.height else { return }
+
+ let targetWidth = max(frame.width, minSize.width)
+ let targetHeight = max(frame.height, minSize.height)
+ let targetFrame = NSRect(
+ x: frame.midX - targetWidth / 2,
+ y: frame.midY - targetHeight / 2,
+ width: targetWidth,
+ height: targetHeight
+ )
+ window.setFrame(targetFrame, display: true, animate: false)
+ }
+}
+
+extension View {
+ func fluidWindowSizing(_ sizing: FluidWindowSizing) -> some View {
+ self.modifier(FluidWindowSizingModifier(sizing: sizing))
+ }
+}
diff --git a/Sources/Fluid/Theme/ThemeEnvironment.swift b/Sources/Fluid/Theme/ThemeEnvironment.swift
index 17382e77..dea192e1 100644
--- a/Sources/Fluid/Theme/ThemeEnvironment.swift
+++ b/Sources/Fluid/Theme/ThemeEnvironment.swift
@@ -18,6 +18,28 @@ extension View {
}
}
+struct AdaptiveAppTheme<Content: View>: View {
+ @Environment(\.colorScheme) private var colorScheme
+ @ObservedObject private var settings = SettingsStore.shared
+
+ let accent: Color
+ let content: Content
+
+ init(accent: Color, @ViewBuilder content: () -> Content) {
+ self.accent = accent
+ self.content = content()
+ }
+
+ var body: some View {
+ let preferredScheme = self.settings.themePreference.preferredColorScheme
+ let activeScheme = preferredScheme ?? self.colorScheme
+
+ self.content
+ .appTheme(AppTheme.adaptive(accent: self.accent, colorScheme: activeScheme))
+ .preferredColorScheme(preferredScheme)
+ }
+}
+
// MARK: - Color Hex Initializer
extension Color {
diff --git a/Sources/Fluid/UI/AISettingsView+SpeechRecognition.swift b/Sources/Fluid/UI/AISettingsView+SpeechRecognition.swift
index 0ff94dc9..5585b4b9 100644
--- a/Sources/Fluid/UI/AISettingsView+SpeechRecognition.swift
+++ b/Sources/Fluid/UI/AISettingsView+SpeechRecognition.swift
@@ -758,7 +758,7 @@ extension VoiceEngineSettingsView {
} else {
Text(String(model.brandName.prefix(2)).uppercased())
.font(.system(size: 10, weight: .bold, design: .rounded))
- .foregroundStyle(.white)
+ .foregroundStyle(self.theme.palette.primaryText)
}
}
.frame(width: 28, height: 28)
diff --git a/Sources/Fluid/UI/SettingsView.swift b/Sources/Fluid/UI/SettingsView.swift
index baa8962d..edc439fd 100644
--- a/Sources/Fluid/UI/SettingsView.swift
+++ b/Sources/Fluid/UI/SettingsView.swift
@@ -1498,7 +1498,6 @@ struct SettingsView: View {
AnalyticsPrivacyView()
.frame(minWidth: 520, minHeight: 520)
.appTheme(self.theme)
- .preferredColorScheme(.dark)
}
.sheet(isPresented: self.analyticsConfirmationBinding) {
AnalyticsConfirmationView(
diff --git a/Sources/Fluid/UI/WelcomeView.swift b/Sources/Fluid/UI/WelcomeView.swift
index d1eb4be5..58e51387 100644
--- a/Sources/Fluid/UI/WelcomeView.swift
+++ b/Sources/Fluid/UI/WelcomeView.swift
@@ -621,14 +621,17 @@ struct OnboardingFlowView: View {
}
private enum Step: Int, CaseIterable {
- case voiceModel = 0
- case microphone = 1
- case accessibility = 2
- case aiEnhancement = 3
- case playground = 4
+ case landing = 0
+ case voiceModel = 1
+ case microphone = 2
+ case accessibility = 3
+ case aiEnhancement = 4
+ case playground = 5
var title: String {
switch self {
+ case .landing:
+ return "Welcome"
case .voiceModel:
return "Download Voice Model"
case .microphone:
@@ -644,6 +647,8 @@ struct OnboardingFlowView: View {
var subtitle: String {
switch self {
+ case .landing:
+ return "Talk anywhere. FluidVoice types for you."
case .voiceModel:
return CPUArchitecture.isAppleSilicon
? "Choose the best voice model for how you speak. Download it once to continue."
@@ -665,7 +670,7 @@ struct OnboardingFlowView: View {
}
private var progressValue: Double {
- Double(self.step.rawValue + 1) / Double(Step.allCases.count)
+ Double(self.step.rawValue) / Double(Step.allCases.count - 1)
}
private var recommendedOnboardingModel: SettingsStore.SpeechModel {
@@ -799,6 +804,8 @@ struct OnboardingFlowView: View {
private var canContinue: Bool {
switch self.step {
+ case .landing:
+ return true
case .voiceModel:
return self.isVoiceModelReady
case .microphone:
@@ -814,6 +821,8 @@ struct OnboardingFlowView: View {
private var primaryButtonTitle: String {
switch self.step {
+ case .landing:
+ return "Get Started"
case .playground:
return "Finish Setup"
default:
@@ -823,12 +832,17 @@ struct OnboardingFlowView: View {
var body: some View {
VStack(spacing: 0) {
- self.header
- Divider()
- self.stepContent
- .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
- Divider()
- self.footer
+ if self.step == .landing {
+ self.stepContent
+ .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .center)
+ } else {
+ self.header
+ Divider()
+ self.stepContent
+ .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
+ Divider()
+ self.footer
+ }
}
.background {
ZStack {
@@ -883,6 +897,8 @@ struct OnboardingFlowView: View {
@ViewBuilder
private var stepContent: some View {
switch self.step {
+ case .landing:
+ self.landingStep
case .voiceModel:
self.voiceModelStep
case .microphone:
@@ -896,6 +912,65 @@ struct OnboardingFlowView: View {
}
}
+ private var landingStep: some View {
+ ScrollView {
+ let landing = self.theme.metrics.onboardingSurface.landing
+ let tileWidth = (landing.contentWidth - (landing.tileSpacing * 2)) / 3
+ let tileColumns = Array(
+ repeating: GridItem(.fixed(tileWidth), spacing: landing.tileSpacing, alignment: .top),
+ count: 3
+ )
+
+ VStack(alignment: .leading, spacing: self.theme.metrics.onboardingSurface.landing.sectionSpacing) {
+ FluidOnboardingLandingHero(
+ eyebrow: "FluidVoice",
+ title: "Say it once. Use it anywhere.",
+ statement: "FluidVoice turns your speech into clean, ready-to-use text across your Mac, with local dictation first and optional AI polish when you want it.",
+ systemImage: "waveform.and.mic"
+ ) {
+ Button("Get Started") {
+ self.goNext()
+ }
+ .fluidOnboardingProminentButton(controlSize: .large)
+ .keyboardShortcut(.defaultAction)
+ }
+
+ LazyVGrid(
+ columns: tileColumns,
+ alignment: .leading,
+ spacing: self.theme.metrics.onboardingSurface.landing.tileSpacing
+ ) {
+ FluidOnboardingValueTile(
+ systemImage: "keyboard",
+ title: "Types where you work",
+ description: "Dictate into Notes, browsers, chat, docs, and editors."
+ )
+ FluidOnboardingValueTile(
+ systemImage: "lock",
+ title: "Local-first setup",
+ description: "Prepare a voice model once and keep core dictation on your Mac."
+ )
+ FluidOnboardingValueTile(
+ systemImage: "wand.and.stars",
+ title: "Cleaner drafts",
+ description: "Turn rough speech into polished text when enhancement is enabled."
+ )
+ }
+
+ FluidOnboardingChecklistPanel(title: "Setup takes a few minutes") {
+ FluidOnboardingChecklistRow(systemImage: "cpu", text: "Choose and prepare a voice model")
+ FluidOnboardingChecklistRow(systemImage: "mic", text: "Allow microphone access")
+ FluidOnboardingChecklistRow(systemImage: "keyboard.badge.eye", text: "Allow FluidVoice to type into apps")
+ FluidOnboardingChecklistRow(systemImage: "text.bubble", text: "Run one quick test")
+ }
+ }
+ .frame(width: landing.contentWidth, alignment: .leading)
+ .frame(maxWidth: .infinity)
+ .padding(24)
+ }
+ .defaultScrollAnchor(.center)
+ }
+
private var voiceModelStep: some View {
ScrollView {
VStack(alignment: .leading, spacing: 16) {
diff --git a/Sources/Fluid/Views/CommandModeView.swift b/Sources/Fluid/Views/CommandModeView.swift
index 1423d658..39b40c4e 100644
--- a/Sources/Fluid/Views/CommandModeView.swift
+++ b/Sources/Fluid/Views/CommandModeView.swift
@@ -545,10 +545,10 @@ struct CommandModeView: View {
Image(systemName: "arrow.up")
.font(.system(size: 18, weight: .semibold))
.frame(width: 34, height: 34)
- .foregroundStyle(self.canSubmitCommand ? Color.black : .secondary)
+ .foregroundStyle(self.canSubmitCommand ? Color.white : .secondary)
.background(
Circle()
- .fill(self.canSubmitCommand ? Color.white.opacity(0.86) : self.theme.palette.cardBackground)
+ .fill(self.canSubmitCommand ? self.theme.palette.accent : self.theme.palette.cardBackground)
)
}
.buttonStyle(.plain)
diff --git a/Sources/Fluid/fluidApp.swift b/Sources/Fluid/fluidApp.swift
index 5665adb3..4d94cbfc 100644
--- a/Sources/Fluid/fluidApp.swift
+++ b/Sources/Fluid/fluidApp.swift
@@ -23,11 +23,11 @@ struct FluidApp: App {
var body: some Scene {
WindowGroup(id: "main") {
- ContentView()
- .environmentObject(self.menuBarManager)
- .environmentObject(self.appServices)
- .appTheme(AppTheme.dark(accent: self.settings.accentColor))
- .preferredColorScheme(.dark)
+ AdaptiveAppTheme(accent: self.settings.accentColor) {
+ ContentView()
+ .environmentObject(self.menuBarManager)
+ .environmentObject(self.appServices)
+ }
}
.defaultSize(width: 1000, height: 700)
.commands {