From 6c29b685e80b289ce42338f4739579d3119237c5 Mon Sep 17 00:00:00 2001 From: bvandeusen Date: Wed, 8 Apr 2026 13:54:39 -0400 Subject: [PATCH 1/3] feat(theme): shift Android palette from indigo to deep violet to match web identity --- lib/core/theme.dart | 34 +++++++++---------- lib/screens/briefing/briefing_screen.dart | 2 +- lib/screens/calendar/event_form_sheet.dart | 2 +- lib/screens/library/project_tasks_screen.dart | 4 +-- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/lib/core/theme.dart b/lib/core/theme.dart index c6fb537..df516fa 100644 --- a/lib/core/theme.dart +++ b/lib/core/theme.dart @@ -3,21 +3,21 @@ import 'package:google_fonts/google_fonts.dart'; // ── Colour constants ────────────────────────────────────────────────────────── -const _darkBackground = Color(0xFF111113); -const _darkSurface = Color(0xFF18181C); -const _darkSurfaceVar = Color(0xFF1E1E24); -const _darkPrimary = Color(0xFF6366F1); -const _darkOnSurface = Color(0xFFE8E8F0); +const _darkBackground = Color(0xFF0F0F14); +const _darkSurface = Color(0xFF16161F); +const _darkSurfaceVar = Color(0xFF1A1A24); +const _darkPrimary = Color(0xFF7C3AED); +const _darkOnSurface = Color(0xFFE4E4F0); const _darkOnSurfaceVar = Color(0xFF8888A8); -const _darkOutline = Color(0xFF2E2E3A); +const _darkOutline = Color(0xFF2A2A3A); -const _lightBackground = Color(0xFFF4F4F8); +const _lightBackground = Color(0xFFF5F5FB); const _lightSurface = Color(0xFFFFFFFF); -const _lightSurfaceVar = Color(0xFFF0F0F5); -const _lightPrimary = Color(0xFF4F46E5); -const _lightOnSurface = Color(0xFF18181C); -const _lightOnSurfaceVar = Color(0xFF6B6B88); -const _lightOutline = Color(0xFFD4D4E4); +const _lightSurfaceVar = Color(0xFFF0F0F8); +const _lightPrimary = Color(0xFF7C3AED); +const _lightOnSurface = Color(0xFF1A1A1A); +const _lightOnSurfaceVar = Color(0xFF666666); +const _lightOutline = Color(0xFFDDDDE8); // ── Typography ───────────────────────────────────────────────────────────────── @@ -41,7 +41,7 @@ ThemeData fabledDarkTheme() { brightness: Brightness.dark, primary: _darkPrimary, onPrimary: Colors.white, - primaryContainer: const Color(0xFF3730A3), + primaryContainer: const Color(0xFF5B21B6), onPrimaryContainer: _darkOnSurface, secondary: _darkPrimary, onSecondary: Colors.white, @@ -118,7 +118,7 @@ ThemeData fabledLightTheme() { brightness: Brightness.light, primary: _lightPrimary, onPrimary: Colors.white, - primaryContainer: const Color(0xFFE0E0FF), + primaryContainer: const Color(0xFFEDE5FF), onPrimaryContainer: _lightOnSurface, secondary: _lightPrimary, onSecondary: Colors.white, @@ -218,15 +218,15 @@ class GradientButton extends StatelessWidget { : const LinearGradient( begin: Alignment.topLeft, end: Alignment.bottomRight, - colors: [Color(0xFF6366F1), Color(0xFF4F46E5)], + colors: [Color(0xFF7C3AED), Color(0xFF5B21B6)], ), - color: disabled ? const Color(0xFF6366F1) : null, + color: disabled ? const Color(0xFF7C3AED) : null, borderRadius: BorderRadius.circular(12), boxShadow: disabled ? null : [ BoxShadow( - color: const Color(0xFF6366F1).withValues(alpha: 0.35), + color: const Color(0xFF7C3AED).withValues(alpha: 0.45), blurRadius: 8, offset: const Offset(0, 3), ), diff --git a/lib/screens/briefing/briefing_screen.dart b/lib/screens/briefing/briefing_screen.dart index 8b5bde0..7159c3a 100644 --- a/lib/screens/briefing/briefing_screen.dart +++ b/lib/screens/briefing/briefing_screen.dart @@ -462,7 +462,7 @@ class _GradientSendButton extends StatelessWidget { : const LinearGradient( begin: Alignment.topLeft, end: Alignment.bottomRight, - colors: [Color(0xFF6366F1), Color(0xFF4F46E5)], + colors: [Color(0xFF7C3AED), Color(0xFF5B21B6)], ), color: disabled ? scheme.onSurface.withValues(alpha: 0.12) : null, borderRadius: BorderRadius.circular(10), diff --git a/lib/screens/calendar/event_form_sheet.dart b/lib/screens/calendar/event_form_sheet.dart index d1460ca..012bf13 100644 --- a/lib/screens/calendar/event_form_sheet.dart +++ b/lib/screens/calendar/event_form_sheet.dart @@ -57,7 +57,7 @@ class _EventFormSheetState extends ConsumerState { '#EF4444', '#F59E0B', '#10B981', - '#6366F1', + '#7C3AED', '#8B5CF6', '#EC4899', ]; diff --git a/lib/screens/library/project_tasks_screen.dart b/lib/screens/library/project_tasks_screen.dart index fb41c15..2398394 100644 --- a/lib/screens/library/project_tasks_screen.dart +++ b/lib/screens/library/project_tasks_screen.dart @@ -55,11 +55,11 @@ class _ProjectTasksScreenState extends ConsumerState { } Color _parseColor(String? hex) { - if (hex == null || hex.isEmpty) return const Color(0xFF6366F1); + if (hex == null || hex.isEmpty) return const Color(0xFF7C3AED); try { return Color(int.parse(hex.replaceFirst('#', '0xFF'))); } catch (_) { - return const Color(0xFF6366F1); + return const Color(0xFF7C3AED); } } From 3e888b6458cea0484ed5ff07cf798346fc72938b Mon Sep 17 00:00:00 2001 From: bvandeusen Date: Wed, 8 Apr 2026 14:39:50 -0400 Subject: [PATCH 2/3] fix: eliminate pull-to-refresh flicker by holding stale data during re-fetch --- lib/app.dart | 14 +++++++------- lib/providers/calendar_provider.dart | 11 +++++++++++ lib/providers/chat_provider.dart | 13 +++++++++++++ lib/providers/news_provider.dart | 19 +++++++++++++++++++ lib/providers/projects_provider.dart | 6 ++++++ lib/providers/tasks_provider.dart | 5 +++++ lib/screens/calendar/calendar_screen.dart | 2 +- lib/screens/chat/chat_screen.dart | 2 +- .../chat/conversations_tab_screen.dart | 2 +- lib/screens/library/project_tasks_screen.dart | 6 ++++-- lib/screens/news/news_screen.dart | 2 +- lib/screens/projects/projects_screen.dart | 2 +- 12 files changed, 70 insertions(+), 14 deletions(-) diff --git a/lib/app.dart b/lib/app.dart index aa41f9f..9d55a01 100644 --- a/lib/app.dart +++ b/lib/app.dart @@ -236,13 +236,13 @@ class _ShellState extends ConsumerState<_Shell> with WidgetsBindingObserver { /// Refresh every major data provider. Safe to call speculatively — /// providers that aren't currently watched are already disposed. void _refreshAll() { - ref.invalidate(conversationsProvider); - ref.invalidate(calendarProvider); - ref.invalidate(newsProvider); - // Notifier (not AsyncNotifier) — needs explicit refresh call. + ref.read(conversationsProvider.notifier).refresh(); + ref.read(calendarProvider.notifier).refresh(); + ref.read(newsProvider.notifier).refresh(); ref.read(knowledgeProvider.notifier).refresh(); - // briefingProvider is an AsyncNotifier family; invalidating the family - // is safe even if no conversation is open. + // briefingProvider is an AsyncNotifier family; invalidating is safe + // even if no conversation is open — it doesn't cause flicker since + // the briefing screen isn't a list view. ref.invalidate(briefingProvider); } @@ -254,7 +254,7 @@ class _ShellState extends ConsumerState<_Shell> with WidgetsBindingObserver { case 1: ref.read(knowledgeProvider.notifier).refresh(); case 2: - ref.invalidate(conversationsProvider); + ref.read(conversationsProvider.notifier).refresh(); } } diff --git a/lib/providers/calendar_provider.dart b/lib/providers/calendar_provider.dart index c3c8951..3afc96c 100644 --- a/lib/providers/calendar_provider.dart +++ b/lib/providers/calendar_provider.dart @@ -56,6 +56,17 @@ class CalendarNotifier extends AsyncNotifier { ); } + /// Re-fetch events for the current range without clearing state (no flicker). + Future refresh() async { + final current = state.value; + if (current == null) return; + final events = await ref.read(eventsApiProvider).getEvents( + current.loadedRange.start, + current.loadedRange.end, + ); + state = AsyncData(current.copyWith(eventsByDay: _groupByDay(events))); + } + /// Synchronously updates selectedDay and focusedMonth. No API call. void selectDay(DateTime day) { final current = state.value; diff --git a/lib/providers/chat_provider.dart b/lib/providers/chat_provider.dart index 0a6e61d..b633ad4 100644 --- a/lib/providers/chat_provider.dart +++ b/lib/providers/chat_provider.dart @@ -58,6 +58,12 @@ class ConversationsNotifier extends AsyncNotifier> { ]); } + /// Re-fetch conversations without clearing the current list (no flicker). + Future refresh() async { + final fresh = await ref.read(chatRepositoryProvider).getConversations(); + state = AsyncData(fresh); + } + // Called after a message is sent to patch the server-generated title // in-place without triggering a full reload or loading state. void patchConversation(Conversation updated) { @@ -86,6 +92,13 @@ class MessagesNotifier extends AsyncNotifier> { return messages; } + /// Re-fetch messages without clearing the current list (no flicker). + Future refresh() async { + final (_, messages) = + await ref.read(chatRepositoryProvider).getMessages(_convId); + state = AsyncData(messages); + } + Future sendMessage(String content) async { final convId = _convId; final repo = ref.read(chatRepositoryProvider); diff --git a/lib/providers/news_provider.dart b/lib/providers/news_provider.dart index 2077a0c..5377bdd 100644 --- a/lib/providers/news_provider.dart +++ b/lib/providers/news_provider.dart @@ -71,6 +71,25 @@ class NewsNotifier extends AsyncNotifier { ); } + /// Re-fetch the first page without clearing state (no flicker). + Future refresh() async { + final current = state.value; + final items = await ref.read(newsApiProvider).getNewsItems( + days: 90, + limit: _limit, + offset: 0, + feedId: current?.selectedFeedId, + ); + state = AsyncData(NewsState( + items: items, + offset: items.length, + hasMore: items.length == _limit, + loadingMore: false, + selectedFeedId: current?.selectedFeedId, + reactions: {for (final item in items) item.id: item.reaction}, + )); + } + Future loadMore() async { final current = state.value; if (current == null || current.loadingMore || !current.hasMore) return; diff --git a/lib/providers/projects_provider.dart b/lib/providers/projects_provider.dart index d3981d5..724b0cc 100644 --- a/lib/providers/projects_provider.dart +++ b/lib/providers/projects_provider.dart @@ -15,6 +15,12 @@ class ProjectsNotifier extends AsyncNotifier> { .getAll(sort: 'updated_at', order: 'desc'); } + Future refresh() async { + final fresh = await ref.read(projectsRepositoryProvider) + .getAll(sort: 'updated_at', order: 'desc'); + state = AsyncData(fresh); + } + Future create({ required String title, String? description, diff --git a/lib/providers/tasks_provider.dart b/lib/providers/tasks_provider.dart index 9ad6b42..e2a31ed 100644 --- a/lib/providers/tasks_provider.dart +++ b/lib/providers/tasks_provider.dart @@ -17,6 +17,11 @@ class TasksNotifier extends AsyncNotifier> { return ref.watch(tasksRepositoryProvider).getAll(); } + Future refresh() async { + final fresh = await ref.read(tasksRepositoryProvider).getAll(); + state = AsyncData(fresh); + } + Future create({ required String title, String? description, diff --git a/lib/screens/calendar/calendar_screen.dart b/lib/screens/calendar/calendar_screen.dart index 0d0394e..9d9e628 100644 --- a/lib/screens/calendar/calendar_screen.dart +++ b/lib/screens/calendar/calendar_screen.dart @@ -68,7 +68,7 @@ class CalendarScreen extends ConsumerWidget { const Divider(height: 1), Expanded( child: RefreshIndicator( - onRefresh: () async => ref.invalidate(calendarProvider), + onRefresh: () => ref.read(calendarProvider.notifier).refresh(), child: _AgendaList( events: cal.eventsByDay[dateOnly(cal.selectedDay)] ?? [], diff --git a/lib/screens/chat/chat_screen.dart b/lib/screens/chat/chat_screen.dart index 7520aea..27698b5 100644 --- a/lib/screens/chat/chat_screen.dart +++ b/lib/screens/chat/chat_screen.dart @@ -30,7 +30,7 @@ class _ChatScreenState extends ConsumerState @override void didChangeAppLifecycleState(AppLifecycleState state) { if (state == AppLifecycleState.resumed) { - ref.invalidate(messagesProvider(widget.conversationId)); + ref.read(messagesProvider(widget.conversationId).notifier).refresh(); } } diff --git a/lib/screens/chat/conversations_tab_screen.dart b/lib/screens/chat/conversations_tab_screen.dart index 6c8f271..ee4f541 100644 --- a/lib/screens/chat/conversations_tab_screen.dart +++ b/lib/screens/chat/conversations_tab_screen.dart @@ -64,7 +64,7 @@ class ConversationsTabScreen extends ConsumerWidget { ); } return RefreshIndicator( - onRefresh: () async => ref.invalidate(conversationsProvider), + onRefresh: () => ref.read(conversationsProvider.notifier).refresh(), child: ListView.builder( itemCount: convs.length, itemBuilder: (ctx, i) { diff --git a/lib/screens/library/project_tasks_screen.dart b/lib/screens/library/project_tasks_screen.dart index 2398394..775715d 100644 --- a/lib/screens/library/project_tasks_screen.dart +++ b/lib/screens/library/project_tasks_screen.dart @@ -151,8 +151,10 @@ class _ProjectTasksScreenState extends ConsumerState { return RefreshIndicator( onRefresh: () async { setState(() => _pendingStatus.clear()); - ref.invalidate(projectTasksProvider(widget.projectId)); - ref.invalidate(projectMilestonesProvider(widget.projectId)); + await Future.wait([ + ref.refresh(projectTasksProvider(widget.projectId).future), + ref.refresh(projectMilestonesProvider(widget.projectId).future), + ]); }, child: CustomScrollView( slivers: [ diff --git a/lib/screens/news/news_screen.dart b/lib/screens/news/news_screen.dart index be3d16c..760d930 100644 --- a/lib/screens/news/news_screen.dart +++ b/lib/screens/news/news_screen.dart @@ -97,7 +97,7 @@ class _NewsScreenState extends ConsumerState { const Divider(height: 1), Expanded( child: RefreshIndicator( - onRefresh: () async => ref.invalidate(newsProvider), + onRefresh: () => ref.read(newsProvider.notifier).refresh(), child: ListView.builder( padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 8), diff --git a/lib/screens/projects/projects_screen.dart b/lib/screens/projects/projects_screen.dart index a468ff0..2436fb9 100644 --- a/lib/screens/projects/projects_screen.dart +++ b/lib/screens/projects/projects_screen.dart @@ -19,7 +19,7 @@ class ProjectsScreen extends ConsumerWidget { data: (projects) => projects.isEmpty ? const Center(child: Text('No projects yet.')) : RefreshIndicator( - onRefresh: () async => ref.invalidate(projectsProvider), + onRefresh: () => ref.read(projectsProvider.notifier).refresh(), child: ListView.separated( itemCount: projects.length, separatorBuilder: (_, _) => const Divider(height: 1), From 47c190891e3cb181531e76812c4e084cef84cd99 Mon Sep 17 00:00:00 2001 From: bvandeusen Date: Wed, 8 Apr 2026 14:45:57 -0400 Subject: [PATCH 3/3] fix(knowledge): hold stale items during refresh to eliminate flicker --- lib/providers/knowledge_provider.dart | 43 +++++++++++++++++++++++---- 1 file changed, 37 insertions(+), 6 deletions(-) diff --git a/lib/providers/knowledge_provider.dart b/lib/providers/knowledge_provider.dart index b63ef31..86a4e26 100644 --- a/lib/providers/knowledge_provider.dart +++ b/lib/providers/knowledge_provider.dart @@ -115,12 +115,43 @@ class KnowledgeNotifier extends Notifier { } Future refresh() async { - state = KnowledgeState( - noteType: state.noteType, - activeTags: state.activeTags, - searchQuery: state.searchQuery, - ); - await _fetchFromScratch(); + // Keep current items visible during re-fetch (no flicker). + try { + if (state.noteType == 'task') { + final tasks = await ref.read(tasksApiProvider).getAll(); + final items = { + for (final t in tasks) t.id: KnowledgeItem.fromTask(t), + }; + state = state.copyWith( + ids: tasks.map((t) => t.id).toList(), + items: items, + totalIds: tasks.length, + hasMore: false, + ); + await _loadCounts(); + return; + } + + final (ids, total) = await _repo.fetchIds( + noteType: state.noteType, + tags: state.activeTags, + q: state.searchQuery, + limit: 50, + offset: 0, + ); + // Hydrate the new IDs + final batch = await _repo.fetchBatch(ids); + final freshItems = {for (final item in batch) item.id: item}; + state = state.copyWith( + ids: ids, + items: freshItems, + totalIds: total, + hasMore: ids.length < total, + ); + await Future.wait([_loadCounts(), _loadTags()]); + } catch (_) { + // Silent — stale data is better than an error on refresh + } } // ── Scroll-triggered loaders ─────────────────────────────────────────────