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)

92
lib/screens/bookmarks/ui/add_bookmark_modal.dart
View File

@@ -6,61 +6,65 @@ import 'package:linkdy/screens/bookmarks/provider/add_bookmark.provider.dart';
import 'package:linkdy/widgets/section_label.dart';
import 'package:linkdy/i18n/strings.g.dart';
import 'package:linkdy/constants/global_keys.dart';
import 'package:linkdy/constants/enums.dart';
class AddBookmarkModal extends ConsumerWidget {
final bool fullscreen;
const AddBookmarkModal({
Key? key,
super.key,
required this.fullscreen,
}) : super(key: key);
});
@override
Widget build(BuildContext context, WidgetRef ref) {
return Dialog.fullscreen(
child: Scaffold(
body: NestedScrollView(
headerSliverBuilder: (context, innerBoxIsScrolled) => [
SliverOverlapAbsorber(
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
sliver: SliverAppBar.large(
pinned: true,
floating: true,
centerTitle: false,
forceElevated: innerBoxIsScrolled,
leading: CloseButton(
onPressed: () => Navigator.pop(context),
return ScaffoldMessenger(
key: ScaffoldMessengerKeys.addBookmark,
child: Dialog.fullscreen(
child: Scaffold(
body: NestedScrollView(
headerSliverBuilder: (context, innerBoxIsScrolled) => [
SliverOverlapAbsorber(
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
sliver: SliverAppBar.large(
pinned: true,
floating: true,
centerTitle: false,
forceElevated: innerBoxIsScrolled,
leading: CloseButton(
onPressed: () => Navigator.pop(context),
),
title: Text(t.bookmarks.addBookmark.addBookmark),
actions: [
IconButton(
onPressed: ref.watch(addBookmarkProvider).checkBookmark != null
? () => ref.read(addBookmarkProvider.notifier).addBookmark()
: null,
icon: const Icon(Icons.save_rounded),
tooltip: t.generic.save,
),
const SizedBox(width: 8),
],
),
title: Text(t.bookmarks.addBookmark.addBookmark),
actions: [
IconButton(
onPressed: ref.watch(addBookmarkProvider).checkBookmark != null
? () => ref.read(addBookmarkProvider.notifier).addBookmark()
: null,
icon: const Icon(Icons.save_rounded),
tooltip: t.generic.save,
),
const SizedBox(width: 8),
],
),
),
],
body: SafeArea(
top: false,
bottom: true,
child: Builder(
builder: (context) => CustomScrollView(
slivers: [
SliverOverlapInjector(
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
),
SliverList.list(
children: const [
_ModalContent(),
],
),
],
],
body: SafeArea(
top: false,
bottom: true,
child: Builder(
builder: (context) => CustomScrollView(
slivers: [
SliverOverlapInjector(
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
),
SliverList.list(
children: const [
_ModalContent(),
],
),
],
),
),
),
),
@@ -71,7 +75,7 @@ class AddBookmarkModal extends ConsumerWidget {
}
class _ModalContent extends ConsumerWidget {
const _ModalContent({Key? key}) : super(key: key);
const _ModalContent();
@override
Widget build(BuildContext context, WidgetRef ref) {

177
lib/screens/bookmarks/ui/bookmarks.dart
View File

@@ -3,7 +3,6 @@ import 'dart:io';
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:flutter_slidable/flutter_slidable.dart';
import 'package:linkdy/constants/enums.dart';
import 'package:linkdy/screens/bookmarks/provider/bookmarks.provider.dart';
import 'package:linkdy/screens/bookmarks/ui/bookmark_item.dart';
@@ -12,8 +11,9 @@ import 'package:linkdy/screens/bookmarks/ui/delete_bookmark_modal.dart';
import 'package:linkdy/screens/bookmarks/ui/search_bookmarks.dart';
import 'package:linkdy/widgets/error_screen.dart';
import 'package:linkdy/widgets/no_data_screen.dart';
import 'package:linkdy/widgets/snackbar_fab.dart';
import 'package:linkdy/constants/enums.dart';
import 'package:linkdy/constants/global_keys.dart';
import 'package:linkdy/i18n/strings.g.dart';
class BookmarksScreen extends ConsumerWidget {
@@ -67,105 +67,104 @@ class BookmarksScreen extends ConsumerWidget {
return false;
}
return Scaffold(
body: Stack(
children: [
NestedScrollView(
headerSliverBuilder: (context, innerBoxIsScrolled) => [
SliverOverlapAbsorber(
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
sliver: SliverAppBar.large(
pinned: true,
floating: true,
centerTitle: false,
forceElevated: innerBoxIsScrolled,
title: Text(t.bookmarks.bookmarks),
actions: [
IconButton(
onPressed: openSearchModal,
icon: const Icon(Icons.search_rounded),
tooltip: t.bookmarks.search.searchBookmarks,
),
const SizedBox(width: 8),
],
),
return ScaffoldMessenger(
key: ScaffoldMessengerKeys.bookmarks,
child: Scaffold(
body: NestedScrollView(
headerSliverBuilder: (context, innerBoxIsScrolled) => [
SliverOverlapAbsorber(
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
sliver: SliverAppBar.large(
pinned: true,
floating: true,
centerTitle: false,
forceElevated: innerBoxIsScrolled,
title: Text(t.bookmarks.bookmarks),
actions: [
IconButton(
onPressed: openSearchModal,
icon: const Icon(Icons.search_rounded),
tooltip: t.bookmarks.search.searchBookmarks,
),
const SizedBox(width: 8),
],
),
],
body: SafeArea(
top: false,
bottom: false,
child: Builder(
builder: (context) => RefreshIndicator(
displacement: 120,
onRefresh: () => ref.read(bookmarksProvider.notifier).refresh(),
child: NotificationListener(
onNotification: scrollListener,
child: CustomScrollView(
slivers: [
SliverOverlapInjector(
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
),
],
body: SafeArea(
top: false,
bottom: false,
child: Builder(
builder: (context) => RefreshIndicator(
displacement: 120,
onRefresh: () => ref.read(bookmarksProvider.notifier).refresh(),
child: NotificationListener(
onNotification: scrollListener,
child: CustomScrollView(
slivers: [
SliverOverlapInjector(
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
),
if (bookmarks.inialLoadStatus == LoadStatus.loading)
const SliverFillRemaining(
child: Center(child: CircularProgressIndicator()),
),
if (bookmarks.inialLoadStatus == LoadStatus.loading)
const SliverFillRemaining(
child: Center(child: CircularProgressIndicator()),
if (bookmarks.inialLoadStatus == LoadStatus.error)
SliverFillRemaining(
child: ErrorScreen(
error: t.bookmarks.cannotLoadBookmarks,
),
if (bookmarks.inialLoadStatus == LoadStatus.error)
SliverFillRemaining(
child: ErrorScreen(
error: t.bookmarks.cannotLoadBookmarks,
),
),
if (bookmarks.bookmarks.isEmpty)
SliverFillRemaining(
child: NoDataScreen(
message: t.bookmarks.noBookmarksAdded,
),
if (bookmarks.bookmarks.isEmpty)
SliverFillRemaining(
child: NoDataScreen(
message: t.bookmarks.noBookmarksAdded,
),
),
if (bookmarks.bookmarks.isNotEmpty)
SlidableAutoCloseBehavior(
child: SliverList.builder(
itemCount: bookmarks.bookmarks.length + 1,
itemBuilder: (context, index) {
// index == bookmarks.value!.content!.results!.length -> itemCount + 1
if (index == bookmarks.bookmarks.length) {
if (bookmarks.loadingMore) {
return const SizedBox(
height: 80,
child: Center(
child: CircularProgressIndicator(),
),
);
}
// Bottom gap for FAB
return const SizedBox(height: 80);
}
return BookmarkItem(
bookmark: bookmarks.bookmarks[index],
onReadUnread: ref.read(bookmarksProvider.notifier).markAsReadUnread,
onDelete: (bookmark) => showDialog(
context: context,
builder: (context) => DeleteBookmarkModal(
bookmark: bookmark,
onDelete: ref.read(bookmarksProvider.notifier).deleteBookmark,
),
if (bookmarks.bookmarks.isNotEmpty)
SlidableAutoCloseBehavior(
child: SliverList.builder(
itemCount: bookmarks.bookmarks.length + 1,
itemBuilder: (context, index) {
// index == bookmarks.value!.content!.results!.length -> itemCount + 1
if (index == bookmarks.bookmarks.length) {
if (bookmarks.loadingMore) {
return const SizedBox(
height: 80,
child: Center(
child: CircularProgressIndicator(),
),
);
}
// Bottom gap for FAB
return const SizedBox(height: 80);
}
return BookmarkItem(
bookmark: bookmarks.bookmarks[index],
onReadUnread: ref.read(bookmarksProvider.notifier).markAsReadUnread,
onDelete: (bookmark) => showDialog(
context: context,
builder: (context) => DeleteBookmarkModal(
bookmark: bookmark,
onDelete: ref.read(bookmarksProvider.notifier).deleteBookmark,
),
onArchiveUnarchive: ref.read(bookmarksProvider.notifier).archiveUnarchive,
);
},
),
),
onArchiveUnarchive: ref.read(bookmarksProvider.notifier).archiveUnarchive,
);
},
),
],
),
),
],
),
),
),
),
),
SnackbarFloatingActionButton(
onPressed: openAddModal,
child: const Icon(Icons.add_rounded),
),
],
),
floatingActionButton: FloatingActionButton(
onPressed: openAddModal,
child: const Icon(Icons.add_rounded),
),
),
);
}

2
lib/screens/bookmarks/ui/search_bookmarks.dart
View File

@@ -38,7 +38,7 @@ class SearchBookmarksModal extends ConsumerWidget {
}
return ScaffoldMessenger(
key: searchScaffoldMessengerKey,
key: ScaffoldMessengerKeys.search,
child: Dialog.fullscreen(
child: Scaffold(
appBar: AppBar(

15
lib/screens/onboarding/provider/connect.provider.dart
View File

@@ -5,8 +5,9 @@ import 'package:riverpod_annotation/riverpod_annotation.dart';
import 'package:linkdy/screens/onboarding/model/connect.model.dart';
import 'package:linkdy/constants/global_keys.dart';
import 'package:linkdy/utils/snackbar.dart';
import 'package:linkdy/providers/dio_interceptor.provider.dart';
import 'package:linkdy/providers/snackbar.provider.dart';
import 'package:linkdy/providers/server_instances.provider.dart';
import 'package:linkdy/utils/api_base_url.dart';
import 'package:linkdy/i18n/strings.g.dart';
@@ -155,9 +156,17 @@ FutureOr<bool> connectToServer(ConnectToServerRef ref) async {
ref.read(apiClientProvider.notifier).setApiClient(apiClient);
ref.read(serverInstancesProvider.notifier).saveNewInstance(serverInstance);
} else if (result == AuthResult.invalidToken) {
ref.read(snackbarProvider.notifier).showSnacbkar(label: t.onboarding.invalidToken, color: Colors.red);
showSnackbar(
key: ScaffoldMessengerKeys.onboarding,
label: t.onboarding.invalidToken,
color: Colors.red,
);
} else {
ref.read(snackbarProvider.notifier).showSnacbkar(label: t.onboarding.cannotConnectToServer, color: Colors.red);
showSnackbar(
key: ScaffoldMessengerKeys.onboarding,
label: t.onboarding.cannotConnectToServer,
color: Colors.red,
);
}
return false;

2
lib/screens/onboarding/provider/connect.provider.g.dart
View File

@@ -6,7 +6,7 @@ part of 'connect.provider.dart';
// RiverpodGenerator
// **************************************************************************
String _$connectToServerHash() => r'a5225cddee0824ab2e6393da9d5c305e212bbfba';
String _$connectToServerHash() => r'4c7d8eb1e2ed082e5ce2cde03f8afe343d7126b9';
/// See also [connectToServer].
@ProviderFor(connectToServer)

27
lib/screens/onboarding/ui/onboarding.dart
View File

@@ -7,22 +7,27 @@ import 'package:linkdy/screens/onboarding/ui/server_required.dart';
import 'package:linkdy/screens/onboarding/ui/welcome.dart';
import 'package:linkdy/widgets/system_overlay_style.dart';
import 'package:linkdy/constants/global_keys.dart';
class Onboarding extends ConsumerWidget {
const Onboarding({Key? key}) : super(key: key);
const Onboarding({super.key});
@override
Widget build(BuildContext context, WidgetRef ref) {
return OverlayStyle(
child: Scaffold(
body: SafeArea(
child: PageView(
controller: ref.watch(onboardingProvider).pageController,
physics: const NeverScrollableScrollPhysics(),
children: const [
OnboardingWelcome(),
OnboardingServerRequired(),
OnboardingConnect(),
],
child: ScaffoldMessenger(
key: ScaffoldMessengerKeys.onboarding,
child: Scaffold(
body: SafeArea(
child: PageView(
controller: ref.watch(onboardingProvider).pageController,
physics: const NeverScrollableScrollPhysics(),
children: const [
OnboardingWelcome(),
OnboardingServerRequired(),
OnboardingConnect(),
],
),
),
),
),

4
lib/screens/tag_bookmarks/provider/tag_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/favicon_loader.provider.dart';
@@ -99,6 +100,7 @@ class TagBookmarks extends _$TagBookmarks {
void deleteBookmark(Bookmark bookmark) async {
final result = await BookmarkCommonFunctions.deleteBookmark<TagBookmarksModel>(
scaffoldMessengerKey: ScaffoldMessengerKeys.tagBookmarks,
ref: ref,
bookmark: bookmark,
apiClient: ref.read(apiClientProvider)!,
@@ -111,6 +113,7 @@ class TagBookmarks extends _$TagBookmarks {
void markAsReadUnread(Bookmark bookmark) async {
final result = await BookmarkCommonFunctions.markAsReadUnread<TagBookmarksModel>(
scaffoldMessengerKey: ScaffoldMessengerKeys.tagBookmarks,
ref: ref,
bookmark: bookmark,
apiClient: ref.read(apiClientProvider)!,
@@ -123,6 +126,7 @@ class TagBookmarks extends _$TagBookmarks {
void archiveUnarchive(Bookmark bookmark) async {
final result = await BookmarkCommonFunctions.archiveUnarchive<TagBookmarksModel>(
scaffoldMessengerKey: ScaffoldMessengerKeys.tagBookmarks,
ref: ref,
bookmark: bookmark,
apiClient: ref.read(apiClientProvider)!,

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

@@ -206,7 +206,7 @@ final tagBookmarksRequestLoadMoreProvider =
);
typedef TagBookmarksRequestLoadMoreRef = AutoDisposeFutureProviderRef<void>;
String _$tagBookmarksHash() => r'5a183019775e04aa10f28c1492993f09445867a7';
String _$tagBookmarksHash() => r'd5004cac68d86490b49fc6f722ec819267aedf17';
/// See also [TagBookmarks].
@ProviderFor(TagBookmarks)

151
lib/screens/tag_bookmarks/ui/tag_bookmarks.dart
View File

@@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:flutter_slidable/flutter_slidable.dart';
import 'package:linkdy/constants/global_keys.dart';
import 'package:linkdy/screens/bookmarks/ui/bookmark_item.dart';
import 'package:linkdy/screens/bookmarks/ui/delete_bookmark_modal.dart';
@@ -19,10 +20,10 @@ class TagBookmarksScreen extends ConsumerStatefulWidget {
final Tag? tag;
const TagBookmarksScreen({
Key? key,
super.key,
required this.tagId,
this.tag,
}) : super(key: key);
});
@override
TagBookmarksScreenState createState() => TagBookmarksScreenState();
@@ -66,85 +67,89 @@ class TagBookmarksScreenState extends ConsumerState<TagBookmarksScreen> {
return false;
}
return Scaffold(
body: NestedScrollView(
headerSliverBuilder: (context, innerBoxIsScrolled) => [
SliverOverlapAbsorber(
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
sliver: SliverAppBar.large(
pinned: true,
floating: true,
centerTitle: false,
forceElevated: innerBoxIsScrolled,
title: Text(
widget.tag != null
? "#${widget.tag!.name}"
: provider.tag != null
? "#${provider.tag!.name}"
: '',
return ScaffoldMessenger(
key: ScaffoldMessengerKeys.tagBookmarks,
child: Scaffold(
body: NestedScrollView(
headerSliverBuilder: (context, innerBoxIsScrolled) => [
SliverOverlapAbsorber(
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
sliver: SliverAppBar.large(
pinned: true,
floating: true,
centerTitle: false,
forceElevated: innerBoxIsScrolled,
title: Text(
widget.tag != null
? "#${widget.tag!.name}"
: provider.tag != null
? "#${provider.tag!.name}"
: '',
),
),
),
),
],
body: SafeArea(
top: false,
child: Builder(
builder: (context) => RefreshIndicator(
displacement: 120,
onRefresh: () => ref.read(tagBookmarksProvider.notifier).refresh(),
child: NotificationListener(
onNotification: scrollListener,
child: CustomScrollView(
slivers: [
SliverOverlapInjector(
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
),
if (provider.initialLoadStatus == LoadStatus.loading)
const SliverFillRemaining(
child: Center(child: CircularProgressIndicator()),
],
body: SafeArea(
top: false,
child: Builder(
builder: (context) => RefreshIndicator(
displacement: 120,
onRefresh: () => ref.read(tagBookmarksProvider.notifier).refresh(),
child: NotificationListener(
onNotification: scrollListener,
child: CustomScrollView(
slivers: [
SliverOverlapInjector(
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
),
if (provider.initialLoadStatus == LoadStatus.error)
SliverFillRemaining(
child: ErrorScreen(
error: t.bookmarks.cannotLoadBookmarks,
if (provider.initialLoadStatus == LoadStatus.loading)
const SliverFillRemaining(
child: Center(child: CircularProgressIndicator()),
),
),
if (provider.bookmarks.isEmpty)
SliverFillRemaining(
child: NoDataScreen(
message: t.tags.tagBookmarks.noBookmarksWithThisTag,
if (provider.initialLoadStatus == LoadStatus.error)
SliverFillRemaining(
child: ErrorScreen(
error: t.bookmarks.cannotLoadBookmarks,
),
),
),
if (provider.bookmarks.isNotEmpty)
SlidableAutoCloseBehavior(
child: SliverList.builder(
itemCount:
provider.loadingMore == true ? provider.bookmarks.length + 1 : provider.bookmarks.length,
itemBuilder: (context, index) {
if (provider.loadingMore == true && index == provider.bookmarks.length) {
return const Padding(
padding: EdgeInsets.all(16),
child: Center(
child: CircularProgressIndicator(),
if (provider.bookmarks.isEmpty)
SliverFillRemaining(
child: NoDataScreen(
message: t.tags.tagBookmarks.noBookmarksWithThisTag,
),
),
if (provider.bookmarks.isNotEmpty)
SlidableAutoCloseBehavior(
child: SliverList.builder(
itemCount: provider.loadingMore == true
? provider.bookmarks.length + 1
: provider.bookmarks.length,
itemBuilder: (context, index) {
if (provider.loadingMore == true && index == provider.bookmarks.length) {
return const Padding(
padding: EdgeInsets.all(16),
child: Center(
child: CircularProgressIndicator(),
),
);
}
return BookmarkItem(
bookmark: provider.bookmarks[index],
onReadUnread: ref.read(tagBookmarksProvider.notifier).markAsReadUnread,
onDelete: (bookmark) => showDialog(
context: context,
builder: (context) => DeleteBookmarkModal(
bookmark: bookmark,
onDelete: ref.read(tagBookmarksProvider.notifier).deleteBookmark,
),
),
onArchiveUnarchive: ref.read(tagBookmarksProvider.notifier).archiveUnarchive,
);
}
return BookmarkItem(
bookmark: provider.bookmarks[index],
onReadUnread: ref.read(tagBookmarksProvider.notifier).markAsReadUnread,
onDelete: (bookmark) => showDialog(
context: context,
builder: (context) => DeleteBookmarkModal(
bookmark: bookmark,
onDelete: ref.read(tagBookmarksProvider.notifier).deleteBookmark,
),
),
onArchiveUnarchive: ref.read(tagBookmarksProvider.notifier).archiveUnarchive,
);
},
},
),
),
),
],
],
),
),
),
),

209
lib/screens/tags/ui/tags.dart
View File

@@ -1,19 +1,19 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:linkdy/providers/router.provider.dart';
import 'package:linkdy/router/names.dart';
import 'package:linkdy/screens/tags/provider/tags.provider.dart';
import 'package:linkdy/screens/tags/ui/add_tag_modal.dart';
import 'package:linkdy/widgets/error_screen.dart';
import 'package:linkdy/widgets/no_data_screen.dart';
import 'package:linkdy/widgets/snackbar_fab.dart';
import 'package:linkdy/utils/date_to_string.dart';
import 'package:linkdy/constants/global_keys.dart';
import 'package:linkdy/providers/router.provider.dart';
import 'package:linkdy/router/names.dart';
import 'package:linkdy/i18n/strings.g.dart';
class TagsScreen extends ConsumerWidget {
const TagsScreen({Key? key}) : super(key: key);
const TagsScreen({super.key});
@override
Widget build(BuildContext context, WidgetRef ref) {
@@ -28,120 +28,119 @@ class TagsScreen extends ConsumerWidget {
);
}
return Scaffold(
body: Stack(
children: [
NestedScrollView(
headerSliverBuilder: (context, innerBoxIsScrolled) => [
SliverOverlapAbsorber(
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
sliver: SliverAppBar.large(
pinned: true,
floating: true,
centerTitle: false,
forceElevated: innerBoxIsScrolled,
title: Text(t.tags.tags),
),
return ScaffoldMessenger(
key: ScaffoldMessengerKeys.tags,
child: Scaffold(
body: NestedScrollView(
headerSliverBuilder: (context, innerBoxIsScrolled) => [
SliverOverlapAbsorber(
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
sliver: SliverAppBar.large(
pinned: true,
floating: true,
centerTitle: false,
forceElevated: innerBoxIsScrolled,
title: Text(t.tags.tags),
),
],
body: SafeArea(
top: false,
bottom: false,
child: Builder(
builder: (context) => RefreshIndicator(
displacement: 120,
onRefresh: () => ref.refresh(tagsRequestProvider.future),
child: CustomScrollView(
slivers: [
SliverOverlapInjector(
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
),
],
body: SafeArea(
top: false,
bottom: false,
child: Builder(
builder: (context) => RefreshIndicator(
displacement: 120,
onRefresh: () => ref.refresh(tagsRequestProvider.future),
child: CustomScrollView(
slivers: [
SliverOverlapInjector(
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
),
if (tags.isLoading && !tags.isRefreshing)
const SliverFillRemaining(
child: Center(child: CircularProgressIndicator()),
),
if (tags.isLoading && !tags.isRefreshing)
const SliverFillRemaining(
child: Center(child: CircularProgressIndicator()),
if (tags.value != null && tags.value!.successful == false)
SliverFillRemaining(
child: ErrorScreen(
error: t.bookmarks.cannotLoadBookmarks,
),
if (tags.value != null && tags.value!.successful == false)
SliverFillRemaining(
child: ErrorScreen(
error: t.bookmarks.cannotLoadBookmarks,
),
),
if (tags.value != null && tags.value!.successful == true && tags.value!.content!.results!.isEmpty)
SliverFillRemaining(
child: NoDataScreen(
message: t.bookmarks.noBookmarksAdded,
),
if (tags.value != null && tags.value!.successful == true && tags.value!.content!.results!.isEmpty)
SliverFillRemaining(
child: NoDataScreen(
message: t.bookmarks.noBookmarksAdded,
),
),
if (tags.value != null &&
tags.value!.successful == true &&
tags.value!.content!.results!.isNotEmpty)
SliverList.builder(
itemCount: tags.value!.content!.results!.length + 1,
itemBuilder: (context, index) {
// index == bookmarks.value!.content!.results!.length -> itemCount + 1
if (index == tags.value!.content!.results!.length) {
// Bottom gap for FAB
return const SizedBox(height: 80);
}
final tag = tags.value?.content?.results?[index];
return InkWell(
onTap: () => ref.watch(routerProvider).pushNamed(
RoutesNames.tagBookmarks,
extra: tag,
pathParameters: {'id': tag.id!.toString()},
),
child: Container(
width: double.maxFinite,
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Icon(
Icons.label_rounded,
size: 16,
color: Theme.of(context).colorScheme.onSurfaceVariant.withOpacity(0.7),
),
const SizedBox(width: 8),
Flexible(
child: Text(
tag!.name!,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w500,
color: Theme.of(context).colorScheme.onSurface,
),
),
if (tags.value != null &&
tags.value!.successful == true &&
tags.value!.content!.results!.isNotEmpty)
SliverList.builder(
itemCount: tags.value!.content!.results!.length + 1,
itemBuilder: (context, index) {
// index == bookmarks.value!.content!.results!.length -> itemCount + 1
if (index == tags.value!.content!.results!.length) {
// Bottom gap for FAB
return const SizedBox(height: 80);
}
final tag = tags.value?.content?.results?[index];
return InkWell(
onTap: () => ref.watch(routerProvider).pushNamed(
RoutesNames.tagBookmarks,
extra: tag,
pathParameters: {'id': tag.id!.toString()},
),
child: Container(
width: double.maxFinite,
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Icon(
Icons.label_rounded,
size: 16,
color: Theme.of(context).colorScheme.onSurfaceVariant.withOpacity(0.7),
),
const SizedBox(width: 8),
Flexible(
child: Text(
tag!.name!,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w500,
color: Theme.of(context).colorScheme.onSurface,
),
),
],
),
const SizedBox(height: 4),
Text(
t.tags.created(created: dateToString(tag.dateAdded!)),
style: TextStyle(
fontSize: 14,
color: Theme.of(context).colorScheme.onSurfaceVariant,
),
],
),
const SizedBox(height: 4),
Text(
t.tags.created(created: dateToString(tag.dateAdded!)),
style: TextStyle(
fontSize: 14,
color: Theme.of(context).colorScheme.onSurfaceVariant,
),
],
),
),
],
),
);
},
),
],
),
),
);
},
),
],
),
),
),
),
SnackbarFloatingActionButton(
onPressed: openAddModal,
child: const Icon(Icons.add_rounded),
),
],
),
floatingActionButton: FloatingActionButton(
onPressed: openAddModal,
child: const Icon(Icons.add_rounded),
),
),
);
}

253
lib/screens/webview/ui/webview.dart
View File

@@ -5,6 +5,7 @@ import 'package:share_plus/share_plus.dart';
import 'package:linkdy/screens/webview/provider/webview.provider.dart';
import 'package:linkdy/constants/global_keys.dart';
import 'package:linkdy/models/data/bookmarks.dart';
import 'package:linkdy/i18n/strings.g.dart';
import 'package:linkdy/utils/copy_clipboard.dart';
@@ -14,144 +15,148 @@ class WebViewScreen extends ConsumerWidget {
final Bookmark bookmark;
const WebViewScreen({
Key? key,
super.key,
required this.bookmark,
}) : super(key: key);
});
@override
Widget build(BuildContext context, WidgetRef ref) {
return Scaffold(
appBar: AppBar(
elevation: 3,
title: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
bookmark.title != "" ? bookmark.title! : bookmark.websiteTitle!,
style: const TextStyle(fontSize: 14),
),
const SizedBox(height: 4),
Text(
bookmark.url!,
style: TextStyle(
fontSize: 12,
color: Theme.of(context).colorScheme.onSurfaceVariant,
return ScaffoldMessenger(
key: ScaffoldMessengerKeys.webview,
child: Scaffold(
appBar: AppBar(
elevation: 3,
title: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
bookmark.title != "" ? bookmark.title! : bookmark.websiteTitle!,
style: const TextStyle(fontSize: 14),
),
),
],
),
bottom: PreferredSize(
preferredSize: const Size(double.maxFinite, 0),
child: ref.watch(webViewProvider).loadProgress < 100
? const LinearProgressIndicator()
: const SizedBox(
height: 4,
const SizedBox(height: 4),
Text(
bookmark.url!,
style: TextStyle(
fontSize: 12,
color: Theme.of(context).colorScheme.onSurfaceVariant,
),
),
],
),
bottom: PreferredSize(
preferredSize: const Size(double.maxFinite, 0),
child: ref.watch(webViewProvider).loadProgress < 100
? const LinearProgressIndicator()
: const SizedBox(
height: 4,
),
),
),
),
body: SafeArea(
child: Column(
children: [
Expanded(
child: InAppWebView(
initialUrlRequest: URLRequest(url: WebUri.uri(Uri.parse(bookmark.url!))),
onWebViewCreated: (controller) {
ref.read(webViewProvider).inAppWebViewController = controller;
},
onPermissionRequest: (controller, request) async {
return PermissionResponse(
resources: request.resources,
action: PermissionResponseAction.DENY,
);
},
onProgressChanged: (controller, progress) {
ref.read(webViewProvider.notifier).setLoadProgress(progress);
},
initialSettings: InAppWebViewSettings(
cacheEnabled: false,
isInspectable: false,
body: SafeArea(
child: Column(
children: [
Expanded(
child: InAppWebView(
initialUrlRequest: URLRequest(url: WebUri.uri(Uri.parse(bookmark.url!))),
onWebViewCreated: (controller) {
ref.read(webViewProvider).inAppWebViewController = controller;
},
onPermissionRequest: (controller, request) async {
return PermissionResponse(
resources: request.resources,
action: PermissionResponseAction.DENY,
);
},
onProgressChanged: (controller, progress) {
ref.read(webViewProvider.notifier).setLoadProgress(progress);
},
initialSettings: InAppWebViewSettings(
cacheEnabled: false,
isInspectable: false,
),
onUpdateVisitedHistory: (controller, url, androidIsReload) {
controller.canGoBack().then(
(value) => context.mounted ? ref.read(webViewProvider.notifier).setCanGoBack(value) : null,
);
controller.canGoForward().then(
(value) => context.mounted ? ref.read(webViewProvider.notifier).setCanGoForward(value) : null,
);
},
),
onUpdateVisitedHistory: (controller, url, androidIsReload) {
controller.canGoBack().then(
(value) => context.mounted ? ref.read(webViewProvider.notifier).setCanGoBack(value) : null,
);
controller.canGoForward().then(
(value) => context.mounted ? ref.read(webViewProvider.notifier).setCanGoForward(value) : null,
);
},
),
),
Padding(
padding: const EdgeInsets.all(8.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Row(
children: [
IconButton(
onPressed: ref.watch(webViewProvider).canGoBack == true
? () => ref.watch(webViewProvider).inAppWebViewController?.goBack()
: null,
icon: const Icon(Icons.arrow_back_rounded),
tooltip: t.webview.goForward,
),
const SizedBox(width: 8),
IconButton(
onPressed: ref.watch(webViewProvider).canGoForward == true
? () => ref.watch(webViewProvider).inAppWebViewController?.goForward()
: null,
icon: const Icon(Icons.arrow_forward_rounded),
tooltip: t.webview.goForward,
),
const SizedBox(width: 16),
IconButton(
onPressed: () => ref.watch(webViewProvider).inAppWebViewController?.reload(),
icon: const Icon(Icons.refresh_rounded),
tooltip: t.webview.reload,
),
],
),
PopupMenuButton(
itemBuilder: (context) => [
PopupMenuItem(
onTap: () => Share.shareUri(Uri.parse(bookmark.url!)),
child: Row(
children: [
const Icon(Icons.share_rounded),
const SizedBox(width: 12),
Flexible(child: Text(t.webview.share)),
],
Padding(
padding: const EdgeInsets.all(8.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Row(
children: [
IconButton(
onPressed: ref.watch(webViewProvider).canGoBack == true
? () => ref.watch(webViewProvider).inAppWebViewController?.goBack()
: null,
icon: const Icon(Icons.arrow_back_rounded),
tooltip: t.webview.goForward,
),
),
PopupMenuItem(
onTap: () => copyToClipboard(
value: bookmark.url!,
successMessage: t.webview.linkCopiedClipboard,
const SizedBox(width: 8),
IconButton(
onPressed: ref.watch(webViewProvider).canGoForward == true
? () => ref.watch(webViewProvider).inAppWebViewController?.goForward()
: null,
icon: const Icon(Icons.arrow_forward_rounded),
tooltip: t.webview.goForward,
),
child: Row(
children: [
const Icon(Icons.copy_rounded),
const SizedBox(width: 12),
Flexible(child: Text(t.webview.copyLinkClipboard)),
],
const SizedBox(width: 16),
IconButton(
onPressed: () => ref.watch(webViewProvider).inAppWebViewController?.reload(),
icon: const Icon(Icons.refresh_rounded),
tooltip: t.webview.reload,
),
),
PopupMenuItem(
onTap: () => openUrl(bookmark.url!),
child: Row(
children: [
const Icon(Icons.open_in_browser_rounded),
const SizedBox(width: 12),
Flexible(child: Text(t.webview.openInSystemBrowser)),
],
],
),
PopupMenuButton(
itemBuilder: (context) => [
PopupMenuItem(
onTap: () => Share.shareUri(Uri.parse(bookmark.url!)),
child: Row(
children: [
const Icon(Icons.share_rounded),
const SizedBox(width: 12),
Flexible(child: Text(t.webview.share)),
],
),
),
),
],
),
],
PopupMenuItem(
onTap: () => copyToClipboard(
key: ScaffoldMessengerKeys.webview,
value: bookmark.url!,
successMessage: t.webview.linkCopiedClipboard,
),
child: Row(
children: [
const Icon(Icons.copy_rounded),
const SizedBox(width: 12),
Flexible(child: Text(t.webview.copyLinkClipboard)),
],
),
),
PopupMenuItem(
onTap: () => openUrl(bookmark.url!),
child: Row(
children: [
const Icon(Icons.open_in_browser_rounded),
const SizedBox(width: 12),
Flexible(child: Text(t.webview.openInSystemBrowser)),
],
),
),
],
),
],
),
),
),
],
],
),
),
),
);