Small improvements
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
final scaffoldMessengerGlobalKey = GlobalKey<ScaffoldMessengerState>();
|
||||
final searchScaffoldMessengerKey = GlobalKey<ScaffoldMessengerState>();
|
||||
|
||||
@@ -13,6 +13,7 @@ class BookmarkCommonFunctions {
|
||||
required AutoDisposeNotifierProviderRef<T> ref,
|
||||
required Bookmark bookmark,
|
||||
required ApiClientService apiClient,
|
||||
GlobalKey<ScaffoldMessengerState>? scaffoldMessengerKey,
|
||||
}) async {
|
||||
final processModal = ProcessModal();
|
||||
processModal.open(t.bookmarks.bookmarkOptions.deletingBookmark);
|
||||
@@ -21,13 +22,17 @@ class BookmarkCommonFunctions {
|
||||
|
||||
processModal.close();
|
||||
if (result.successful == true) {
|
||||
ref
|
||||
.read(snackbarProvider.notifier)
|
||||
.showSnacbkar(label: t.bookmarks.bookmarkOptions.bookmarkDeleted, color: Colors.green);
|
||||
ref.read(snackbarProvider.notifier).showSnacbkar(
|
||||
key: scaffoldMessengerKey,
|
||||
label: t.bookmarks.bookmarkOptions.bookmarkDeleted,
|
||||
color: Colors.green,
|
||||
);
|
||||
} else {
|
||||
ref
|
||||
.read(snackbarProvider.notifier)
|
||||
.showSnacbkar(label: t.bookmarks.bookmarkOptions.bookmarkNotDeleted, color: Colors.red);
|
||||
ref.read(snackbarProvider.notifier).showSnacbkar(
|
||||
key: scaffoldMessengerKey,
|
||||
label: t.bookmarks.bookmarkOptions.bookmarkNotDeleted,
|
||||
color: Colors.red,
|
||||
);
|
||||
}
|
||||
return result.successful;
|
||||
}
|
||||
@@ -36,6 +41,7 @@ class BookmarkCommonFunctions {
|
||||
required AutoDisposeNotifierProviderRef<T> ref,
|
||||
required Bookmark bookmark,
|
||||
required ApiClientService apiClient,
|
||||
GlobalKey<ScaffoldMessengerState>? scaffoldMessengerKey,
|
||||
}) async {
|
||||
final processModal = ProcessModal();
|
||||
processModal.open(
|
||||
@@ -58,6 +64,7 @@ class BookmarkCommonFunctions {
|
||||
processModal.close();
|
||||
if (result.successful == true) {
|
||||
ref.read(snackbarProvider.notifier).showSnacbkar(
|
||||
key: scaffoldMessengerKey,
|
||||
label: bookmark.unread == true
|
||||
? t.bookmarks.bookmarkOptions.markedAsReadSuccessfully
|
||||
: t.bookmarks.bookmarkOptions.markedAsUnreadSuccessfully,
|
||||
@@ -66,6 +73,7 @@ class BookmarkCommonFunctions {
|
||||
return result.content;
|
||||
} else {
|
||||
ref.read(snackbarProvider.notifier).showSnacbkar(
|
||||
key: scaffoldMessengerKey,
|
||||
label: bookmark.unread == true
|
||||
? t.bookmarks.bookmarkOptions.bookmarkNotMarkedAsRead
|
||||
: t.bookmarks.bookmarkOptions.bookmarkNotMarkedAsUnread,
|
||||
@@ -79,6 +87,7 @@ class BookmarkCommonFunctions {
|
||||
required AutoDisposeNotifierProviderRef<T> ref,
|
||||
required Bookmark bookmark,
|
||||
required ApiClientService apiClient,
|
||||
GlobalKey<ScaffoldMessengerState>? scaffoldMessengerKey,
|
||||
}) async {
|
||||
final processModal = ProcessModal();
|
||||
processModal.open(
|
||||
@@ -94,6 +103,7 @@ class BookmarkCommonFunctions {
|
||||
processModal.close();
|
||||
if (result.successful == true) {
|
||||
ref.read(snackbarProvider.notifier).showSnacbkar(
|
||||
key: scaffoldMessengerKey,
|
||||
label: bookmark.isArchived == true
|
||||
? t.bookmarks.bookmarkOptions.bookmarkUnrchivedSuccessfully
|
||||
: t.bookmarks.bookmarkOptions.bookmarkArchivedSuccessfully,
|
||||
@@ -101,6 +111,7 @@ class BookmarkCommonFunctions {
|
||||
);
|
||||
} else {
|
||||
ref.read(snackbarProvider.notifier).showSnacbkar(
|
||||
key: scaffoldMessengerKey,
|
||||
label: bookmark.isArchived == true
|
||||
? t.bookmarks.bookmarkOptions.bookmarkNotUnrchived
|
||||
: t.bookmarks.bookmarkOptions.bookmarkNotArchived,
|
||||
|
||||
@@ -6,6 +6,7 @@ import 'package:linkdy/screens/bookmarks/provider/bookmarks.provider.dart';
|
||||
import 'package:linkdy/screens/bookmarks/provider/common_functions.dart';
|
||||
import 'package:linkdy/screens/bookmarks/model/search_bookmarks.model.dart';
|
||||
|
||||
import 'package:linkdy/constants/global_keys.dart';
|
||||
import 'package:linkdy/constants/enums.dart';
|
||||
import 'package:linkdy/models/data/bookmarks.dart';
|
||||
import 'package:linkdy/providers/api_client.provider.dart';
|
||||
@@ -103,6 +104,7 @@ class SearchBookmarks extends _$SearchBookmarks {
|
||||
ref: ref,
|
||||
bookmark: bookmark,
|
||||
apiClient: ref.read(apiClientProvider)!,
|
||||
scaffoldMessengerKey: searchScaffoldMessengerKey,
|
||||
);
|
||||
if (result == true) {
|
||||
state.bookmarks = state.bookmarks.where((b) => b.id != bookmark.id).toList();
|
||||
@@ -118,6 +120,7 @@ class SearchBookmarks extends _$SearchBookmarks {
|
||||
ref: ref,
|
||||
bookmark: bookmark,
|
||||
apiClient: ref.read(apiClientProvider)!,
|
||||
scaffoldMessengerKey: searchScaffoldMessengerKey,
|
||||
);
|
||||
if (result != null) {
|
||||
state.bookmarks = state.bookmarks.map((b) => b.id == result.id ? result : b).toList();
|
||||
@@ -133,6 +136,7 @@ class SearchBookmarks extends _$SearchBookmarks {
|
||||
ref: ref,
|
||||
bookmark: bookmark,
|
||||
apiClient: ref.read(apiClientProvider)!,
|
||||
scaffoldMessengerKey: searchScaffoldMessengerKey,
|
||||
);
|
||||
if (result == true) {
|
||||
// On this case the bookmark always will pass from unarchived to archived
|
||||
|
||||
@@ -8,6 +8,7 @@ import 'package:linkdy/screens/bookmarks/ui/delete_bookmark_modal.dart';
|
||||
import 'package:linkdy/widgets/enter_search_term_screen.dart';
|
||||
import 'package:linkdy/widgets/error_screen.dart';
|
||||
|
||||
import 'package:linkdy/constants/global_keys.dart';
|
||||
import 'package:linkdy/constants/enums.dart';
|
||||
import 'package:linkdy/providers/router.provider.dart';
|
||||
|
||||
@@ -36,7 +37,9 @@ class SearchBookmarksModal extends ConsumerWidget {
|
||||
return false;
|
||||
}
|
||||
|
||||
return Dialog.fullscreen(
|
||||
return ScaffoldMessenger(
|
||||
key: searchScaffoldMessengerKey,
|
||||
child: Dialog.fullscreen(
|
||||
child: Scaffold(
|
||||
appBar: AppBar(
|
||||
toolbarHeight: 68,
|
||||
@@ -55,6 +58,7 @@ class SearchBookmarksModal extends ConsumerWidget {
|
||||
controller: ref.watch(searchBookmarksProvider).searchController,
|
||||
onChanged: (_) => ref.read(searchBookmarksProvider.notifier).notifyListeners(),
|
||||
onEditingComplete: () {
|
||||
FocusManager.instance.primaryFocus?.unfocus();
|
||||
ref.read(searchBookmarksProvider.notifier).setSearchTerm();
|
||||
ref.read(searchBookmarksProvider.notifier).setInitialLoadStatus(LoadStatus.loading);
|
||||
ref.read(fetchSearchBookmarksProvider(provider.limit));
|
||||
@@ -139,6 +143,7 @@ class SearchBookmarksModal extends ConsumerWidget {
|
||||
},
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user