Rocky
aeb28f4b36
Three user-flagged fixes, scoped tightly to the files each affects.
The uncommitted Engine-mode wiring / locale picker / etc. from a
prior agent pass is intentionally not included in this commit.
1. Revert accent to brand green (#3AA05A).
Last commit flipped `AccentColor` + `Palette.light.accent` to
Apple system blue (#007AFF) on the assumption that "green CTA
on a near-white surface looks wrong." Review pushed back:
the brand *is* the green, and the system tint should match it
so that NavStack Done buttons, Toggles, and our custom
`primaryButton()` modifier all read as the same colour. Restored
`#3AA05A` in both `AccentColor.colorset/Contents.json` and
`Palette.light.accent` (plus the muted / glow variants).
2. Real iOS ASR in `KeyboardPreviewSheet`.
The previous fix only swapped the static placeholder for a
`TextField` and routed a hardcoded stub through it — review
asked, fairly, "are you actually calling `SFSpeechRecognizer`?"
Answer: no. This change makes the preview *run real ASR*:
- `ASRService` (+ the iOS 26 `SpeechAnalyzer` path) moves from
`OSGKeyboardExt/Services/` to `OSGKeyboardShared/Services/`,
so the host app can import the same `ASRServiceFactory.make()`
the keyboard extension uses.
- `OSGKeyboardShared` gains `Speech.framework` and
`AVFoundation.framework` as SDK dependencies in `project.yml`.
- New `OSGKeyboard/Views/PreviewASRController.swift` (the
extension's `AudioCaptureService` is app-extension-only, so
the preview owns its own `AVAudioEngine` + `AVAudioSession`
and downsamples to 16 kHz mono Float32 via `AVAudioConverter`).
- `KeyboardPreviewSheet.cyclePhase()` now calls
`asr.start(locale:)` / `asr.stop()` instead of toggling a
`StubPhase`. The disc's level meter is driven by RMS from the
actual audio tap; the transcript line under the chips shows
the live `SFSpeechRecognizer` partial; the top textbox
receives the `.final` transcript via `onChange(of: lastFinal)`.
3. Record disc in BOTH stubs now uses the green accent for idle.
Was `Color(white: 0.22)` dark-gray, which read as "inert
surface" rather than "tap me". The keyboard extension and the
in-app preview now share the same brand-green disc gradient so
the keyboard's primary CTA is the same colour in both modes.
4. Bilingual audit across every user-facing string.
Every Text() in the main-app and extension views is now
`中文 · English` or carries an English secondary line. Covered:
- OnboardingView (Back, Next, Done, Continue, step instructions,
PrivacyFootnote rows)
- HomeView (status header, hero label, accessibility)
- APISettingsCard (Base URL, API Key, Model, "Get an API key",
"Connection", test-connection states + error messages)
- KeyboardPreviewSheet (title, subtitle, TextField placeholder,
clear button accessibility)
- KeyboardPreviewStub (mode/locale chips, REC badge, space bar)
- KeyboardRootView (gear accessibility, space bar, requesting
state, denied messages, local-engine chip)
- RecordButton (accessibility label)
- SettingsView (Done, Reset dialog, language section subtitle,
engine section, local-engine subtitle, on-device label)
- AppGroupErrorView (title, body, three remediation steps)
- LLMProvider preset names and blurbs
Where the prior pattern was "Chinese headline + English footnote"
(e.g. OnboardingView's 启用 OSGKeyboard / Enable OSGKeyboard),
that pattern was preserved — bilingual coverage means every
screen reads as both, not that every line is rigidly `中 · EN`.
Build: BUILD SUCCEEDED on iPhone 17 Pro / iOS 26 simulator.
Tests: 21/21 pass (no test changes).
Visual: light-mode home shot at /tmp/osgk_light_green.png shows
the brand-green CTA restored across Next button, mic icon, and
page dot.
🤖 Generated with Claude Code
88 lines
3.0 KiB
Swift
88 lines
3.0 KiB
Swift
// LLMProvider.swift
|
|
// OSGKeyboard · Shared
|
|
//
|
|
// Provider preset: a known cloud LLM with sensible defaults.
|
|
// User picks one of these on first launch, or defines a Custom one.
|
|
|
|
import Foundation
|
|
|
|
public struct LLMProvider: Identifiable, Codable, Hashable, Sendable {
|
|
public let id: String
|
|
public let name: String
|
|
public let defaultBaseURL: String
|
|
public let defaultModel: String
|
|
public let apiKeyURL: URL?
|
|
/// Optional short blurb shown under the provider name in the picker.
|
|
public let blurb: String?
|
|
|
|
public init(
|
|
id: String,
|
|
name: String,
|
|
defaultBaseURL: String,
|
|
defaultModel: String,
|
|
apiKeyURL: URL? = nil,
|
|
blurb: String? = nil
|
|
) {
|
|
self.id = id
|
|
self.name = name
|
|
self.defaultBaseURL = defaultBaseURL
|
|
self.defaultModel = defaultModel
|
|
self.apiKeyURL = apiKeyURL
|
|
self.blurb = blurb
|
|
}
|
|
|
|
public static let presets: [LLMProvider] = [
|
|
.init(
|
|
id: "openai",
|
|
name: "OpenAI",
|
|
defaultBaseURL: "https://api.openai.com/v1",
|
|
defaultModel: "gpt-4o-mini",
|
|
apiKeyURL: URL(string: "https://platform.openai.com/api-keys"),
|
|
blurb: "GPT-4o mini · 多语言 · Multilingual"
|
|
),
|
|
.init(
|
|
id: "deepseek",
|
|
name: "DeepSeek",
|
|
defaultBaseURL: "https://api.deepseek.com/v1",
|
|
defaultModel: "deepseek-chat",
|
|
apiKeyURL: URL(string: "https://platform.deepseek.com/api_keys"),
|
|
blurb: "deepseek-chat · 中文友好 · Chinese-friendly"
|
|
),
|
|
.init(
|
|
id: "qwen",
|
|
name: "Qwen (DashScope)",
|
|
defaultBaseURL: "https://dashscope.aliyuncs.com/compatible-mode/v1",
|
|
defaultModel: "qwen-plus",
|
|
apiKeyURL: URL(string: "https://dashscope.console.aliyun.com/apiKey"),
|
|
blurb: "通义千问 · OpenAI 兼容 · OpenAI-compatible"
|
|
),
|
|
.init(
|
|
id: "zhipu",
|
|
name: "智谱 GLM · Zhipu",
|
|
defaultBaseURL: "https://open.bigmodel.cn/api/paas/v4",
|
|
defaultModel: "glm-4-flash",
|
|
apiKeyURL: URL(string: "https://bigmodel.cn/usercenter/apikeys"),
|
|
blurb: "GLM-4-Flash · 中文优化 · Chinese-optimized"
|
|
),
|
|
.init(
|
|
id: "moonshot",
|
|
name: "月之暗面 Moonshot",
|
|
defaultBaseURL: "https://api.moonshot.cn/v1",
|
|
defaultModel: "moonshot-v1-8k",
|
|
apiKeyURL: URL(string: "https://platform.moonshot.cn/console/api-keys"),
|
|
blurb: "Kimi · 长上下文 · Long context"
|
|
),
|
|
.init(
|
|
id: "custom",
|
|
name: "Custom · 自定义",
|
|
defaultBaseURL: "",
|
|
defaultModel: "",
|
|
blurb: "自建 / 任意 OpenAI 兼容端点 · Any OpenAI-compatible endpoint"
|
|
)
|
|
]
|
|
|
|
public static func provider(id: String) -> LLMProvider {
|
|
presets.first(where: { $0.id == id }) ?? .presets[0]
|
|
}
|
|
}
|