feat(polish): allow mood emoji on custom styles and ship Flow/ASR fixes
Custom polish styles can opt in to emotion-matched emoji (default off), with prompt-level opt-in detection so paste-only styles keep model-added emoji. Also include Volcengine API-Key ASR auth, voice-processing capture, PiP flash fix, and related keyboard Shift/haptics reliability work.
This commit is contained in:
Rocky
@@ -146,7 +146,8 @@ struct MacPolishStylesView: View {
|
||||
duplicate: {
|
||||
editingPack = PolishStylePack(
|
||||
name: "\(pack.displayName(language: lang)) \(MacL10n.string("mac.styles.copy", language: lang))",
|
||||
prompt: pack.prompt
|
||||
prompt: pack.prompt,
|
||||
allowsAddedEmoji: pack.allowsAddedEmoji
|
||||
)
|
||||
showEditor = true
|
||||
},
|
||||
@@ -347,6 +348,7 @@ private struct MacPolishStyleEditor: View {
|
||||
@Environment(\.themePalette) private var palette
|
||||
@State private var name: String
|
||||
@State private var prompt: String
|
||||
@State private var allowsAddedEmoji: Bool
|
||||
|
||||
init(
|
||||
pack: PolishStylePack?,
|
||||
@@ -358,6 +360,7 @@ private struct MacPolishStyleEditor: View {
|
||||
self.onSave = onSave
|
||||
_name = State(initialValue: pack?.name ?? "")
|
||||
_prompt = State(initialValue: pack?.prompt ?? PolishStylePackCatalog.newUserPromptTemplate)
|
||||
_allowsAddedEmoji = State(initialValue: pack?.allowsAddedEmoji ?? false)
|
||||
}
|
||||
|
||||
var body: some View {
|
||||
@@ -366,6 +369,13 @@ private struct MacPolishStyleEditor: View {
|
||||
.font(TypeStyle.title2)
|
||||
TextField(MacL10n.string("mac.styles.name", language: language), text: $name)
|
||||
.textFieldStyle(.roundedBorder)
|
||||
Toggle(
|
||||
MacL10n.string("mac.styles.allowsAddedEmoji", language: language),
|
||||
isOn: $allowsAddedEmoji
|
||||
)
|
||||
Text(MacL10n.string("mac.styles.allowsAddedEmoji.hint", language: language))
|
||||
.font(TypeStyle.caption2)
|
||||
.foregroundStyle(palette.textTertiary)
|
||||
HStack {
|
||||
Text(MacL10n.string("mac.styles.prompt", language: language))
|
||||
.font(MacSettingsType.sectionTitle)
|
||||
@@ -380,13 +390,19 @@ private struct MacPolishStyleEditor: View {
|
||||
}
|
||||
TextEditor(text: $prompt)
|
||||
.font(.body.monospaced())
|
||||
.frame(minHeight: 360)
|
||||
.frame(minHeight: 320)
|
||||
.padding(4)
|
||||
.background(palette.surface, in: RoundedRectangle(cornerRadius: Radius.medium))
|
||||
.overlay(
|
||||
RoundedRectangle(cornerRadius: Radius.medium)
|
||||
.stroke(palette.divider, lineWidth: 1)
|
||||
)
|
||||
.onChange(of: prompt) { _, newValue in
|
||||
if !allowsAddedEmoji,
|
||||
PolishStylePack.promptDeclaresAddedEmojiOptIn(newValue) {
|
||||
allowsAddedEmoji = true
|
||||
}
|
||||
}
|
||||
Text(MacL10n.string("mac.styles.hint", language: language))
|
||||
.font(TypeStyle.caption2)
|
||||
.foregroundStyle(palette.textTertiary)
|
||||
@@ -399,6 +415,8 @@ private struct MacPolishStyleEditor: View {
|
||||
id: pack?.id ?? "user.\(UUID().uuidString.lowercased())",
|
||||
name: name,
|
||||
prompt: prompt,
|
||||
allowsAddedEmoji: allowsAddedEmoji
|
||||
|| PolishStylePack.promptDeclaresAddedEmojiOptIn(prompt),
|
||||
kind: .user,
|
||||
createdAt: pack?.createdAt ?? Date()
|
||||
)
|
||||
@@ -414,7 +432,7 @@ private struct MacPolishStyleEditor: View {
|
||||
}
|
||||
}
|
||||
.padding(Spacing.xl)
|
||||
.frame(width: 680, height: 590)
|
||||
.frame(width: 680, height: 640)
|
||||
.background(palette.background)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -188,34 +188,52 @@ struct MacSettingsView: View {
|
||||
|
||||
@ViewBuilder
|
||||
private var volcengineAsrRows: some View {
|
||||
MacCredentialField(
|
||||
title: MacL10n.string("mac.settings.volcengineAppId", language: lang),
|
||||
placeholder: "APP ID",
|
||||
text: Binding(
|
||||
get: { macVolcengineFields.appID },
|
||||
set: { updateMacVolcengine(appID: $0) }
|
||||
),
|
||||
isSecret: true
|
||||
MacProviderThinkingRow(
|
||||
title: MacL10n.string("mac.settings.volcengineApiKeyMode", language: lang),
|
||||
subtitle: MacL10n.string("mac.settings.volcengineApiKeyModeSubtitle", language: lang),
|
||||
isOn: Binding(
|
||||
get: { macVolcengineFields.usesAPIKeyAuth },
|
||||
set: { updateMacVolcengine(authMode: $0 ? .apiKey : .appToken) }
|
||||
)
|
||||
)
|
||||
MacCredentialField(
|
||||
title: MacL10n.string("mac.settings.volcengineAccessToken", language: lang),
|
||||
placeholder: "Access Token",
|
||||
text: Binding(
|
||||
get: { macVolcengineFields.accessToken },
|
||||
set: { updateMacVolcengine(accessToken: $0) }
|
||||
),
|
||||
isSecret: true
|
||||
if macVolcengineFields.usesAPIKeyAuth {
|
||||
MacCredentialField(
|
||||
title: MacL10n.string("mac.settings.volcengineApiKey", language: lang),
|
||||
placeholder: "API Key",
|
||||
text: Binding(
|
||||
get: { macVolcengineFields.apiKeyCredential },
|
||||
set: { updateMacVolcengine(apiKeyCredential: $0) }
|
||||
),
|
||||
isSecret: true
|
||||
)
|
||||
} else {
|
||||
MacCredentialField(
|
||||
title: MacL10n.string("mac.settings.volcengineAppId", language: lang),
|
||||
placeholder: "APP ID",
|
||||
text: Binding(
|
||||
get: { macVolcengineFields.appID },
|
||||
set: { updateMacVolcengine(appID: $0) }
|
||||
),
|
||||
isSecret: true
|
||||
)
|
||||
MacCredentialField(
|
||||
title: MacL10n.string("mac.settings.volcengineAccessToken", language: lang),
|
||||
placeholder: "Access Token",
|
||||
text: Binding(
|
||||
get: { macVolcengineFields.accessToken },
|
||||
set: { updateMacVolcengine(accessToken: $0) }
|
||||
),
|
||||
isSecret: true
|
||||
)
|
||||
}
|
||||
MacProviderNoteRow(
|
||||
text: MacL10n.string(
|
||||
macVolcengineFields.usesAPIKeyAuth
|
||||
? "mac.settings.volcengineNoteApiKey"
|
||||
: "mac.settings.volcengineNoteAppToken",
|
||||
language: lang
|
||||
)
|
||||
)
|
||||
MacCredentialField(
|
||||
title: MacL10n.string("mac.settings.volcengineResourceId", language: lang),
|
||||
placeholder: CloudASRModelCatalog.defaultModel(for: "volcengine"),
|
||||
text: Binding(
|
||||
get: { macVolcengineFields.resourceID },
|
||||
set: { updateMacVolcengine(resourceID: $0) }
|
||||
),
|
||||
defaultValue: CloudASRModelCatalog.defaultModel(for: "volcengine")
|
||||
)
|
||||
MacProviderNoteRow(text: MacL10n.string("mac.settings.volcengineNote", language: lang))
|
||||
}
|
||||
|
||||
@ViewBuilder
|
||||
@@ -407,22 +425,21 @@ struct MacSettingsView: View {
|
||||
}
|
||||
|
||||
private var macVolcengineFields: VolcengineASRFields {
|
||||
VolcengineASRFields.parse(
|
||||
apiKey: viewModel.config.asrApiKey,
|
||||
resourceFallback: viewModel.config.asrModel.isEmpty
|
||||
? CloudASRModelCatalog.defaultModel(for: "volcengine")
|
||||
: viewModel.config.asrModel
|
||||
)
|
||||
VolcengineASRFields.parse(apiKey: viewModel.config.asrApiKey)
|
||||
}
|
||||
|
||||
private func updateMacVolcengine(appID: String? = nil, accessToken: String? = nil, resourceID: String? = nil) {
|
||||
private func updateMacVolcengine(
|
||||
authMode: VolcengineASRAuthMode? = nil,
|
||||
appID: String? = nil,
|
||||
accessToken: String? = nil,
|
||||
apiKeyCredential: String? = nil
|
||||
) {
|
||||
var fields = macVolcengineFields
|
||||
if let authMode { fields.authMode = authMode }
|
||||
if let appID { fields.appID = appID }
|
||||
if let accessToken { fields.accessToken = accessToken }
|
||||
if let resourceID {
|
||||
fields.resourceID = resourceID
|
||||
viewModel.config.asrModel = resourceID
|
||||
}
|
||||
if let apiKeyCredential { fields.apiKeyCredential = apiKeyCredential }
|
||||
viewModel.config.asrModel = VolcengineASRFields.fixedResourceID
|
||||
viewModel.config.asrApiKey = fields.encodedAPIKey
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user