admin/linkding-ios
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Improved snackbars

Browse Source
This commit is contained in:
Juan Gilsanz Polo
2024-02-27 01:46:12 +01:00
parent 16d05880c9
commit 8a968be6e0
29 changed files with 588 additions and 627 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/screens/bookmarks/provider/add_bookmark.provider.dart
View File

@@ -1,10 +1,11 @@
import 'package:flutter/material.dart';
import 'package:linkdy/constants/global_keys.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
import 'package:linkdy/screens/bookmarks/provider/bookmarks.provider.dart';
import 'package:linkdy/screens/bookmarks/model/add_link.model.dart';
import 'package:linkdy/providers/snackbar.provider.dart';
import 'package:linkdy/utils/snackbar.dart';
import 'package:linkdy/models/data/tags.dart';
import 'package:linkdy/i18n/strings.g.dart';
import 'package:linkdy/utils/process_modal.dart';
@@ -101,10 +102,11 @@ class AddBookmark extends _$AddBookmark {
ref.read(bookmarksProvider.notifier).refresh();
ref.watch(routerProvider).pop();
} else {
ref.read(snackbarProvider.notifier).showSnacbkar(
label: t.bookmarks.addBookmark.errorSavingBookmark,
color: Colors.red,
);
showSnackbar(
key: ScaffoldMessengerKeys.addBookmark,
label: t.bookmarks.addBookmark.errorSavingBookmark,
color: Colors.red,
);
}
}

2
lib/screens/bookmarks/provider/add_bookmark.provider.g.dart
View File

@@ -175,7 +175,7 @@ final getTagsProvider =
);
typedef GetTagsRef = AutoDisposeFutureProviderRef<ApiResponse<TagsResponse>>;
String _$addBookmarkHash() => r'd6425004c3e755ec539ad28da3ef44349680b04b';
String _$addBookmarkHash() => r'a350eee7aeed2fabae90966afadc609ee5eef895';
/// See also [AddBookmark].
@ProviderFor(AddBookmark)

4
lib/screens/bookmarks/provider/bookmarks.provider.dart
View File

