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: consolidate UI theming across all views

altic-dev9271b2a0fd9c
diff --git a/Sources/Fluid/ContentView.swift b/Sources/Fluid/ContentView.swift
index 13d8dcec..47940779 100644
--- a/Sources/Fluid/ContentView.swift
+++ b/Sources/Fluid/ContentView.swift
@@ -739,10 +739,12 @@ struct ContentView: View {
private var detailView: some View {
ZStack {
self.theme.palette.windowBackground
+ .opacity(0.98)
.ignoresSafeArea()
Rectangle()
.fill(self.theme.materials.window)
+ .opacity(0.75)
.ignoresSafeArea()
self.detailContent
diff --git a/Sources/Fluid/Theme/AppTheme.swift b/Sources/Fluid/Theme/AppTheme.swift
index 1f3c9e8c..2a6e2a02 100644
--- a/Sources/Fluid/Theme/AppTheme.swift
+++ b/Sources/Fluid/Theme/AppTheme.swift
@@ -87,14 +87,15 @@ struct AppTheme {
static func dark(accent: Color) -> AppTheme {
AppTheme(
palette: Palette(
- windowBackground: Color(red: 0.08, green: 0.08, blue: 0.08),
- contentBackground: Color(red: 0.10, green: 0.10, blue: 0.10),
+ windowBackground: Color(red: 0.07, green: 0.07, blue: 0.07),
+ contentBackground: Color(red: 0.09, green: 0.09, blue: 0.09),
sidebarBackground: Color(red: 0.06, green: 0.06, blue: 0.06),
- cardBackground: Color(red: 0.12, green: 0.12, blue: 0.12),
- elevatedCardBackground: Color(red: 0.14, green: 0.14, blue: 0.14),
- toolbarBackground: Color(red: 0.09, green: 0.09, blue: 0.09),
- cardBorder: Color(nsColor: .separatorColor).opacity(0.25),
- separator: Color(nsColor: .separatorColor).opacity(0.4),
+ cardBackground: Color(red: 0.08, green: 0.08, blue: 0.08),
+ elevatedCardBackground: Color(red: 0.11, green: 0.11, blue: 0.11),
+ toolbarBackground: Color(red: 0.06, green: 0.06, blue: 0.06),
+
+ cardBorder: Color.white.opacity(0.10),
+ separator: Color.white.opacity(0.16),
primaryText: Color(nsColor: .labelColor),
secondaryText: Color(nsColor: .secondaryLabelColor),
tertiaryText: Color(nsColor: .tertiaryLabelColor),
diff --git a/Sources/Fluid/UI/AISettingsComponents.swift b/Sources/Fluid/UI/AISettingsComponents.swift
index 5e420a4d..953c7f8f 100644
--- a/Sources/Fluid/UI/AISettingsComponents.swift
+++ b/Sources/Fluid/UI/AISettingsComponents.swift
@@ -50,6 +50,7 @@ struct LiquidLayer: Shape {
/// A vertical liquid-filled bar with animated fill level
struct LiquidBar: View {
+ @Environment(\.theme) private var theme
let fillPercent: Double
let color: Color
let secondaryColor: Color
@@ -75,12 +76,15 @@ struct LiquidBar: View {
ZStack(alignment: .bottom) {
// Background (Empty glass interior)
Capsule()
- .fill(Color.black.opacity(0.35))
+ .fill(self.theme.palette.cardBackground.opacity(0.9))
.overlay(
Capsule()
.strokeBorder(
LinearGradient(
- colors: [.white.opacity(0.25), .white.opacity(0.05)],
+ colors: [
+ self.theme.palette.cardBorder.opacity(0.55),
+ self.theme.palette.cardBorder.opacity(0.25),
+ ],
startPoint: .topLeading,
endPoint: .bottomTrailing
),
diff --git a/Sources/Fluid/UI/AISettingsView+AdvancedSettings.swift b/Sources/Fluid/UI/AISettingsView+AdvancedSettings.swift
index 91c9a0a1..ca1356c5 100644
--- a/Sources/Fluid/UI/AISettingsView+AdvancedSettings.swift
+++ b/Sources/Fluid/UI/AISettingsView+AdvancedSettings.swift
@@ -188,10 +188,10 @@ extension AISettingsView {
.padding(12)
.background(
RoundedRectangle(cornerRadius: 12, style: .continuous)
- .fill(.ultraThinMaterial.opacity(0.25))
+ .fill(self.theme.palette.cardBackground.opacity(0.7))
.overlay(
RoundedRectangle(cornerRadius: 12, style: .continuous)
- .stroke(isSelected ? self.theme.palette.accent.opacity(0.55) : .white.opacity(0.12), lineWidth: 1)
+ .stroke(isSelected ? self.theme.palette.accent.opacity(0.55) : self.theme.palette.cardBorder.opacity(0.35), lineWidth: 1)
)
)
}
@@ -241,10 +241,10 @@ extension AISettingsView {
.frame(minHeight: 180)
.background(
RoundedRectangle(cornerRadius: 8, style: .continuous)
- .fill(.ultraThinMaterial.opacity(0.25))
+ .fill(self.theme.palette.contentBackground.opacity(0.7))
.overlay(
RoundedRectangle(cornerRadius: 8, style: .continuous)
- .stroke(.white.opacity(0.12), lineWidth: 1)
+ .stroke(self.theme.palette.cardBorder.opacity(0.35), lineWidth: 1)
)
)
.onChange(of: self.draftPromptText) { _, newValue in
@@ -325,10 +325,10 @@ extension AISettingsView {
.scrollContentBackground(.hidden)
.background(
RoundedRectangle(cornerRadius: 8, style: .continuous)
- .fill(.ultraThinMaterial.opacity(0.25))
+ .fill(self.theme.palette.contentBackground.opacity(0.7))
.overlay(
RoundedRectangle(cornerRadius: 8, style: .continuous)
- .stroke(.white.opacity(0.12), lineWidth: 1)
+ .stroke(self.theme.palette.cardBorder.opacity(0.35), lineWidth: 1)
)
)
}
@@ -346,10 +346,10 @@ extension AISettingsView {
.scrollContentBackground(.hidden)
.background(
RoundedRectangle(cornerRadius: 8, style: .continuous)
- .fill(.ultraThinMaterial.opacity(0.25))
+ .fill(self.theme.palette.contentBackground.opacity(0.7))
.overlay(
RoundedRectangle(cornerRadius: 8, style: .continuous)
- .stroke(.white.opacity(0.12), lineWidth: 1)
+ .stroke(self.theme.palette.cardBorder.opacity(0.35), lineWidth: 1)
)
)
}
@@ -361,7 +361,7 @@ extension AISettingsView {
.fill(self.theme.palette.accent.opacity(0.06))
.overlay(
RoundedRectangle(cornerRadius: 12, style: .continuous)
- .stroke(.white.opacity(0.10), lineWidth: 1)
+ .stroke(self.theme.palette.cardBorder.opacity(0.5), lineWidth: 1)
)
)
diff --git a/Sources/Fluid/UI/AISettingsView+SpeechRecognition.swift b/Sources/Fluid/UI/AISettingsView+SpeechRecognition.swift
index 072194fa..7b034454 100644
--- a/Sources/Fluid/UI/AISettingsView+SpeechRecognition.swift
+++ b/Sources/Fluid/UI/AISettingsView+SpeechRecognition.swift
@@ -32,11 +32,12 @@ extension AISettingsView {
.padding(12)
.background(
RoundedRectangle(cornerRadius: 12)
- .fill(.white.opacity(0.04))
+ .fill(self.theme.palette.contentBackground.opacity(0.6))
.overlay(
RoundedRectangle(cornerRadius: 12)
- .stroke(.white.opacity(0.08), lineWidth: 1)
+ .stroke(self.theme.palette.cardBorder.opacity(0.3), lineWidth: 1)
)
+ .shadow(color: self.theme.metrics.cardShadow.color.opacity(self.theme.metrics.cardShadow.opacity), radius: self.theme.metrics.cardShadow.radius, x: self.theme.metrics.cardShadow.x, y: self.theme.metrics.cardShadow.y)
)
HStack(spacing: 6) {
@@ -66,10 +67,10 @@ extension AISettingsView {
.padding(.vertical, 6)
.background(
RoundedRectangle(cornerRadius: 9)
- .fill(.white.opacity(0.08))
+ .fill(self.theme.palette.cardBackground.opacity(0.8))
.overlay(
RoundedRectangle(cornerRadius: 9)
- .stroke(.white.opacity(0.12), lineWidth: 1)
+ .stroke(self.theme.palette.cardBorder.opacity(0.5), lineWidth: 1)
)
)
}
@@ -90,10 +91,10 @@ extension AISettingsView {
.padding(.vertical, 6)
.background(
RoundedRectangle(cornerRadius: 9)
- .fill(.white.opacity(0.08))
+ .fill(self.theme.palette.cardBackground.opacity(0.8))
.overlay(
RoundedRectangle(cornerRadius: 9)
- .stroke(.white.opacity(0.12), lineWidth: 1)
+ .stroke(self.theme.palette.cardBorder.opacity(0.5), lineWidth: 1)
)
)
}
@@ -126,11 +127,12 @@ extension AISettingsView {
.padding(12)
.background(
RoundedRectangle(cornerRadius: 12)
- .fill(.white.opacity(0.04))
+ .fill(self.theme.palette.cardBackground.opacity(0.9))
.overlay(
RoundedRectangle(cornerRadius: 12)
- .stroke(.white.opacity(0.08), lineWidth: 1)
+ .stroke(self.theme.palette.cardBorder.opacity(0.3), lineWidth: 1)
)
+ .shadow(color: self.theme.metrics.cardShadow.color.opacity(self.theme.metrics.cardShadow.opacity), radius: self.theme.metrics.cardShadow.radius, x: self.theme.metrics.cardShadow.x, y: self.theme.metrics.cardShadow.y)
)
Divider().padding(.vertical, 4)
@@ -270,11 +272,11 @@ extension AISettingsView {
return HStack(alignment: .top, spacing: 10) {
// Selection indicator
Circle()
- .fill(isSelected ? Color.fluidGreen : .white.opacity(0.1))
+ .fill(isSelected ? Color.fluidGreen : self.theme.palette.cardBorder.opacity(0.25))
.frame(width: 8, height: 8)
.overlay(
Circle()
- .stroke(isSelected ? Color.fluidGreen : .white.opacity(0.3), lineWidth: 1)
+ .stroke(isSelected ? Color.fluidGreen : self.theme.palette.cardBorder.opacity(0.5), lineWidth: 1)
)
// Brand logo/badge - fixed size container for consistency
@@ -422,10 +424,10 @@ extension AISettingsView {
.animation(.easeInOut(duration: 0.2), value: isSelected)
.background(
RoundedRectangle(cornerRadius: 8)
- .fill(isSelected ? .white.opacity(0.05) : .clear)
+ .fill(isSelected ? self.theme.palette.cardBackground.opacity(0.8) : .clear)
.overlay(
RoundedRectangle(cornerRadius: 8)
- .stroke(isSelected ? .white.opacity(0.25) : .white.opacity(0.05), lineWidth: 1)
+ .stroke(isSelected ? self.theme.palette.cardBorder.opacity(0.6) : self.theme.palette.cardBorder.opacity(0.25), lineWidth: 1)
)
.overlay(
RoundedRectangle(cornerRadius: 8)
@@ -592,8 +594,8 @@ extension AISettingsView {
.padding(.horizontal, 12)
.padding(.vertical, 8)
.background(RoundedRectangle(cornerRadius: 8)
- .fill(.ultraThinMaterial.opacity(0.3))
- .overlay(RoundedRectangle(cornerRadius: 8).stroke(.white.opacity(0.1), lineWidth: 1)))
+ .fill(self.theme.palette.cardBackground.opacity(0.8))
+ .overlay(RoundedRectangle(cornerRadius: 8).stroke(self.theme.palette.cardBorder.opacity(0.5), lineWidth: 1)))
}
var fillerWordsSection: some View {
diff --git a/Sources/Fluid/UI/AnalyticsPrivacyView.swift b/Sources/Fluid/UI/AnalyticsPrivacyView.swift
index 63b2a86d..5bfc930e 100644
--- a/Sources/Fluid/UI/AnalyticsPrivacyView.swift
+++ b/Sources/Fluid/UI/AnalyticsPrivacyView.swift
@@ -53,7 +53,7 @@ struct AnalyticsPrivacyView: View {
}
.padding(16)
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
- .background(self.theme.palette.cardBackground.opacity(0.2))
+ .background(self.theme.palette.contentBackground)
}
private var contactInfoView: some View {
@@ -63,11 +63,11 @@ struct AnalyticsPrivacyView: View {
.padding(12)
.background(
RoundedRectangle(cornerRadius: 8)
- .fill(.ultraThinMaterial)
+ .fill(self.theme.palette.cardBackground)
)
.overlay(
RoundedRectangle(cornerRadius: 8)
- .stroke(self.theme.palette.accent.opacity(0.3), lineWidth: 1)
+ .stroke(self.theme.palette.cardBorder.opacity(0.6), lineWidth: 1)
)
}
diff --git a/Sources/Fluid/UI/CustomDictionaryView.swift b/Sources/Fluid/UI/CustomDictionaryView.swift
index bf0783c9..693740d9 100644
--- a/Sources/Fluid/UI/CustomDictionaryView.swift
+++ b/Sources/Fluid/UI/CustomDictionaryView.swift
@@ -481,7 +481,14 @@ struct AddDictionaryEntrySheet: View {
}
.padding(10)
.frame(maxWidth: .infinity, alignment: .leading)
- .background(RoundedRectangle(cornerRadius: 8).fill(.ultraThinMaterial))
+ .background(
+ RoundedRectangle(cornerRadius: 8, style: .continuous)
+ .fill(self.theme.palette.cardBackground)
+ .overlay(
+ RoundedRectangle(cornerRadius: 8, style: .continuous)
+ .stroke(self.theme.palette.cardBorder.opacity(0.5), lineWidth: 1)
+ )
+ )
}
// Save button
@@ -624,7 +631,14 @@ struct EditDictionaryEntrySheet: View {
}
.padding(10)
.frame(maxWidth: .infinity, alignment: .leading)
- .background(RoundedRectangle(cornerRadius: 8).fill(.ultraThinMaterial))
+ .background(
+ RoundedRectangle(cornerRadius: 8, style: .continuous)
+ .fill(self.theme.palette.cardBackground)
+ .overlay(
+ RoundedRectangle(cornerRadius: 8, style: .continuous)
+ .stroke(self.theme.palette.cardBorder.opacity(0.5), lineWidth: 1)
+ )
+ )
}
// Save button
diff --git a/Sources/Fluid/UI/FeedbackView.swift b/Sources/Fluid/UI/FeedbackView.swift
index c66f2c60..1aada099 100644
--- a/Sources/Fluid/UI/FeedbackView.swift
+++ b/Sources/Fluid/UI/FeedbackView.swift
@@ -133,9 +133,9 @@ struct FeedbackView: View {
.frame(height: 120)
.padding(12)
.background(RoundedRectangle(cornerRadius: 8)
- .fill(Color(nsColor: NSColor.textBackgroundColor))
+ .fill(self.theme.palette.contentBackground)
.overlay(RoundedRectangle(cornerRadius: 8)
- .strokeBorder(Color(nsColor: NSColor.separatorColor), lineWidth: 1.5)))
+ .strokeBorder(self.theme.palette.cardBorder.opacity(0.45), lineWidth: 1.2)))
.scrollContentBackground(.hidden)
.overlay(
Group {
diff --git a/Sources/Fluid/UI/MeetingTranscriptionView.swift b/Sources/Fluid/UI/MeetingTranscriptionView.swift
index 487838b1..90e7a6e3 100644
--- a/Sources/Fluid/UI/MeetingTranscriptionView.swift
+++ b/Sources/Fluid/UI/MeetingTranscriptionView.swift
@@ -5,6 +5,7 @@ struct MeetingTranscriptionView: View {
let asrService: ASRService
@StateObject private var transcriptionService: MeetingTranscriptionService
@State private var selectedFileURL: URL?
+ @Environment(\.theme) private var theme
init(asrService: ASRService) {
self.asrService = asrService
@@ -72,7 +73,7 @@ struct MeetingTranscriptionView: View {
}
}
.frame(maxWidth: .infinity, maxHeight: .infinity)
- .background(Color(nsColor: .windowBackgroundColor))
+ .background(self.theme.palette.windowBackground)
.overlay(alignment: .topTrailing) {
if self.showingCopyConfirmation {
Text("Copied!")
@@ -120,8 +121,14 @@ struct MeetingTranscriptionView: View {
.buttonStyle(.plain)
}
.padding()
- .background(Color(nsColor: .controlBackgroundColor))
- .cornerRadius(8)
+ .background(
+ RoundedRectangle(cornerRadius: 8, style: .continuous)
+ .fill(self.theme.palette.cardBackground)
+ .overlay(
+ RoundedRectangle(cornerRadius: 8, style: .continuous)
+ .stroke(self.theme.palette.cardBorder.opacity(0.5), lineWidth: 1)
+ )
+ )
// Transcribe Button
Button(action: {
@@ -159,8 +166,14 @@ struct MeetingTranscriptionView: View {
.padding(32)
}
.buttonStyle(.plain)
- .background(Color(nsColor: .controlBackgroundColor))
- .cornerRadius(12)
+ .background(
+ RoundedRectangle(cornerRadius: 12, style: .continuous)
+ .fill(self.theme.palette.cardBackground)
+ .overlay(
+ RoundedRectangle(cornerRadius: 12, style: .continuous)
+ .stroke(self.theme.palette.cardBorder.opacity(0.45), lineWidth: 1)
+ )
+ )
.overlay(RoundedRectangle(cornerRadius: 12)
.strokeBorder(style: StrokeStyle(lineWidth: 2, dash: [8]))
.foregroundColor(Color.fluidGreen.opacity(0.3)))
@@ -207,8 +220,14 @@ struct MeetingTranscriptionView: View {
}
}
.padding()
- .background(Color(nsColor: .controlBackgroundColor))
- .cornerRadius(12)
+ .background(
+ RoundedRectangle(cornerRadius: 12, style: .continuous)
+ .fill(self.theme.palette.cardBackground)
+ .overlay(
+ RoundedRectangle(cornerRadius: 12, style: .continuous)
+ .stroke(self.theme.palette.cardBorder.opacity(0.45), lineWidth: 1)
+ )
+ )
}
// MARK: - Results Card
@@ -265,12 +284,24 @@ struct MeetingTranscriptionView: View {
.padding()
}
.frame(maxHeight: 300)
- .background(Color(nsColor: .textBackgroundColor))
- .cornerRadius(8)
+ .background(
+ RoundedRectangle(cornerRadius: 8, style: .continuous)
+ .fill(self.theme.palette.contentBackground)
+ .overlay(
+ RoundedRectangle(cornerRadius: 8, style: .continuous)
+ .stroke(self.theme.palette.cardBorder.opacity(0.45), lineWidth: 1)
+ )
+ )
}
.padding()
- .background(Color(nsColor: .controlBackgroundColor))
- .cornerRadius(12)
+ .background(
+ RoundedRectangle(cornerRadius: 12, style: .continuous)
+ .fill(self.theme.palette.cardBackground)
+ .overlay(
+ RoundedRectangle(cornerRadius: 12, style: .continuous)
+ .stroke(self.theme.palette.cardBorder.opacity(0.45), lineWidth: 1)
+ )
+ )
.fileExporter(
isPresented: self.$showingExportDialog,
document: TranscriptionDocument(
@@ -308,8 +339,14 @@ struct MeetingTranscriptionView: View {
.buttonStyle(.borderless)
}
.padding()
- .background(Color.red.opacity(0.1))
- .cornerRadius(12)
+ .background(
+ RoundedRectangle(cornerRadius: 12, style: .continuous)
+ .fill(Color.red.opacity(0.12))
+ .overlay(
+ RoundedRectangle(cornerRadius: 12, style: .continuous)
+ .stroke(Color.red.opacity(0.4), lineWidth: 1)
+ )
+ )
}
// MARK: - Helper Functions
diff --git a/Sources/Fluid/UI/SearchableModelPicker.swift b/Sources/Fluid/UI/SearchableModelPicker.swift
index 2b59d638..3080232f 100644
--- a/Sources/Fluid/UI/SearchableModelPicker.swift
+++ b/Sources/Fluid/UI/SearchableModelPicker.swift
@@ -9,6 +9,7 @@
import SwiftUI
struct SearchableModelPicker: View {
+ @Environment(\.theme) private var theme
let models: [String]
@Binding var selectedModel: String
var onRefresh: (() async -> Void)?
@@ -40,8 +41,14 @@ struct SearchableModelPicker: View {
.frame(width: 180, alignment: .leading)
.padding(.horizontal, 8)
.padding(.vertical, 5)
- .background(Color(nsColor: .controlBackgroundColor))
- .cornerRadius(6)
+ .background(
+ RoundedRectangle(cornerRadius: 6, style: .continuous)
+ .fill(self.theme.palette.cardBackground)
+ .overlay(
+ RoundedRectangle(cornerRadius: 6, style: .continuous)
+ .stroke(self.theme.palette.cardBorder.opacity(0.35), lineWidth: 1)
+ )
+ )
}
.buttonStyle(.plain)
.popover(isPresented: self.$isShowingPopover, arrowEdge: .bottom) {
@@ -54,7 +61,14 @@ struct SearchableModelPicker: View {
.textFieldStyle(.plain)
}
.padding(8)
- .background(Color(nsColor: .textBackgroundColor))
+ .background(
+ RoundedRectangle(cornerRadius: 6, style: .continuous)
+ .fill(self.theme.palette.contentBackground)
+ .overlay(
+ RoundedRectangle(cornerRadius: 6, style: .continuous)
+ .stroke(self.theme.palette.cardBorder.opacity(0.3), lineWidth: 1)
+ )
+ )
Divider()
@@ -93,7 +107,7 @@ struct SearchableModelPicker: View {
Spacer()
if model == self.selectedModel {
Image(systemName: "checkmark")
- .foregroundStyle(.blue)
+ .foregroundStyle(self.theme.palette.accent)
}
}
.padding(.horizontal, 10)
@@ -101,7 +115,7 @@ struct SearchableModelPicker: View {
.contentShape(Rectangle())
}
.buttonStyle(.plain)
- .background(model == self.selectedModel ? Color.blue.opacity(0.1) : Color.clear)
+ .background(model == self.selectedModel ? self.theme.palette.accent.opacity(0.15) : Color.clear)
}
}
}
diff --git a/Sources/Fluid/UI/SearchableProviderPicker.swift b/Sources/Fluid/UI/SearchableProviderPicker.swift
index 4b9b4f79..f1485762 100644
--- a/Sources/Fluid/UI/SearchableProviderPicker.swift
+++ b/Sources/Fluid/UI/SearchableProviderPicker.swift
@@ -9,6 +9,7 @@
import SwiftUI
struct SearchableProviderPicker: View {
+ @Environment(\.theme) private var theme
let builtInProviders: [(id: String, name: String)]
let savedProviders: [SettingsStore.SavedProvider]
@Binding var selectedProviderID: String
@@ -62,8 +63,14 @@ struct SearchableProviderPicker: View {
.frame(width: 180, alignment: .leading)
.padding(.horizontal, 8)
.padding(.vertical, 5)
- .background(Color(nsColor: .controlBackgroundColor))
- .cornerRadius(6)
+ .background(
+ RoundedRectangle(cornerRadius: 6, style: .continuous)
+ .fill(self.theme.palette.cardBackground)
+ .overlay(
+ RoundedRectangle(cornerRadius: 6, style: .continuous)
+ .stroke(self.theme.palette.cardBorder.opacity(0.35), lineWidth: 1)
+ )
+ )
}
.buttonStyle(.plain)
.popover(isPresented: self.$isShowingPopover, arrowEdge: .bottom) {
@@ -76,7 +83,14 @@ struct SearchableProviderPicker: View {
.textFieldStyle(.plain)
}
.padding(8)
- .background(Color(nsColor: .textBackgroundColor))
+ .background(
+ RoundedRectangle(cornerRadius: 6, style: .continuous)
+ .fill(self.theme.palette.contentBackground)
+ .overlay(
+ RoundedRectangle(cornerRadius: 6, style: .continuous)
+ .stroke(self.theme.palette.cardBorder.opacity(0.3), lineWidth: 1)
+ )
+ )
Divider()
@@ -146,7 +160,7 @@ struct SearchableProviderPicker: View {
Spacer()
if provider.id == self.selectedProviderID {
Image(systemName: "checkmark")
- .foregroundStyle(.blue)
+ .foregroundStyle(self.theme.palette.accent)
}
}
.padding(.horizontal, 10)
@@ -154,7 +168,7 @@ struct SearchableProviderPicker: View {
.contentShape(Rectangle())
}
.buttonStyle(.plain)
- .background(provider.id == self.selectedProviderID ? Color.blue.opacity(0.1) : Color.clear)
+ .background(provider.id == self.selectedProviderID ? self.theme.palette.accent.opacity(0.15) : Color.clear)
}
}
diff --git a/Sources/Fluid/UI/SettingsView.swift b/Sources/Fluid/UI/SettingsView.swift
index 9e6b95fe..99e66594 100644
--- a/Sources/Fluid/UI/SettingsView.swift
+++ b/Sources/Fluid/UI/SettingsView.swift
@@ -105,7 +105,7 @@ struct SettingsView: View {
.font(.headline)
.foregroundStyle(.primary)
- VStack(spacing: 0) {
+ VStack(spacing: 16) {
// Launch at startup
self.settingsToggleRow(
title: "Launch at startup",
@@ -116,8 +116,7 @@ struct SettingsView: View {
set: { SettingsStore.shared.launchAtStartup = $0 }
)
)
-
- Divider().padding(.vertical, 10)
+ Divider().opacity(0.2)
// Show in Dock
self.settingsToggleRow(
@@ -129,8 +128,7 @@ struct SettingsView: View {
set: { SettingsStore.shared.showInDock = $0 }
)
)
-
- Divider().padding(.vertical, 10)
+ Divider().opacity(0.2)
// Accent Color
VStack(alignment: .leading, spacing: 6) {
@@ -145,22 +143,42 @@ struct SettingsView: View {
Spacer()
- Picker("", selection: Binding(
- get: { self.settings.accentColorOption },
- set: { self.settings.accentColorOption = $0 }
- )) {
+ HStack(spacing: 10) {
ForEach(SettingsStore.AccentColorOption.allCases) { option in
- Text(option.rawValue)
- .tag(option)
+ let isSelected = self.settings.accentColorOption == option
+ Button {
+ self.settings.accentColorOption = option
+ } label: {
+ Circle()
+ .fill(Color(hex: option.hex) ?? .gray)
+ .frame(width: 16, height: 16)
+ .overlay(
+ Circle()
+ .stroke(
+ isSelected ? self.theme.palette.accent : self.theme.palette.cardBorder.opacity(0.5),
+ lineWidth: isSelected ? 2 : 1
+ )
+ )
+ .padding(4)
+ }
+ .buttonStyle(.plain)
+ .accessibilityLabel(option.rawValue)
+ .help(option.rawValue)
}
}
- .pickerStyle(.segmented)
- .tint(self.theme.palette.accent)
- .frame(maxWidth: 320)
+ .padding(.horizontal, 6)
+ .padding(.vertical, 4)
+ .background(
+ RoundedRectangle(cornerRadius: 8, style: .continuous)
+ .fill(self.theme.palette.contentBackground)
+ .overlay(
+ RoundedRectangle(cornerRadius: 8, style: .continuous)
+ .stroke(self.theme.palette.cardBorder.opacity(0.4), lineWidth: 1)
+ )
+ )
}
}
-
- Divider().padding(.vertical, 10)
+ Divider().opacity(0.2)
// Automatic Updates
VStack(alignment: .leading, spacing: 6) {
@@ -302,50 +320,54 @@ struct SettingsView: View {
// Global Hotkey Card
ThemedCard(style: .standard) {
VStack(alignment: .leading, spacing: 14) {
- Label("Global Hotkey", systemImage: "keyboard")
- .font(.headline)
- .foregroundStyle(.primary)
+ HStack(spacing: 8) {
+ Label("Global Hotkey", systemImage: "keyboard")
+ .font(.headline)
+ .foregroundStyle(.primary)
+
+ Spacer()
+
+ if self.accessibilityEnabled {
+ if self.isRecordingShortcut || self.isRecordingCommandModeShortcut || self.isRecordingRewriteShortcut {
+ Text("Recording…")
+ .font(.caption.weight(.semibold))
+ .foregroundStyle(.orange)
+ } else if self.hotkeyManagerInitialized {
+ HStack(spacing: 6) {
+ Image(systemName: "checkmark.circle.fill")
+ .foregroundStyle(Color.fluidGreen)
+ .font(.caption)
+ Text("Active")
+ .font(.caption.weight(.semibold))
+ .foregroundStyle(.secondary)
+ }
+ } else {
+ Text("Initializing…")
+ .font(.caption.weight(.semibold))
+ .foregroundStyle(.secondary)
+ }
+ }
+ }
if self.accessibilityEnabled {
VStack(alignment: .leading, spacing: 12) {
- // Status indicator
- HStack(spacing: 8) {
- if self.isRecordingShortcut || self.isRecordingCommandModeShortcut || self.isRecordingRewriteShortcut {
+ if self.isRecordingShortcut || self.isRecordingCommandModeShortcut || self.isRecordingRewriteShortcut {
+ HStack(spacing: 8) {
Image(systemName: "hand.point.up.left.fill")
.foregroundStyle(.orange)
- Text("Press your new hotkey combination now...")
- .font(.subheadline)
+ Text("Press your new hotkey combination now…")
+ .font(.caption)
.foregroundStyle(.orange)
- } else if self.hotkeyManagerInitialized {
- Image(systemName: "checkmark.circle.fill")
- .foregroundStyle(Color.fluidGreen)
- Text("Global Shortcuts Active")
- .font(.subheadline.weight(.medium))
-
- Spacer()
- } else {
+ }
+ } else if !self.hotkeyManagerInitialized {
+ HStack(spacing: 8) {
ProgressView()
.controlSize(.small)
- VStack(alignment: .leading, spacing: 2) {
- Text("Hotkey Initializing...")
- .font(.subheadline.weight(.medium))
- .foregroundStyle(.orange)
- Text("Please wait while the global hotkey system starts up")
- .font(.caption)
- .foregroundStyle(.secondary)
- }
+ Text("Hotkey initializing…")
+ .font(.caption)
+ .foregroundStyle(.secondary)
}
}
- .padding(10)
- .frame(maxWidth: .infinity, alignment: .leading)
- .background(
- RoundedRectangle(cornerRadius: 8, style: .continuous)
- .fill(.ultraThinMaterial.opacity(0.5))
- .overlay(
- RoundedRectangle(cornerRadius: 8, style: .continuous)
- .stroke(.white.opacity(0.1), lineWidth: 1)
- )
- )
// MARK: - Shortcuts Section
@@ -366,8 +388,7 @@ struct SettingsView: View {
self.isRecordingShortcut = true
}
)
-
- Divider()
+ Divider().opacity(0.2).padding(.vertical, 4)
self.shortcutRow(
icon: "terminal.fill",
@@ -382,8 +403,7 @@ struct SettingsView: View {
self.isRecordingCommandModeShortcut = true
}
)
-
- Divider()
+ Divider().opacity(0.2).padding(.vertical, 4)
self.shortcutRow(
icon: "pencil.and.outline",
@@ -402,16 +422,16 @@ struct SettingsView: View {
.padding(12)
.background(
RoundedRectangle(cornerRadius: 8, style: .continuous)
- .fill(.ultraThinMaterial.opacity(0.5))
+ .fill(self.theme.palette.elevatedCardBackground)
.overlay(
RoundedRectangle(cornerRadius: 8, style: .continuous)
- .stroke(.white.opacity(0.08), lineWidth: 1)
+ .stroke(self.theme.palette.cardBorder.opacity(0.45), lineWidth: 1)
)
)
// MARK: - Options Section
- VStack(spacing: 0) {
+ VStack(spacing: 12) {
self.optionToggleRow(
title: "Press and Hold Mode",
description: "The shortcut only records while you hold it down, giving you quick push-to-talk style control.",
@@ -421,8 +441,7 @@ struct SettingsView: View {
SettingsStore.shared.pressAndHoldMode = newValue
self.hotkeyManager?.enablePressAndHoldMode(newValue)
}
-
- Divider().padding(.vertical, 8)
+ Divider().opacity(0.2)
self.optionToggleRow(
title: "Show Live Preview",
@@ -432,8 +451,7 @@ struct SettingsView: View {
.onChange(of: self.enableStreamingPreview) { _, newValue in
SettingsStore.shared.enableStreamingPreview = newValue
}
-
- Divider().padding(.vertical, 8)
+ Divider().opacity(0.2)
self.optionToggleRow(
title: "Copy to Clipboard",
@@ -443,8 +461,7 @@ struct SettingsView: View {
.onChange(of: self.copyToClipboard) { _, newValue in
SettingsStore.shared.copyTranscriptionToClipboard = newValue
}
-
- Divider().padding(.vertical, 8)
+ Divider().opacity(0.2)
self.optionToggleRow(
title: "Save Transcription History",
@@ -454,8 +471,7 @@ struct SettingsView: View {
set: { SettingsStore.shared.saveTranscriptionHistory = $0 }
)
)
-
- Divider().padding(.vertical, 8)
+ Divider().opacity(0.2)
self.optionToggleRow(
title: "GAAV Mode",
@@ -465,8 +481,7 @@ struct SettingsView: View {
set: { SettingsStore.shared.gaavModeEnabled = $0 }
)
)
-
- Divider().padding(.vertical, 8)
+ Divider().opacity(0.2)
self.optionToggleRow(
title: "Pause Media During Transcription",
@@ -476,8 +491,7 @@ struct SettingsView: View {
set: { SettingsStore.shared.pauseMediaDuringTranscription = $0 }
)
)
-
- Divider().padding(.vertical, 8)
+ Divider().opacity(0.2)
self.optionToggleRow(
title: "Share Anonymous Analytics",
@@ -496,10 +510,6 @@ struct SettingsView: View {
.padding(.top, 6)
}
.padding(12)
- .background(RoundedRectangle(cornerRadius: 8, style: .continuous)
- .fill(.ultraThinMaterial.opacity(0.5))
- .overlay(RoundedRectangle(cornerRadius: 8, style: .continuous)
- .stroke(.white.opacity(0.08), lineWidth: 1)))
}
} else {
// Hotkey disabled - accessibility not enabled
@@ -1321,11 +1331,11 @@ struct AnalyticsConfirmationView: View {
.padding(12)
.background(
RoundedRectangle(cornerRadius: 8)
- .fill(.ultraThinMaterial)
+ .fill(self.theme.palette.cardBackground)
)
.overlay(
RoundedRectangle(cornerRadius: 8)
- .stroke(self.theme.palette.accent.opacity(0.3), lineWidth: 1)
+ .stroke(self.theme.palette.cardBorder.opacity(0.6), lineWidth: 1)
)
Text(self.contactInfoText)
diff --git a/Sources/Fluid/UI/StatsView.swift b/Sources/Fluid/UI/StatsView.swift
index fd825123..0fc4b6cb 100644
--- a/Sources/Fluid/UI/StatsView.swift
+++ b/Sources/Fluid/UI/StatsView.swift
@@ -176,129 +176,123 @@ struct StatsView: View {
// MARK: - Activity Chart Card
private var activityChartCard: some View {
- VStack(alignment: .leading, spacing: 12) {
- HStack {
- Label("ACTIVITY", systemImage: "chart.bar.fill")
- .font(.system(size: 11, weight: .semibold))
- .foregroundStyle(.secondary)
+ ThemedCard(style: .standard, padding: 16, hoverEffect: false) {
+ VStack(alignment: .leading, spacing: 12) {
+ HStack {
+ Label("ACTIVITY", systemImage: "chart.bar.fill")
+ .font(.system(size: 11, weight: .semibold))
+ .foregroundStyle(.secondary)
- Spacer()
+ Spacer()
- Picker("", selection: self.$chartDays) {
- Text("7 days").tag(7)
- Text("30 days").tag(30)
+ Picker("", selection: self.$chartDays) {
+ Text("7 days").tag(7)
+ Text("30 days").tag(30)
+ }
+ .pickerStyle(.segmented)
+ .frame(width: 140)
}
- .pickerStyle(.segmented)
- .frame(width: 140)
- }
-
- let data = self.historyStore.dailyWordCounts(days: self.chartDays)
- let maxWords = data.map { $0.words }.max() ?? 0
- if maxWords == 0 {
- // Empty state
- HStack {
- Spacer()
- VStack(spacing: 8) {
- Image(systemName: "chart.bar")
- .font(.system(size: 24))
- .foregroundStyle(.tertiary)
- Text("No activity yet")
- .font(.system(size: 12))
- .foregroundStyle(.secondary)
+ let data = self.historyStore.dailyWordCounts(days: self.chartDays)
+ let maxWords = data.map { $0.words }.max() ?? 0
+
+ if maxWords == 0 {
+ // Empty state
+ HStack {
+ Spacer()
+ VStack(spacing: 8) {
+ Image(systemName: "chart.bar")
+ .font(.system(size: 24))
+ .foregroundStyle(.tertiary)
+ Text("No activity yet")
+ .font(.system(size: 12))
+ .foregroundStyle(.secondary)
+ }
+ .padding(.vertical, 30)
+ Spacer()
}
- .padding(.vertical, 30)
- Spacer()
- }
- } else {
- // Bar chart
- HStack(alignment: .bottom, spacing: self.chartDays == 7 ? 8 : 2) {
- ForEach(Array(data.enumerated()), id: \.offset) { _, item in
- VStack(spacing: 4) {
- // Bar (avoid division by zero)
- let height = (item.words > 0 && maxWords > 0) ? CGFloat(item.words) / CGFloat(maxWords) *
- 80 : 2
- RoundedRectangle(cornerRadius: 3)
- .fill(item.words > 0 ? self.theme.palette.accent : Color.secondary.opacity(0.2))
- .frame(width: self.chartDays == 7 ? 30 : 8, height: max(2, height))
-
- // Label (only for 7-day view)
- if self.chartDays == 7 {
- Text(self.dayLabel(item.date))
- .font(.system(size: 9, weight: .medium))
- .foregroundStyle(.secondary)
+ } else {
+ // Bar chart
+ HStack(alignment: .bottom, spacing: self.chartDays == 7 ? 8 : 2) {
+ ForEach(Array(data.enumerated()), id: \.offset) { _, item in
+ VStack(spacing: 4) {
+ // Bar (avoid division by zero)
+ let height = (item.words > 0 && maxWords > 0) ? CGFloat(item.words) / CGFloat(maxWords) *
+ 80 : 2
+ RoundedRectangle(cornerRadius: 3)
+ .fill(item.words > 0 ? self.theme.palette.accent : Color.secondary.opacity(0.2))
+ .frame(width: self.chartDays == 7 ? 30 : 8, height: max(2, height))
+
+ // Label (only for 7-day view)
+ if self.chartDays == 7 {
+ Text(self.dayLabel(item.date))
+ .font(.system(size: 9, weight: .medium))
+ .foregroundStyle(.secondary)
+ }
}
}
}
- }
- .frame(height: 110)
- .frame(maxWidth: .infinity)
+ .frame(height: 110)
+ .frame(maxWidth: .infinity)
- // Summary
- HStack {
- let totalPeriod = data.reduce(0) { $0 + $1.words }
- let activeDays = data.filter { $0.words > 0 }.count
+ // Summary
+ HStack {
+ let totalPeriod = data.reduce(0) { $0 + $1.words }
+ let activeDays = data.filter { $0.words > 0 }.count
- Text("\(self.formatNumber(totalPeriod)) words")
- .font(.system(size: 11, weight: .medium))
- .foregroundStyle(.primary)
+ Text("\(self.formatNumber(totalPeriod)) words")
+ .font(.system(size: 11, weight: .medium))
+ .foregroundStyle(.primary)
- Text("across \(activeDays) active days")
- .font(.system(size: 11))
- .foregroundStyle(.secondary)
+ Text("across \(activeDays) active days")
+ .font(.system(size: 11))
+ .foregroundStyle(.secondary)
- Spacer()
+ Spacer()
+ }
}
}
}
- .padding(16)
- .background(RoundedRectangle(cornerRadius: 12)
- .fill(.ultraThinMaterial)
- .overlay(RoundedRectangle(cornerRadius: 12)
- .stroke(.white.opacity(0.08), lineWidth: 1)))
}
// MARK: - Milestones Card
private var milestonesCard: some View {
- VStack(alignment: .leading, spacing: 12) {
- HStack {
- Label("MILESTONES", systemImage: "flag.fill")
- .font(.system(size: 11, weight: .semibold))
- .foregroundStyle(.secondary)
-
- Spacer()
-
- Text("\(self.historyStore.totalMilestonesAchieved)/\(self.historyStore.totalMilestonesPossible)")
- .font(.system(size: 11, weight: .medium))
- .foregroundStyle(self.theme.palette.accent)
- }
+ ThemedCard(style: .standard, padding: 16, hoverEffect: false) {
+ VStack(alignment: .leading, spacing: 12) {
+ HStack {
+ Label("MILESTONES", systemImage: "flag.fill")
+ .font(.system(size: 11, weight: .semibold))
+ .foregroundStyle(.secondary)
- VStack(alignment: .leading, spacing: 10) {
- // Word milestones
- self.milestoneRow(
- title: "Words",
- milestones: self.historyStore.wordMilestones
- )
+ Spacer()
- // Transcription milestones
- self.milestoneRow(
- title: "Transcriptions",
- milestones: self.historyStore.transcriptionMilestones
- )
+ Text("\(self.historyStore.totalMilestonesAchieved)/\(self.historyStore.totalMilestonesPossible)")
+ .font(.system(size: 11, weight: .medium))
+ .foregroundStyle(self.theme.palette.accent)
+ }
- // Streak milestones
- self.milestoneRow(
- title: "Streak",
- milestones: self.historyStore.streakMilestones
- )
+ VStack(alignment: .leading, spacing: 10) {
+ // Word milestones
+ self.milestoneRow(
+ title: "Words",
+ milestones: self.historyStore.wordMilestones
+ )
+
+ // Transcription milestones
+ self.milestoneRow(
+ title: "Transcriptions",
+ milestones: self.historyStore.transcriptionMilestones
+ )
+
+ // Streak milestones
+ self.milestoneRow(
+ title: "Streak",
+ milestones: self.historyStore.streakMilestones
+ )
+ }
}
}
- .padding(16)
- .background(RoundedRectangle(cornerRadius: 12)
- .fill(.ultraThinMaterial)
- .overlay(RoundedRectangle(cornerRadius: 12)
- .stroke(.white.opacity(0.08), lineWidth: 1)))
}
private func milestoneRow(title: String, milestones: [(target: Int, achieved: Bool, label: String)]) -> some View {
@@ -333,53 +327,50 @@ struct StatsView: View {
// MARK: - Insights Card
private var insightsCard: some View {
- VStack(alignment: .leading, spacing: 12) {
- Label("INSIGHTS", systemImage: "lightbulb.fill")
- .font(.system(size: 11, weight: .semibold))
- .foregroundStyle(.secondary)
-
- LazyVGrid(columns: [
- GridItem(.flexible(), spacing: 12),
- GridItem(.flexible(), spacing: 12),
- ], spacing: 12) {
- // Top Apps
- self.insightItem(
- icon: "app.fill",
- title: "Top Apps",
- value: self.historyStore.topAppsFormatted(limit: 3).joined(separator: ", "),
- fallback: "No data yet"
- )
-
- // AI Enhancement Rate
- self.insightItem(
- icon: "sparkles",
- title: "AI Enhanced",
- value: "\(self.historyStore.aiEnhancementRate)%",
- fallback: "0%"
- )
-
- // Peak Hours
- self.insightItem(
- icon: "clock.fill",
- title: "Peak Time",
- value: self.historyStore.peakHourFormatted,
- fallback: "N/A"
- )
+ ThemedCard(style: .standard, padding: 16, hoverEffect: false) {
+ VStack(alignment: .leading, spacing: 12) {
+ Label("INSIGHTS", systemImage: "lightbulb.fill")
+ .font(.system(size: 11, weight: .semibold))
+ .foregroundStyle(.secondary)
- // Avg Length
- self.insightItem(
- icon: "ruler.fill",
- title: "Avg Length",
- value: "\(self.historyStore.averageWordsPerTranscription) words",
- fallback: "0 words"
- )
+ LazyVGrid(columns: [
+ GridItem(.flexible(), spacing: 12),
+ GridItem(.flexible(), spacing: 12),
+ ], spacing: 12) {
+ // Top Apps
+ self.insightItem(
+ icon: "app.fill",
+ title: "Top Apps",
+ value: self.historyStore.topAppsFormatted(limit: 3).joined(separator: ", "),
+ fallback: "No data yet"
+ )
+
+ // AI Enhancement Rate
+ self.insightItem(
+ icon: "sparkles",
+ title: "AI Enhanced",
+ value: "\(self.historyStore.aiEnhancementRate)%",
+ fallback: "0%"
+ )
+
+ // Peak Hours
+ self.insightItem(
+ icon: "clock.fill",
+ title: "Peak Time",
+ value: self.historyStore.peakHourFormatted,
+ fallback: "N/A"
+ )
+
+ // Avg Length
+ self.insightItem(
+ icon: "ruler.fill",
+ title: "Avg Length",
+ value: "\(self.historyStore.averageWordsPerTranscription) words",
+ fallback: "0 words"
+ )
+ }
}
}
- .padding(16)
- .background(RoundedRectangle(cornerRadius: 12)
- .fill(.ultraThinMaterial)
- .overlay(RoundedRectangle(cornerRadius: 12)
- .stroke(.white.opacity(0.08), lineWidth: 1)))
}
private func insightItem(icon: String, title: String, value: String, fallback: String) -> some View {
@@ -410,33 +401,30 @@ struct StatsView: View {
// MARK: - Personal Records Card
private var recordsCard: some View {
- VStack(alignment: .leading, spacing: 12) {
- Label("PERSONAL RECORDS", systemImage: "trophy.fill")
- .font(.system(size: 11, weight: .semibold))
- .foregroundStyle(.secondary)
-
- HStack(spacing: 12) {
- self.recordItem(
- title: "Longest Transcription",
- value: "\(self.historyStore.longestTranscriptionWords) words"
- )
-
- self.recordItem(
- title: "Most Words in a Day",
- value: "\(self.formatNumber(self.historyStore.mostWordsInDay)) words"
- )
+ ThemedCard(style: .standard, padding: 16, hoverEffect: false) {
+ VStack(alignment: .leading, spacing: 12) {
+ Label("PERSONAL RECORDS", systemImage: "trophy.fill")
+ .font(.system(size: 11, weight: .semibold))
+ .foregroundStyle(.secondary)
- self.recordItem(
- title: "Most in a Day",
- value: "\(self.historyStore.mostTranscriptionsInDay) transcriptions"
- )
+ HStack(spacing: 12) {
+ self.recordItem(
+ title: "Longest Transcription",
+ value: "\(self.historyStore.longestTranscriptionWords) words"
+ )
+
+ self.recordItem(
+ title: "Most Words in a Day",
+ value: "\(self.formatNumber(self.historyStore.mostWordsInDay)) words"
+ )
+
+ self.recordItem(
+ title: "Most in a Day",
+ value: "\(self.historyStore.mostTranscriptionsInDay) transcriptions"
+ )
+ }
}
}
- .padding(16)
- .background(RoundedRectangle(cornerRadius: 12)
- .fill(.ultraThinMaterial)
- .overlay(RoundedRectangle(cornerRadius: 12)
- .stroke(.white.opacity(0.08), lineWidth: 1)))
}
private func recordItem(title: String, value: String) -> some View {
@@ -453,7 +441,11 @@ struct StatsView: View {
.padding(10)
.background(
RoundedRectangle(cornerRadius: 8)
- .fill(self.theme.palette.accent.opacity(0.08))
+ .fill(self.theme.palette.cardBackground)
+ .overlay(
+ RoundedRectangle(cornerRadius: 8)
+ .stroke(self.theme.palette.cardBorder.opacity(0.45), lineWidth: 1)
+ )
)
}
@@ -510,19 +502,16 @@ private struct StatCard<Content: View>: View {
@ViewBuilder let content: Content
var body: some View {
- VStack(alignment: .leading, spacing: 10) {
- Label(self.title, systemImage: self.icon)
- .font(.system(size: 11, weight: .semibold))
- .foregroundStyle(.secondary)
+ ThemedCard(style: .standard, padding: 16, hoverEffect: false) {
+ VStack(alignment: .leading, spacing: 10) {
+ Label(self.title, systemImage: self.icon)
+ .font(.system(size: 11, weight: .semibold))
+ .foregroundStyle(.secondary)
- self.content
+ self.content
+ }
+ .frame(maxWidth: .infinity, alignment: .leading)
}
- .frame(maxWidth: .infinity, alignment: .leading)
- .padding(16)
- .background(RoundedRectangle(cornerRadius: 12)
- .fill(.ultraThinMaterial)
- .overlay(RoundedRectangle(cornerRadius: 12)
- .stroke(.white.opacity(0.08), lineWidth: 1)))
}
}
diff --git a/Sources/Fluid/UI/TranscriptionHistoryView.swift b/Sources/Fluid/UI/TranscriptionHistoryView.swift
index ee8c24ef..ff863fb8 100644
--- a/Sources/Fluid/UI/TranscriptionHistoryView.swift
+++ b/Sources/Fluid/UI/TranscriptionHistoryView.swift
@@ -40,7 +40,7 @@ struct TranscriptionHistoryView: View {
self.footerView
}
.frame(minWidth: 280, idealWidth: 320, maxWidth: 400)
- .background(self.theme.palette.cardBackground.opacity(0.3))
+ .background(self.theme.palette.contentBackground)
// MARK: - Right Panel: Entry Detail
@@ -96,9 +96,9 @@ struct TranscriptionHistoryView: View {
.padding(.horizontal, 10)
.padding(.vertical, 8)
.background(RoundedRectangle(cornerRadius: 8)
- .fill(.ultraThinMaterial)
+ .fill(self.theme.palette.cardBackground)
.overlay(RoundedRectangle(cornerRadius: 8)
- .stroke(.white.opacity(0.08), lineWidth: 1)))
+ .stroke(self.theme.palette.cardBorder.opacity(0.6), lineWidth: 1)))
}
// MARK: - Entry List
@@ -339,7 +339,7 @@ struct TranscriptionHistoryView: View {
}
.padding(24)
}
- .background(self.theme.palette.cardBackground.opacity(0.15))
+ .background(self.theme.palette.contentBackground)
}
private func detailSection(
@@ -376,9 +376,9 @@ struct TranscriptionHistoryView: View {
.padding(14)
.frame(maxWidth: .infinity, alignment: .leading)
.background(RoundedRectangle(cornerRadius: 10)
- .fill(.ultraThinMaterial)
+ .fill(self.theme.palette.cardBackground)
.overlay(RoundedRectangle(cornerRadius: 10)
- .stroke(.white.opacity(isSecondary ? 0.04 : 0.08), lineWidth: 1)))
+ .stroke(self.theme.palette.cardBorder.opacity(isSecondary ? 0.35 : 0.5), lineWidth: 1)))
}
}
@@ -424,7 +424,7 @@ struct TranscriptionHistoryView: View {
}
.padding(10)
.background(RoundedRectangle(cornerRadius: 8)
- .fill(.ultraThinMaterial.opacity(0.5)))
+ .fill(self.theme.palette.cardBackground.opacity(0.9)))
}
// MARK: - No Selection View
@@ -440,7 +440,7 @@ struct TranscriptionHistoryView: View {
.foregroundStyle(.secondary)
}
.frame(maxWidth: .infinity, maxHeight: .infinity)
- .background(self.theme.palette.cardBackground.opacity(0.15))
+ .background(self.theme.palette.contentBackground)
}
}
diff --git a/Sources/Fluid/UI/WelcomeView.swift b/Sources/Fluid/UI/WelcomeView.swift
index 193be328..a1b6d367 100644
--- a/Sources/Fluid/UI/WelcomeView.swift
+++ b/Sources/Fluid/UI/WelcomeView.swift
@@ -373,12 +373,12 @@ struct WelcomeView: View {
.background(
RoundedRectangle(cornerRadius: 8, style: .continuous)
.fill(
- self.asr.isRunning ? self.theme.palette.accent.opacity(0.06) : Color(nsColor: NSColor.textBackgroundColor)
+ self.asr.isRunning ? self.theme.palette.accent.opacity(0.06) : self.theme.palette.cardBackground
)
.overlay(
RoundedRectangle(cornerRadius: 8, style: .continuous)
.strokeBorder(
- self.asr.isRunning ? self.theme.palette.accent.opacity(0.4) : Color(nsColor: NSColor.separatorColor),
+ self.asr.isRunning ? self.theme.palette.accent.opacity(0.4) : self.theme.palette.cardBorder.opacity(0.6),
lineWidth: self.asr.isRunning ? 2 : 1
)
)
@@ -489,7 +489,7 @@ struct WelcomeView: View {
.font(.caption.weight(.medium))
.padding(.horizontal, 6)
.padding(.vertical, 2)
- .background(Color.primary.opacity(0.1), in: RoundedRectangle(cornerRadius: 4, style: .continuous))
+ .background(self.theme.palette.cardBackground.opacity(0.7), in: RoundedRectangle(cornerRadius: 4, style: .continuous))
}
private func commandModeExample(icon: String, text: String) -> some View {
diff --git a/Sources/Fluid/Views/BottomOverlayView.swift b/Sources/Fluid/Views/BottomOverlayView.swift
index 12ab0eda..4bae819c 100644
--- a/Sources/Fluid/Views/BottomOverlayView.swift
+++ b/Sources/Fluid/Views/BottomOverlayView.swift
@@ -182,6 +182,7 @@ struct BottomOverlayView: View {
@ObservedObject private var contentState = NotchContentState.shared
@ObservedObject private var appServices = AppServices.shared
@ObservedObject private var settings = SettingsStore.shared
+ @Environment(\.theme) private var theme
@State private var showPromptHoverMenu = false
@State private var promptHoverWorkItem: DispatchWorkItem?
@@ -363,11 +364,11 @@ struct BottomOverlayView: View {
}
.padding(.horizontal, 8)
.padding(.vertical, 6)
- .background(Color.black.opacity(0.92))
+ .background(self.theme.palette.cardBackground.opacity(0.95))
.cornerRadius(8)
.overlay(
RoundedRectangle(cornerRadius: 8)
- .stroke(Color.white.opacity(0.12), lineWidth: 1)
+ .stroke(self.theme.palette.cardBorder.opacity(0.45), lineWidth: 1)
)
.onHover { hovering in
self.handlePromptHover(hovering)
@@ -381,7 +382,7 @@ struct BottomOverlayView: View {
if self.hasTranscription && !self.contentState.isProcessing {
Text(self.transcriptionSuffix)
.font(.system(size: self.layout.transFontSize, weight: .medium))
- .foregroundStyle(.white.opacity(0.9))
+ .foregroundStyle(self.theme.palette.primaryText.opacity(0.9))
.lineLimit(1)
.truncationMode(.head)
} else if self.contentState.isProcessing {
@@ -398,18 +399,18 @@ struct BottomOverlayView: View {
HStack(spacing: 6) {
Text("Prompt:")
.font(.system(size: self.layout.modeFontSize, weight: .medium))
- .foregroundStyle(.white.opacity(0.5))
+ .foregroundStyle(self.theme.palette.secondaryText.opacity(0.7))
Text(self.selectedPromptLabel)
.font(.system(size: self.layout.modeFontSize, weight: .semibold))
- .foregroundStyle(.white.opacity(0.8))
+ .foregroundStyle(self.theme.palette.primaryText.opacity(0.85))
.lineLimit(1)
Image(systemName: "chevron.down")
.font(.system(size: max(self.layout.modeFontSize - 2, 9), weight: .semibold))
- .foregroundStyle(.white.opacity(0.45))
+ .foregroundStyle(self.theme.palette.secondaryText.opacity(0.7))
}
.padding(.horizontal, 8)
.padding(.vertical, 5)
- .background(Color.white.opacity(0.05))
+ .background(self.theme.palette.cardBackground.opacity(0.6))
.cornerRadius(8)
.onHover { hovering in
self.handlePromptHover(hovering)
@@ -474,13 +475,16 @@ struct BottomOverlayView: View {
ZStack {
// Solid black background
RoundedRectangle(cornerRadius: self.layout.cornerRadius)
- .fill(Color.black)
+ .fill(self.theme.palette.cardBackground)
// Inner border
RoundedRectangle(cornerRadius: self.layout.cornerRadius)
.strokeBorder(
LinearGradient(
- colors: [.white.opacity(0.15), .white.opacity(0.05)],
+ colors: [
+ self.theme.palette.cardBorder.opacity(0.6),
+ self.theme.palette.cardBorder.opacity(0.35),
+ ],
startPoint: .top,
endPoint: .bottom
),
diff --git a/Sources/Fluid/Views/CommandModeView.swift b/Sources/Fluid/Views/CommandModeView.swift
index c35f6b9d..8633087a 100644
--- a/Sources/Fluid/Views/CommandModeView.swift
+++ b/Sources/Fluid/Views/CommandModeView.swift
@@ -153,7 +153,7 @@ struct CommandModeView: View {
.help("Ask for confirmation before running commands")
}
.padding()
- .background(Color(nsColor: .windowBackgroundColor))
+ .background(self.theme.palette.windowBackground)
.confirmationDialog(
"Delete this chat?",
isPresented: self.$showingClearConfirmation,
@@ -188,7 +188,7 @@ struct CommandModeView: View {
.foregroundStyle(self.isHoveringHowTo ? .primary : .secondary)
.padding(.horizontal, 16)
.padding(.vertical, 8)
- .background(self.isHoveringHowTo ? Color.primary.opacity(0.05) : Color.clear)
+ .background(self.isHoveringHowTo ? self.theme.palette.cardBackground.opacity(0.6) : Color.clear)
.cornerRadius(4)
}
.buttonStyle(.plain)
@@ -213,7 +213,7 @@ struct CommandModeView: View {
.fontWeight(.medium)
.padding(.horizontal, 6)
.padding(.vertical, 2)
- .background(Color.primary.opacity(0.1))
+ .background(self.theme.palette.cardBackground.opacity(0.8))
.cornerRadius(4)
Text("to open Command Mode, speak your command, then press again to send.")
.font(.caption)
@@ -256,7 +256,7 @@ struct CommandModeView: View {
.transition(.opacity.combined(with: .move(edge: .top)))
}
}
- .background(Color(nsColor: .windowBackgroundColor).opacity(0.5))
+ .background(self.theme.palette.contentBackground)
}
private func howToItem(_ text: String) -> some View {
@@ -304,6 +304,16 @@ struct CommandModeView: View {
}
.padding()
}
+ .padding(.horizontal, 16)
+ .padding(.vertical, 8)
+ .background(
+ RoundedRectangle(cornerRadius: 14, style: .continuous)
+ .fill(self.theme.palette.cardBackground)
+ .overlay(
+ RoundedRectangle(cornerRadius: 14, style: .continuous)
+ .stroke(self.theme.palette.cardBorder.opacity(0.45), lineWidth: 1)
+ )
+ )
.onChange(of: self.service.conversationHistory.count) { _, _ in
self.scrollToBottom(proxy)
}
@@ -365,7 +375,7 @@ struct CommandModeView: View {
}
}
}
- .background(Color(nsColor: .controlBackgroundColor).opacity(0.5))
+ .background(self.theme.palette.cardBackground.opacity(0.9))
.cornerRadius(8)
.frame(maxWidth: 520, alignment: .leading)
}
@@ -376,7 +386,7 @@ struct CommandModeView: View {
CommandShimmerText(text: self.currentStepLabel)
.padding(.horizontal, 12)
.padding(.vertical, 8)
- .background(Color(nsColor: .controlBackgroundColor).opacity(0.6))
+ .background(self.theme.palette.cardBackground.opacity(0.9))
.cornerRadius(6)
}
@@ -390,7 +400,7 @@ struct CommandModeView: View {
.padding(.horizontal, 12)
.padding(.vertical, 10)
.frame(maxWidth: 520, alignment: .leading)
- .background(Color(nsColor: .textBackgroundColor).opacity(0.5))
+ .background(self.theme.palette.contentBackground.opacity(0.9))
.cornerRadius(8)
.drawingGroup() // Flatten to bitmap for faster updates
// textSelection disabled during streaming - re-enabled in final message
@@ -456,7 +466,7 @@ struct CommandModeView: View {
}
.padding(.horizontal, 10)
.padding(.vertical, 6)
- .background(Color(nsColor: .windowBackgroundColor))
+ .background(self.theme.palette.cardBackground)
Divider()
@@ -465,7 +475,7 @@ struct CommandModeView: View {
.textSelection(.enabled)
.padding(10)
}
- .background(Color(nsColor: .textBackgroundColor))
+ .background(self.theme.palette.contentBackground)
.cornerRadius(8)
.overlay(
RoundedRectangle(cornerRadius: 8)
@@ -544,12 +554,12 @@ struct CommandModeView: View {
Button(action: self.toggleRecording) {
Image(systemName: self.asr.isRunning ? "stop.circle.fill" : "mic.circle.fill")
.font(.title2)
- .foregroundStyle(self.asr.isRunning ? Color.red : Color.accentColor)
+ .foregroundStyle(self.asr.isRunning ? Color.red : self.theme.palette.accent)
}
.buttonStyle(.plain)
}
.padding()
- .background(Color(nsColor: .windowBackgroundColor))
+ .background(self.theme.palette.windowBackground)
}
// MARK: - Actions
@@ -701,6 +711,7 @@ struct ThinkingShimmerLabel: View {
struct MessageBubble: View {
let message: CommandModeService.Message
+ @Environment(\.theme) private var theme
@State private var isThinkingExpanded: Bool = false
var body: some View {
@@ -722,7 +733,7 @@ struct MessageBubble: View {
.font(.system(size: 13))
.padding(.horizontal, 12)
.padding(.vertical, 8)
- .background(Color.accentColor.opacity(0.15))
+ .background(self.theme.palette.accent.opacity(0.15))
.cornerRadius(10)
.frame(maxWidth: 380, alignment: .trailing)
}
@@ -810,7 +821,7 @@ struct MessageBubble: View {
.padding(.bottom, 6)
}
}
- .background(Color(nsColor: .controlBackgroundColor).opacity(0.4))
+ .background(self.theme.palette.cardBackground.opacity(0.85))
.cornerRadius(6)
}
@@ -836,7 +847,7 @@ struct MessageBubble: View {
.textSelection(.enabled)
.padding(.horizontal, 10)
.padding(.vertical, 8)
- .background(Color(nsColor: .textBackgroundColor))
+ .background(self.theme.palette.contentBackground)
.cornerRadius(6)
}
}
@@ -892,7 +903,7 @@ struct MessageBubble: View {
.frame(maxHeight: 120)
}
}
- .background(Color(nsColor: .textBackgroundColor).opacity(0.5))
+ .background(self.theme.palette.cardBackground.opacity(0.85))
.cornerRadius(6)
}
diff --git a/Sources/Fluid/Views/NotchContentViews.swift b/Sources/Fluid/Views/NotchContentViews.swift
index 626e64a8..fef277a8 100644
--- a/Sources/Fluid/Views/NotchContentViews.swift
+++ b/Sources/Fluid/Views/NotchContentViews.swift
@@ -234,6 +234,7 @@ struct NotchExpandedView: View {
let audioPublisher: AnyPublisher<CGFloat, Never>
@ObservedObject private var contentState = NotchContentState.shared
@ObservedObject private var settings = SettingsStore.shared
+ @Environment(\.theme) private var theme
@State private var showPromptHoverMenu = false
@State private var promptHoverWorkItem: DispatchWorkItem?
@@ -340,11 +341,11 @@ struct NotchExpandedView: View {
}
.padding(.horizontal, 8)
.padding(.vertical, 6)
- .background(Color.black.opacity(0.92))
+ .background(self.theme.palette.cardBackground.opacity(0.95))
.cornerRadius(8)
.overlay(
RoundedRectangle(cornerRadius: 8)
- .stroke(Color.white.opacity(0.12), lineWidth: 1)
+ .stroke(self.theme.palette.cardBorder.opacity(0.45), lineWidth: 1)
)
.onHover { hovering in
self.handlePromptHover(hovering)
@@ -387,18 +388,18 @@ struct NotchExpandedView: View {
HStack(spacing: 6) {
Text("Prompt:")
.font(.system(size: 9, weight: .medium))
- .foregroundStyle(.white.opacity(0.5))
+ .foregroundStyle(self.theme.palette.secondaryText.opacity(0.7))
Text(self.selectedPromptLabel)
.font(.system(size: 9, weight: .medium))
- .foregroundStyle(.white.opacity(0.75))
+ .foregroundStyle(self.theme.palette.primaryText.opacity(0.85))
.lineLimit(1)
Image(systemName: "chevron.down")
.font(.system(size: 8, weight: .semibold))
- .foregroundStyle(.white.opacity(0.45))
+ .foregroundStyle(self.theme.palette.secondaryText.opacity(0.7))
}
.padding(.horizontal, 6)
.padding(.vertical, 4)
- .background(Color.white.opacity(0.04))
+ .background(self.theme.palette.cardBackground.opacity(0.6))
.cornerRadius(6)
.onHover { hovering in
self.handlePromptHover(hovering)
@@ -419,7 +420,7 @@ struct NotchExpandedView: View {
if self.hasTranscription && !self.contentState.isProcessing {
Text(self.contentState.cachedLine2)
.font(.system(size: 10, weight: .medium))
- .foregroundStyle(.white.opacity(0.75))
+ .foregroundStyle(self.theme.palette.secondaryText.opacity(0.8))
.lineLimit(1)
.truncationMode(.tail)
.frame(maxWidth: 180)
@@ -428,7 +429,7 @@ struct NotchExpandedView: View {
}
.padding(.horizontal, 8)
.padding(.vertical, 6)
- .background(Color.black)
+ .background(self.theme.palette.windowBackground)
.contentShape(Rectangle()) // Make entire area tappable
.onTapGesture {
// If in command mode with history, clicking expands the conversation
@@ -622,6 +623,7 @@ struct NotchCommandOutputExpandedView: View {
let onClearChat: () -> Void
@ObservedObject private var contentState = NotchContentState.shared
+ @Environment(\.theme) private var theme
@State private var inputText: String = ""
@FocusState private var isInputFocused: Bool
@State private var scrollProxy: ScrollViewProxy?
@@ -676,7 +678,7 @@ struct NotchCommandOutputExpandedView: View {
self.inputArea
}
.frame(width: 380, height: self.dynamicHeight)
- .background(Color.black)
+ .background(self.theme.palette.windowBackground)
.clipShape(RoundedRectangle(cornerRadius: 16))
.animation(.spring(response: 0.3, dampingFraction: 0.8), value: self.contentState.commandConversationHistory.count)
// No animation on streamingText - it updates too frequently, animations add overhead
@@ -806,7 +808,7 @@ struct NotchCommandOutputExpandedView: View {
// Vertical divider
Rectangle()
- .fill(.white.opacity(0.15))
+ .fill(self.theme.palette.cardBorder.opacity(0.6))
.frame(width: 1, height: 14)
.padding(.horizontal, 2)
@@ -930,7 +932,7 @@ struct NotchCommandOutputExpandedView: View {
Spacer()
Text(message.content)
.font(.system(size: 11))
- .foregroundStyle(.white.opacity(0.9))
+ .foregroundStyle(self.theme.palette.primaryText)
.padding(.horizontal, 10)
.padding(.vertical, 6)
.background(self.commandRed.opacity(0.25))
@@ -941,10 +943,10 @@ struct NotchCommandOutputExpandedView: View {
case .assistant:
Text(message.content)
.font(.system(size: 11))
- .foregroundStyle(.white.opacity(0.85))
+ .foregroundStyle(self.theme.palette.primaryText.opacity(0.9))
.padding(.horizontal, 10)
.padding(.vertical, 6)
- .background(Color.white.opacity(0.08))
+ .background(self.theme.palette.cardBackground.opacity(0.9))
.cornerRadius(8)
.frame(maxWidth: 320, alignment: .leading)
.textSelection(.enabled)
@@ -969,10 +971,10 @@ struct NotchCommandOutputExpandedView: View {
HStack(alignment: .top) {
Text(self.contentState.commandStreamingText)
.font(.system(size: 11))
- .foregroundStyle(.white.opacity(0.85))
+ .foregroundStyle(self.theme.palette.primaryText.opacity(0.9))
.padding(.horizontal, 10)
.padding(.vertical, 6)
- .background(Color.white.opacity(0.08))
+ .background(self.theme.palette.cardBackground.opacity(0.9))
.cornerRadius(8)
.frame(maxWidth: 320, alignment: .leading)
.drawingGroup() // Flatten to bitmap for faster streaming updates
@@ -1008,10 +1010,10 @@ struct NotchCommandOutputExpandedView: View {
TextField("Ask follow-up...", text: self.$inputText)
.textFieldStyle(.plain)
.font(.system(size: 11))
- .foregroundStyle(.white)
+ .foregroundStyle(self.theme.palette.primaryText)
.padding(.horizontal, 10)
.padding(.vertical, 6)
- .background(Color.white.opacity(0.08))
+ .background(self.theme.palette.contentBackground)
.cornerRadius(8)
.focused(self.$isInputFocused)
.onSubmit {
@@ -1028,7 +1030,7 @@ struct NotchCommandOutputExpandedView: View {
}
.padding(.horizontal, 12)
.padding(.vertical, 8)
- .background(Color.white.opacity(0.03))
+ .background(self.theme.palette.cardBackground.opacity(0.75))
}
private func submitFollowUp() {
diff --git a/Sources/Fluid/Views/RewriteModeView.swift b/Sources/Fluid/Views/RewriteModeView.swift
index f8a0c4a4..352af38b 100644
--- a/Sources/Fluid/Views/RewriteModeView.swift
+++ b/Sources/Fluid/Views/RewriteModeView.swift
@@ -38,7 +38,7 @@ struct RewriteModeView: View {
.buttonStyle(.plain)
}
.padding()
- .background(Color(nsColor: .windowBackgroundColor))
+ .background(self.theme.palette.windowBackground)
// How To (collapsible)
self.howToSection
@@ -69,7 +69,7 @@ struct RewriteModeView: View {
Text(self.service.originalText)
.padding()
.frame(maxWidth: .infinity, alignment: .leading)
- .background(Color.gray.opacity(0.1))
+ .background(self.theme.palette.cardBackground)
.cornerRadius(8)
.textSelection(.enabled)
}
@@ -144,6 +144,16 @@ struct RewriteModeView: View {
}
.padding()
}
+ .padding(.horizontal, 16)
+ .padding(.vertical, 8)
+ .background(
+ RoundedRectangle(cornerRadius: 14, style: .continuous)
+ .fill(self.theme.palette.cardBackground)
+ .overlay(
+ RoundedRectangle(cornerRadius: 14, style: .continuous)
+ .stroke(self.theme.palette.cardBorder.opacity(0.45), lineWidth: 1)
+ )
+ )
Divider()
@@ -211,7 +221,7 @@ struct RewriteModeView: View {
}
}
.padding()
- .background(Color(nsColor: .windowBackgroundColor))
+ .background(self.theme.palette.windowBackground)
// Thinking view (real-time, during processing)
if self.service.isProcessing && self.settings.showThinkingTokens && !self.service.streamingThinkingText.isEmpty {
@@ -338,7 +348,7 @@ struct RewriteModeView: View {
.fontWeight(.medium)
.padding(.horizontal, 6)
.padding(.vertical, 2)
- .background(Color.primary.opacity(0.1))
+ .background(self.theme.palette.cardBackground.opacity(0.8))
.cornerRadius(4)
Text("and speak what you want to write.")
.font(.caption)
@@ -381,7 +391,7 @@ struct RewriteModeView: View {
.transition(.opacity.combined(with: .move(edge: .top)))
}
}
- .background(Color(nsColor: .windowBackgroundColor).opacity(0.5))
+ .background(self.theme.palette.contentBackground)
}
private func howToItem(_ text: String) -> some View {
@@ -438,7 +448,7 @@ struct RewriteModeView: View {
}
}
}
- .background(Color(nsColor: .controlBackgroundColor).opacity(0.5))
+ .background(self.theme.palette.cardBackground.opacity(0.9))
.cornerRadius(8)
}
}