Skip to content

Onboarding: make the model-card info (ⓘ) icon a real button with a click-to-open popover #465

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
geekrebel wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Onboarding: make the model-card info (ⓘ) icon a real button with a click-to-open popover #465

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 42 additions & 7 deletions Sources/Fluid/UI/WelcomeView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,6 +598,7 @@ struct OnboardingFlowView: View {
@State private var selectedModelRouteID: String?
@State private var hoveredLanguageID: String?
@State private var hoveredModelRouteID: String?
@State private var infoPopoverRouteID: String?
@State private var hoveredModelActionButtonID: String?
@State private var hoveredPermissionButtonID: String?
@State private var hoveredFooterButton: OnboardingFooterButton?
Expand Down Expand Up @@ -2002,13 +2003,28 @@ struct OnboardingFlowView: View {

Spacer(minLength: 8)

Image(systemName: "info.circle")
.font(self.theme.typography.sectionTitle)
.foregroundStyle(Color.white.opacity(0.58))
.frame(width: 24, height: 24)
.contentShape(Circle())
.help(self.onboardingModelTooltip(for: route))
.accessibilityLabel(self.onboardingModelTooltip(for: route))
Button {
self.infoPopoverRouteID = (self.infoPopoverRouteID == route.id) ? nil : route.id
} label: {
Image(systemName: "info.circle")
.font(self.theme.typography.sectionTitle)
.foregroundStyle(Color.white.opacity(0.58))
.frame(width: 28, height: 28)
.contentShape(Circle())
}
.buttonStyle(.plain)
.help(self.onboardingModelTooltip(for: route))
.accessibilityLabel("About \(self.onboardingModelTitle(for: model))")
.accessibilityHint("Shows details for this voice model")
.popover(
isPresented: Binding(
get: { self.infoPopoverRouteID == route.id },
set: { isShown in self.infoPopoverRouteID = isShown ? route.id : nil }
),
arrowEdge: .top
) {
self.onboardingModelInfoPopover(for: route)
}
}
.frame(height: 38, alignment: .top)

Expand Down Expand Up @@ -2388,6 +2404,25 @@ struct OnboardingFlowView: View {
return "\(self.onboardingModelSubtitle(for: model)) - \(model.downloadSize)\n\(model.cardDescription)"
}

private func onboardingModelInfoPopover(for route: VoiceEngineLanguageRoute) -> some View {
let model = route.model
return VStack(alignment: .leading, spacing: 8) {
Text(self.onboardingModelTitle(for: model))
.font(self.theme.typography.bodySmallStrong)

Text("\(self.onboardingModelSubtitle(for: model)) · \(model.downloadSize)")
.font(self.theme.typography.captionStrong)
.foregroundStyle(self.theme.palette.accent)

Text(model.cardDescription)
.font(self.theme.typography.caption)
.foregroundStyle(self.theme.palette.secondaryText)
.fixedSize(horizontal: false, vertical: true)
}
.padding(16)
.frame(width: 300, alignment: .leading)
}

private func onboardingModelTitle(for model: SettingsStore.SpeechModel) -> String {
model.humanReadableName
}
Expand Down