Implement the SDD-094 / SDD-095 / SDD-096 / SDD-097 detailed designs
committed in dfa84ee.
Rust side
- chanora_audio::TransmitMode enum (Ptt/Continuous/VoiceActivity) with
serde-friendly u8 repr (SDD-095).
- chanora_audio::TransmitModeSelector: lock-free Atomic-backed selector
that is the sole writer of transmit_active (per SAD-083), applying
hard_mute as a final clamp. VoiceActivity falls through to Continuous
for v1 (DEC-030 placeholder).
- chanora_audio::ReleaseTailTimer: tokio-task-owning struct driving the
selector's ptt_held input; default 200 ms tail, configurable 0–500 ms
with AtomicU32 hot read; pending JoinHandle held in a std::sync::Mutex
touched only on PTT edge transitions (SDD-096).
- chanora_storage: AudioMeta persisted as audio_meta.json next to
identity.dek; get/set_transmit_mode + get/set_release_tail_ms with
0..=500 clamp on write.
- chanora_core::ChanoraSession: voice_join(channel, password) and
voice_leave() are the new lifecycle entry points; ensure_audio_running
and shutdown_audio_if_idle are private helpers around the existing
Option<AudioEngine> field. SessionEvent::VoiceState carries the
in_channel / transmit_mode / mute / release_tail_ms tuple. Selector
state survives reconnect; supervisor rewires it to each fresh engine
gate.
- chanora_bridge: drop start_audio; add voice_join, voice_leave,
set/get_transmit_mode, set/get_release_tail_ms, set_hard_mute.
BridgeEvent::VoiceState mirrors the core event. AudioStarted/Stopped
kept for backwards compat but Flutter ignores them in the new UI.
Flutter side
- New apps/chanora_flutter/lib/widgets/voice_bar.dart replaces the
legacy _AudioControls widget. Renders channel pill, mode badge,
mute toggle, level meter, PttCapabilityBadge, leave button. No
manual Start affordance anywhere.
- New apps/chanora_flutter/lib/widgets/voice_settings.dart dialog with
TransmitMode radio group (VoiceActivity disabled with 'Coming soon'
trailing label per DEC-030), bind-key button, release-tail slider
0–500 ms step 25.
- main.dart: state fields _inChannel, _transmitMode, _hardMute,
_releaseTailMs driven by BridgeEvent_VoiceState. Channel-tap now
calls voiceJoin instead of moveToChannel. Removed _onStartAudio,
_audioStarted-gated branch, and the FilledButton.
- l10n: 11 new strings in app_en.arb + app_zh.arb.
Verification
- cargo check --workspace: clean.
- cargo test --workspace --lib: 72 passed / 0 failed / 1 ignored
(chanora_audio: +12 new tests for TransmitMode/Selector/ReleaseTail;
chanora_storage: +2 new tests for audio_meta round-trip).
- flutter analyze: 0 errors, 0 warnings; 6 infos are the Flutter 3.32
Radio.groupValue deprecation (pre-existing API usage).
- FRB Dart/Rust bindings regenerated via flutter_rust_bridge_codegen.
Follow-up (intentionally deferred)
- PttController and per-platform PTT backends still drive AudioTransmitGate
directly via the legacy set_ptt path; routing those key edges through
ChanoraSession::release_tail_timer().{key_down,key_up} so the tail
applies to native PTT input is a contained wiring change in a follow-up.
- Real audio-level RMS in BridgeAudioStats (current meter is binary).
- VoiceActivity backend (DEC-030).
168 lines
5.2 KiB
Dart
168 lines
5.2 KiB
Dart
// Voice settings dialog (SDD-097). Surfaces a TransmitMode radio
|
|
// group, a bind-key button, and a release-tail slider.
|
|
|
|
import 'package:flutter/material.dart';
|
|
|
|
import '../l10n/generated/app_localizations.dart';
|
|
import '../src/rust/api.dart' as rust;
|
|
|
|
/// Result returned by [`VoiceSettingsDialog`]. `null` indicates a
|
|
/// cancelled dialog.
|
|
class VoiceSettingsResult {
|
|
/// Construct a result snapshot.
|
|
const VoiceSettingsResult({
|
|
required this.mode,
|
|
required this.releaseTailMs,
|
|
required this.bindKeyRequested,
|
|
});
|
|
|
|
/// Selected transmit mode.
|
|
final rust.BridgeTransmitMode mode;
|
|
|
|
/// Chosen release-tail in milliseconds (0..=500, step 25).
|
|
final int releaseTailMs;
|
|
|
|
/// True when the user tapped the "bind key" button. The caller
|
|
/// is expected to open the focus-scoped capture dialog
|
|
/// afterwards.
|
|
final bool bindKeyRequested;
|
|
}
|
|
|
|
/// Voice settings dialog widget.
|
|
class VoiceSettingsDialog extends StatefulWidget {
|
|
/// Construct a dialog seeded with the current settings.
|
|
const VoiceSettingsDialog({
|
|
super.key,
|
|
required this.initialMode,
|
|
required this.initialReleaseTailMs,
|
|
});
|
|
|
|
/// Currently active transmit mode.
|
|
final rust.BridgeTransmitMode initialMode;
|
|
|
|
/// Currently configured release tail in milliseconds.
|
|
final int initialReleaseTailMs;
|
|
|
|
@override
|
|
State<VoiceSettingsDialog> createState() => _VoiceSettingsDialogState();
|
|
}
|
|
|
|
class _VoiceSettingsDialogState extends State<VoiceSettingsDialog> {
|
|
late rust.BridgeTransmitMode _mode;
|
|
late double _releaseTail;
|
|
|
|
@override
|
|
void initState() {
|
|
super.initState();
|
|
_mode = widget.initialMode;
|
|
_releaseTail = widget.initialReleaseTailMs.clamp(0, 500).toDouble();
|
|
}
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
final l10n = AppL10n.of(context);
|
|
final theme = Theme.of(context);
|
|
return AlertDialog(
|
|
title: Text(l10n.voiceSettingsTitle),
|
|
content: SizedBox(
|
|
width: 360,
|
|
child: Column(
|
|
mainAxisSize: MainAxisSize.min,
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
children: [
|
|
Text(
|
|
l10n.voiceModeLabel,
|
|
style: theme.textTheme.titleSmall,
|
|
),
|
|
const SizedBox(height: 4),
|
|
RadioListTile<rust.BridgeTransmitMode>(
|
|
dense: true,
|
|
value: rust.BridgeTransmitMode.ptt,
|
|
groupValue: _mode,
|
|
title: Text(l10n.voiceModePtt),
|
|
onChanged: (v) => setState(() => _mode = v!),
|
|
),
|
|
RadioListTile<rust.BridgeTransmitMode>(
|
|
dense: true,
|
|
value: rust.BridgeTransmitMode.continuous,
|
|
groupValue: _mode,
|
|
title: Text(l10n.voiceModeContinuous),
|
|
onChanged: (v) => setState(() => _mode = v!),
|
|
),
|
|
RadioListTile<rust.BridgeTransmitMode>(
|
|
dense: true,
|
|
value: rust.BridgeTransmitMode.voiceActivity,
|
|
groupValue: _mode,
|
|
title: Text(l10n.voiceModeVoiceActivity),
|
|
secondary: Text(
|
|
l10n.voiceModeComingSoon,
|
|
style: theme.textTheme.bodySmall,
|
|
),
|
|
// VoiceActivity is reserved per DEC-030 — keep the
|
|
// tile visible but disabled per SDD-095.
|
|
onChanged: null,
|
|
),
|
|
const Divider(),
|
|
OutlinedButton.icon(
|
|
icon: const Icon(Icons.keyboard),
|
|
label: Text(l10n.voiceBindKeyAction),
|
|
onPressed: () {
|
|
Navigator.of(context).pop(
|
|
VoiceSettingsResult(
|
|
mode: _mode,
|
|
releaseTailMs: _releaseTail.round(),
|
|
bindKeyRequested: true,
|
|
),
|
|
);
|
|
},
|
|
),
|
|
const SizedBox(height: 8),
|
|
Text(
|
|
l10n.voiceReleaseTailLabel,
|
|
style: theme.textTheme.titleSmall,
|
|
),
|
|
Row(
|
|
children: [
|
|
Expanded(
|
|
child: Slider(
|
|
value: _releaseTail,
|
|
min: 0,
|
|
max: 500,
|
|
divisions: 20, // step 25 ms
|
|
label: '${_releaseTail.round()}${l10n.voiceReleaseTailHint}',
|
|
onChanged: (v) => setState(() => _releaseTail = v),
|
|
),
|
|
),
|
|
SizedBox(
|
|
width: 64,
|
|
child: Text(
|
|
'${_releaseTail.round()}${l10n.voiceReleaseTailHint}',
|
|
style: theme.textTheme.bodySmall,
|
|
textAlign: TextAlign.end,
|
|
),
|
|
),
|
|
],
|
|
),
|
|
],
|
|
),
|
|
),
|
|
actions: [
|
|
TextButton(
|
|
onPressed: () => Navigator.of(context).pop(),
|
|
child: Text(l10n.closeAction),
|
|
),
|
|
FilledButton(
|
|
onPressed: () => Navigator.of(context).pop(
|
|
VoiceSettingsResult(
|
|
mode: _mode,
|
|
releaseTailMs: _releaseTail.round(),
|
|
bindKeyRequested: false,
|
|
),
|
|
),
|
|
child: Text(l10n.pttConfigureSaveAction),
|
|
),
|
|
],
|
|
);
|
|
}
|
|
}
|