feat: upgrade Riverpod 3, go_router 17, google_fonts 8, package_info_plus 9
Migrate StateNotifierProvider/StateNotifier → NotifierProvider/Notifier, StateProvider → NotifierProvider with simple notifier, FamilyAsyncNotifier removed in Riverpod 3 (replaced with constructor-arg pattern), and rename .valueOrNull → .value throughout all providers and screens. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -4,18 +4,15 @@ import 'api_client_provider.dart';
|
|||||||
|
|
||||||
enum AuthStatus { unknown, authenticated, unauthenticated }
|
enum AuthStatus { unknown, authenticated, unauthenticated }
|
||||||
|
|
||||||
final authProvider = StateNotifierProvider<AuthNotifier, AuthStatus>((ref) {
|
final authProvider = NotifierProvider<AuthNotifier, AuthStatus>(AuthNotifier.new);
|
||||||
return AuthNotifier(ref);
|
|
||||||
});
|
|
||||||
|
|
||||||
class AuthNotifier extends StateNotifier<AuthStatus> {
|
class AuthNotifier extends Notifier<AuthStatus> {
|
||||||
final Ref _ref;
|
@override
|
||||||
|
AuthStatus build() => AuthStatus.unknown;
|
||||||
AuthNotifier(this._ref) : super(AuthStatus.unknown);
|
|
||||||
|
|
||||||
Future<void> verify() async {
|
Future<void> verify() async {
|
||||||
try {
|
try {
|
||||||
final repo = _ref.read(authRepositoryProvider);
|
final repo = ref.read(authRepositoryProvider);
|
||||||
final ok = await repo.verify();
|
final ok = await repo.verify();
|
||||||
state = ok ? AuthStatus.authenticated : AuthStatus.unauthenticated;
|
state = ok ? AuthStatus.authenticated : AuthStatus.unauthenticated;
|
||||||
} catch (_) {
|
} catch (_) {
|
||||||
@@ -24,14 +21,14 @@ class AuthNotifier extends StateNotifier<AuthStatus> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Future<void> login(String username, String password) async {
|
Future<void> login(String username, String password) async {
|
||||||
final repo = _ref.read(authRepositoryProvider);
|
final repo = ref.read(authRepositoryProvider);
|
||||||
await repo.login(username, password);
|
await repo.login(username, password);
|
||||||
state = AuthStatus.authenticated;
|
state = AuthStatus.authenticated;
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> logout() async {
|
Future<void> logout() async {
|
||||||
try {
|
try {
|
||||||
final repo = _ref.read(authRepositoryProvider);
|
final repo = ref.read(authRepositoryProvider);
|
||||||
await repo.logout();
|
await repo.logout();
|
||||||
} finally {
|
} finally {
|
||||||
state = AuthStatus.unauthenticated;
|
state = AuthStatus.unauthenticated;
|
||||||
|
|||||||
@@ -5,7 +5,13 @@ import '../data/models/message.dart';
|
|||||||
import 'api_client_provider.dart';
|
import 'api_client_provider.dart';
|
||||||
|
|
||||||
/// Drives the loading indicator in BriefingScreen's reply area.
|
/// Drives the loading indicator in BriefingScreen's reply area.
|
||||||
final isBriefingStreamingProvider = StateProvider<bool>((ref) => false);
|
final isBriefingStreamingProvider =
|
||||||
|
NotifierProvider<_BoolNotifier, bool>(_BoolNotifier.new);
|
||||||
|
|
||||||
|
class _BoolNotifier extends Notifier<bool> {
|
||||||
|
@override
|
||||||
|
bool build() => false;
|
||||||
|
}
|
||||||
|
|
||||||
final briefingProvider =
|
final briefingProvider =
|
||||||
AsyncNotifierProvider<BriefingNotifier, BriefingConversation>(
|
AsyncNotifierProvider<BriefingNotifier, BriefingConversation>(
|
||||||
@@ -32,7 +38,7 @@ class BriefingNotifier extends AsyncNotifier<BriefingConversation> {
|
|||||||
/// 3. SSE stream (best-effort)
|
/// 3. SSE stream (best-effort)
|
||||||
/// 4. Poll until complete
|
/// 4. Poll until complete
|
||||||
Future<void> sendReply(String content) async {
|
Future<void> sendReply(String content) async {
|
||||||
final conv = state.valueOrNull;
|
final conv = state.value;
|
||||||
if (conv == null) return;
|
if (conv == null) return;
|
||||||
final convId = conv.id;
|
final convId = conv.id;
|
||||||
final chatApi = ref.read(chatApiProvider);
|
final chatApi = ref.read(chatApiProvider);
|
||||||
@@ -65,7 +71,7 @@ class BriefingNotifier extends AsyncNotifier<BriefingConversation> {
|
|||||||
try {
|
try {
|
||||||
await for (final chunk in chatApi.streamGeneration(convId)) {
|
await for (final chunk in chatApi.streamGeneration(convId)) {
|
||||||
streamedContent = true;
|
streamedContent = true;
|
||||||
final current = state.valueOrNull;
|
final current = state.value;
|
||||||
if (current == null) break;
|
if (current == null) break;
|
||||||
final msgs = current.messages;
|
final msgs = current.messages;
|
||||||
if (msgs.isEmpty) continue;
|
if (msgs.isEmpty) continue;
|
||||||
@@ -88,7 +94,7 @@ class BriefingNotifier extends AsyncNotifier<BriefingConversation> {
|
|||||||
final hasContent = fresh.any(
|
final hasContent = fresh.any(
|
||||||
(m) => m.role == MessageRole.assistant && m.content.isNotEmpty,
|
(m) => m.role == MessageRole.assistant && m.content.isNotEmpty,
|
||||||
);
|
);
|
||||||
final current = state.valueOrNull;
|
final current = state.value;
|
||||||
if (current != null && (!streamedContent || done || hasContent)) {
|
if (current != null && (!streamedContent || done || hasContent)) {
|
||||||
state = AsyncData(current.copyWith(messages: fresh));
|
state = AsyncData(current.copyWith(messages: fresh));
|
||||||
}
|
}
|
||||||
@@ -96,7 +102,7 @@ class BriefingNotifier extends AsyncNotifier<BriefingConversation> {
|
|||||||
}
|
}
|
||||||
} catch (_) {
|
} catch (_) {
|
||||||
// Clear the generating placeholder so UI doesn't spin forever.
|
// Clear the generating placeholder so UI doesn't spin forever.
|
||||||
final current = state.valueOrNull;
|
final current = state.value;
|
||||||
if (current != null) {
|
if (current != null) {
|
||||||
final msgs = current.messages;
|
final msgs = current.messages;
|
||||||
if (msgs.isNotEmpty && msgs.last.status == 'generating') {
|
if (msgs.isNotEmpty && msgs.last.status == 'generating') {
|
||||||
|
|||||||
@@ -4,16 +4,20 @@ import 'package:shared_preferences/shared_preferences.dart';
|
|||||||
import 'settings_provider.dart';
|
import 'settings_provider.dart';
|
||||||
|
|
||||||
final captureQueueProvider =
|
final captureQueueProvider =
|
||||||
StateNotifierProvider<CaptureQueueNotifier, List<String>>(
|
NotifierProvider<CaptureQueueNotifier, List<String>>(
|
||||||
(ref) => CaptureQueueNotifier(ref.watch(sharedPreferencesProvider)),
|
CaptureQueueNotifier.new,
|
||||||
);
|
);
|
||||||
|
|
||||||
class CaptureQueueNotifier extends StateNotifier<List<String>> {
|
class CaptureQueueNotifier extends Notifier<List<String>> {
|
||||||
static const _key = 'capture_queue';
|
static const _key = 'capture_queue';
|
||||||
final SharedPreferences _prefs;
|
|
||||||
|
|
||||||
CaptureQueueNotifier(this._prefs)
|
SharedPreferences get _prefs => ref.read(sharedPreferencesProvider);
|
||||||
: super(_prefs.getStringList(_key) ?? []);
|
|
||||||
|
@override
|
||||||
|
List<String> build() {
|
||||||
|
final prefs = ref.watch(sharedPreferencesProvider);
|
||||||
|
return prefs.getStringList(_key) ?? [];
|
||||||
|
}
|
||||||
|
|
||||||
Future<void> enqueue(String text) async {
|
Future<void> enqueue(String text) async {
|
||||||
final updated = [...state, text];
|
final updated = [...state, text];
|
||||||
|
|||||||
@@ -15,20 +15,27 @@ class CaptureResult {
|
|||||||
|
|
||||||
/// The most recent capture result. UI watches this to show snackbars.
|
/// The most recent capture result. UI watches this to show snackbars.
|
||||||
/// Reset to null by the notifier before each new item so listeners always fire.
|
/// Reset to null by the notifier before each new item so listeners always fire.
|
||||||
final captureResultProvider = StateProvider<CaptureResult?>((_) => null);
|
final captureResultProvider =
|
||||||
|
NotifierProvider<_CaptureResultNotifier, CaptureResult?>(
|
||||||
|
_CaptureResultNotifier.new);
|
||||||
|
|
||||||
|
class _CaptureResultNotifier extends Notifier<CaptureResult?> {
|
||||||
|
@override
|
||||||
|
CaptureResult? build() => null;
|
||||||
|
}
|
||||||
|
|
||||||
/// In-memory sequential work queue for quick captures.
|
/// In-memory sequential work queue for quick captures.
|
||||||
/// Separate from [captureQueueProvider] (which is the offline persistence queue).
|
/// Separate from [captureQueueProvider] (which is the offline persistence queue).
|
||||||
final captureWorkQueueProvider =
|
final captureWorkQueueProvider =
|
||||||
StateNotifierProvider<CaptureWorkQueueNotifier, List<String>>(
|
NotifierProvider<CaptureWorkQueueNotifier, List<String>>(
|
||||||
(ref) => CaptureWorkQueueNotifier(ref),
|
CaptureWorkQueueNotifier.new,
|
||||||
);
|
);
|
||||||
|
|
||||||
class CaptureWorkQueueNotifier extends StateNotifier<List<String>> {
|
class CaptureWorkQueueNotifier extends Notifier<List<String>> {
|
||||||
final Ref _ref;
|
|
||||||
bool _running = false;
|
bool _running = false;
|
||||||
|
|
||||||
CaptureWorkQueueNotifier(this._ref) : super([]);
|
@override
|
||||||
|
List<String> build() => [];
|
||||||
|
|
||||||
/// Add text to the queue and start the drain loop if not already running.
|
/// Add text to the queue and start the drain loop if not already running.
|
||||||
void enqueue(String text) {
|
void enqueue(String text) {
|
||||||
@@ -43,9 +50,9 @@ class CaptureWorkQueueNotifier extends StateNotifier<List<String>> {
|
|||||||
while (state.isNotEmpty) {
|
while (state.isNotEmpty) {
|
||||||
final text = state.first;
|
final text = state.first;
|
||||||
// Signal "no result yet" so the same result value can re-trigger watch.
|
// Signal "no result yet" so the same result value can re-trigger watch.
|
||||||
_ref.read(captureResultProvider.notifier).state = null;
|
ref.read(captureResultProvider.notifier).state = null;
|
||||||
try {
|
try {
|
||||||
final api = _ref.read(quickCaptureApiProvider);
|
final api = ref.read(quickCaptureApiProvider);
|
||||||
final result = await api.capture(text);
|
final result = await api.capture(text);
|
||||||
|
|
||||||
// Dequeue on success.
|
// Dequeue on success.
|
||||||
@@ -54,32 +61,32 @@ class CaptureWorkQueueNotifier extends StateNotifier<List<String>> {
|
|||||||
// Invalidate content providers so lists refresh.
|
// Invalidate content providers so lists refresh.
|
||||||
switch (result.type) {
|
switch (result.type) {
|
||||||
case 'note':
|
case 'note':
|
||||||
_ref.invalidate(notesProvider);
|
ref.invalidate(notesProvider);
|
||||||
case 'task':
|
case 'task':
|
||||||
case 'todo':
|
case 'todo':
|
||||||
_ref.invalidate(tasksProvider);
|
ref.invalidate(tasksProvider);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Publish result for snackbar.
|
// Publish result for snackbar.
|
||||||
final msg = result.message.isNotEmpty
|
final msg = result.message.isNotEmpty
|
||||||
? result.message
|
? result.message
|
||||||
: '${_typeLabel(result.type)} created: ${result.title}';
|
: '${_typeLabel(result.type)} created: ${result.title}';
|
||||||
_ref.read(captureResultProvider.notifier).state = CaptureResult(msg);
|
ref.read(captureResultProvider.notifier).state = CaptureResult(msg);
|
||||||
} on NetworkException catch (_) {
|
} on NetworkException catch (_) {
|
||||||
// Persist to offline queue and stop draining — still offline.
|
// Persist to offline queue and stop draining — still offline.
|
||||||
await _ref.read(captureQueueProvider.notifier).enqueue(text);
|
await ref.read(captureQueueProvider.notifier).enqueue(text);
|
||||||
state = state.length > 1 ? state.sublist(1) : [];
|
state = state.length > 1 ? state.sublist(1) : [];
|
||||||
_ref.read(captureResultProvider.notifier).state = CaptureResult(
|
ref.read(captureResultProvider.notifier).state = CaptureResult(
|
||||||
"You're offline — capture saved and will retry automatically.",
|
"You're offline — capture saved and will retry automatically.",
|
||||||
);
|
);
|
||||||
break;
|
break;
|
||||||
} on AppException catch (e) {
|
} on AppException catch (e) {
|
||||||
state = state.length > 1 ? state.sublist(1) : [];
|
state = state.length > 1 ? state.sublist(1) : [];
|
||||||
_ref.read(captureResultProvider.notifier).state =
|
ref.read(captureResultProvider.notifier).state =
|
||||||
CaptureResult(e.message, isError: true);
|
CaptureResult(e.message, isError: true);
|
||||||
} catch (_) {
|
} catch (_) {
|
||||||
state = state.length > 1 ? state.sublist(1) : [];
|
state = state.length > 1 ? state.sublist(1) : [];
|
||||||
_ref.read(captureResultProvider.notifier).state =
|
ref.read(captureResultProvider.notifier).state =
|
||||||
CaptureResult('Capture failed. Please try again.', isError: true);
|
CaptureResult('Capture failed. Please try again.', isError: true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,8 +4,19 @@ import '../data/models/conversation.dart';
|
|||||||
import '../data/models/message.dart';
|
import '../data/models/message.dart';
|
||||||
import 'api_client_provider.dart';
|
import 'api_client_provider.dart';
|
||||||
|
|
||||||
// Separate StateProvider so UI re-builds immediately when streaming starts/stops.
|
// Separate NotifierProvider.family so UI re-builds immediately when streaming starts/stops.
|
||||||
final isStreamingProvider = StateProvider.family<bool, int>((ref, _) => false);
|
final isStreamingProvider =
|
||||||
|
NotifierProvider.family<_IsStreamingNotifier, bool, int>(
|
||||||
|
(convId) => _IsStreamingNotifier(convId),
|
||||||
|
);
|
||||||
|
|
||||||
|
class _IsStreamingNotifier extends Notifier<bool> {
|
||||||
|
// ignore: avoid_unused_constructor_parameters
|
||||||
|
_IsStreamingNotifier(int convId);
|
||||||
|
|
||||||
|
@override
|
||||||
|
bool build() => false;
|
||||||
|
}
|
||||||
|
|
||||||
final conversationsProvider =
|
final conversationsProvider =
|
||||||
AsyncNotifierProvider<ConversationsNotifier, List<Conversation>>(
|
AsyncNotifierProvider<ConversationsNotifier, List<Conversation>>(
|
||||||
@@ -20,14 +31,14 @@ class ConversationsNotifier extends AsyncNotifier<List<Conversation>> {
|
|||||||
Future<Conversation> create(String title) async {
|
Future<Conversation> create(String title) async {
|
||||||
final conv =
|
final conv =
|
||||||
await ref.read(chatRepositoryProvider).createConversation(title);
|
await ref.read(chatRepositoryProvider).createConversation(title);
|
||||||
state = AsyncData([conv, ...state.valueOrNull ?? []]);
|
state = AsyncData([conv, ...state.value ?? []]);
|
||||||
return conv;
|
return conv;
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> delete(int id) async {
|
Future<void> delete(int id) async {
|
||||||
await ref.read(chatRepositoryProvider).deleteConversation(id);
|
await ref.read(chatRepositoryProvider).deleteConversation(id);
|
||||||
state = AsyncData([
|
state = AsyncData([
|
||||||
for (final c in state.valueOrNull ?? [])
|
for (final c in state.value ?? [])
|
||||||
if (c.id != id) c,
|
if (c.id != id) c,
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
@@ -35,7 +46,7 @@ class ConversationsNotifier extends AsyncNotifier<List<Conversation>> {
|
|||||||
// Called after a message is sent to patch the server-generated title
|
// Called after a message is sent to patch the server-generated title
|
||||||
// in-place without triggering a full reload or loading state.
|
// in-place without triggering a full reload or loading state.
|
||||||
void patchConversation(Conversation updated) {
|
void patchConversation(Conversation updated) {
|
||||||
final list = state.valueOrNull;
|
final list = state.value;
|
||||||
if (list == null) return;
|
if (list == null) return;
|
||||||
state = AsyncData([
|
state = AsyncData([
|
||||||
for (final c in list)
|
for (final c in list)
|
||||||
@@ -44,21 +55,26 @@ class ConversationsNotifier extends AsyncNotifier<List<Conversation>> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
final messagesProvider = AsyncNotifierProvider.family<MessagesNotifier,
|
final messagesProvider =
|
||||||
List<Message>, int>(MessagesNotifier.new);
|
AsyncNotifierProvider.family<MessagesNotifier, List<Message>, int>(
|
||||||
|
(convId) => MessagesNotifier(convId),
|
||||||
|
);
|
||||||
|
|
||||||
|
class MessagesNotifier extends AsyncNotifier<List<Message>> {
|
||||||
|
final int _convId;
|
||||||
|
MessagesNotifier(this._convId);
|
||||||
|
|
||||||
class MessagesNotifier extends FamilyAsyncNotifier<List<Message>, int> {
|
|
||||||
@override
|
@override
|
||||||
Future<List<Message>> build(int arg) async {
|
Future<List<Message>> build() async {
|
||||||
final (_, messages) =
|
final (_, messages) =
|
||||||
await ref.watch(chatRepositoryProvider).getMessages(arg);
|
await ref.watch(chatRepositoryProvider).getMessages(_convId);
|
||||||
return messages;
|
return messages;
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> sendMessage(String content) async {
|
Future<void> sendMessage(String content) async {
|
||||||
final convId = arg;
|
final convId = _convId;
|
||||||
final repo = ref.read(chatRepositoryProvider);
|
final repo = ref.read(chatRepositoryProvider);
|
||||||
final previousMessages = state.valueOrNull ?? [];
|
final previousMessages = state.value ?? [];
|
||||||
|
|
||||||
// Optimistic UI: show the user message + assistant placeholder immediately.
|
// Optimistic UI: show the user message + assistant placeholder immediately.
|
||||||
final userMsg = Message(
|
final userMsg = Message(
|
||||||
@@ -132,7 +148,7 @@ class MessagesNotifier extends FamilyAsyncNotifier<List<Message>, int> {
|
|||||||
} catch (_) {
|
} catch (_) {
|
||||||
// Polling failed entirely — clear the generating placeholder so the UI
|
// Polling failed entirely — clear the generating placeholder so the UI
|
||||||
// doesn't spin forever.
|
// doesn't spin forever.
|
||||||
final msgs = state.valueOrNull;
|
final msgs = state.value;
|
||||||
if (msgs != null && msgs.isNotEmpty && msgs.last.status == 'generating') {
|
if (msgs != null && msgs.isNotEmpty && msgs.last.status == 'generating') {
|
||||||
state = AsyncData([
|
state = AsyncData([
|
||||||
...msgs.sublist(0, msgs.length - 1),
|
...msgs.sublist(0, msgs.length - 1),
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ class NotesNotifier extends AsyncNotifier<List<Note>> {
|
|||||||
final note = await ref
|
final note = await ref
|
||||||
.read(notesRepositoryProvider)
|
.read(notesRepositoryProvider)
|
||||||
.create(title, body, tags: tags, projectId: projectId);
|
.create(title, body, tags: tags, projectId: projectId);
|
||||||
state = AsyncData([...state.valueOrNull ?? [], note]);
|
state = AsyncData([...state.value ?? [], note]);
|
||||||
return note;
|
return note;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -42,7 +42,7 @@ class NotesNotifier extends AsyncNotifier<List<Note>> {
|
|||||||
clearProject: clearProject,
|
clearProject: clearProject,
|
||||||
);
|
);
|
||||||
state = AsyncData([
|
state = AsyncData([
|
||||||
for (final n in state.valueOrNull ?? [])
|
for (final n in state.value ?? [])
|
||||||
if (n.id == id) updated else n,
|
if (n.id == id) updated else n,
|
||||||
]);
|
]);
|
||||||
return updated;
|
return updated;
|
||||||
@@ -51,7 +51,7 @@ class NotesNotifier extends AsyncNotifier<List<Note>> {
|
|||||||
Future<void> delete(int id) async {
|
Future<void> delete(int id) async {
|
||||||
await ref.read(notesRepositoryProvider).delete(id);
|
await ref.read(notesRepositoryProvider).delete(id);
|
||||||
state = AsyncData([
|
state = AsyncData([
|
||||||
for (final n in state.valueOrNull ?? [])
|
for (final n in state.value ?? [])
|
||||||
if (n.id != id) n,
|
if (n.id != id) n,
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ class ProjectsNotifier extends AsyncNotifier<List<Project>> {
|
|||||||
goal: goal,
|
goal: goal,
|
||||||
color: color,
|
color: color,
|
||||||
);
|
);
|
||||||
state = AsyncData([...state.valueOrNull ?? [], project]);
|
state = AsyncData([...state.value ?? [], project]);
|
||||||
return project;
|
return project;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -33,7 +33,7 @@ class ProjectsNotifier extends AsyncNotifier<List<Project>> {
|
|||||||
final updated =
|
final updated =
|
||||||
await ref.read(projectsRepositoryProvider).update(id, fields);
|
await ref.read(projectsRepositoryProvider).update(id, fields);
|
||||||
state = AsyncData([
|
state = AsyncData([
|
||||||
for (final p in state.valueOrNull ?? [])
|
for (final p in state.value ?? [])
|
||||||
if (p.id == id) updated else p,
|
if (p.id == id) updated else p,
|
||||||
]);
|
]);
|
||||||
return updated;
|
return updated;
|
||||||
@@ -42,7 +42,7 @@ class ProjectsNotifier extends AsyncNotifier<List<Project>> {
|
|||||||
Future<void> delete(int id) async {
|
Future<void> delete(int id) async {
|
||||||
await ref.read(projectsRepositoryProvider).delete(id);
|
await ref.read(projectsRepositoryProvider).delete(id);
|
||||||
state = AsyncData([
|
state = AsyncData([
|
||||||
for (final p in state.valueOrNull ?? [])
|
for (final p in state.value ?? [])
|
||||||
if (p.id != id) p,
|
if (p.id != id) p,
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,16 +15,14 @@ final cookiesPathProvider = Provider<String>((ref) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
final themeModeProvider =
|
final themeModeProvider =
|
||||||
StateNotifierProvider<ThemeModeNotifier, ThemeMode>((ref) {
|
NotifierProvider<ThemeModeNotifier, ThemeMode>(ThemeModeNotifier.new);
|
||||||
final prefs = ref.watch(sharedPreferencesProvider);
|
|
||||||
return ThemeModeNotifier(prefs);
|
|
||||||
});
|
|
||||||
|
|
||||||
class ThemeModeNotifier extends StateNotifier<ThemeMode> {
|
class ThemeModeNotifier extends Notifier<ThemeMode> {
|
||||||
final SharedPreferences _prefs;
|
@override
|
||||||
|
ThemeMode build() {
|
||||||
ThemeModeNotifier(this._prefs)
|
final prefs = ref.watch(sharedPreferencesProvider);
|
||||||
: super(_fromString(_prefs.getString(_kThemeMode)));
|
return _fromString(prefs.getString(_kThemeMode));
|
||||||
|
}
|
||||||
|
|
||||||
static ThemeMode _fromString(String? value) => switch (value) {
|
static ThemeMode _fromString(String? value) => switch (value) {
|
||||||
'light' => ThemeMode.light,
|
'light' => ThemeMode.light,
|
||||||
@@ -38,48 +36,49 @@ class ThemeModeNotifier extends StateNotifier<ThemeMode> {
|
|||||||
ThemeMode.dark => 'dark',
|
ThemeMode.dark => 'dark',
|
||||||
_ => 'system',
|
_ => 'system',
|
||||||
};
|
};
|
||||||
await _prefs.setString(_kThemeMode, value);
|
await ref.read(sharedPreferencesProvider).setString(_kThemeMode, value);
|
||||||
state = mode;
|
state = mode;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
final forgejoRepoUrlProvider =
|
final forgejoRepoUrlProvider =
|
||||||
StateNotifierProvider<ForgejoRepoUrlNotifier, String?>((ref) {
|
NotifierProvider<ForgejoRepoUrlNotifier, String?>(
|
||||||
return ForgejoRepoUrlNotifier(ref.watch(sharedPreferencesProvider));
|
ForgejoRepoUrlNotifier.new);
|
||||||
});
|
|
||||||
|
|
||||||
class ForgejoRepoUrlNotifier extends StateNotifier<String?> {
|
class ForgejoRepoUrlNotifier extends Notifier<String?> {
|
||||||
final SharedPreferences _prefs;
|
@override
|
||||||
ForgejoRepoUrlNotifier(this._prefs)
|
String? build() {
|
||||||
: super(_prefs.getString(_kForgejoRepoUrl) ??
|
final prefs = ref.watch(sharedPreferencesProvider);
|
||||||
'https://git.fabledsword.com/bvandeusen/FabledApp');
|
return prefs.getString(_kForgejoRepoUrl) ??
|
||||||
|
'https://git.fabledsword.com/bvandeusen/FabledApp';
|
||||||
|
}
|
||||||
|
|
||||||
Future<void> setUrl(String url) async {
|
Future<void> setUrl(String url) async {
|
||||||
final clean = url.endsWith('/') ? url.substring(0, url.length - 1) : url;
|
final clean = url.endsWith('/') ? url.substring(0, url.length - 1) : url;
|
||||||
await _prefs.setString(_kForgejoRepoUrl, clean);
|
await ref.read(sharedPreferencesProvider).setString(_kForgejoRepoUrl, clean);
|
||||||
state = clean;
|
state = clean;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
final serverUrlProvider = StateNotifierProvider<ServerUrlNotifier, String?>((ref) {
|
final serverUrlProvider =
|
||||||
final prefs = ref.watch(sharedPreferencesProvider);
|
NotifierProvider<ServerUrlNotifier, String?>(ServerUrlNotifier.new);
|
||||||
return ServerUrlNotifier(prefs);
|
|
||||||
});
|
|
||||||
|
|
||||||
class ServerUrlNotifier extends StateNotifier<String?> {
|
class ServerUrlNotifier extends Notifier<String?> {
|
||||||
final SharedPreferences _prefs;
|
@override
|
||||||
|
String? build() {
|
||||||
ServerUrlNotifier(this._prefs) : super(_prefs.getString(_kServerUrl));
|
final prefs = ref.watch(sharedPreferencesProvider);
|
||||||
|
return prefs.getString(_kServerUrl);
|
||||||
|
}
|
||||||
|
|
||||||
Future<void> setUrl(String url) async {
|
Future<void> setUrl(String url) async {
|
||||||
// Strip trailing slash
|
// Strip trailing slash
|
||||||
final clean = url.endsWith('/') ? url.substring(0, url.length - 1) : url;
|
final clean = url.endsWith('/') ? url.substring(0, url.length - 1) : url;
|
||||||
await _prefs.setString(_kServerUrl, clean);
|
await ref.read(sharedPreferencesProvider).setString(_kServerUrl, clean);
|
||||||
state = clean;
|
state = clean;
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> clear() async {
|
Future<void> clear() async {
|
||||||
await _prefs.remove(_kServerUrl);
|
await ref.read(sharedPreferencesProvider).remove(_kServerUrl);
|
||||||
state = null;
|
state = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,14 +28,14 @@ class TasksNotifier extends AsyncNotifier<List<Task>> {
|
|||||||
dueDate: dueDate,
|
dueDate: dueDate,
|
||||||
projectId: projectId,
|
projectId: projectId,
|
||||||
);
|
);
|
||||||
state = AsyncData([...state.valueOrNull ?? [], task]);
|
state = AsyncData([...state.value ?? [], task]);
|
||||||
return task;
|
return task;
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<Task> updateTask(int id, Map<String, dynamic> fields) async {
|
Future<Task> updateTask(int id, Map<String, dynamic> fields) async {
|
||||||
final updated = await ref.read(tasksRepositoryProvider).update(id, fields);
|
final updated = await ref.read(tasksRepositoryProvider).update(id, fields);
|
||||||
state = AsyncData([
|
state = AsyncData([
|
||||||
for (final t in state.valueOrNull ?? [])
|
for (final t in state.value ?? [])
|
||||||
if (t.id == id) updated else t,
|
if (t.id == id) updated else t,
|
||||||
]);
|
]);
|
||||||
return updated;
|
return updated;
|
||||||
@@ -44,7 +44,7 @@ class TasksNotifier extends AsyncNotifier<List<Task>> {
|
|||||||
Future<void> delete(int id) async {
|
Future<void> delete(int id) async {
|
||||||
await ref.read(tasksRepositoryProvider).delete(id);
|
await ref.read(tasksRepositoryProvider).delete(id);
|
||||||
state = AsyncData([
|
state = AsyncData([
|
||||||
for (final t in state.valueOrNull ?? [])
|
for (final t in state.value ?? [])
|
||||||
if (t.id != id) t,
|
if (t.id != id) t,
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -70,7 +70,7 @@ class _ChatScreenState extends ConsumerState<ChatScreen> {
|
|||||||
|
|
||||||
final convTitle = ref
|
final convTitle = ref
|
||||||
.watch(conversationsProvider)
|
.watch(conversationsProvider)
|
||||||
.valueOrNull
|
.value
|
||||||
?.where((c) => c.id == widget.conversationId)
|
?.where((c) => c.id == widget.conversationId)
|
||||||
.firstOrNull
|
.firstOrNull
|
||||||
?.title;
|
?.title;
|
||||||
|
|||||||
@@ -228,8 +228,8 @@ class _LibraryScreenState extends ConsumerState<LibraryScreen> {
|
|||||||
AsyncValue<List<Note>> notesAsync,
|
AsyncValue<List<Note>> notesAsync,
|
||||||
AsyncValue<List<Task>> tasksAsync,
|
AsyncValue<List<Task>> tasksAsync,
|
||||||
) {
|
) {
|
||||||
final notes = notesAsync.valueOrNull ?? [];
|
final notes = notesAsync.value ?? [];
|
||||||
final tasks = tasksAsync.valueOrNull ?? [];
|
final tasks = tasksAsync.value ?? [];
|
||||||
|
|
||||||
// Merge and sort by updatedAt desc
|
// Merge and sort by updatedAt desc
|
||||||
final items = <(DateTime, Widget)>[];
|
final items = <(DateTime, Widget)>[];
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ class NoteDetailScreen extends ConsumerWidget {
|
|||||||
@override
|
@override
|
||||||
Widget build(BuildContext context, WidgetRef ref) {
|
Widget build(BuildContext context, WidgetRef ref) {
|
||||||
final noteAsync = ref.watch(noteDetailProvider(noteId));
|
final noteAsync = ref.watch(noteDetailProvider(noteId));
|
||||||
final allNotes = ref.watch(notesProvider).valueOrNull ?? [];
|
final allNotes = ref.watch(notesProvider).value ?? [];
|
||||||
|
|
||||||
void navigateByTitle(String title) {
|
void navigateByTitle(String title) {
|
||||||
final matches = allNotes.where(
|
final matches = allNotes.where(
|
||||||
|
|||||||
Reference in New Issue
Block a user