Compare commits
14 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 413b82f724 | |||
| 5f11b344a3 | |||
| 8959b62abe | |||
| c967a49e5a | |||
| 58d4cfab4d | |||
| ee0f354312 | |||
| bdaa5210f0 | |||
| ad20c9f9d4 | |||
| 48c134ce6a | |||
| 634b6d05cf | |||
| 00878a8a42 | |||
| ddbf867b03 | |||
| 51f1cffe79 | |||
| fa84e40efc |
@@ -1,7 +1,12 @@
|
|||||||
# CI runs first; build only proceeds if all checks pass.
|
# CI runs first; build only proceeds if all checks pass.
|
||||||
#
|
#
|
||||||
# Push to dev or main: flutter analyze + flutter test
|
# Push to dev: flutter analyze + flutter test
|
||||||
# Tag v* (release): gates + signed APK build + attach to Forgejo Release
|
# Tag v* (release): gates + signed APK build + attach to Forgejo Release
|
||||||
|
#
|
||||||
|
# main pushes are NOT gated here: a merge to main only happens after
|
||||||
|
# dev has already passed CI, and the release tag is the sole trigger
|
||||||
|
# for a signed APK build. Re-running analyze+test on the merge commit
|
||||||
|
# just burns runner time without changing the outcome.
|
||||||
#
|
#
|
||||||
# To cut a release:
|
# To cut a release:
|
||||||
# Create a release via the Forgejo UI on main with a v* tag name.
|
# Create a release via the Forgejo UI on main with a v* tag name.
|
||||||
@@ -20,7 +25,7 @@ name: CI & Build
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [dev, main]
|
branches: [dev]
|
||||||
tags: ["v*"]
|
tags: ["v*"]
|
||||||
|
|
||||||
# Cancel older runs on the same branch when a newer push lands. Tag runs
|
# Cancel older runs on the same branch when a newer push lands. Tag runs
|
||||||
@@ -63,7 +68,7 @@ jobs:
|
|||||||
build:
|
build:
|
||||||
name: Build release APK
|
name: Build release APK
|
||||||
needs: [analyze]
|
needs: [analyze]
|
||||||
# Only tag pushes produce a signed release build. dev/main pushes
|
# Only tag pushes produce a signed release build. dev pushes
|
||||||
# run the gates above and stop there.
|
# run the gates above and stop there.
|
||||||
if: startsWith(github.ref, 'refs/tags/')
|
if: startsWith(github.ref, 'refs/tags/')
|
||||||
runs-on: ci-runner
|
runs-on: ci-runner
|
||||||
|
|||||||
+36
-29
@@ -159,20 +159,20 @@ final routerProvider = Provider<GoRouter>((ref) {
|
|||||||
path: Routes.conversations,
|
path: Routes.conversations,
|
||||||
builder: (_, _) => const ConversationsTabScreen(),
|
builder: (_, _) => const ConversationsTabScreen(),
|
||||||
),
|
),
|
||||||
|
GoRoute(
|
||||||
|
path: Routes.projects,
|
||||||
|
builder: (_, _) => const ProjectsScreen(),
|
||||||
|
),
|
||||||
|
GoRoute(
|
||||||
|
path: Routes.news,
|
||||||
|
builder: (_, _) => const NewsScreen(),
|
||||||
|
),
|
||||||
|
GoRoute(
|
||||||
|
path: Routes.calendar,
|
||||||
|
builder: (_, _) => const CalendarScreen(),
|
||||||
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
GoRoute(
|
|
||||||
path: Routes.projects,
|
|
||||||
builder: (_, _) => const ProjectsScreen(),
|
|
||||||
),
|
|
||||||
GoRoute(
|
|
||||||
path: Routes.news,
|
|
||||||
builder: (_, _) => const NewsScreen(),
|
|
||||||
),
|
|
||||||
GoRoute(
|
|
||||||
path: Routes.calendar,
|
|
||||||
builder: (_, _) => const CalendarScreen(),
|
|
||||||
),
|
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
@@ -190,6 +190,9 @@ class _ShellState extends ConsumerState<_Shell> with WidgetsBindingObserver {
|
|||||||
Routes.briefing,
|
Routes.briefing,
|
||||||
Routes.knowledge,
|
Routes.knowledge,
|
||||||
Routes.conversations,
|
Routes.conversations,
|
||||||
|
Routes.projects,
|
||||||
|
Routes.news,
|
||||||
|
Routes.calendar,
|
||||||
];
|
];
|
||||||
|
|
||||||
// Minimum gap between app-resume refreshes to avoid hammering the server.
|
// Minimum gap between app-resume refreshes to avoid hammering the server.
|
||||||
@@ -255,6 +258,10 @@ class _ShellState extends ConsumerState<_Shell> with WidgetsBindingObserver {
|
|||||||
ref.read(knowledgeProvider.notifier).refresh();
|
ref.read(knowledgeProvider.notifier).refresh();
|
||||||
case 2:
|
case 2:
|
||||||
ref.read(conversationsProvider.notifier).refresh();
|
ref.read(conversationsProvider.notifier).refresh();
|
||||||
|
case 4:
|
||||||
|
ref.read(newsProvider.notifier).refresh();
|
||||||
|
case 5:
|
||||||
|
ref.read(calendarProvider.notifier).refresh();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -271,11 +278,6 @@ class _ShellState extends ConsumerState<_Shell> with WidgetsBindingObserver {
|
|||||||
for (var i = 0; i < _tabs.length; i++) {
|
for (var i = 0; i < _tabs.length; i++) {
|
||||||
if (location.startsWith(_tabs[i])) return i;
|
if (location.startsWith(_tabs[i])) return i;
|
||||||
}
|
}
|
||||||
if (location.startsWith(Routes.projects) ||
|
|
||||||
location.startsWith(Routes.news) ||
|
|
||||||
location.startsWith(Routes.calendar)) {
|
|
||||||
return 3;
|
|
||||||
}
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -394,7 +396,7 @@ class _ShellState extends ConsumerState<_Shell> with WidgetsBindingObserver {
|
|||||||
final index = _tabIndex(location);
|
final index = _tabIndex(location);
|
||||||
|
|
||||||
// Refresh the incoming tab's data when switching between shell tabs.
|
// Refresh the incoming tab's data when switching between shell tabs.
|
||||||
if (_prevTabIndex != null && _prevTabIndex != index && index < 3) {
|
if (_prevTabIndex != null && _prevTabIndex != index) {
|
||||||
WidgetsBinding.instance.addPostFrameCallback((_) => _refreshTab(index));
|
WidgetsBinding.instance.addPostFrameCallback((_) => _refreshTab(index));
|
||||||
}
|
}
|
||||||
_prevTabIndex = index;
|
_prevTabIndex = index;
|
||||||
@@ -413,13 +415,7 @@ class _ShellState extends ConsumerState<_Shell> with WidgetsBindingObserver {
|
|||||||
children: [
|
children: [
|
||||||
NavigationRail(
|
NavigationRail(
|
||||||
selectedIndex: index,
|
selectedIndex: index,
|
||||||
onDestinationSelected: (i) {
|
onDestinationSelected: (i) => context.go(_tabs[i]),
|
||||||
if (i == 3) {
|
|
||||||
_showMoreSheet(context);
|
|
||||||
} else {
|
|
||||||
context.go(_tabs[i]);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
labelType: NavigationRailLabelType.all,
|
labelType: NavigationRailLabelType.all,
|
||||||
destinations: const [
|
destinations: const [
|
||||||
NavigationRailDestination(
|
NavigationRailDestination(
|
||||||
@@ -438,9 +434,19 @@ class _ShellState extends ConsumerState<_Shell> with WidgetsBindingObserver {
|
|||||||
label: Text('Chat'),
|
label: Text('Chat'),
|
||||||
),
|
),
|
||||||
NavigationRailDestination(
|
NavigationRailDestination(
|
||||||
icon: Icon(Icons.more_horiz_outlined),
|
icon: Icon(Icons.folder_outlined),
|
||||||
selectedIcon: Icon(Icons.more_horiz),
|
selectedIcon: Icon(Icons.folder),
|
||||||
label: Text('More'),
|
label: Text('Projects'),
|
||||||
|
),
|
||||||
|
NavigationRailDestination(
|
||||||
|
icon: Icon(Icons.newspaper_outlined),
|
||||||
|
selectedIcon: Icon(Icons.newspaper),
|
||||||
|
label: Text('News'),
|
||||||
|
),
|
||||||
|
NavigationRailDestination(
|
||||||
|
icon: Icon(Icons.calendar_month_outlined),
|
||||||
|
selectedIcon: Icon(Icons.calendar_month),
|
||||||
|
label: Text('Calendar'),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
@@ -469,7 +475,7 @@ class _ShellState extends ConsumerState<_Shell> with WidgetsBindingObserver {
|
|||||||
],
|
],
|
||||||
),
|
),
|
||||||
bottomNavigationBar: NavigationBar(
|
bottomNavigationBar: NavigationBar(
|
||||||
selectedIndex: index,
|
selectedIndex: index >= 3 ? 3 : index,
|
||||||
onDestinationSelected: (i) {
|
onDestinationSelected: (i) {
|
||||||
if (i == 3) {
|
if (i == 3) {
|
||||||
_showMoreSheet(context);
|
_showMoreSheet(context);
|
||||||
@@ -653,6 +659,7 @@ class _QuickCaptureBarState extends ConsumerState<_QuickCaptureBar> {
|
|||||||
VoiceMicButton(
|
VoiceMicButton(
|
||||||
mode: ref.watch(voiceProvider).mode,
|
mode: ref.watch(voiceProvider).mode,
|
||||||
voiceModeActive: ref.watch(voiceProvider).voiceModeActive,
|
voiceModeActive: ref.watch(voiceProvider).voiceModeActive,
|
||||||
|
amplitude: ref.watch(voiceProvider).amplitude,
|
||||||
onTap: _toggleCaptureMic,
|
onTap: _toggleCaptureMic,
|
||||||
),
|
),
|
||||||
IconButton(
|
IconButton(
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ class KnowledgeItem {
|
|||||||
id: json['id'] as int,
|
id: json['id'] as int,
|
||||||
noteType: json['note_type'] as String? ?? 'note',
|
noteType: json['note_type'] as String? ?? 'note',
|
||||||
title: json['title'] as String? ?? '',
|
title: json['title'] as String? ?? '',
|
||||||
body: json['body'] as String? ?? '',
|
body: (json['snippet'] ?? json['body']) as String? ?? '',
|
||||||
tags: (json['tags'] as List<dynamic>?)
|
tags: (json['tags'] as List<dynamic>?)
|
||||||
?.map((e) => e as String)
|
?.map((e) => e as String)
|
||||||
.toList() ??
|
.toList() ??
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
import 'dart:async';
|
||||||
|
|
||||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||||
|
|
||||||
import '../data/api/chat_api.dart';
|
import '../data/api/chat_api.dart';
|
||||||
@@ -49,6 +51,40 @@ class BriefingNotifier extends AsyncNotifier<BriefingConversation> {
|
|||||||
await future;
|
await future;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Re-fetch the current briefing conversation and unfreeze a stuck
|
||||||
|
/// streaming state if the server-side message is already complete.
|
||||||
|
///
|
||||||
|
/// Same role as MessagesNotifier.refresh() in chat_provider: when an SSE
|
||||||
|
/// socket dies silently (mobile network handoff, app backgrounded mid-stream,
|
||||||
|
/// reverse proxy dropping idle sockets) the send loop never observes close
|
||||||
|
/// and [isBriefingStreamingProvider] stays stuck true. This is the manual
|
||||||
|
/// recovery path hit by pull-to-refresh, the AppBar refresh button, and the
|
||||||
|
/// lifecycle-resume hook.
|
||||||
|
Future<void> refreshMessages() async {
|
||||||
|
final current = state.value;
|
||||||
|
if (current == null) {
|
||||||
|
ref.invalidateSelf();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
final fresh = await ref.read(briefingApiProvider).getToday();
|
||||||
|
state = AsyncData(fresh);
|
||||||
|
final messages = fresh.messages;
|
||||||
|
Message? lastAssistant;
|
||||||
|
for (var i = messages.length - 1; i >= 0; i--) {
|
||||||
|
if (messages[i].role == MessageRole.assistant) {
|
||||||
|
lastAssistant = messages[i];
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (lastAssistant != null && lastAssistant.status != 'generating') {
|
||||||
|
ref.read(isBriefingStreamingProvider.notifier).state = false;
|
||||||
|
}
|
||||||
|
} catch (_) {
|
||||||
|
// Network hiccup — keep existing state; user can retry.
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// Inject a news article as context and trigger generation.
|
/// Inject a news article as context and trigger generation.
|
||||||
///
|
///
|
||||||
/// Mirrors sendReply() but calls the /discuss endpoint instead of
|
/// Mirrors sendReply() but calls the /discuss endpoint instead of
|
||||||
@@ -77,10 +113,71 @@ class BriefingNotifier extends AsyncNotifier<BriefingConversation> {
|
|||||||
rethrow;
|
rethrow;
|
||||||
}
|
}
|
||||||
|
|
||||||
// SSE stream (best-effort)
|
final streamedContent = await _consumeStream(chatApi.streamGeneration(convId));
|
||||||
bool streamedContent = false;
|
await _pollUntilComplete(convId, streamedContent);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Send a reply to today's briefing conversation.
|
||||||
|
///
|
||||||
|
/// Mirrors MessagesNotifier.sendMessage() in chat_provider with the same
|
||||||
|
/// stall-watchdog pattern:
|
||||||
|
/// 1. Optimistic UI update
|
||||||
|
/// 2. POST message to chat endpoint
|
||||||
|
/// 3. SSE stream with per-event timeout (stall watchdog)
|
||||||
|
/// 4. Poll until complete
|
||||||
|
Future<void> sendReply(String content) async {
|
||||||
|
final conv = state.value;
|
||||||
|
if (conv == null) return;
|
||||||
|
final convId = conv.id;
|
||||||
|
final chatApi = ref.read(chatApiProvider);
|
||||||
|
|
||||||
|
final previous = conv.messages;
|
||||||
|
final userMsg = Message(
|
||||||
|
conversationId: convId,
|
||||||
|
role: MessageRole.user,
|
||||||
|
content: content,
|
||||||
|
);
|
||||||
|
final placeholder = Message(
|
||||||
|
conversationId: convId,
|
||||||
|
role: MessageRole.assistant,
|
||||||
|
content: '',
|
||||||
|
status: 'generating',
|
||||||
|
);
|
||||||
|
state = AsyncData(conv.copyWith(messages: [...previous, userMsg, placeholder]));
|
||||||
|
ref.read(isBriefingStreamingProvider.notifier).state = true;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await for (final event in chatApi.streamGeneration(convId)) {
|
await chatApi.sendMessage(convId, content);
|
||||||
|
} catch (e) {
|
||||||
|
state = AsyncData(conv.copyWith(messages: previous));
|
||||||
|
ref.read(isBriefingStreamingProvider.notifier).state = false;
|
||||||
|
rethrow;
|
||||||
|
}
|
||||||
|
|
||||||
|
final streamedContent = await _consumeStream(chatApi.streamGeneration(convId));
|
||||||
|
await _pollUntilComplete(convId, streamedContent);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Consume an SSE stream into the current briefing conversation state.
|
||||||
|
///
|
||||||
|
/// Uses a StreamIterator with a per-event timeout as a stall watchdog —
|
||||||
|
/// same rationale as MessagesNotifier.sendMessage() in chat_provider.dart.
|
||||||
|
/// Mobile networks occasionally drop SSE sockets silently: the TCP
|
||||||
|
/// connection is half-closed, Dio never sees the close, and `await for`
|
||||||
|
/// hangs forever with [isBriefingStreamingProvider] stuck true. If no event
|
||||||
|
/// arrives within the watchdog window we bail out and let the polling pass
|
||||||
|
/// below reconcile state from the server.
|
||||||
|
///
|
||||||
|
/// Returns whether any text content was actually streamed (the polling
|
||||||
|
/// pass uses this to decide whether it's safe to overwrite with a possibly
|
||||||
|
/// empty server-side row).
|
||||||
|
Future<bool> _consumeStream(Stream<ChatStreamEvent> stream) async {
|
||||||
|
const stallTimeout = Duration(seconds: 45);
|
||||||
|
bool streamedContent = false;
|
||||||
|
final iter = StreamIterator(stream);
|
||||||
|
try {
|
||||||
|
while (await iter.moveNext().timeout(stallTimeout)) {
|
||||||
|
final event = iter.current;
|
||||||
final current = state.value;
|
final current = state.value;
|
||||||
if (current == null) break;
|
if (current == null) break;
|
||||||
final msgs = current.messages;
|
final msgs = current.messages;
|
||||||
@@ -100,11 +197,22 @@ class BriefingNotifier extends AsyncNotifier<BriefingConversation> {
|
|||||||
messages: [...msgs.sublist(0, msgs.length - 1), updated]));
|
messages: [...msgs.sublist(0, msgs.length - 1), updated]));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} on TimeoutException {
|
||||||
|
// Stall watchdog — no SSE event for stallTimeout. Fall through to
|
||||||
|
// polling so the UI eventually unfreezes even if the socket is dead.
|
||||||
} catch (_) {
|
} catch (_) {
|
||||||
// Fall through to polling.
|
// SSE failed — fall through to polling.
|
||||||
|
} finally {
|
||||||
|
await iter.cancel();
|
||||||
}
|
}
|
||||||
|
return streamedContent;
|
||||||
|
}
|
||||||
|
|
||||||
// Poll until complete (max 20 attempts, 2s apart)
|
/// Poll /api/briefing messages until the last assistant row is complete,
|
||||||
|
/// same reconcile pattern as MessagesNotifier.sendMessage(). Always clears
|
||||||
|
/// [isBriefingStreamingProvider] at the end so the input can't stay locked.
|
||||||
|
Future<void> _pollUntilComplete(int convId, bool streamedContent) async {
|
||||||
|
final briefingApi = ref.read(briefingApiProvider);
|
||||||
try {
|
try {
|
||||||
for (var attempt = 0; attempt < 20; attempt++) {
|
for (var attempt = 0; attempt < 20; attempt++) {
|
||||||
if (attempt > 0) await Future.delayed(const Duration(seconds: 2));
|
if (attempt > 0) await Future.delayed(const Duration(seconds: 2));
|
||||||
@@ -136,101 +244,4 @@ class BriefingNotifier extends AsyncNotifier<BriefingConversation> {
|
|||||||
ref.read(isBriefingStreamingProvider.notifier).state = false;
|
ref.read(isBriefingStreamingProvider.notifier).state = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Send a reply to today's briefing conversation.
|
|
||||||
///
|
|
||||||
/// Mirrors MessagesNotifier.sendMessage():
|
|
||||||
/// 1. Optimistic UI update
|
|
||||||
/// 2. POST message to chat endpoint
|
|
||||||
/// 3. SSE stream (best-effort)
|
|
||||||
/// 4. Poll until complete
|
|
||||||
Future<void> sendReply(String content) async {
|
|
||||||
final conv = state.value;
|
|
||||||
if (conv == null) return;
|
|
||||||
final convId = conv.id;
|
|
||||||
final chatApi = ref.read(chatApiProvider);
|
|
||||||
|
|
||||||
final previous = conv.messages;
|
|
||||||
final userMsg = Message(
|
|
||||||
conversationId: convId,
|
|
||||||
role: MessageRole.user,
|
|
||||||
content: content,
|
|
||||||
);
|
|
||||||
final placeholder = Message(
|
|
||||||
conversationId: convId,
|
|
||||||
role: MessageRole.assistant,
|
|
||||||
content: '',
|
|
||||||
status: 'generating',
|
|
||||||
);
|
|
||||||
state = AsyncData(conv.copyWith(messages: [...previous, userMsg, placeholder]));
|
|
||||||
ref.read(isBriefingStreamingProvider.notifier).state = true;
|
|
||||||
|
|
||||||
try {
|
|
||||||
await chatApi.sendMessage(convId, content);
|
|
||||||
} catch (e) {
|
|
||||||
state = AsyncData(conv.copyWith(messages: previous));
|
|
||||||
ref.read(isBriefingStreamingProvider.notifier).state = false;
|
|
||||||
rethrow;
|
|
||||||
}
|
|
||||||
|
|
||||||
// SSE stream (best-effort)
|
|
||||||
bool streamedContent = false;
|
|
||||||
try {
|
|
||||||
await for (final event in chatApi.streamGeneration(convId)) {
|
|
||||||
final current = state.value;
|
|
||||||
if (current == null) break;
|
|
||||||
final msgs = current.messages;
|
|
||||||
if (msgs.isEmpty) continue;
|
|
||||||
if (event is ChatTextChunk) {
|
|
||||||
streamedContent = true;
|
|
||||||
final updated =
|
|
||||||
msgs.last.copyWith(content: msgs.last.content + event.text);
|
|
||||||
state = AsyncData(current.copyWith(
|
|
||||||
messages: [...msgs.sublist(0, msgs.length - 1), updated]));
|
|
||||||
} else if (event is ChatToolCall) {
|
|
||||||
final last = msgs.last;
|
|
||||||
if (last.role != MessageRole.assistant) continue;
|
|
||||||
final nextCalls = [...?last.toolCalls, event.toolCall];
|
|
||||||
final updated = last.copyWith(toolCalls: nextCalls);
|
|
||||||
state = AsyncData(current.copyWith(
|
|
||||||
messages: [...msgs.sublist(0, msgs.length - 1), updated]));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (_) {
|
|
||||||
// Fall through to polling.
|
|
||||||
}
|
|
||||||
|
|
||||||
// Poll until complete (max 20 attempts, 2s apart)
|
|
||||||
try {
|
|
||||||
for (var attempt = 0; attempt < 20; attempt++) {
|
|
||||||
if (attempt > 0) await Future.delayed(const Duration(seconds: 2));
|
|
||||||
final fresh = await ref.read(briefingApiProvider).getMessages(convId);
|
|
||||||
final done = fresh.any(
|
|
||||||
(m) => m.role == MessageRole.assistant && m.status != 'generating',
|
|
||||||
);
|
|
||||||
final hasContent = fresh.any(
|
|
||||||
(m) => m.role == MessageRole.assistant && m.content.isNotEmpty,
|
|
||||||
);
|
|
||||||
final current = state.value;
|
|
||||||
if (current != null && (!streamedContent || done || hasContent)) {
|
|
||||||
state = AsyncData(current.copyWith(messages: fresh));
|
|
||||||
}
|
|
||||||
if (done) break;
|
|
||||||
}
|
|
||||||
} catch (_) {
|
|
||||||
// Clear the generating placeholder so UI doesn't spin forever.
|
|
||||||
final current = state.value;
|
|
||||||
if (current != null) {
|
|
||||||
final msgs = current.messages;
|
|
||||||
if (msgs.isNotEmpty && msgs.last.status == 'generating') {
|
|
||||||
state = AsyncData(current.copyWith(messages: [
|
|
||||||
...msgs.sublist(0, msgs.length - 1),
|
|
||||||
msgs.last.copyWith(status: 'complete'),
|
|
||||||
]));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} finally {
|
|
||||||
ref.read(isBriefingStreamingProvider.notifier).state = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -118,6 +118,120 @@ class MessagesNotifier extends AsyncNotifier<List<Message>> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Attach to an already-running generation for this conversation.
|
||||||
|
///
|
||||||
|
/// Used when the chat screen lands on a conversation that was started by
|
||||||
|
/// something other than a direct user message — e.g. the /news discuss
|
||||||
|
/// button, which creates a conversation on the backend and auto-kicks a
|
||||||
|
/// generation before navigating. Without this the stream runs to
|
||||||
|
/// completion invisibly and the screen only shows the final persisted
|
||||||
|
/// message after a manual refresh.
|
||||||
|
///
|
||||||
|
/// Safe to call unconditionally on screen init: no-ops when there is no
|
||||||
|
/// generating assistant message. Mirrors the web chat store's
|
||||||
|
/// reconnectIfGenerating() helper.
|
||||||
|
Future<void> attachToGeneration() async {
|
||||||
|
final convId = _convId;
|
||||||
|
final repo = ref.read(chatRepositoryProvider);
|
||||||
|
|
||||||
|
// Make sure we're looking at fresh server state before deciding whether
|
||||||
|
// to attach. The provider's build() fetches once; if the conversation
|
||||||
|
// was seeded via a POST that happened between build() and this call the
|
||||||
|
// generating placeholder won't be in our in-memory list yet.
|
||||||
|
try {
|
||||||
|
final (_, fresh) = await repo.getMessages(convId);
|
||||||
|
state = AsyncData(fresh);
|
||||||
|
} catch (_) {
|
||||||
|
// If we can't load messages we can't attach either — bail cleanly.
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ref.read(isStreamingProvider(convId))) return;
|
||||||
|
final msgs = state.value ?? const <Message>[];
|
||||||
|
final hasGeneratingAssistant = msgs.any(
|
||||||
|
(m) => m.role == MessageRole.assistant && m.status == 'generating',
|
||||||
|
);
|
||||||
|
if (!hasGeneratingAssistant) return;
|
||||||
|
|
||||||
|
ref.read(isStreamingProvider(convId).notifier).state = true;
|
||||||
|
|
||||||
|
const stallTimeout = Duration(seconds: 45);
|
||||||
|
bool streamedContent = false;
|
||||||
|
final iter = StreamIterator(repo.streamGeneration(convId));
|
||||||
|
try {
|
||||||
|
while (await iter.moveNext().timeout(stallTimeout)) {
|
||||||
|
final event = iter.current;
|
||||||
|
if (event is ChatTextChunk) {
|
||||||
|
streamedContent = true;
|
||||||
|
ref.read(streamingStatusProvider(convId).notifier).state = '';
|
||||||
|
final cur = state.requireValue;
|
||||||
|
if (cur.isEmpty) continue;
|
||||||
|
// Route text chunks into the generating assistant message. The
|
||||||
|
// last message is usually the placeholder, but tool-call fan-in
|
||||||
|
// means we can't rely on that universally.
|
||||||
|
final idx = _findGeneratingAssistantIndex(cur);
|
||||||
|
if (idx < 0) continue;
|
||||||
|
final updated = cur[idx].copyWith(content: cur[idx].content + event.text);
|
||||||
|
state = AsyncData([
|
||||||
|
...cur.sublist(0, idx),
|
||||||
|
updated,
|
||||||
|
...cur.sublist(idx + 1),
|
||||||
|
]);
|
||||||
|
} else if (event is ChatStatusUpdate) {
|
||||||
|
ref.read(streamingStatusProvider(convId).notifier).state = event.status;
|
||||||
|
} else if (event is ChatToolCall) {
|
||||||
|
final cur = state.requireValue;
|
||||||
|
if (cur.isEmpty) continue;
|
||||||
|
final idx = _findGeneratingAssistantIndex(cur);
|
||||||
|
if (idx < 0) continue;
|
||||||
|
final nextCalls = [...?cur[idx].toolCalls, event.toolCall];
|
||||||
|
final updated = cur[idx].copyWith(toolCalls: nextCalls);
|
||||||
|
state = AsyncData([
|
||||||
|
...cur.sublist(0, idx),
|
||||||
|
updated,
|
||||||
|
...cur.sublist(idx + 1),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} on TimeoutException {
|
||||||
|
// Stall — fall through to polling.
|
||||||
|
} catch (_) {
|
||||||
|
// Stream failed — fall through to polling.
|
||||||
|
} finally {
|
||||||
|
await iter.cancel();
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
for (var attempt = 0; attempt < 20; attempt++) {
|
||||||
|
if (attempt > 0) await Future.delayed(const Duration(seconds: 2));
|
||||||
|
final (_, fresh) = await repo.getMessages(convId);
|
||||||
|
final done = fresh.any(
|
||||||
|
(m) => m.role == MessageRole.assistant && m.status != 'generating',
|
||||||
|
);
|
||||||
|
final polledHasContent = fresh.any(
|
||||||
|
(m) => m.role == MessageRole.assistant && m.content.isNotEmpty,
|
||||||
|
);
|
||||||
|
if (!streamedContent || done || polledHasContent) {
|
||||||
|
state = AsyncData(fresh);
|
||||||
|
}
|
||||||
|
if (done) break;
|
||||||
|
}
|
||||||
|
} catch (_) {
|
||||||
|
// Give up silently — user can pull-to-refresh.
|
||||||
|
} finally {
|
||||||
|
ref.read(isStreamingProvider(convId).notifier).state = false;
|
||||||
|
ref.read(streamingStatusProvider(convId).notifier).state = '';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
int _findGeneratingAssistantIndex(List<Message> msgs) {
|
||||||
|
for (var i = msgs.length - 1; i >= 0; i--) {
|
||||||
|
final m = msgs[i];
|
||||||
|
if (m.role == MessageRole.assistant && m.status == 'generating') return i;
|
||||||
|
}
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
Future<void> sendMessage(String content) async {
|
Future<void> sendMessage(String content) async {
|
||||||
final convId = _convId;
|
final convId = _convId;
|
||||||
final repo = ref.read(chatRepositoryProvider);
|
final repo = ref.read(chatRepositoryProvider);
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import 'package:just_audio/just_audio.dart';
|
|||||||
import 'package:path_provider/path_provider.dart';
|
import 'package:path_provider/path_provider.dart';
|
||||||
import 'package:permission_handler/permission_handler.dart';
|
import 'package:permission_handler/permission_handler.dart';
|
||||||
import 'package:record/record.dart';
|
import 'package:record/record.dart';
|
||||||
|
import 'package:vad/vad.dart';
|
||||||
|
|
||||||
import 'api_client_provider.dart';
|
import 'api_client_provider.dart';
|
||||||
|
|
||||||
@@ -59,22 +60,29 @@ class VoiceState {
|
|||||||
final VoiceMode mode;
|
final VoiceMode mode;
|
||||||
final bool voiceModeActive;
|
final bool voiceModeActive;
|
||||||
final bool available;
|
final bool available;
|
||||||
|
/// Normalized mic amplitude 0.0–1.0 while recording. Drives the live
|
||||||
|
/// pulse on VoiceMicButton so the user has obvious feedback that audio
|
||||||
|
/// is actually being picked up.
|
||||||
|
final double amplitude;
|
||||||
|
|
||||||
const VoiceState({
|
const VoiceState({
|
||||||
this.mode = VoiceMode.idle,
|
this.mode = VoiceMode.idle,
|
||||||
this.voiceModeActive = false,
|
this.voiceModeActive = false,
|
||||||
this.available = true,
|
this.available = true,
|
||||||
|
this.amplitude = 0.0,
|
||||||
});
|
});
|
||||||
|
|
||||||
VoiceState copyWith({
|
VoiceState copyWith({
|
||||||
VoiceMode? mode,
|
VoiceMode? mode,
|
||||||
bool? voiceModeActive,
|
bool? voiceModeActive,
|
||||||
bool? available,
|
bool? available,
|
||||||
|
double? amplitude,
|
||||||
}) =>
|
}) =>
|
||||||
VoiceState(
|
VoiceState(
|
||||||
mode: mode ?? this.mode,
|
mode: mode ?? this.mode,
|
||||||
voiceModeActive: voiceModeActive ?? this.voiceModeActive,
|
voiceModeActive: voiceModeActive ?? this.voiceModeActive,
|
||||||
available: available ?? this.available,
|
available: available ?? this.available,
|
||||||
|
amplitude: amplitude ?? this.amplitude,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -91,12 +99,13 @@ class VoiceNotifier extends Notifier<VoiceState> {
|
|||||||
AudioPlayer? _player;
|
AudioPlayer? _player;
|
||||||
StreamSubscription<Amplitude>? _amplitudeSubscription;
|
StreamSubscription<Amplitude>? _amplitudeSubscription;
|
||||||
|
|
||||||
// Recording / silence detection
|
// VAD-based speech detection
|
||||||
int _recordingStartMs = 0;
|
VadHandler? _vadHandler;
|
||||||
int _silenceMs = 0;
|
StreamSubscription<void>? _vadSpeechStartSub;
|
||||||
static const _silenceThresholdDb = -40.0;
|
StreamSubscription<List<double>>? _vadSpeechEndSub;
|
||||||
static const _silenceDurationMs = 1500;
|
bool _speechDetected = false;
|
||||||
static const _minRecordingMs = 300;
|
int _speechStartMs = 0;
|
||||||
|
static const _vadGraceMs = 1500;
|
||||||
|
|
||||||
// Voice mode callbacks
|
// Voice mode callbacks
|
||||||
Future<void> Function(String transcript)? _onTranscript;
|
Future<void> Function(String transcript)? _onTranscript;
|
||||||
@@ -144,6 +153,9 @@ class VoiceNotifier extends Notifier<VoiceState> {
|
|||||||
required void Function(String message) onError,
|
required void Function(String message) onError,
|
||||||
}) async {
|
}) async {
|
||||||
if (state.voiceModeActive) {
|
if (state.voiceModeActive) {
|
||||||
|
if (state.mode == VoiceMode.recording && !_speechDetected) {
|
||||||
|
onError('No speech detected');
|
||||||
|
}
|
||||||
exitVoiceMode();
|
exitVoiceMode();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -191,12 +203,14 @@ class VoiceNotifier extends Notifier<VoiceState> {
|
|||||||
_amplitudeSubscription?.cancel();
|
_amplitudeSubscription?.cancel();
|
||||||
_amplitudeSubscription = null;
|
_amplitudeSubscription = null;
|
||||||
_recorder?.stop();
|
_recorder?.stop();
|
||||||
|
_stopVad();
|
||||||
_player?.stop();
|
_player?.stop();
|
||||||
_ttsQueue.clear();
|
_ttsQueue.clear();
|
||||||
_ttsPlaying = false;
|
_ttsPlaying = false;
|
||||||
_sentenceBuffer = '';
|
_sentenceBuffer = '';
|
||||||
_lastSeenLength = 0;
|
_lastSeenLength = 0;
|
||||||
_streamComplete = false;
|
_streamComplete = false;
|
||||||
|
_speechDetected = false;
|
||||||
_onTranscript = null;
|
_onTranscript = null;
|
||||||
_onError = null;
|
_onError = null;
|
||||||
state = const VoiceState();
|
state = const VoiceState();
|
||||||
@@ -228,8 +242,8 @@ class VoiceNotifier extends Notifier<VoiceState> {
|
|||||||
Future<void> _startListening() async {
|
Future<void> _startListening() async {
|
||||||
if (!state.voiceModeActive) return;
|
if (!state.voiceModeActive) return;
|
||||||
|
|
||||||
_silenceMs = 0;
|
_speechDetected = false;
|
||||||
_recordingStartMs = DateTime.now().millisecondsSinceEpoch;
|
_speechStartMs = 0;
|
||||||
state = state.copyWith(mode: VoiceMode.recording);
|
state = state.copyWith(mode: VoiceMode.recording);
|
||||||
|
|
||||||
final dir = _tempDir ?? await getTemporaryDirectory();
|
final dir = _tempDir ?? await getTemporaryDirectory();
|
||||||
@@ -237,9 +251,6 @@ class VoiceNotifier extends Notifier<VoiceState> {
|
|||||||
'${dir.path}/voice_rec_${DateTime.now().millisecondsSinceEpoch}.m4a';
|
'${dir.path}/voice_rec_${DateTime.now().millisecondsSinceEpoch}.m4a';
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// Recreate the recorder each session — the record package can leave
|
|
||||||
// the native AudioRecord in a bad state after stop/error cycles,
|
|
||||||
// and a stale instance is the most common cause of "could not start".
|
|
||||||
_recorder?.dispose();
|
_recorder?.dispose();
|
||||||
_recorder = AudioRecorder();
|
_recorder = AudioRecorder();
|
||||||
|
|
||||||
@@ -258,33 +269,52 @@ class VoiceNotifier extends Notifier<VoiceState> {
|
|||||||
_amplitudeSubscription = _recorder!
|
_amplitudeSubscription = _recorder!
|
||||||
.onAmplitudeChanged(const Duration(milliseconds: 200))
|
.onAmplitudeChanged(const Duration(milliseconds: 200))
|
||||||
.listen(_onAmplitude);
|
.listen(_onAmplitude);
|
||||||
|
|
||||||
|
// VAD for speech detection — uses its own AudioRecorder internally
|
||||||
|
await _stopVad();
|
||||||
|
_vadHandler = VadHandler.create();
|
||||||
|
_vadSpeechStartSub = _vadHandler!.onSpeechStart.listen((_) {
|
||||||
|
if (!_speechDetected) {
|
||||||
|
_speechDetected = true;
|
||||||
|
_speechStartMs = DateTime.now().millisecondsSinceEpoch;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
_vadSpeechEndSub = _vadHandler!.onSpeechEnd.listen((_) {
|
||||||
|
if (!state.voiceModeActive) return;
|
||||||
|
final now = DateTime.now().millisecondsSinceEpoch;
|
||||||
|
final sinceStart = _speechStartMs > 0 ? now - _speechStartMs : 0;
|
||||||
|
if (_speechDetected && sinceStart >= _vadGraceMs) {
|
||||||
|
_amplitudeSubscription?.cancel();
|
||||||
|
_amplitudeSubscription = null;
|
||||||
|
_stopVad();
|
||||||
|
_handleSilence();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
await _vadHandler!.startListening(model: 'v5');
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
_onError?.call('Microphone error: $e');
|
_onError?.call('Microphone error: $e');
|
||||||
exitVoiceMode();
|
exitVoiceMode();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Future<void> _stopVad() async {
|
||||||
|
await _vadSpeechStartSub?.cancel();
|
||||||
|
_vadSpeechStartSub = null;
|
||||||
|
await _vadSpeechEndSub?.cancel();
|
||||||
|
_vadSpeechEndSub = null;
|
||||||
|
if (_vadHandler != null) {
|
||||||
|
await _vadHandler!.dispose();
|
||||||
|
_vadHandler = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void _onAmplitude(Amplitude event) {
|
void _onAmplitude(Amplitude event) {
|
||||||
if (!state.voiceModeActive) return;
|
if (!state.voiceModeActive) return;
|
||||||
|
|
||||||
final elapsed =
|
|
||||||
DateTime.now().millisecondsSinceEpoch - _recordingStartMs;
|
|
||||||
if (elapsed < _minRecordingMs) return;
|
|
||||||
|
|
||||||
final db = event.current;
|
final db = event.current;
|
||||||
// Guard against NaN / ±Infinity which can arrive on some Android devices
|
if (db.isNaN || db.isInfinite) return;
|
||||||
// when the recorder is initialising. Treat invalid readings as silence.
|
final norm = ((db + 60.0) / 60.0).clamp(0.0, 1.0);
|
||||||
final isSilent = db.isNaN || db.isInfinite || db < _silenceThresholdDb;
|
if ((norm - state.amplitude).abs() > 0.02) {
|
||||||
|
state = state.copyWith(amplitude: norm);
|
||||||
if (isSilent) {
|
|
||||||
_silenceMs += 200;
|
|
||||||
if (_silenceMs >= _silenceDurationMs) {
|
|
||||||
_amplitudeSubscription?.cancel();
|
|
||||||
_amplitudeSubscription = null;
|
|
||||||
_handleSilence();
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
_silenceMs = 0;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -41,7 +41,14 @@ class _BriefingScreenState extends ConsumerState<BriefingScreen>
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
void didChangeAppLifecycleState(AppLifecycleState state) {
|
void didChangeAppLifecycleState(AppLifecycleState state) {
|
||||||
|
final wasBackground = !_appInForeground;
|
||||||
_appInForeground = state == AppLifecycleState.resumed;
|
_appInForeground = state == AppLifecycleState.resumed;
|
||||||
|
// On resume, force a message refresh. This also unfreezes a stuck
|
||||||
|
// streaming state if the SSE socket died while the app was backgrounded
|
||||||
|
// — silentRefresh won't do that because it guards on isStreaming.
|
||||||
|
if (_appInForeground && wasBackground && mounted) {
|
||||||
|
ref.read(briefingProvider.notifier).refreshMessages();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void _pollSilently() {
|
void _pollSilently() {
|
||||||
@@ -51,6 +58,18 @@ class _BriefingScreenState extends ConsumerState<BriefingScreen>
|
|||||||
ref.read(briefingProvider.notifier).silentRefresh();
|
ref.read(briefingProvider.notifier).silentRefresh();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Future<void> _pullToRefresh() async {
|
||||||
|
try {
|
||||||
|
await ref.read(briefingProvider.notifier).refreshMessages();
|
||||||
|
} catch (_) {
|
||||||
|
if (mounted) {
|
||||||
|
ScaffoldMessenger.of(context).showSnackBar(
|
||||||
|
const SnackBar(content: Text('Could not refresh.')),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void dispose() {
|
void dispose() {
|
||||||
_pollTimer?.cancel();
|
_pollTimer?.cancel();
|
||||||
@@ -247,12 +266,18 @@ class _BriefingScreenState extends ConsumerState<BriefingScreen>
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
data: (conv) {
|
data: (conv) {
|
||||||
return Column(
|
final isWide = MediaQuery.of(context).size.width >= 600;
|
||||||
|
Widget body = Column(
|
||||||
children: [
|
children: [
|
||||||
Expanded(
|
Expanded(
|
||||||
child: CustomScrollView(
|
child: RefreshIndicator(
|
||||||
controller: _scrollController,
|
onRefresh: _pullToRefresh,
|
||||||
slivers: [
|
child: CustomScrollView(
|
||||||
|
controller: _scrollController,
|
||||||
|
// AlwaysScrollable so pull-to-refresh fires even when
|
||||||
|
// the briefing is empty or shorter than the viewport.
|
||||||
|
physics: const AlwaysScrollableScrollPhysics(),
|
||||||
|
slivers: [
|
||||||
if (conv.messages.isEmpty)
|
if (conv.messages.isEmpty)
|
||||||
SliverFillRemaining(
|
SliverFillRemaining(
|
||||||
child: Center(
|
child: Center(
|
||||||
@@ -293,7 +318,8 @@ class _BriefingScreenState extends ConsumerState<BriefingScreen>
|
|||||||
},
|
},
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|
||||||
@@ -351,6 +377,7 @@ class _BriefingScreenState extends ConsumerState<BriefingScreen>
|
|||||||
VoiceMicButton(
|
VoiceMicButton(
|
||||||
mode: voiceState.mode,
|
mode: voiceState.mode,
|
||||||
voiceModeActive: voiceState.voiceModeActive,
|
voiceModeActive: voiceState.voiceModeActive,
|
||||||
|
amplitude: voiceState.amplitude,
|
||||||
onTap: _toggleVoiceMode,
|
onTap: _toggleVoiceMode,
|
||||||
),
|
),
|
||||||
const SizedBox(width: 6),
|
const SizedBox(width: 6),
|
||||||
@@ -366,6 +393,15 @@ class _BriefingScreenState extends ConsumerState<BriefingScreen>
|
|||||||
),
|
),
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
|
if (isWide) {
|
||||||
|
body = Center(
|
||||||
|
child: ConstrainedBox(
|
||||||
|
constraints: const BoxConstraints(maxWidth: 700),
|
||||||
|
child: body,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return body;
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -44,6 +44,16 @@ class _ChatScreenState extends ConsumerState<ChatScreen>
|
|||||||
void initState() {
|
void initState() {
|
||||||
super.initState();
|
super.initState();
|
||||||
WidgetsBinding.instance.addObserver(this);
|
WidgetsBinding.instance.addObserver(this);
|
||||||
|
// If we land on a conversation whose last assistant message is already
|
||||||
|
// mid-stream (e.g. the /news discuss button creates a conv and
|
||||||
|
// auto-kicks generation), attach to the running stream so the user sees
|
||||||
|
// live tokens instead of a frozen placeholder.
|
||||||
|
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||||
|
if (!mounted) return;
|
||||||
|
ref
|
||||||
|
.read(messagesProvider(widget.conversationId).notifier)
|
||||||
|
.attachToGeneration();
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@@ -257,6 +267,7 @@ class _ChatScreenState extends ConsumerState<ChatScreen>
|
|||||||
VoiceMicButton(
|
VoiceMicButton(
|
||||||
mode: voiceState.mode,
|
mode: voiceState.mode,
|
||||||
voiceModeActive: voiceState.voiceModeActive,
|
voiceModeActive: voiceState.voiceModeActive,
|
||||||
|
amplitude: voiceState.amplitude,
|
||||||
onTap: _toggleVoiceMode,
|
onTap: _toggleVoiceMode,
|
||||||
),
|
),
|
||||||
const SizedBox(width: 6),
|
const SizedBox(width: 6),
|
||||||
|
|||||||
@@ -4,30 +4,79 @@ import 'package:go_router/go_router.dart';
|
|||||||
|
|
||||||
import '../../core/constants.dart';
|
import '../../core/constants.dart';
|
||||||
import '../../providers/chat_provider.dart';
|
import '../../providers/chat_provider.dart';
|
||||||
|
import 'chat_screen.dart';
|
||||||
|
|
||||||
class ConversationsTabScreen extends ConsumerWidget {
|
class ConversationsTabScreen extends ConsumerStatefulWidget {
|
||||||
const ConversationsTabScreen({super.key});
|
const ConversationsTabScreen({super.key});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context, WidgetRef ref) {
|
ConsumerState<ConversationsTabScreen> createState() =>
|
||||||
|
_ConversationsTabScreenState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _ConversationsTabScreenState
|
||||||
|
extends ConsumerState<ConversationsTabScreen> {
|
||||||
|
int? _selectedConvId;
|
||||||
|
|
||||||
|
Future<void> _createConversation() async {
|
||||||
|
final conv =
|
||||||
|
await ref.read(conversationsProvider.notifier).create('');
|
||||||
|
if (!mounted) return;
|
||||||
|
final isWide = MediaQuery.of(context).size.width >= 600;
|
||||||
|
if (isWide) {
|
||||||
|
setState(() => _selectedConvId = conv.id);
|
||||||
|
} else {
|
||||||
|
context.push(Routes.chat.replaceFirst(':id', '${conv.id}'));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void _openConversation(int id) {
|
||||||
|
final isWide = MediaQuery.of(context).size.width >= 600;
|
||||||
|
if (isWide) {
|
||||||
|
setState(() => _selectedConvId = id);
|
||||||
|
} else {
|
||||||
|
context.push(Routes.chat.replaceFirst(':id', '$id'));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _confirmDelete(int id, String title) async {
|
||||||
|
final ok = await showDialog<bool>(
|
||||||
|
context: context,
|
||||||
|
builder: (dialogContext) => AlertDialog(
|
||||||
|
title: const Text('Delete conversation?'),
|
||||||
|
content: Text('"$title" will be permanently deleted.'),
|
||||||
|
actions: [
|
||||||
|
TextButton(
|
||||||
|
onPressed: () => Navigator.pop(dialogContext, false),
|
||||||
|
child: const Text('Cancel')),
|
||||||
|
FilledButton(
|
||||||
|
onPressed: () => Navigator.pop(dialogContext, true),
|
||||||
|
child: const Text('Delete')),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
if (ok == true) {
|
||||||
|
await ref.read(conversationsProvider.notifier).delete(id);
|
||||||
|
if (_selectedConvId == id) {
|
||||||
|
setState(() => _selectedConvId = null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final isWide = MediaQuery.of(context).size.width >= 600;
|
||||||
final theme = Theme.of(context);
|
final theme = Theme.of(context);
|
||||||
final convsAsync = ref.watch(conversationsProvider);
|
final convsAsync = ref.watch(conversationsProvider);
|
||||||
|
|
||||||
return Scaffold(
|
final listPanel = Scaffold(
|
||||||
appBar: AppBar(
|
appBar: AppBar(
|
||||||
title: Text('Chat', style: theme.textTheme.titleLarge),
|
title: Text('Chat', style: theme.textTheme.titleLarge),
|
||||||
actions: [
|
actions: [
|
||||||
IconButton(
|
IconButton(
|
||||||
icon: const Icon(Icons.add),
|
icon: const Icon(Icons.add),
|
||||||
tooltip: 'New conversation',
|
tooltip: 'New conversation',
|
||||||
onPressed: () async {
|
onPressed: _createConversation,
|
||||||
final conv = await ref
|
|
||||||
.read(conversationsProvider.notifier)
|
|
||||||
.create('');
|
|
||||||
if (context.mounted) {
|
|
||||||
context.push(Routes.chat.replaceFirst(':id', '${conv.id}'));
|
|
||||||
}
|
|
||||||
},
|
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
@@ -49,26 +98,20 @@ class ConversationsTabScreen extends ConsumerWidget {
|
|||||||
FilledButton.icon(
|
FilledButton.icon(
|
||||||
icon: const Icon(Icons.add),
|
icon: const Icon(Icons.add),
|
||||||
label: const Text('Start a conversation'),
|
label: const Text('Start a conversation'),
|
||||||
onPressed: () async {
|
onPressed: _createConversation,
|
||||||
final conv = await ref
|
|
||||||
.read(conversationsProvider.notifier)
|
|
||||||
.create('');
|
|
||||||
if (context.mounted) {
|
|
||||||
context.push(
|
|
||||||
Routes.chat.replaceFirst(':id', '${conv.id}'));
|
|
||||||
}
|
|
||||||
},
|
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
return RefreshIndicator(
|
return RefreshIndicator(
|
||||||
onRefresh: () => ref.read(conversationsProvider.notifier).refresh(),
|
onRefresh: () =>
|
||||||
|
ref.read(conversationsProvider.notifier).refresh(),
|
||||||
child: ListView.builder(
|
child: ListView.builder(
|
||||||
itemCount: convs.length,
|
itemCount: convs.length,
|
||||||
itemBuilder: (ctx, i) {
|
itemBuilder: (ctx, i) {
|
||||||
final c = convs[i];
|
final c = convs[i];
|
||||||
|
final selected = isWide && c.id == _selectedConvId;
|
||||||
return ListTile(
|
return ListTile(
|
||||||
leading: const Icon(Icons.chat_bubble_outline),
|
leading: const Icon(Icons.chat_bubble_outline),
|
||||||
title: Text(
|
title: Text(
|
||||||
@@ -79,13 +122,12 @@ class ConversationsTabScreen extends ConsumerWidget {
|
|||||||
_relativeTime(c.updatedAt),
|
_relativeTime(c.updatedAt),
|
||||||
style: theme.textTheme.labelSmall,
|
style: theme.textTheme.labelSmall,
|
||||||
),
|
),
|
||||||
|
selected: selected,
|
||||||
trailing: IconButton(
|
trailing: IconButton(
|
||||||
icon: const Icon(Icons.delete_outline),
|
icon: const Icon(Icons.delete_outline),
|
||||||
onPressed: () =>
|
onPressed: () => _confirmDelete(c.id, c.title),
|
||||||
_confirmDelete(context, ref, c.id, c.title),
|
|
||||||
),
|
),
|
||||||
onTap: () =>
|
onTap: () => _openConversation(c.id),
|
||||||
ctx.push(Routes.chat.replaceFirst(':id', '${c.id}')),
|
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
@@ -93,28 +135,38 @@ class ConversationsTabScreen extends ConsumerWidget {
|
|||||||
},
|
},
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
|
||||||
|
|
||||||
Future<void> _confirmDelete(
|
if (!isWide) return listPanel;
|
||||||
BuildContext context, WidgetRef ref, int id, String title) async {
|
|
||||||
final ok = await showDialog<bool>(
|
return Row(
|
||||||
context: context,
|
children: [
|
||||||
builder: (dialogContext) => AlertDialog(
|
SizedBox(
|
||||||
title: const Text('Delete conversation?'),
|
width: 320,
|
||||||
content: Text('"$title" will be permanently deleted.'),
|
child: listPanel,
|
||||||
actions: [
|
),
|
||||||
TextButton(
|
const VerticalDivider(width: 1),
|
||||||
onPressed: () => Navigator.pop(dialogContext, false),
|
Expanded(
|
||||||
child: const Text('Cancel')),
|
child: _selectedConvId != null
|
||||||
FilledButton(
|
? ChatScreen(
|
||||||
onPressed: () => Navigator.pop(dialogContext, true),
|
key: ValueKey(_selectedConvId),
|
||||||
child: const Text('Delete')),
|
conversationId: _selectedConvId!,
|
||||||
],
|
)
|
||||||
),
|
: Center(
|
||||||
|
child: Column(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: [
|
||||||
|
Icon(Icons.chat_bubble_outline,
|
||||||
|
size: 48,
|
||||||
|
color: theme.colorScheme.onSurfaceVariant),
|
||||||
|
const SizedBox(height: 16),
|
||||||
|
Text('Select a conversation',
|
||||||
|
style: theme.textTheme.titleMedium),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
);
|
);
|
||||||
if (ok == true) {
|
|
||||||
await ref.read(conversationsProvider.notifier).delete(id);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -186,18 +186,57 @@ class _KnowledgeScreenState extends ConsumerState<KnowledgeScreen>
|
|||||||
}
|
}
|
||||||
return RefreshIndicator(
|
return RefreshIndicator(
|
||||||
onRefresh: () => ref.read(knowledgeProvider.notifier).refresh(),
|
onRefresh: () => ref.read(knowledgeProvider.notifier).refresh(),
|
||||||
child: ListView.separated(
|
child: LayoutBuilder(
|
||||||
controller: _scrollController,
|
builder: (context, constraints) {
|
||||||
itemCount: items.length + (state.isLoadingBatch ? 1 : 0),
|
final cols = constraints.maxWidth >= 900
|
||||||
separatorBuilder: (_, _) => const Divider(height: 1),
|
? 3
|
||||||
itemBuilder: (_, i) {
|
: constraints.maxWidth >= 600
|
||||||
if (i >= items.length) {
|
? 2
|
||||||
return const Padding(
|
: 1;
|
||||||
padding: EdgeInsets.all(16),
|
if (cols == 1) {
|
||||||
child: Center(child: CircularProgressIndicator()),
|
return ListView.separated(
|
||||||
|
controller: _scrollController,
|
||||||
|
itemCount: items.length + (state.isLoadingBatch ? 1 : 0),
|
||||||
|
separatorBuilder: (_, _) => const Divider(height: 1),
|
||||||
|
itemBuilder: (_, i) {
|
||||||
|
if (i >= items.length) {
|
||||||
|
return const Padding(
|
||||||
|
padding: EdgeInsets.all(16),
|
||||||
|
child: Center(child: CircularProgressIndicator()),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return KnowledgeItemCard(item: items[i]);
|
||||||
|
},
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
return KnowledgeItemCard(item: items[i]);
|
return CustomScrollView(
|
||||||
|
controller: _scrollController,
|
||||||
|
slivers: [
|
||||||
|
SliverPadding(
|
||||||
|
padding: const EdgeInsets.all(8),
|
||||||
|
sliver: SliverGrid(
|
||||||
|
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
|
||||||
|
crossAxisCount: cols,
|
||||||
|
crossAxisSpacing: 8,
|
||||||
|
mainAxisSpacing: 8,
|
||||||
|
childAspectRatio: 1.8,
|
||||||
|
),
|
||||||
|
delegate: SliverChildBuilderDelegate(
|
||||||
|
(_, i) {
|
||||||
|
if (i >= items.length) {
|
||||||
|
return const Center(
|
||||||
|
child: CircularProgressIndicator());
|
||||||
|
}
|
||||||
|
return KnowledgeItemCard(item: items[i])
|
||||||
|
.buildGridCard(context);
|
||||||
|
},
|
||||||
|
childCount:
|
||||||
|
items.length + (state.isLoadingBatch ? 1 : 0),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
);
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -50,6 +50,34 @@ class _NewsScreenState extends ConsumerState<NewsScreen> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Widget _buildNewsItem(NewsState news, int i, {int cols = 1}) {
|
||||||
|
if (i >= news.items.length) {
|
||||||
|
if (!news.hasMore) return const SizedBox.shrink();
|
||||||
|
return Padding(
|
||||||
|
padding: const EdgeInsets.symmetric(vertical: 8),
|
||||||
|
child: Center(
|
||||||
|
child: news.loadingMore
|
||||||
|
? const CircularProgressIndicator()
|
||||||
|
: FilledButton.tonal(
|
||||||
|
onPressed: _loadMore,
|
||||||
|
child: const Text('Load more'),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
final item = news.items[i];
|
||||||
|
return NewsCard(
|
||||||
|
item: RssItemMeta.fromNewsItem(item),
|
||||||
|
reaction: news.reactions[item.id],
|
||||||
|
snippetMaxLines: cols > 1 ? 5 : 2,
|
||||||
|
onReaction: (itemId, reaction) =>
|
||||||
|
ref.read(newsProvider.notifier).toggleReaction(itemId, reaction),
|
||||||
|
onDiscuss: _openingChat.contains(item.id)
|
||||||
|
? null
|
||||||
|
: () => _handleDiscuss(item.id),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
final newsAsync = ref.watch(newsProvider);
|
final newsAsync = ref.watch(newsProvider);
|
||||||
@@ -98,38 +126,59 @@ class _NewsScreenState extends ConsumerState<NewsScreen> {
|
|||||||
Expanded(
|
Expanded(
|
||||||
child: RefreshIndicator(
|
child: RefreshIndicator(
|
||||||
onRefresh: () => ref.read(newsProvider.notifier).refresh(),
|
onRefresh: () => ref.read(newsProvider.notifier).refresh(),
|
||||||
child: ListView.builder(
|
child: LayoutBuilder(
|
||||||
padding:
|
builder: (context, constraints) {
|
||||||
const EdgeInsets.symmetric(horizontal: 8, vertical: 8),
|
final cols = constraints.maxWidth >= 900
|
||||||
itemCount: news.items.length + 1,
|
? 3
|
||||||
itemBuilder: (_, i) {
|
: constraints.maxWidth >= 600
|
||||||
if (i == news.items.length) {
|
? 2
|
||||||
if (!news.hasMore) return const SizedBox.shrink();
|
: 1;
|
||||||
return Padding(
|
if (cols == 1) {
|
||||||
padding: const EdgeInsets.symmetric(vertical: 8),
|
return ListView.builder(
|
||||||
child: Center(
|
padding: const EdgeInsets.symmetric(
|
||||||
child: news.loadingMore
|
horizontal: 8, vertical: 8),
|
||||||
? const CircularProgressIndicator()
|
itemCount: news.items.length + 1,
|
||||||
: FilledButton.tonal(
|
itemBuilder: (_, i) =>
|
||||||
onPressed: _loadMore,
|
_buildNewsItem(news, i),
|
||||||
child: const Text('Load more'),
|
);
|
||||||
|
}
|
||||||
|
return CustomScrollView(
|
||||||
|
slivers: [
|
||||||
|
SliverPadding(
|
||||||
|
padding: const EdgeInsets.all(8),
|
||||||
|
sliver: SliverGrid(
|
||||||
|
gridDelegate:
|
||||||
|
SliverGridDelegateWithFixedCrossAxisCount(
|
||||||
|
crossAxisCount: cols,
|
||||||
|
crossAxisSpacing: 8,
|
||||||
|
mainAxisSpacing: 8,
|
||||||
|
childAspectRatio: 1.6,
|
||||||
|
),
|
||||||
|
delegate: SliverChildBuilderDelegate(
|
||||||
|
(_, i) => _buildNewsItem(news, i, cols: cols),
|
||||||
|
childCount: news.items.length,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
if (news.hasMore)
|
||||||
|
SliverToBoxAdapter(
|
||||||
|
child: Padding(
|
||||||
|
padding:
|
||||||
|
const EdgeInsets.symmetric(vertical: 12),
|
||||||
|
child: Center(
|
||||||
|
child: news.loadingMore
|
||||||
|
? const CircularProgressIndicator()
|
||||||
|
: FilledButton.tonal(
|
||||||
|
onPressed: _loadMore,
|
||||||
|
child: const Text('Load more'),
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
);
|
);
|
||||||
}
|
},
|
||||||
final item = news.items[i];
|
),
|
||||||
return NewsCard(
|
|
||||||
item: RssItemMeta.fromNewsItem(item),
|
|
||||||
reaction: news.reactions[item.id],
|
|
||||||
onReaction: (itemId, reaction) => ref
|
|
||||||
.read(newsProvider.notifier)
|
|
||||||
.toggleReaction(itemId, reaction),
|
|
||||||
onDiscuss: _openingChat.contains(item.id)
|
|
||||||
? null
|
|
||||||
: () => _handleDiscuss(item.id),
|
|
||||||
);
|
|
||||||
},
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -27,12 +27,24 @@ class KnowledgeItemCard extends StatelessWidget {
|
|||||||
|
|
||||||
String? get _subtitle {
|
String? get _subtitle {
|
||||||
if (item.noteType == 'task') {
|
if (item.noteType == 'task') {
|
||||||
|
if (item.body.trim().isNotEmpty) {
|
||||||
|
final preview = item.body.trim().replaceAll('\n', ' ');
|
||||||
|
return preview.length > 200 ? '${preview.substring(0, 200)}…' : preview;
|
||||||
|
}
|
||||||
if (item.dueDate != null) return 'Due ${item.dueDate}';
|
if (item.dueDate != null) return 'Due ${item.dueDate}';
|
||||||
return item.status;
|
return item.status;
|
||||||
}
|
}
|
||||||
if (item.body.trim().isEmpty) return null;
|
if (item.body.trim().isEmpty) return null;
|
||||||
final preview = item.body.trim().replaceAll('\n', ' ');
|
final preview = item.body.trim().replaceAll('\n', ' ');
|
||||||
return preview.length > 120 ? '${preview.substring(0, 120)}…' : preview;
|
return preview.length > 200 ? '${preview.substring(0, 200)}…' : preview;
|
||||||
|
}
|
||||||
|
|
||||||
|
void _onTap(BuildContext context) {
|
||||||
|
if (item.noteType == 'task') {
|
||||||
|
context.push('/tasks/${item.id}/edit');
|
||||||
|
} else {
|
||||||
|
context.push('/notes/${item.id}');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@@ -53,13 +65,64 @@ class KnowledgeItemCard extends StatelessWidget {
|
|||||||
)
|
)
|
||||||
: null,
|
: null,
|
||||||
trailing: item.tags.isNotEmpty ? _TagChips(tags: item.tags) : null,
|
trailing: item.tags.isNotEmpty ? _TagChips(tags: item.tags) : null,
|
||||||
onTap: () {
|
onTap: () => _onTap(context),
|
||||||
if (item.noteType == 'task') {
|
);
|
||||||
context.push('/tasks/${item.id}/edit');
|
}
|
||||||
} else {
|
|
||||||
context.push('/notes/${item.id}');
|
Widget buildGridCard(BuildContext context) {
|
||||||
}
|
final scheme = Theme.of(context).colorScheme;
|
||||||
},
|
final textTheme = Theme.of(context).textTheme;
|
||||||
|
return Card(
|
||||||
|
elevation: 0,
|
||||||
|
shape: RoundedRectangleBorder(
|
||||||
|
borderRadius: BorderRadius.circular(10),
|
||||||
|
side: BorderSide(color: scheme.outlineVariant),
|
||||||
|
),
|
||||||
|
child: InkWell(
|
||||||
|
borderRadius: BorderRadius.circular(10),
|
||||||
|
onTap: () => _onTap(context),
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.all(12),
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Row(
|
||||||
|
children: [
|
||||||
|
Icon(_icon, size: 18, color: _statusColor(context)),
|
||||||
|
const SizedBox(width: 8),
|
||||||
|
Expanded(
|
||||||
|
child: Text(
|
||||||
|
item.title.isEmpty ? '(untitled)' : item.title,
|
||||||
|
maxLines: 2,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
style: textTheme.titleSmall
|
||||||
|
?.copyWith(fontWeight: FontWeight.w600),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
if (_subtitle != null) ...[
|
||||||
|
const SizedBox(height: 8),
|
||||||
|
Expanded(
|
||||||
|
child: Text(
|
||||||
|
_subtitle!,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
maxLines: 4,
|
||||||
|
style: textTheme.bodySmall?.copyWith(
|
||||||
|
color: scheme.onSurfaceVariant,
|
||||||
|
height: 1.4,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
if (item.tags.isNotEmpty) ...[
|
||||||
|
const Spacer(),
|
||||||
|
_TagChips(tags: item.tags),
|
||||||
|
],
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -54,6 +54,7 @@ class NewsCard extends StatelessWidget {
|
|||||||
final String? reaction; // 'up' | 'down' | null
|
final String? reaction; // 'up' | 'down' | null
|
||||||
final void Function(int itemId, String reaction) onReaction;
|
final void Function(int itemId, String reaction) onReaction;
|
||||||
final VoidCallback? onDiscuss;
|
final VoidCallback? onDiscuss;
|
||||||
|
final int snippetMaxLines;
|
||||||
|
|
||||||
const NewsCard({
|
const NewsCard({
|
||||||
super.key,
|
super.key,
|
||||||
@@ -61,6 +62,7 @@ class NewsCard extends StatelessWidget {
|
|||||||
required this.reaction,
|
required this.reaction,
|
||||||
required this.onReaction,
|
required this.onReaction,
|
||||||
this.onDiscuss,
|
this.onDiscuss,
|
||||||
|
this.snippetMaxLines = 2,
|
||||||
});
|
});
|
||||||
|
|
||||||
Future<void> _openUrl() async {
|
Future<void> _openUrl() async {
|
||||||
@@ -113,16 +115,20 @@ class NewsCard extends StatelessWidget {
|
|||||||
],
|
],
|
||||||
),
|
),
|
||||||
const SizedBox(height: 4),
|
const SizedBox(height: 4),
|
||||||
// Title — tappable if URL present
|
// Title — tappable if URL present. Text stays in onSurface for
|
||||||
|
// contrast; the primary-colored underline carries the "this is a
|
||||||
|
// link" signal without tanking readability.
|
||||||
GestureDetector(
|
GestureDetector(
|
||||||
onTap: item.url.isNotEmpty ? _openUrl : null,
|
onTap: item.url.isNotEmpty ? _openUrl : null,
|
||||||
child: Text(
|
child: Text(
|
||||||
item.title,
|
item.title,
|
||||||
style: textTheme.bodyMedium?.copyWith(
|
style: textTheme.titleSmall?.copyWith(
|
||||||
fontWeight: FontWeight.w600,
|
fontWeight: FontWeight.w600,
|
||||||
color: item.url.isNotEmpty ? scheme.primary : scheme.onSurface,
|
color: scheme.onSurface,
|
||||||
|
height: 1.3,
|
||||||
decoration: item.url.isNotEmpty ? TextDecoration.underline : null,
|
decoration: item.url.isNotEmpty ? TextDecoration.underline : null,
|
||||||
decorationColor: scheme.primary,
|
decorationColor: scheme.primary.withValues(alpha: 0.7),
|
||||||
|
decorationThickness: 1.5,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
@@ -131,7 +137,7 @@ class NewsCard extends StatelessWidget {
|
|||||||
const SizedBox(height: 4),
|
const SizedBox(height: 4),
|
||||||
Text(
|
Text(
|
||||||
item.snippet,
|
item.snippet,
|
||||||
maxLines: 2,
|
maxLines: snippetMaxLines,
|
||||||
overflow: TextOverflow.ellipsis,
|
overflow: TextOverflow.ellipsis,
|
||||||
style: textTheme.bodySmall?.copyWith(
|
style: textTheme.bodySmall?.copyWith(
|
||||||
color: scheme.onSurfaceVariant,
|
color: scheme.onSurfaceVariant,
|
||||||
|
|||||||
@@ -5,51 +5,29 @@ import '../providers/voice_provider.dart';
|
|||||||
/// Animated mic button that reflects the current [VoiceMode].
|
/// Animated mic button that reflects the current [VoiceMode].
|
||||||
///
|
///
|
||||||
/// - idle: muted background, mic_none icon
|
/// - idle: muted background, mic_none icon
|
||||||
/// - recording: red with pulsing shadow ring
|
/// - recording: red, pulses with live [amplitude] for real-time feedback
|
||||||
/// - transcribing: indigo with spinner
|
/// - transcribing: indigo with spinner
|
||||||
/// - playing: indigo with volume_up icon
|
/// - playing: indigo with volume_up icon
|
||||||
class VoiceMicButton extends StatefulWidget {
|
class VoiceMicButton extends StatelessWidget {
|
||||||
final VoiceMode mode;
|
final VoiceMode mode;
|
||||||
final bool voiceModeActive;
|
final bool voiceModeActive;
|
||||||
|
/// Live mic amplitude 0.0–1.0 while recording. Drives the button scale
|
||||||
|
/// and glow so the user has obvious feedback that audio is being picked
|
||||||
|
/// up. Ignored when not in [VoiceMode.recording].
|
||||||
|
final double amplitude;
|
||||||
final VoidCallback? onTap;
|
final VoidCallback? onTap;
|
||||||
|
|
||||||
const VoiceMicButton({
|
const VoiceMicButton({
|
||||||
super.key,
|
super.key,
|
||||||
required this.mode,
|
required this.mode,
|
||||||
required this.voiceModeActive,
|
required this.voiceModeActive,
|
||||||
|
this.amplitude = 0.0,
|
||||||
this.onTap,
|
this.onTap,
|
||||||
});
|
});
|
||||||
|
|
||||||
@override
|
|
||||||
State<VoiceMicButton> createState() => _VoiceMicButtonState();
|
|
||||||
}
|
|
||||||
|
|
||||||
class _VoiceMicButtonState extends State<VoiceMicButton>
|
|
||||||
with SingleTickerProviderStateMixin {
|
|
||||||
late AnimationController _pulseController;
|
|
||||||
late Animation<double> _pulseAnimation;
|
|
||||||
|
|
||||||
@override
|
|
||||||
void initState() {
|
|
||||||
super.initState();
|
|
||||||
_pulseController = AnimationController(
|
|
||||||
vsync: this,
|
|
||||||
duration: const Duration(milliseconds: 900),
|
|
||||||
)..repeat(reverse: true);
|
|
||||||
_pulseAnimation = Tween<double>(begin: 1.0, end: 1.25).animate(
|
|
||||||
CurvedAnimation(parent: _pulseController, curve: Curves.easeInOut),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
|
||||||
void dispose() {
|
|
||||||
_pulseController.dispose();
|
|
||||||
super.dispose();
|
|
||||||
}
|
|
||||||
|
|
||||||
Color _bgColor(BuildContext context) {
|
Color _bgColor(BuildContext context) {
|
||||||
final cs = Theme.of(context).colorScheme;
|
final cs = Theme.of(context).colorScheme;
|
||||||
return switch (widget.mode) {
|
return switch (mode) {
|
||||||
VoiceMode.recording => const Color(0xFFEF4444),
|
VoiceMode.recording => const Color(0xFFEF4444),
|
||||||
VoiceMode.transcribing || VoiceMode.playing => cs.primary,
|
VoiceMode.transcribing || VoiceMode.playing => cs.primary,
|
||||||
VoiceMode.idle => cs.surfaceContainerHighest,
|
VoiceMode.idle => cs.surfaceContainerHighest,
|
||||||
@@ -58,11 +36,10 @@ class _VoiceMicButtonState extends State<VoiceMicButton>
|
|||||||
|
|
||||||
Widget _icon(BuildContext context) {
|
Widget _icon(BuildContext context) {
|
||||||
final cs = Theme.of(context).colorScheme;
|
final cs = Theme.of(context).colorScheme;
|
||||||
final iconColor = widget.mode == VoiceMode.idle
|
final iconColor =
|
||||||
? cs.onSurfaceVariant
|
mode == VoiceMode.idle ? cs.onSurfaceVariant : Colors.white;
|
||||||
: Colors.white;
|
|
||||||
|
|
||||||
return switch (widget.mode) {
|
return switch (mode) {
|
||||||
VoiceMode.transcribing => SizedBox(
|
VoiceMode.transcribing => SizedBox(
|
||||||
width: 18,
|
width: 18,
|
||||||
height: 18,
|
height: 18,
|
||||||
@@ -78,14 +55,14 @@ class _VoiceMicButtonState extends State<VoiceMicButton>
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
final isRecording = widget.mode == VoiceMode.recording;
|
final isRecording = mode == VoiceMode.recording;
|
||||||
|
|
||||||
final button = Material(
|
final button = Material(
|
||||||
color: _bgColor(context),
|
color: _bgColor(context),
|
||||||
shape: const CircleBorder(),
|
shape: const CircleBorder(),
|
||||||
child: InkWell(
|
child: InkWell(
|
||||||
customBorder: const CircleBorder(),
|
customBorder: const CircleBorder(),
|
||||||
onTap: widget.onTap,
|
onTap: onTap,
|
||||||
child: SizedBox(
|
child: SizedBox(
|
||||||
width: 40,
|
width: 40,
|
||||||
height: 40,
|
height: 40,
|
||||||
@@ -96,22 +73,30 @@ class _VoiceMicButtonState extends State<VoiceMicButton>
|
|||||||
|
|
||||||
if (!isRecording) return button;
|
if (!isRecording) return button;
|
||||||
|
|
||||||
return AnimatedBuilder(
|
// Base pulse so silence still breathes (0.1 floor), scale + glow climb
|
||||||
animation: _pulseAnimation,
|
// linearly with live amplitude.
|
||||||
builder: (_, child) => Container(
|
final amp = amplitude.clamp(0.0, 1.0);
|
||||||
decoration: BoxDecoration(
|
final pulse = 0.1 + amp * 0.9;
|
||||||
shape: BoxShape.circle,
|
|
||||||
boxShadow: [
|
return AnimatedContainer(
|
||||||
BoxShadow(
|
duration: const Duration(milliseconds: 120),
|
||||||
color: const Color(0xFFEF4444).withValues(alpha: 0.35),
|
curve: Curves.easeOut,
|
||||||
blurRadius: 8 * _pulseAnimation.value,
|
decoration: BoxDecoration(
|
||||||
spreadRadius: 2 * _pulseAnimation.value,
|
shape: BoxShape.circle,
|
||||||
),
|
boxShadow: [
|
||||||
],
|
BoxShadow(
|
||||||
),
|
color: const Color(0xFFEF4444).withValues(alpha: 0.2 + pulse * 0.3),
|
||||||
child: child,
|
blurRadius: 6 + pulse * 14,
|
||||||
|
spreadRadius: 1 + pulse * 5,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
child: AnimatedScale(
|
||||||
|
scale: 1.0 + pulse * 0.18,
|
||||||
|
duration: const Duration(milliseconds: 120),
|
||||||
|
curve: Curves.easeOut,
|
||||||
|
child: button,
|
||||||
),
|
),
|
||||||
child: button,
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+23
-7
@@ -804,10 +804,10 @@ packages:
|
|||||||
dependency: "direct main"
|
dependency: "direct main"
|
||||||
description:
|
description:
|
||||||
name: record
|
name: record
|
||||||
sha256: "2e3d56d196abcd69f1046339b75e5f3855b2406fc087e5991f6703f188aa03a6"
|
sha256: d5b6b334f3ab02460db6544e08583c942dbf23e3504bf1e14fd4cbe3d9409277
|
||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "5.2.1"
|
version: "6.2.0"
|
||||||
record_android:
|
record_android:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
@@ -816,22 +816,30 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.5.1"
|
version: "1.5.1"
|
||||||
record_darwin:
|
record_ios:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: record_darwin
|
name: record_ios
|
||||||
sha256: e487eccb19d82a9a39cd0126945cfc47b9986e0df211734e2788c95e3f63c82c
|
sha256: "8df7c136131bd05efc19256af29b2ba6ccc000ccc2c80d4b6b6d7a8d21a3b5a9"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.2.2"
|
version: "1.2.0"
|
||||||
record_linux:
|
record_linux:
|
||||||
dependency: "direct overridden"
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: record_linux
|
name: record_linux
|
||||||
sha256: c31a35cc158cd666fc6395f7f56fc054f31685571684be6b97670a27649ce5c7
|
sha256: c31a35cc158cd666fc6395f7f56fc054f31685571684be6b97670a27649ce5c7
|
||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.3.0"
|
version: "1.3.0"
|
||||||
|
record_macos:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: record_macos
|
||||||
|
sha256: "084902e63fc9c0c224c29203d6c75f0bdf9b6a40536c9d916393c8f4c4256488"
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "1.2.1"
|
||||||
record_platform_interface:
|
record_platform_interface:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
@@ -1165,6 +1173,14 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "4.5.3"
|
version: "4.5.3"
|
||||||
|
vad:
|
||||||
|
dependency: "direct main"
|
||||||
|
description:
|
||||||
|
name: vad
|
||||||
|
sha256: ef6c8b12c5af7a6a519ff5684f074b8a2ac00c434705f544af379ea77bccd258
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "0.0.7+1"
|
||||||
vector_math:
|
vector_math:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
|
|||||||
+2
-4
@@ -28,13 +28,11 @@ dependencies:
|
|||||||
google_fonts: ^8.0.2
|
google_fonts: ^8.0.2
|
||||||
flutter_timezone: ^5.0.2
|
flutter_timezone: ^5.0.2
|
||||||
url_launcher: ^6.3.1
|
url_launcher: ^6.3.1
|
||||||
record: ^5.0.0
|
record: ^6.2.0
|
||||||
|
vad: ^0.0.7
|
||||||
just_audio: ^0.9.39
|
just_audio: ^0.9.39
|
||||||
table_calendar: ^3.1.2
|
table_calendar: ^3.1.2
|
||||||
|
|
||||||
dependency_overrides:
|
|
||||||
record_linux: ^1.3.0
|
|
||||||
|
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
flutter_test:
|
flutter_test:
|
||||||
sdk: flutter
|
sdk: flutter
|
||||||
|
|||||||
Reference in New Issue
Block a user