feat(app): add crash visibility, memory relief, and clipboard reply work
Squashes the working tree that had accumulated on cloud-agent. Two strands of work, kept in one commit at the maintainer's request. Crash and stability (this session): - Subscribe to MetricKit so crash, hang, CPU, and disk-write diagnostics are recorded on device. Keyboard-extension memory kills are the most likely way a user loses the keyboard mid-sentence and iOS does not classify them as crashes, so they never reach App Store Connect. - Upload those reports to POST /v1/analytics/diagnostics from internal builds only (local Debug and TestFlight), reusing the analytics installation identifier and skipping entirely when analytics are off. App Store builds keep everything on device. - Shed the Chinese engine, English lexicon, and in-flight pipeline work at the 40 MiB and 48 MiB budget thresholds instead of waiting for a system memory warning that jetsam often preempts. - Install audio taps with the input node's live format through one shared adaptive resampler, so an audio-route change mid-recording no longer raises an uncatchable format-mismatch exception. Covers the dictation preview and the Mac recorder, which still used the pattern the Flow capture path had already moved away from. - Harden the librime bridge: never pass a nil string across a nonnull boundary when a user dictionary holds malformed UTF-8, null-check the engine API vector, and distrust a candidate count without its array. - Guard the expanded candidate grid against a list that shrinks while the collection view is still laying out against the previous count. - Resolve localized text without the App Group so the screen shown when that container is missing renders its message instead of crashing on launch, which is the one situation it exists to handle. - Gate CI on the App Group and Keychain wiring that the keyboard extension hard-depends on, with a self-test proving the check fails. Clipboard, reply, and semantics (pre-existing working tree): - Unify the reply center, refresh keyboard AI features, and add native event and reminder exporters. - Expand clipboard semantic routing with authored corpora and a product-blind holdout, plus the scripts that build and validate them. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
Claude Opus 5
@@ -76,7 +76,6 @@ struct AIKeyboardView: View {
|
||||
@State private var carouselBag = AIHintCarouselBag()
|
||||
@State private var poolCards: [AIHintCard] = []
|
||||
@State private var selectedSkillPage = 0
|
||||
@State private var dismissedClipboardEntryID: UUID?
|
||||
@State private var debugSkillsDismissed = false
|
||||
@State private var micLongPressConsumed = false
|
||||
@State private var micIsHoldingForAI = false
|
||||
@@ -121,7 +120,7 @@ struct AIKeyboardView: View {
|
||||
}
|
||||
.onChange(of: state.clipboardHistoryEnabled) { _, _ in resetCarousel() }
|
||||
.onChange(of: clipboardHistory.entries.first?.id) { _, _ in
|
||||
dismissedClipboardEntryID = nil
|
||||
state.dismissedClipboardSkillEntryID = nil
|
||||
debugSkillsDismissed = false
|
||||
selectedSkillPage = 0
|
||||
resetCarousel()
|
||||
@@ -191,27 +190,46 @@ struct AIKeyboardView: View {
|
||||
private var pendingAnswerSurface: some View {
|
||||
VStack(spacing: 0) {
|
||||
topBar.frame(height: Layout.topBarHeight)
|
||||
ScrollView(.vertical) {
|
||||
Text(state.aiSession.answer?.text ?? "")
|
||||
.font(TypeStyle.body)
|
||||
.foregroundStyle(palette.textPrimary)
|
||||
.frame(maxWidth: .infinity, alignment: .topLeading)
|
||||
.padding(.horizontal, Spacing.md)
|
||||
.padding(.vertical, Spacing.sm)
|
||||
}
|
||||
.scrollIndicators(.visible)
|
||||
if state.autoResultReadOnly {
|
||||
// Auto-translate / email-reply stay staged: the result is shown,
|
||||
// and lands in the field via the labeled liquid-glass button.
|
||||
ScrollView(.vertical) {
|
||||
Text(state.aiSession.answer?.text ?? "")
|
||||
.font(TypeStyle.body)
|
||||
.foregroundStyle(palette.textPrimary)
|
||||
.frame(maxWidth: .infinity, alignment: .topLeading)
|
||||
.padding(.horizontal, Spacing.md)
|
||||
.padding(.vertical, Spacing.sm)
|
||||
}
|
||||
.scrollIndicators(.visible)
|
||||
|
||||
Button(action: state.confirmPendingAIAnswer) {
|
||||
Image(systemName: "plus")
|
||||
.font(.system(size: 20, weight: .semibold))
|
||||
.foregroundStyle(OSGColor.fixedLightContent)
|
||||
.frame(width: Layout.fieldActionWidth, height: 44)
|
||||
.background(palette.accent, in: Capsule())
|
||||
Button(action: state.confirmPendingAIAnswer) {
|
||||
HStack(spacing: 6) {
|
||||
Image(systemName: "arrow.down.to.line")
|
||||
.font(TypeStyle.body.weight(.semibold))
|
||||
ExtL10n.text(state.autoResultInsertLabelKey)
|
||||
.font(TypeStyle.body.weight(.semibold))
|
||||
}
|
||||
.foregroundStyle(palette.textPrimary)
|
||||
.padding(.horizontal, 22)
|
||||
.frame(height: 44)
|
||||
.glassEffect(.regular.interactive(), in: Capsule())
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
.accessibilityIdentifier("assistant.autoResult.insert")
|
||||
.frame(height: 55)
|
||||
.accessibilityLabel(ExtL10n.text(state.autoResultInsertLabelKey))
|
||||
} else {
|
||||
// A single reply is one tappable liquid-glass card — same style
|
||||
// as the multi-variant cards; tapping it inserts.
|
||||
ScrollView(.vertical) {
|
||||
pendingAnswerCard
|
||||
.padding(.horizontal, Spacing.xs)
|
||||
.padding(.vertical, Spacing.xs)
|
||||
}
|
||||
.scrollIndicators(.visible)
|
||||
.scrollBounceBehavior(.basedOnSize)
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
.accessibilityIdentifier("assistant.pending.insert")
|
||||
.frame(height: 55)
|
||||
.accessibilityLabel(ExtL10n.text("keyboard.assistant.insertPending"))
|
||||
}
|
||||
.padding(.vertical, 4)
|
||||
.padding(.horizontal, KeyboardChromeLayout.horizontalInset)
|
||||
@@ -220,6 +238,38 @@ struct AIKeyboardView: View {
|
||||
.frame(height: resolvedHeight)
|
||||
}
|
||||
|
||||
private var pendingAnswerCard: some View {
|
||||
let shape = RoundedRectangle(cornerRadius: Radius.medium)
|
||||
return Button(action: state.confirmPendingAIAnswer) {
|
||||
HStack(alignment: .top, spacing: Spacing.sm) {
|
||||
Text(state.aiSession.answer?.text ?? "")
|
||||
.font(TypeStyle.body)
|
||||
.foregroundStyle(palette.textPrimary)
|
||||
.multilineTextAlignment(.leading)
|
||||
.fixedSize(horizontal: false, vertical: true)
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
Image(systemName: "arrow.down.to.line")
|
||||
.font(TypeStyle.body.weight(.semibold))
|
||||
.foregroundStyle(palette.textSecondary)
|
||||
.accessibilityHidden(true)
|
||||
}
|
||||
.padding(.horizontal, Spacing.sm)
|
||||
.padding(.vertical, 10)
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
.contentShape(shape)
|
||||
.glassEffect(
|
||||
.regular
|
||||
.tint(palette.textPrimary.opacity(0.04))
|
||||
.interactive(),
|
||||
in: shape
|
||||
)
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
.accessibilityIdentifier("assistant.pending.insert")
|
||||
.accessibilityLabel(Text(state.aiSession.answer?.text ?? ""))
|
||||
.accessibilityHint(ExtL10n.text("keyboard.assistant.insertPending"))
|
||||
}
|
||||
|
||||
private var replyVariantsSurface: some View {
|
||||
VStack(spacing: 0) {
|
||||
topBar.frame(height: Layout.topBarHeight)
|
||||
@@ -322,14 +372,12 @@ struct AIKeyboardView: View {
|
||||
labelKey: "keyboard.voice.cancel",
|
||||
hintKey: "keyboard.voice.cancelHint"
|
||||
)
|
||||
} else if shouldShowClipboardSuggestion {
|
||||
ClipboardSuggestionBar(
|
||||
text: state.clipboardSuggestionText ?? "",
|
||||
onInsert: insertClipboardSuggestion,
|
||||
onDismiss: dismissClipboardPresentation
|
||||
)
|
||||
.padding(.horizontal, KeyboardTopBarMetrics.nestedHorizontalInset)
|
||||
} else if showsClipboardSkills || semanticBadgeContent != nil {
|
||||
} else if showsClipboardSkillBar {
|
||||
// Fresh copy, no AI result yet: the top bar becomes the skill entry
|
||||
// point (paste + every applicable skill + dismiss).
|
||||
clipboardSkillTopBar
|
||||
} else if showsClipboardSkills {
|
||||
// OOBE / debug chip pager keeps its dismiss bar.
|
||||
cancelTopBar(
|
||||
action: dismissClipboardPresentation,
|
||||
labelKey: "keyboard.assistant.dismissClipboard",
|
||||
@@ -344,7 +392,7 @@ struct AIKeyboardView: View {
|
||||
onInsert: onInsert
|
||||
)
|
||||
HStack {
|
||||
KeyboardBrandLogo(action: state.openSettings)
|
||||
leadingBrandOrPaste
|
||||
Spacer(minLength: 0)
|
||||
}
|
||||
}
|
||||
@@ -352,14 +400,75 @@ struct AIKeyboardView: View {
|
||||
}
|
||||
}
|
||||
|
||||
/// Fresh-copy top bar (no active result): paste + scrollable skills + dismiss.
|
||||
private var clipboardSkillTopBar: some View {
|
||||
HStack(spacing: 6) {
|
||||
leadingScrollRow
|
||||
KeyboardCancelButton(
|
||||
action: dismissClipboardPresentation,
|
||||
accessibilityLabel: ExtL10n.text("keyboard.assistant.dismissClipboard"),
|
||||
accessibilityHint: ExtL10n.text("keyboard.assistant.dismissClipboardHint"),
|
||||
accessibilityIdentifier: "assistant.clipboard.dismiss"
|
||||
)
|
||||
}
|
||||
.padding(.horizontal, KeyboardTopBarMetrics.nestedHorizontalInset)
|
||||
}
|
||||
|
||||
/// Fresh copy with applicable skills and no active AI result to defer to.
|
||||
private var showsClipboardSkillBar: Bool {
|
||||
guard assistantIsResting,
|
||||
state.oobePracticeSession == nil,
|
||||
state.clipboardHistoryEnabled,
|
||||
state.aiServiceAvailable,
|
||||
!state.aiSession.canInsert,
|
||||
!state.aiSession.canSelectReplyVariant,
|
||||
let newest = clipboardHistory.newestEntry,
|
||||
newest.id != state.dismissedClipboardSkillEntryID,
|
||||
!topBarSkills.isEmpty else {
|
||||
return false
|
||||
}
|
||||
return AIHintPool.isClipboardSkillWindowActive(
|
||||
clipboardHistoryEnabled: true,
|
||||
newestClipboard: newest
|
||||
)
|
||||
}
|
||||
|
||||
/// The top-bar leading slot: a "Paste" glass capsule whenever a fresh copy is
|
||||
/// available (replacing the OSG logo), otherwise the logo itself. Copying is
|
||||
/// frequent, so this keeps a one-tap paste always in the same spot without a
|
||||
/// full-width suggestion strip.
|
||||
@ViewBuilder
|
||||
private var leadingBrandOrPaste: some View {
|
||||
if shouldShowClipboardSuggestion {
|
||||
pasteCapsule
|
||||
} else {
|
||||
KeyboardBrandLogo(action: state.openSettings)
|
||||
}
|
||||
}
|
||||
|
||||
private var pasteCapsule: some View {
|
||||
Button(action: insertClipboardSuggestion) {
|
||||
Text(ExtL10n.string("keyboard.clipboard.paste"))
|
||||
.font(TypeStyle.footnote.weight(.semibold))
|
||||
.foregroundStyle(palette.textPrimary)
|
||||
.lineLimit(1)
|
||||
.padding(.horizontal, 14)
|
||||
.frame(height: 30)
|
||||
.glassEffect(.regular.interactive(), in: Capsule())
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
.accessibilityIdentifier("assistant.clipboard.paste")
|
||||
.accessibilityLabel(ExtL10n.text("keyboard.clipboard.paste"))
|
||||
}
|
||||
|
||||
private func cancelTopBar(
|
||||
action: @escaping () -> Void,
|
||||
labelKey: String,
|
||||
hintKey: String
|
||||
) -> some View {
|
||||
HStack(spacing: Spacing.xs) {
|
||||
KeyboardBrandLogo(action: state.openSettings)
|
||||
Spacer(minLength: 0)
|
||||
HStack(spacing: 6) {
|
||||
// Paste + every applicable skill scroll together; the X stays put.
|
||||
leadingScrollRow
|
||||
KeyboardCancelButton(
|
||||
action: action,
|
||||
accessibilityLabel: ExtL10n.text(labelKey),
|
||||
@@ -370,6 +479,110 @@ struct AIKeyboardView: View {
|
||||
.padding(.horizontal, KeyboardTopBarMetrics.nestedHorizontalInset)
|
||||
}
|
||||
|
||||
/// Leading region of the clipboard top bars: the OSG logo when there's no
|
||||
/// fresh copy, otherwise a horizontally scrollable row whose first item is the
|
||||
/// Paste capsule followed by every applicable skill — so Paste scrolls along
|
||||
/// with the skills instead of staying pinned.
|
||||
@ViewBuilder
|
||||
private var leadingScrollRow: some View {
|
||||
let paste = shouldShowClipboardSuggestion
|
||||
let skills = topBarSkills
|
||||
HStack(spacing: 6) {
|
||||
if !paste {
|
||||
KeyboardBrandLogo(action: state.openSettings)
|
||||
}
|
||||
if paste || !skills.isEmpty {
|
||||
ScrollView(.horizontal, showsIndicators: false) {
|
||||
HStack(spacing: 6) {
|
||||
if paste {
|
||||
pasteCapsule
|
||||
}
|
||||
ForEach(skills) { skill in
|
||||
otherSkillCapsule(skill)
|
||||
}
|
||||
}
|
||||
.padding(.vertical, 2)
|
||||
}
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
.scrollClipDisabled()
|
||||
} else {
|
||||
Spacer(minLength: 0)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func otherSkillCapsule(_ skill: AIClipboardSkill) -> some View {
|
||||
Button {
|
||||
state.submitAIClipboardSkill(skill, replyScene(for: skill))
|
||||
} label: {
|
||||
Text(clipboardSkillTitle(skill))
|
||||
.font(TypeStyle.footnote.weight(.semibold))
|
||||
.foregroundStyle(palette.textPrimary)
|
||||
.lineLimit(1)
|
||||
.padding(.horizontal, 12)
|
||||
.frame(height: 30)
|
||||
.glassEffect(.regular.interactive(), in: Capsule())
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
.disabled(!state.aiServiceAvailable || state.aiSession.isBusy)
|
||||
.accessibilityIdentifier("assistant.otherSkill.\(skill.id)")
|
||||
.accessibilityLabel(Text(clipboardSkillTitle(skill)))
|
||||
}
|
||||
|
||||
/// Skills that apply to the current copy, most-relevant first. This is the
|
||||
/// sole skill entry point now that the circular chips are gone; it shows with
|
||||
/// or without an active result (the invoked skill is excluded when active).
|
||||
///
|
||||
/// Purely relevance-ranked: a skill appears only when its signal is present
|
||||
/// (a URL → Open / Summarize page; a phone → Call; a date/list → Events /
|
||||
/// Todos / Organize; long text → Summary; plus Reply as the message baseline).
|
||||
/// No blanket fallback, so Summary / Organize / Events / Notes do NOT show on
|
||||
/// an ordinary short message.
|
||||
private var topBarSkills: [AIClipboardSkill] {
|
||||
guard state.oobePracticeSession == nil,
|
||||
state.aiServiceAvailable,
|
||||
let newest = clipboardHistory.newestEntry else {
|
||||
return []
|
||||
}
|
||||
let translatable = clipboardIsTranslatable
|
||||
let activeID = state.activeClipboardSkillID
|
||||
func present(_ list: [AIClipboardSkill]) -> [AIClipboardSkill] {
|
||||
list.filter {
|
||||
$0.id != activeID
|
||||
// Don't offer "Translate" for text already in the user's language.
|
||||
&& ($0.id != AIClipboardSkillCatalog.translateID || translatable)
|
||||
}
|
||||
}
|
||||
guard let snapshot = semanticRanking.snapshot,
|
||||
snapshot.entryID == newest.id else {
|
||||
// Analysis not ready yet — keep Reply reachable in the meantime.
|
||||
let reply = state.enabledClipboardSkills.first {
|
||||
$0.id == AIClipboardSkillCatalog.replyID
|
||||
}
|
||||
return present([reply].compactMap { $0 })
|
||||
}
|
||||
return present(
|
||||
ClipboardSkillSemanticRanker.recommended(
|
||||
skills: state.enabledClipboardSkills,
|
||||
sourceText: newest.text,
|
||||
analysis: snapshot.analysis,
|
||||
uiLanguage: state.uiLanguage,
|
||||
limit: 6
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
/// True only when the current copy is in a language other than the user's,
|
||||
/// so offering Translate makes sense.
|
||||
private var clipboardIsTranslatable: Bool {
|
||||
guard let newest = clipboardHistory.newestEntry,
|
||||
let snapshot = semanticRanking.snapshot,
|
||||
snapshot.entryID == newest.id else {
|
||||
return false
|
||||
}
|
||||
return ClipboardSkillSemanticRanker.isForeignLanguage(snapshot.analysis)
|
||||
}
|
||||
|
||||
private func cancelIdentifier(for labelKey: String) -> String {
|
||||
switch labelKey {
|
||||
case "keyboard.assistant.dismissClipboard":
|
||||
@@ -390,7 +603,7 @@ struct AIKeyboardView: View {
|
||||
clipboardSkillPager
|
||||
} else if let onboardingPracticeHint, activeStatus == nil {
|
||||
Text(onboardingPracticeHint)
|
||||
.font(.system(size: 13, weight: .semibold))
|
||||
.font(TypeStyle.footnote.weight(.semibold))
|
||||
.foregroundStyle(palette.textPrimary)
|
||||
.lineLimit(1)
|
||||
.padding(.horizontal, 14)
|
||||
@@ -422,7 +635,7 @@ struct AIKeyboardView: View {
|
||||
statusText(status.text, color: status.color)
|
||||
} else if showsLongPressCoach {
|
||||
Text(ExtL10n.string("keyboard.assistant.longPressCoach"))
|
||||
.font(.system(size: 13, weight: .medium))
|
||||
.font(TypeStyle.footnote.weight(.medium))
|
||||
.foregroundStyle(palette.textSecondary)
|
||||
.lineLimit(1)
|
||||
.padding(.horizontal, 14)
|
||||
@@ -442,7 +655,7 @@ struct AIKeyboardView: View {
|
||||
.font(.system(size: 10, weight: .semibold))
|
||||
.accessibilityHidden(true)
|
||||
Text(content.text)
|
||||
.font(.system(size: 12, weight: .semibold))
|
||||
.font(TypeStyle.caption.weight(.semibold))
|
||||
.lineLimit(1)
|
||||
}
|
||||
.foregroundStyle(palette.textSecondary)
|
||||
@@ -463,44 +676,9 @@ struct AIKeyboardView: View {
|
||||
)
|
||||
}
|
||||
#endif
|
||||
guard assistantIsResting,
|
||||
state.clipboardHistoryEnabled,
|
||||
let newest = clipboardHistory.newestEntry,
|
||||
let snapshot = semanticRanking.snapshot,
|
||||
snapshot.entryID == newest.id,
|
||||
AIHintPool.isClipboardSkillWindowActive(
|
||||
clipboardHistoryEnabled: true,
|
||||
newestClipboard: newest
|
||||
) else {
|
||||
return nil
|
||||
}
|
||||
let intentKey = semanticIntentKey(snapshot.analysis)
|
||||
let domainKey: String? = snapshot.analysis.domain.flatMap { domain in
|
||||
guard let confidence = snapshot.analysis.domainConfidence,
|
||||
confidence > 0 else {
|
||||
return nil
|
||||
}
|
||||
return domain.localizationKey
|
||||
}
|
||||
guard intentKey != nil || domainKey != nil else { return nil }
|
||||
return SemanticBadgeContent(intentKey: intentKey, domainKey: domainKey)
|
||||
}
|
||||
|
||||
private func semanticIntentKey(
|
||||
_ analysis: ClipboardSemanticAnalysis
|
||||
) -> String? {
|
||||
let candidates = [
|
||||
(analysis.assistantCommand, "keyboard.semantic.intent.assistantCommand"),
|
||||
(analysis.informationQuery, "keyboard.semantic.intent.informationQuery"),
|
||||
(analysis.systemNotification, "keyboard.semantic.intent.systemNotification")
|
||||
].filter { label, _ in
|
||||
label.isDetected
|
||||
&& label.confidence > 0
|
||||
&& label.confidence >= label.threshold
|
||||
}
|
||||
return candidates.max {
|
||||
$0.0.confidence < $1.0.confidence
|
||||
}?.1
|
||||
// Retired alongside the idle skill chips it accompanied: the copy flow now
|
||||
// goes straight to an auto result, so no standalone badge is shown.
|
||||
return nil
|
||||
}
|
||||
|
||||
private func statusText(_ text: String, color: Color) -> some View {
|
||||
@@ -600,11 +778,11 @@ struct AIKeyboardView: View {
|
||||
HStack(spacing: 6) {
|
||||
if let hint = currentHint {
|
||||
Image(systemName: hint.visualKind.systemImage)
|
||||
.font(.system(size: 13, weight: .semibold))
|
||||
.font(TypeStyle.footnote.weight(.semibold))
|
||||
}
|
||||
Text(currentHint.map(\.resolvedDisplayText)
|
||||
?? ExtL10n.string("keyboard.ai.placeholder"))
|
||||
.font(.system(size: 13, weight: .medium))
|
||||
.font(TypeStyle.footnote.weight(.medium))
|
||||
.lineLimit(1)
|
||||
.truncationMode(.tail)
|
||||
}
|
||||
@@ -706,16 +884,15 @@ struct AIKeyboardView: View {
|
||||
snapshot.entryID == newest.id else {
|
||||
return nil
|
||||
}
|
||||
return AIClipboardReplyScene.resolve(from: snapshot.analysis)
|
||||
return AIClipboardReplyScene.resolve(
|
||||
from: snapshot.analysis,
|
||||
sourceText: newest.text
|
||||
)
|
||||
}
|
||||
|
||||
private func clipboardSkillTitle(_ skill: AIClipboardSkill) -> String {
|
||||
if skill.id == AIClipboardSkillCatalog.translateID {
|
||||
return AIClipboardSkillCatalog.translateButtonTitle(
|
||||
translationTargetLocaleId: state.translationTargetLocaleId,
|
||||
uiLanguage: state.uiLanguage
|
||||
)
|
||||
}
|
||||
// Capsules stay short: use the plain skill title, not the verbose
|
||||
// "Translate to <language>" form.
|
||||
if let custom = skill.customName?.trimmingCharacters(in: .whitespacesAndNewlines),
|
||||
!custom.isEmpty {
|
||||
return custom
|
||||
@@ -734,16 +911,10 @@ struct AIKeyboardView: View {
|
||||
if showsOOBEClipboardSkill {
|
||||
return assistantIsResting
|
||||
}
|
||||
guard assistantIsResting, state.clipboardHistoryEnabled else { return false }
|
||||
guard !visibleClipboardSkills.isEmpty,
|
||||
let newest = clipboardHistory.newestEntry,
|
||||
newest.id != dismissedClipboardEntryID else {
|
||||
return false
|
||||
}
|
||||
return AIHintPool.isClipboardSkillWindowActive(
|
||||
clipboardHistoryEnabled: true,
|
||||
newestClipboard: newest
|
||||
)
|
||||
// The idle circular skill chips are retired: auto mode runs one skill and
|
||||
// the result panel's top-bar capsules offer the rest. Only OOBE / debug
|
||||
// still present the chip pager above.
|
||||
return false
|
||||
}
|
||||
|
||||
private var visibleClipboardSkills: [AIClipboardSkill] {
|
||||
@@ -909,7 +1080,7 @@ struct AIKeyboardView: View {
|
||||
.foregroundStyle(OSGColor.fixedLightContent)
|
||||
case .idle, .denied:
|
||||
Image(systemName: "mic.fill")
|
||||
.font(.system(size: 28, weight: .semibold))
|
||||
.font(TypeStyle.title.weight(.semibold))
|
||||
.foregroundStyle(OSGColor.fixedLightContent)
|
||||
.symbolEffect(.breathe, isActive: micIsHoldingForAI)
|
||||
}
|
||||
@@ -1131,7 +1302,7 @@ struct AIKeyboardView: View {
|
||||
private var fieldActionButton: some View {
|
||||
Button(action: performFieldAction) {
|
||||
Image(systemName: fieldActionSystemImage)
|
||||
.font(.system(size: 20, weight: .semibold))
|
||||
.font(TypeStyle.title3)
|
||||
.foregroundStyle(fieldActionButtonForeground)
|
||||
.frame(
|
||||
width: fieldActionButtonWidth,
|
||||
@@ -1219,7 +1390,7 @@ struct AIKeyboardView: View {
|
||||
ZStack {
|
||||
Color.clear
|
||||
Image(systemName: "delete.left")
|
||||
.font(.system(size: 17, weight: .semibold))
|
||||
.font(TypeStyle.headline)
|
||||
.foregroundStyle(NativeKeyboardKeyColors.text(for: colorScheme))
|
||||
}
|
||||
.frame(width: lowerCircleSize, height: lowerCircleSize)
|
||||
@@ -1272,7 +1443,7 @@ struct AIKeyboardView: View {
|
||||
}
|
||||
|
||||
private func insertClipboardSuggestion() {
|
||||
dismissedClipboardEntryID = clipboardHistory.newestEntry?.id
|
||||
state.dismissedClipboardSkillEntryID = clipboardHistory.newestEntry?.id
|
||||
if let text = state.clipboardSuggestionText {
|
||||
state.insertClipboardText(text)
|
||||
}
|
||||
@@ -1284,7 +1455,7 @@ struct AIKeyboardView: View {
|
||||
debugSkillsDismissed = true
|
||||
}
|
||||
#endif
|
||||
dismissedClipboardEntryID = clipboardHistory.newestEntry?.id
|
||||
state.dismissedClipboardSkillEntryID = clipboardHistory.newestEntry?.id
|
||||
state.dismissClipboardSuggestion()
|
||||
}
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@ struct ClipboardSuggestionBar: View {
|
||||
|
||||
Button(action: onInsert) {
|
||||
Text(text)
|
||||
.font(.system(size: 15))
|
||||
.font(TypeStyle.body)
|
||||
.foregroundStyle(palette.textPrimary)
|
||||
.lineLimit(1)
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
@@ -96,14 +96,14 @@ struct ClipboardEnableGuideView: View {
|
||||
|
||||
VStack(spacing: 16) {
|
||||
ExtL10n.text("keyboard.clipboard.guide.body")
|
||||
.font(.system(size: 15))
|
||||
.font(TypeStyle.body)
|
||||
.foregroundStyle(palette.textSecondary)
|
||||
.multilineTextAlignment(.center)
|
||||
.padding(.horizontal, 28)
|
||||
|
||||
Button(action: onOpenSettings) {
|
||||
ExtL10n.text("keyboard.clipboard.guide.cta")
|
||||
.font(.system(size: 15, weight: .semibold))
|
||||
.font(TypeStyle.body.weight(.semibold))
|
||||
.foregroundStyle(OSGColor.fixedLightContent)
|
||||
.padding(.horizontal, 20)
|
||||
.padding(.vertical, 10)
|
||||
@@ -119,6 +119,85 @@ struct ClipboardEnableGuideView: View {
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Auto-reply guide
|
||||
|
||||
/// One-time nudge layered *over* the live keyboard: a soft scrim keeps the keys
|
||||
/// faintly visible while a floating pitch + primary action invite the user to
|
||||
/// turn auto mode on. Tapping the scrim (or the ✕) dismisses it.
|
||||
struct ClipboardAutoReplyGuideView: View {
|
||||
let onClose: () -> Void
|
||||
let onTry: () -> Void
|
||||
|
||||
var body: some View {
|
||||
ZStack {
|
||||
// Dim the keyboard beneath; a tap anywhere off the card dismisses.
|
||||
Rectangle()
|
||||
.fill(Color.black.opacity(0.5))
|
||||
.contentShape(Rectangle())
|
||||
.onTapGesture(perform: onClose)
|
||||
.accessibilityIdentifier("assistant.autoReply.guide.scrim")
|
||||
.accessibilityLabel(ExtL10n.text("keyboard.assistant.autoReply.guide.close"))
|
||||
|
||||
VStack(spacing: 12) {
|
||||
Image(systemName: "sparkles")
|
||||
.font(TypeStyle.title.weight(.semibold))
|
||||
.foregroundStyle(OSGColor.fixedLightContent)
|
||||
|
||||
ExtL10n.text("keyboard.assistant.autoReply.guide.title")
|
||||
.font(TypeStyle.headline)
|
||||
.foregroundStyle(OSGColor.fixedLightContent)
|
||||
.multilineTextAlignment(.center)
|
||||
|
||||
ExtL10n.text("keyboard.assistant.autoReply.guide.body")
|
||||
.font(TypeStyle.footnote)
|
||||
.foregroundStyle(OSGColor.fixedLightContent.opacity(0.85))
|
||||
.multilineTextAlignment(.center)
|
||||
.padding(.horizontal, 32)
|
||||
|
||||
Button(action: onTry) {
|
||||
HStack(spacing: 6) {
|
||||
Image(systemName: "sparkles")
|
||||
.font(TypeStyle.body.weight(.semibold))
|
||||
ExtL10n.text("keyboard.assistant.autoReply.guidance.cta")
|
||||
.font(TypeStyle.body.weight(.semibold))
|
||||
}
|
||||
.foregroundStyle(OSGColor.fixedLightContent)
|
||||
.padding(.horizontal, 22)
|
||||
.padding(.vertical, 11)
|
||||
.background(Palette.light.accent, in: Capsule())
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
.padding(.top, 2)
|
||||
.accessibilityIdentifier("assistant.autoReply.guide.try")
|
||||
}
|
||||
.padding(.horizontal, 20)
|
||||
|
||||
VStack(spacing: 0) {
|
||||
HStack(spacing: 0) {
|
||||
Spacer(minLength: 0)
|
||||
Button(action: onClose) {
|
||||
Image(systemName: "xmark")
|
||||
.font(TypeStyle.footnote.weight(.semibold))
|
||||
.foregroundStyle(OSGColor.fixedLightContent)
|
||||
.frame(width: 30, height: 30)
|
||||
.background(Color.black.opacity(0.28), in: Circle())
|
||||
.contentShape(Circle())
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
.accessibilityIdentifier("assistant.autoReply.guide.close")
|
||||
.accessibilityLabel(ExtL10n.text("keyboard.assistant.autoReply.guide.close"))
|
||||
.accessibilityHint(ExtL10n.text("keyboard.assistant.autoReply.guide.closeHint"))
|
||||
}
|
||||
.padding(.horizontal, KeyboardTopBarMetrics.horizontalInset)
|
||||
.padding(.top, 6)
|
||||
Spacer(minLength: 0)
|
||||
}
|
||||
}
|
||||
.frame(maxWidth: .infinity, maxHeight: .infinity)
|
||||
.accessibilityIdentifier("assistant.autoReply.guide")
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - History panel
|
||||
|
||||
struct ClipboardHistoryPanelView: View {
|
||||
@@ -156,7 +235,7 @@ struct ClipboardHistoryPanelView: View {
|
||||
|
||||
if let pastePermissionHint, !pastePermissionHint.isEmpty {
|
||||
Text(pastePermissionHint)
|
||||
.font(.system(size: 12))
|
||||
.font(TypeStyle.caption.weight(.regular))
|
||||
.foregroundStyle(palette.warning)
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
.padding(.horizontal, 14)
|
||||
@@ -207,7 +286,7 @@ struct ClipboardHistoryPanelView: View {
|
||||
.background(palette.surface.opacity(0.35), in: Circle())
|
||||
|
||||
ExtL10n.text("keyboard.clipboard.clear.title")
|
||||
.font(.system(size: 15, weight: .semibold))
|
||||
.font(TypeStyle.body.weight(.semibold))
|
||||
.foregroundStyle(palette.textPrimary)
|
||||
.multilineTextAlignment(.center)
|
||||
|
||||
@@ -216,7 +295,7 @@ struct ClipboardHistoryPanelView: View {
|
||||
showClearConfirmation = false
|
||||
} label: {
|
||||
ExtL10n.text("common.cancel")
|
||||
.font(.system(size: 13, weight: .semibold))
|
||||
.font(TypeStyle.footnote.weight(.semibold))
|
||||
.frame(maxWidth: .infinity)
|
||||
.frame(height: 36)
|
||||
}
|
||||
@@ -231,14 +310,15 @@ struct ClipboardHistoryPanelView: View {
|
||||
onClear()
|
||||
} label: {
|
||||
ExtL10n.text("keyboard.clipboard.clear.confirm")
|
||||
.font(.system(size: 13, weight: .semibold))
|
||||
.font(TypeStyle.footnote.weight(.semibold))
|
||||
.foregroundStyle(palette.background)
|
||||
.frame(maxWidth: .infinity)
|
||||
.frame(height: 36)
|
||||
}
|
||||
.buttonStyle(.glassProminent)
|
||||
.buttonBorderShape(.capsule)
|
||||
.tint(palette.textPrimary)
|
||||
// Match the system alert's destructive styling used in-app.
|
||||
.tint(palette.danger)
|
||||
}
|
||||
}
|
||||
.padding(16)
|
||||
@@ -269,7 +349,7 @@ private struct ClipboardHistoryRow: View {
|
||||
HStack(alignment: .top, spacing: 8) {
|
||||
Button(action: onInsert) {
|
||||
Text(entry.text)
|
||||
.font(.system(size: 15))
|
||||
.font(TypeStyle.body)
|
||||
.foregroundStyle(palette.textPrimary)
|
||||
.lineLimit(3)
|
||||
.multilineTextAlignment(.leading)
|
||||
@@ -302,7 +382,7 @@ private struct ClipboardHistoryRow: View {
|
||||
onInsertToken(token)
|
||||
} label: {
|
||||
Text(token)
|
||||
.font(.system(size: 12, weight: .medium))
|
||||
.font(TypeStyle.caption)
|
||||
.foregroundStyle(palette.textSecondary)
|
||||
.padding(.horizontal, 8)
|
||||
.padding(.vertical, 4)
|
||||
@@ -321,7 +401,7 @@ private struct ClipboardHistoryRow: View {
|
||||
// Half opacity so the keyboard chrome still reads through the card.
|
||||
.background(
|
||||
palette.surface.opacity(0.5),
|
||||
in: RoundedRectangle(cornerRadius: 12, style: .continuous)
|
||||
in: RoundedRectangle(cornerRadius: Radius.medium, style: .continuous)
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -57,7 +57,7 @@ struct SystemGlobeKey: View {
|
||||
cornerRadius: KeyboardChromeLayout.actionKeyCornerRadius
|
||||
) {
|
||||
Image(systemName: "globe")
|
||||
.font(.system(size: 17, weight: .medium))
|
||||
.font(TypeStyle.headline.weight(.medium))
|
||||
.foregroundStyle(NativeKeyboardKeyColors.text(for: colorScheme))
|
||||
.accessibilityHidden(true)
|
||||
}
|
||||
|
||||
@@ -322,7 +322,7 @@ struct KeyboardTranslationMenuButton: View, Equatable {
|
||||
ZStack {
|
||||
Color.clear
|
||||
Image(systemName: isEnabled ? "character.bubble.fill" : "character.bubble")
|
||||
.font(.system(size: 17, weight: .semibold))
|
||||
.font(TypeStyle.headline)
|
||||
.foregroundStyle(
|
||||
isEnabled
|
||||
? palette.accent
|
||||
|
||||
@@ -113,7 +113,7 @@ struct RepeatingPressButton<Label: View>: View {
|
||||
.gesture(pressGesture)
|
||||
.opacity(disabled ? 0.38 : 1)
|
||||
.allowsHitTesting(!disabled)
|
||||
.accessibilityLabel(Text("delete"))
|
||||
.accessibilityLabel(ExtL10n.string("keyboard.key.deleteA11y"))
|
||||
.accessibilityAddTraits(.isButton)
|
||||
.onDisappear { stopRepeating() }
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user