@@ -1,3 +1,4 @@
import 'package:linkdy/constants/global_keys.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
import 'package:linkdy/screens/bookmarks/provider/common_functions.dart';
@@ -90,6 +91,7 @@ class Bookmarks extends _$Bookmarks {
void deleteBookmark(Bookmark bookmark) async {
final result = await BookmarkCommonFunctions.deleteBookmark<BookmarksModel>(
scaffoldMessengerKey: ScaffoldMessengerKeys.bookmarks,
ref: ref,
bookmark: bookmark,
apiClient: ref.read(apiClientProvider)!,
@@ -102,6 +104,7 @@ class Bookmarks extends _$Bookmarks {
void markAsReadUnread(Bookmark bookmark) async {
final result = await BookmarkCommonFunctions.markAsReadUnread<BookmarksModel>(
scaffoldMessengerKey: ScaffoldMessengerKeys.bookmarks,
ref: ref,
bookmark: bookmark,
apiClient: ref.read(apiClientProvider)!,
@@ -114,6 +117,7 @@ class Bookmarks extends _$Bookmarks {
void archiveUnarchive(Bookmark bookmark) async {
final result = await BookmarkCommonFunctions.archiveUnarchive<BookmarksModel>(
scaffoldMessengerKey: ScaffoldMessengerKeys.bookmarks,
ref: ref,
bookmark: bookmark,
apiClient: ref.read(apiClientProvider)!,

2
lib/screens/bookmarks/provider/bookmarks.provider.g.dart
View File

@@ -172,7 +172,7 @@ final bookmarksRequestLoadMoreProvider =
);
typedef BookmarksRequestLoadMoreRef = AutoDisposeFutureProviderRef<void>;
String _$bookmarksHash() => r'a2bd6f3226b5a1b9c19b536b31122fb5b449ff6a';
String _$bookmarksHash() => r'84a236ccce48c0a0069ca2b754da59ff88b17ef2';
/// See also [Bookmarks].
@ProviderFor(Bookmarks)

84
lib/screens/bookmarks/provider/common_functions.dart
View File

@@ -1,9 +1,9 @@
import 'package:flutter/material.dart';
import 'package:linkdy/providers/snackbar.provider.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
import 'package:linkdy/i18n/strings.g.dart';
import 'package:linkdy/models/data/bookmarks.dart';
import 'package:linkdy/utils/snackbar.dart';
import 'package:linkdy/models/data/set_bookmark_data.dart';
import 'package:linkdy/services/api_client.dart';
import 'package:linkdy/utils/process_modal.dart';
@@ -13,7 +13,7 @@ class BookmarkCommonFunctions {
required AutoDisposeNotifierProviderRef<T> ref,
required Bookmark bookmark,
required ApiClientService apiClient,
GlobalKey<ScaffoldMessengerState>? scaffoldMessengerKey,
required GlobalKey<ScaffoldMessengerState> scaffoldMessengerKey,
}) async {
final processModal = ProcessModal();
processModal.open(t.bookmarks.bookmarkOptions.deletingBookmark);
@@ -22,17 +22,17 @@ class BookmarkCommonFunctions {
processModal.close();
if (result.successful == true) {
ref.read(snackbarProvider.notifier).showSnacbkar(
key: scaffoldMessengerKey,
label: t.bookmarks.bookmarkOptions.bookmarkDeleted,
color: Colors.green,
);
showSnackbar(
key: scaffoldMessengerKey,
label: t.bookmarks.bookmarkOptions.bookmarkDeleted,
color: Colors.green,
);
} else {
ref.read(snackbarProvider.notifier).showSnacbkar(
key: scaffoldMessengerKey,
label: t.bookmarks.bookmarkOptions.bookmarkNotDeleted,
color: Colors.red,
);
showSnackbar(
key: scaffoldMessengerKey,
label: t.bookmarks.bookmarkOptions.bookmarkNotDeleted,
color: Colors.red,
);
}
return result.successful;
}
@@ -41,7 +41,7 @@ class BookmarkCommonFunctions {
required AutoDisposeNotifierProviderRef<T> ref,
required Bookmark bookmark,
required ApiClientService apiClient,
GlobalKey<ScaffoldMessengerState>? scaffoldMessengerKey,
required GlobalKey<ScaffoldMessengerState> scaffoldMessengerKey,
}) async {
final processModal = ProcessModal();
processModal.open(
@@ -63,22 +63,22 @@ 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,
color: Colors.green,
);
showSnackbar(
key: scaffoldMessengerKey,
label: bookmark.unread == true
? t.bookmarks.bookmarkOptions.markedAsReadSuccessfully
: t.bookmarks.bookmarkOptions.markedAsUnreadSuccessfully,
color: Colors.green,
);
return result.content;
} else {
ref.read(snackbarProvider.notifier).showSnacbkar(
key: scaffoldMessengerKey,
label: bookmark.unread == true
? t.bookmarks.bookmarkOptions.bookmarkNotMarkedAsRead
: t.bookmarks.bookmarkOptions.bookmarkNotMarkedAsUnread,
color: Colors.red,
);
showSnackbar(
key: scaffoldMessengerKey,
label: bookmark.unread == true
? t.bookmarks.bookmarkOptions.bookmarkNotMarkedAsRead
: t.bookmarks.bookmarkOptions.bookmarkNotMarkedAsUnread,
color: Colors.red,
);
return null;
}
}
@@ -87,7 +87,7 @@ class BookmarkCommonFunctions {
required AutoDisposeNotifierProviderRef<T> ref,
required Bookmark bookmark,
required ApiClientService apiClient,
GlobalKey<ScaffoldMessengerState>? scaffoldMessengerKey,
required GlobalKey<ScaffoldMessengerState> scaffoldMessengerKey,
}) async {
final processModal = ProcessModal();
processModal.open(
@@ -102,21 +102,21 @@ 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,
color: Colors.green,
);
showSnackbar(
key: scaffoldMessengerKey,
label: bookmark.isArchived == true
? t.bookmarks.bookmarkOptions.bookmarkUnrchivedSuccessfully
: t.bookmarks.bookmarkOptions.bookmarkArchivedSuccessfully,
color: Colors.green,
);
} else {
ref.read(snackbarProvider.notifier).showSnacbkar(
key: scaffoldMessengerKey,
label: bookmark.isArchived == true
? t.bookmarks.bookmarkOptions.bookmarkNotUnrchived
: t.bookmarks.bookmarkOptions.bookmarkNotArchived,
color: Colors.red,
);
showSnackbar(
key: scaffoldMessengerKey,
label: bookmark.isArchived == true
? t.bookmarks.bookmarkOptions.bookmarkNotUnrchived
: t.bookmarks.bookmarkOptions.bookmarkNotArchived,
color: Colors.red,
);
}
return result.successful;
}

6
lib/screens/bookmarks/provider/search_bookmarks.provider.dart
View File

@@ -104,7 +104,7 @@ class SearchBookmarks extends _$SearchBookmarks {
ref: ref,
bookmark: bookmark,
apiClient: ref.read(apiClientProvider)!,
scaffoldMessengerKey: searchScaffoldMessengerKey,
scaffoldMessengerKey: ScaffoldMessengerKeys.search,
);
if (result == true) {
state.bookmarks = state.bookmarks.where((b) => b.id != bookmark.id).toList();
@@ -120,7 +120,7 @@ class SearchBookmarks extends _$SearchBookmarks {
ref: ref,
bookmark: bookmark,
apiClient: ref.read(apiClientProvider)!,
scaffoldMessengerKey: searchScaffoldMessengerKey,
scaffoldMessengerKey: ScaffoldMessengerKeys.search,
);
if (result != null) {
state.bookmarks = state.bookmarks.map((b) => b.id == result.id ? result : b).toList();
@@ -136,7 +136,7 @@ class SearchBookmarks extends _$SearchBookmarks {
ref: ref,
bookmark: bookmark,
apiClient: ref.read(apiClientProvider)!,
scaffoldMessengerKey: searchScaffoldMessengerKey,
scaffoldMessengerKey: ScaffoldMessengerKeys.search,
);
if (result == true) {
// On this case the bookmark always will pass from unarchived to archived

2
lib/screens/bookmarks/provider/search_bookmarks.provider.g.dart
View File

@@ -174,7 +174,7 @@ final fetchSearchBookmarksLoadMoreProvider =
);
typedef FetchSearchBookmarksLoadMoreRef = AutoDisposeFutureProviderRef<void>;
String _$searchBookmarksHash() => r'5a5bc02d87a3eff3976a3bc6991c2208f4232fb4';
String _$searchBookmarksHash() => r'c7c8394ae9ad71f8106a3b73100b88e09c154e13';
/// See also [SearchBookmarks].
@ProviderFor(SearchBookmarks)