2026-06-19 02:10:25 +02:00
|
|
|
import SwiftUI
|
|
|
|
|
import VoiceCatCore
|
|
|
|
|
|
2026-06-21 03:02:58 +02:00
|
|
|
/// One row of the combined chat/activity timeline. Mirrors the macOS/Windows clients, which
|
|
|
|
|
/// collapse chat messages and activity events into a single scrolling log (chat in normal
|
|
|
|
|
/// text, activity events in gray).
|
|
|
|
|
private enum TimelineItem: Identifiable {
|
|
|
|
|
case message(ChatMessage)
|
|
|
|
|
case activity(ActivityEntry)
|
|
|
|
|
|
|
|
|
|
var id: UUID {
|
|
|
|
|
switch self {
|
|
|
|
|
case .message(let m): return m.id
|
|
|
|
|
case .activity(let a): return a.id
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
var timestamp: Date {
|
|
|
|
|
switch self {
|
|
|
|
|
case .message(let m): return m.timestamp
|
|
|
|
|
case .activity(let a): return a.timestamp
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2026-06-19 02:10:25 +02:00
|
|
|
struct ChatView: View {
|
|
|
|
|
@Bindable var session: SessionState
|
|
|
|
|
@State private var composeText = ""
|
|
|
|
|
@State private var scope: VoiceCatTextScope = .channel
|
|
|
|
|
@State private var privateTargetId: UInt32 = 0
|
|
|
|
|
|
2026-06-21 03:02:58 +02:00
|
|
|
private var timeline: [TimelineItem] {
|
|
|
|
|
let merged = session.messages.map(TimelineItem.message)
|
|
|
|
|
+ session.activityLog.map(TimelineItem.activity)
|
|
|
|
|
return merged.sorted { $0.timestamp < $1.timestamp }
|
|
|
|
|
}
|
|
|
|
|
|
2026-06-19 02:10:25 +02:00
|
|
|
var body: some View {
|
|
|
|
|
VStack(spacing: 0) {
|
2026-06-21 03:02:58 +02:00
|
|
|
// Combined chat + activity timeline
|
2026-06-19 02:10:25 +02:00
|
|
|
ScrollViewReader { proxy in
|
|
|
|
|
ScrollView {
|
|
|
|
|
LazyVStack(alignment: .leading, spacing: 8) {
|
2026-06-21 03:02:58 +02:00
|
|
|
ForEach(timeline) { item in
|
|
|
|
|
switch item {
|
|
|
|
|
case .message(let msg):
|
|
|
|
|
ChatBubble(message: msg)
|
|
|
|
|
.id(item.id)
|
|
|
|
|
case .activity(let entry):
|
|
|
|
|
ActivityRow(entry: entry)
|
|
|
|
|
.id(item.id)
|
|
|
|
|
}
|
2026-06-19 02:10:25 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
.padding()
|
|
|
|
|
}
|
2026-06-21 03:02:58 +02:00
|
|
|
.onChange(of: session.messages.count + session.activityLog.count) { _, _ in
|
|
|
|
|
if let last = timeline.last {
|
2026-06-19 02:10:25 +02:00
|
|
|
proxy.scrollTo(last.id, anchor: .bottom)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Divider()
|
|
|
|
|
|
|
|
|
|
// Compose bar
|
|
|
|
|
HStack(spacing: 8) {
|
|
|
|
|
TextField("Message…", text: $composeText, axis: .vertical)
|
|
|
|
|
.lineLimit(1...5)
|
|
|
|
|
.textFieldStyle(.roundedBorder)
|
|
|
|
|
.accessibilityLabel("Message text field")
|
|
|
|
|
.onSubmit { sendMessage() }
|
|
|
|
|
|
|
|
|
|
Button {
|
|
|
|
|
sendMessage()
|
|
|
|
|
} label: {
|
|
|
|
|
Image(systemName: "arrow.up.circle.fill")
|
|
|
|
|
.imageScale(.large)
|
|
|
|
|
}
|
|
|
|
|
.disabled(composeText.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
|
|
|
|
|
|| session.currentChannelId == 0)
|
|
|
|
|
.accessibilityLabel("Send message")
|
|
|
|
|
}
|
|
|
|
|
.padding(.horizontal)
|
|
|
|
|
.padding(.vertical, 8)
|
|
|
|
|
}
|
|
|
|
|
.navigationTitle("Chat")
|
|
|
|
|
.navigationBarTitleDisplayMode(.inline)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private func sendMessage() {
|
|
|
|
|
let text = composeText.trimmingCharacters(in: .whitespacesAndNewlines)
|
|
|
|
|
guard !text.isEmpty else { return }
|
feat(clients): persist input settings, add mic input gain, fix iOS chat + VoiceOver
Input mode (VAD/PTT/Always-On), VAD threshold, and the new mic gain were
applied to the core + UI but never saved, so every relaunch reset to VAD
defaults. Each client now persists them and re-applies on connect:
- iOS: UserDefaults (SessionState.loadAndApplyVoiceSettings + setter writes)
- macOS: UserDefaults via MainWindowController didSet + loadPersistedAudioSettings
(settings window also restores the VAD slider from the stored threshold)
- Windows: new Models/VoiceSettings.cs (JSON at %AppData%\VoiceCat\voice.json,
mirrors FeedbackSettings) loaded/applied in MainForm
Add global send-side mic gain API vc_set_input_gain (applied to MIC PCM in
on_capture_frame before the VAD gate, clamped to int16) + Swift/C# bindings,
and a 0-300% (default 100%) mic-volume slider on all three clients.
Fix iOS chat: ChatView called sendText(scope:.channel) with no targetId (0),
so channel messages went nowhere; now passes session.currentChannelId.
Fix iOS per-user tuning for VoiceOver: the tuning sheet was long-press
.contextMenu only (invisible to VoiceOver); UserRow now also exposes the same
buttons via .accessibilityActions (no visual change).
Verified: core builds clean; ctest 24/27 (3 pre-existing teardown crashes,
reproduced with changes stashed); VoiceCatMac + VoiceCatiOS (arm64 sim) build
SUCCEEDED; VoiceCat.Interop dotnet build succeeded. Windows App not built
(WinForms can't build on macOS) — follows existing patterns.
2026-06-23 03:35:26 +02:00
|
|
|
session.sendText(text, scope: .channel, targetId: session.currentChannelId)
|
2026-06-19 02:10:25 +02:00
|
|
|
composeText = ""
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private struct ChatBubble: View {
|
|
|
|
|
let message: ChatMessage
|
|
|
|
|
|
|
|
|
|
private var timeString: String {
|
|
|
|
|
let fmt = DateFormatter()
|
|
|
|
|
fmt.dateStyle = .none
|
|
|
|
|
fmt.timeStyle = .short
|
|
|
|
|
return fmt.string(from: message.timestamp)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
var body: some View {
|
|
|
|
|
VStack(alignment: .leading, spacing: 2) {
|
|
|
|
|
HStack(spacing: 4) {
|
|
|
|
|
Text(message.senderName)
|
|
|
|
|
.font(.caption)
|
|
|
|
|
.fontWeight(.semibold)
|
|
|
|
|
.foregroundStyle(.secondary)
|
|
|
|
|
Text(timeString)
|
|
|
|
|
.font(.caption2)
|
|
|
|
|
.foregroundStyle(.tertiary)
|
|
|
|
|
}
|
|
|
|
|
Text(message.text)
|
|
|
|
|
.font(.body)
|
|
|
|
|
.textSelection(.enabled)
|
|
|
|
|
}
|
|
|
|
|
.frame(maxWidth: .infinity, alignment: .leading)
|
|
|
|
|
.accessibilityElement(children: .combine)
|
|
|
|
|
.accessibilityLabel("\(message.senderName) at \(timeString): \(message.text)")
|
|
|
|
|
}
|
|
|
|
|
}
|
2026-06-21 03:02:58 +02:00
|
|
|
|
|
|
|
|
/// A compact, gray activity row interleaved into the chat timeline (joins/leaves, talk state,
|
|
|
|
|
/// streams, server mute, etc.). Matches the "activity = gray" convention of the macOS/Windows
|
|
|
|
|
/// unified logs.
|
|
|
|
|
private struct ActivityRow: View {
|
|
|
|
|
let entry: ActivityEntry
|
|
|
|
|
|
|
|
|
|
private static let timeFormatter: DateFormatter = {
|
|
|
|
|
let fmt = DateFormatter()
|
|
|
|
|
fmt.dateStyle = .none
|
|
|
|
|
fmt.timeStyle = .short
|
|
|
|
|
return fmt
|
|
|
|
|
}()
|
|
|
|
|
|
|
|
|
|
private var timeString: String { Self.timeFormatter.string(from: entry.timestamp) }
|
|
|
|
|
|
|
|
|
|
var body: some View {
|
|
|
|
|
HStack(alignment: .top, spacing: 6) {
|
|
|
|
|
Text(timeString)
|
|
|
|
|
.font(.caption2)
|
|
|
|
|
.foregroundStyle(.tertiary)
|
|
|
|
|
.monospacedDigit()
|
|
|
|
|
Text(entry.text)
|
|
|
|
|
.font(.caption)
|
|
|
|
|
.foregroundStyle(.secondary)
|
|
|
|
|
}
|
|
|
|
|
.frame(maxWidth: .infinity, alignment: .leading)
|
|
|
|
|
.accessibilityElement(children: .combine)
|
|
|
|
|
.accessibilityLabel("\(timeString): \(entry.text)")
|
|
|
|
|
}
|
|
|
|
|
}
|