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

refactor: route buttons through fluid wrapper

altic-dev39cb9a60fa3c
diff --git a/Sources/Fluid/Theme/NativeButtonStyles.swift b/Sources/Fluid/Theme/NativeButtonStyles.swift
index 85bfc7fd..589622f2 100644
--- a/Sources/Fluid/Theme/NativeButtonStyles.swift
+++ b/Sources/Fluid/Theme/NativeButtonStyles.swift
@@ -22,12 +22,15 @@ enum FluidButtonRole {
}
enum FluidButtonSize: Equatable {
+ case compact
case small
case medium
case large
var controlHeight: CGFloat {
switch self {
+ case .compact:
+ return 34
case .small:
return 32
case .medium:
diff --git a/Sources/Fluid/UI/AISettingsView+AIConfiguration.swift b/Sources/Fluid/UI/AISettingsView+AIConfiguration.swift
index 00524a04..ee19da22 100644
--- a/Sources/Fluid/UI/AISettingsView+AIConfiguration.swift
+++ b/Sources/Fluid/UI/AISettingsView+AIConfiguration.swift
@@ -566,7 +566,7 @@ extension AIEnhancementSettingsView {
Image(systemName: "folder")
.font(.system(size: 12, weight: .semibold))
}
- .buttonStyle(CompactButtonStyle())
+ .fluidButton(.compact, size: .compact)
.frame(width: 28, height: 28)
.help("Open downloaded model folder")
}
@@ -613,7 +613,7 @@ extension AIEnhancementSettingsView {
.font(.system(size: 13, weight: .semibold))
}
}
- .buttonStyle(AccentButtonStyle(compact: true))
+ .fluidButton(.accent, size: .small)
.disabled(isBusy)
} else {
HStack(spacing: 6) {
@@ -636,7 +636,7 @@ extension AIEnhancementSettingsView {
.font(.system(size: 13, weight: .semibold))
}
}
- .buttonStyle(AccentButtonStyle(compact: true))
+ .fluidButton(.accent, size: .small)
.disabled(isBusy)
}
}
@@ -1104,7 +1104,7 @@ extension AIEnhancementSettingsView {
Button("Verify") {
self.viewModel.verifyAppleIntelligence()
}
- .buttonStyle(GlassButtonStyle(height: AISettingsLayout.controlHeight))
+ .fluidButton(.glass, size: .compact)
}
} else {
if isCustom {
@@ -1237,7 +1237,7 @@ extension AIEnhancementSettingsView {
.font(.system(size: 13, weight: .semibold))
}
}
- .buttonStyle(AccentButtonStyle(compact: true))
+ .fluidButton(.accent, size: .small)
.disabled(self.viewModel.isTestingConnection)
} else {
HStack(spacing: 6) {
@@ -1446,7 +1446,7 @@ extension AIEnhancementSettingsView {
.font(.system(size: 12, weight: .semibold))
}
}
- .buttonStyle(AccentButtonStyle(compact: true))
+ .fluidButton(.accent, size: .small)
.disabled(!fluidModel.canDownload || isFluidBusy)
.help(fluidModel.canDownload ? "Download and verify selected model" : "Download URL is not configured yet")
} else if !isFluidVerified || hasFluidLoadFailure {
@@ -1461,7 +1461,7 @@ extension AIEnhancementSettingsView {
.font(.system(size: 12, weight: .semibold))
}
}
- .buttonStyle(AccentButtonStyle(compact: true))
+ .fluidButton(.accent, size: .small)
.disabled(isFluidBusy)
.help("Verify selected model")
}
@@ -1470,7 +1470,7 @@ extension AIEnhancementSettingsView {
Image(systemName: "folder")
.font(.system(size: 12, weight: .semibold))
}
- .buttonStyle(CompactButtonStyle())
+ .fluidButton(.compact, size: .compact)
.frame(width: 28, height: 28)
.help("Open downloaded model folder")
} else {
@@ -1486,7 +1486,7 @@ extension AIEnhancementSettingsView {
self.viewModel.setEditingAPIKey(true, for: item.id)
}
}
- .buttonStyle(CompactButtonStyle())
+ .fluidButton(.compact, size: .compact)
}
}
@@ -1850,7 +1850,7 @@ extension AIEnhancementSettingsView {
Text("Save")
}
}
- .buttonStyle(GlassButtonStyle(height: AISettingsLayout.controlHeight))
+ .fluidButton(.glass, size: .compact)
.disabled(!isBuiltIn &&
(self.viewModel.editProviderName.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty ||
self.viewModel.editProviderBaseURL.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty))
@@ -1858,7 +1858,7 @@ extension AIEnhancementSettingsView {
Button("Cancel") {
self.viewModel.clearEditProviderDraft()
}
- .buttonStyle(CompactButtonStyle())
+ .fluidButton(.compact, size: .compact)
}
HStack(spacing: 10) {
@@ -1998,7 +1998,7 @@ extension AIEnhancementSettingsView {
self.viewModel.showingAddModel = false
self.viewModel.newModelName = ""
}
- .buttonStyle(CompactButtonStyle())
+ .fluidButton(.compact, size: .compact)
.frame(minWidth: AISettingsLayout.compactActionMinWidth, minHeight: AISettingsLayout.controlHeight)
}
.padding(.leading, AISettingsLayout.rowLeadingIndent)
@@ -2136,11 +2136,11 @@ extension AIEnhancementSettingsView {
Text("Save")
.font(.system(size: 12, weight: .semibold))
}
- .buttonStyle(AccentButtonStyle(compact: true))
+ .fluidButton(.accent, size: .small)
.frame(minWidth: 60, minHeight: 26)
Button("Cancel") { self.viewModel.showingReasoningConfig = false }
- .buttonStyle(CompactButtonStyle())
+ .fluidButton(.compact, size: .compact)
.font(.system(size: 12))
.frame(minWidth: 60, minHeight: 26)
}
@@ -2229,7 +2229,7 @@ extension AIEnhancementSettingsView {
Label(websiteInfo.label, systemImage: websiteInfo.label.contains("Download") ? "arrow.down.circle.fill" : (websiteInfo.label.contains("Guide") ? "book.fill" : "link"))
.labelStyle(.titleAndIcon).font(.caption)
}
- .buttonStyle(CompactButtonStyle())
+ .fluidButton(.compact, size: .compact)
.frame(minWidth: AISettingsLayout.actionMinWidth, minHeight: AISettingsLayout.controlHeight)
}
}
@@ -2246,7 +2246,7 @@ extension AIEnhancementSettingsView {
}
HStack(spacing: 12) {
Button("Cancel") { self.viewModel.showAPIKeyEditor = false }
- .buttonStyle(CompactButtonStyle())
+ .fluidButton(.compact, size: .compact)
.frame(minWidth: AISettingsLayout.actionMinWidth, minHeight: AISettingsLayout.controlHeight)
Button("OK") {
let trimmedKey = self.viewModel.newProviderApiKey.trimmingCharacters(in: .whitespacesAndNewlines)
@@ -2258,7 +2258,7 @@ extension AIEnhancementSettingsView {
}
self.viewModel.showAPIKeyEditor = false
}
- .buttonStyle(GlassButtonStyle(height: AISettingsLayout.controlHeight))
+ .fluidButton(.glass, size: .compact)
.frame(minWidth: AISettingsLayout.actionMinWidth, minHeight: AISettingsLayout.controlHeight)
.disabled(!self.viewModel.isLocalEndpoint(self.viewModel.openAIBaseURL.trimmingCharacters(in: .whitespacesAndNewlines)) &&
self.viewModel.newProviderApiKey.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty)
@@ -2319,7 +2319,7 @@ extension AIEnhancementSettingsView {
Text("Save Provider")
}
}
- .buttonStyle(GlassButtonStyle(height: AISettingsLayout.controlHeight))
+ .fluidButton(.glass, size: .compact)
.disabled(self.viewModel.newProviderBaseURL.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty)
Button("Cancel") {
@@ -2329,7 +2329,7 @@ extension AIEnhancementSettingsView {
self.viewModel.newProviderApiKey = ""
self.viewModel.newProviderModels = ""
}
- .buttonStyle(CompactButtonStyle())
+ .fluidButton(.compact, size: .compact)
}
}
.padding(14)
diff --git a/Sources/Fluid/UI/AISettingsView+AdvancedSettings.swift b/Sources/Fluid/UI/AISettingsView+AdvancedSettings.swift
index 4db0dd1f..8e018a75 100644
--- a/Sources/Fluid/UI/AISettingsView+AdvancedSettings.swift
+++ b/Sources/Fluid/UI/AISettingsView+AdvancedSettings.swift
@@ -1266,13 +1266,13 @@ extension AIEnhancementSettingsView {
Button(mode.isDefault ? "Close" : "Cancel") {
self.viewModel.closePromptEditor()
}
- .buttonStyle(CompactButtonStyle())
+ .fluidButton(.compact, size: .compact)
.frame(minWidth: AISettingsLayout.actionMinWidth, minHeight: AISettingsLayout.controlHeight)
Button("Save") {
self.viewModel.savePromptEditor(mode: mode)
}
- .buttonStyle(GlassButtonStyle(height: AISettingsLayout.controlHeight))
+ .fluidButton(.glass, size: .compact)
.frame(minWidth: AISettingsLayout.actionMinWidth, minHeight: AISettingsLayout.controlHeight)
.disabled(!mode.isDefault && self.viewModel.draftPromptName.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty)
}
diff --git a/Sources/Fluid/UI/FeedbackView.swift b/Sources/Fluid/UI/FeedbackView.swift
index c80b765a..a1737485 100644
--- a/Sources/Fluid/UI/FeedbackView.swift
+++ b/Sources/Fluid/UI/FeedbackView.swift
@@ -176,7 +176,7 @@ struct FeedbackView: View {
.padding(.horizontal, 20)
.padding(.vertical, 10)
}
- .buttonStyle(GlassButtonStyle(height: 36))
+ .fluidButton(.glass, size: .medium)
.disabled(self.feedbackText.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty ||
self.feedbackEmail.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty ||
self.isSendingFeedback)
diff --git a/Sources/Fluid/UI/WelcomeView.swift b/Sources/Fluid/UI/WelcomeView.swift
index df97ddfa..4d2ed910 100644
--- a/Sources/Fluid/UI/WelcomeView.swift
+++ b/Sources/Fluid/UI/WelcomeView.swift
@@ -380,7 +380,7 @@ struct WelcomeView: View {
}
.frame(maxWidth: .infinity)
}
- .buttonStyle(PremiumButtonStyle(isRecording: self.asr.isRunning))
+ .fluidButton(.primary, size: .large, isRecording: self.asr.isRunning)
.buttonHoverEffect()
.scaleEffect(self.asr.isRunning ? 1.02 : 1.0)
.animation(.spring(response: 0.3), value: self.asr.isRunning)
@@ -1206,7 +1206,7 @@ struct OnboardingFlowView: View {
Button(self.asr.isRunning ? "Stop Recording" : "Start Recording") {
self.togglePlaygroundRecording()
}
- .buttonStyle(PremiumButtonStyle(isRecording: self.asr.isRunning))
+ .fluidButton(.primary, size: .large, isRecording: self.asr.isRunning)
.disabled(self.asr.micStatus != .authorized)
}