Added bookmarks lazy loading

lib/models/data/bookmarks.dart

@@ -1,7 +1,7 @@
 class BookmarksResponse {
   final int? count;
-  final int? next;
+  final String? next;
-  final int? previous;
+  final String? previous;
   final List<Bookmark>? results;
 
   BookmarksResponse({

lib/screens/bookmarks/model/bookmarks.model.dart

@@ -1,9 +1,20 @@
+import 'package:linkdy/constants/enums.dart';
+import 'package:linkdy/models/data/bookmarks.dart';
+
 class BookmarksModel {
   int currentPage;
   int limit;
+  List<Bookmark> bookmarks;
+  LoadStatus inialLoadStatus;
+  bool loadingMore;
+  int maxNumber;
 
   BookmarksModel({
     this.currentPage = 0,
-    this.limit = 100,
+    this.limit = 20,
+    required this.bookmarks,
+    this.inialLoadStatus = LoadStatus.loading,
+    this.loadingMore = false,
+    this.maxNumber = 0,
   });
 }

lib/screens/bookmarks/provider/bookmarks.provider.dart

@@ -1,24 +1,58 @@
-import 'package:linkdy/models/data/bookmarks.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 import 'package:linkdy/screens/bookmarks/model/bookmarks.model.dart';
 
-import 'package:linkdy/models/api_response.dart';
 import 'package:linkdy/providers/api_client_provider.dart';
+import 'package:linkdy/constants/enums.dart';
 
 part 'bookmarks.provider.g.dart';
 
 @riverpod
-FutureOr<ApiResponse<BookmarksResponse>> bookmarksRequest(BookmarksRequestRef ref) async {
+FutureOr<void> bookmarksRequest(BookmarksRequestRef ref, int limit) async {
-  final result = await ref.watch(apiClientProvider)!.fetchBookmarks();
+  final result = await ref.watch(apiClientProvider)!.fetchBookmarks(
-  return result;
+        limit: limit,
+        offset: 0,
+      );
+
+  if (result.successful == true) {
+    ref.read(bookmarksProvider).bookmarks = result.content!.results!;
+    ref.read(bookmarksProvider).maxNumber = result.content!.count!;
+    ref.read(bookmarksProvider).inialLoadStatus = LoadStatus.loaded;
+  } else {
+    ref.read(bookmarksProvider).inialLoadStatus = LoadStatus.error;
+  }
+  ref.read(bookmarksProvider.notifier).notifyListeners();
 }
 
 @riverpod
+FutureOr<void> bookmarksRequestLoadMore(BookmarksRequestLoadMoreRef ref) async {
+  final provider = ref.watch(bookmarksProvider);
+
+  final newOffset = provider.limit * (provider.currentPage + 1);
+
+  final result = await ref.watch(apiClientProvider)!.fetchBookmarks(
+        limit: provider.limit,
+        offset: newOffset,
+      );
+
+  if (result.successful == true) {
+    provider.bookmarks = [...provider.bookmarks, ...result.content!.results!];
+    provider.maxNumber = result.content!.count!;
+    provider.currentPage = provider.currentPage + 1;
+  }
+
+  ref.read(bookmarksProvider.notifier).setLoadingMore(false);
+}
+
+@Riverpod(keepAlive: true)
 class Bookmarks extends _$Bookmarks {
   @override
   BookmarksModel build() {
-    return BookmarksModel();
+    final model = BookmarksModel(
+      bookmarks: [],
+    );
+    ref.read(bookmarksRequestProvider(model.limit));
+    return model;
   }
 
   void setCurrentPage(int page) {
@@ -28,4 +62,20 @@ class Bookmarks extends _$Bookmarks {
   void setLimit(int limit) {
     state.limit = limit;
   }
+
+  void setLoadingMore(bool value) {
+    state.loadingMore = value;
+    ref.notifyListeners();
+  }
+
+  void notifyListeners() {
+    ref.notifyListeners();
+  }
+
+  Future<void> refresh() async {
+    await ref.read(bookmarksRequestProvider(state.limit).future);
+    state.currentPage = 0;
+    state.loadingMore = false;
+    ref.notifyListeners();
+  }
 }

lib/screens/bookmarks/provider/bookmarks.provider.g.dart

@@ -6,29 +6,177 @@ part of 'bookmarks.provider.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$bookmarksRequestHash() => r'c80328ae148c39617997a44ac5c34f27daf25a8a';
+String _$bookmarksRequestHash() => r'716bbb168bef640b11619d7f6a333c53b3c29bdb';
+
+/// Copied from Dart SDK
+class _SystemHash {
+  _SystemHash._();
+
+  static int combine(int hash, int value) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + value);
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
+    return hash ^ (hash >> 6);
+  }
+
+  static int finish(int hash) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
+    // ignore: parameter_assignments
+    hash = hash ^ (hash >> 11);
+    return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
+  }
+}
 
 /// See also [bookmarksRequest].
 @ProviderFor(bookmarksRequest)
-final bookmarksRequestProvider =
+const bookmarksRequestProvider = BookmarksRequestFamily();
-    AutoDisposeFutureProvider<ApiResponse<BookmarksResponse>>.internal(
+
-  bookmarksRequest,
+/// See also [bookmarksRequest].
+class BookmarksRequestFamily extends Family<AsyncValue<void>> {
+  /// See also [bookmarksRequest].
+  const BookmarksRequestFamily();
+
+  /// See also [bookmarksRequest].
+  BookmarksRequestProvider call(
+    int limit,
+  ) {
+    return BookmarksRequestProvider(
+      limit,
+    );
+  }
+
+  @override
+  BookmarksRequestProvider getProviderOverride(
+    covariant BookmarksRequestProvider provider,
+  ) {
+    return call(
+      provider.limit,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'bookmarksRequestProvider';
+}
+
+/// See also [bookmarksRequest].
+class BookmarksRequestProvider extends AutoDisposeFutureProvider<void> {
+  /// See also [bookmarksRequest].
+  BookmarksRequestProvider(
+    int limit,
+  ) : this._internal(
+          (ref) => bookmarksRequest(
+            ref as BookmarksRequestRef,
+            limit,
+          ),
+          from: bookmarksRequestProvider,
           name: r'bookmarksRequestProvider',
-  debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
                   ? null
                   : _$bookmarksRequestHash,
+          dependencies: BookmarksRequestFamily._dependencies,
+          allTransitiveDependencies:
+              BookmarksRequestFamily._allTransitiveDependencies,
+          limit: limit,
+        );
+
+  BookmarksRequestProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.limit,
+  }) : super.internal();
+
+  final int limit;
+
+  @override
+  Override overrideWith(
+    FutureOr<void> Function(BookmarksRequestRef provider) create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: BookmarksRequestProvider._internal(
+        (ref) => create(ref as BookmarksRequestRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        limit: limit,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeFutureProviderElement<void> createElement() {
+    return _BookmarksRequestProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is BookmarksRequestProvider && other.limit == limit;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, limit.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+mixin BookmarksRequestRef on AutoDisposeFutureProviderRef<void> {
+  /// The parameter `limit` of this provider.
+  int get limit;
+}
+
+class _BookmarksRequestProviderElement
+    extends AutoDisposeFutureProviderElement<void> with BookmarksRequestRef {
+  _BookmarksRequestProviderElement(super.provider);
+
+  @override
+  int get limit => (origin as BookmarksRequestProvider).limit;
+}
+
+String _$bookmarksRequestLoadMoreHash() =>
+    r'523edffa3f18851e1879948e7f8996904aa0aa32';
+
+/// See also [bookmarksRequestLoadMore].
+@ProviderFor(bookmarksRequestLoadMore)
+final bookmarksRequestLoadMoreProvider =
+    AutoDisposeFutureProvider<void>.internal(
+  bookmarksRequestLoadMore,
+  name: r'bookmarksRequestLoadMoreProvider',
+  debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
+      ? null
+      : _$bookmarksRequestLoadMoreHash,
   dependencies: null,
   allTransitiveDependencies: null,
 );
 
-typedef BookmarksRequestRef
+typedef BookmarksRequestLoadMoreRef = AutoDisposeFutureProviderRef<void>;
-    = AutoDisposeFutureProviderRef<ApiResponse<BookmarksResponse>>;
+String _$bookmarksHash() => r'454f0fcfa9ee776828ba50edf4906ed0a267cb97';
-String _$bookmarksHash() => r'4a1726830b4e7bbc131d69761aeb4702ca6b7180';
 
 /// See also [Bookmarks].
 @ProviderFor(Bookmarks)
-final bookmarksProvider =
+final bookmarksProvider = NotifierProvider<Bookmarks, BookmarksModel>.internal(
-    AutoDisposeNotifierProvider<Bookmarks, BookmarksModel>.internal(
   Bookmarks.new,
   name: r'bookmarksProvider',
   debugGetCreateSourceHash:
@@ -37,6 +185,6 @@ final bookmarksProvider =
   allTransitiveDependencies: null,
 );
 
-typedef _$Bookmarks = AutoDisposeNotifier<BookmarksModel>;
+typedef _$Bookmarks = Notifier<BookmarksModel>;
 // ignore_for_file: type=lint
 // ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member

lib/screens/bookmarks/ui/bookmarks.dart

@@ -2,6 +2,7 @@ import 'dart:io';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.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';
@@ -18,7 +19,7 @@ class BookmarksScreen extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final bookmarks = ref.watch(bookmarksRequestProvider);
+    final bookmarks = ref.watch(bookmarksProvider);
 
     final width = MediaQuery.of(context).size.width;
 
@@ -38,6 +39,16 @@ class BookmarksScreen extends ConsumerWidget {
       );
     }
 
+    bool scrollListener(ScrollUpdateNotification scrollNotification) {
+      if (scrollNotification.metrics.extentAfter < 100 &&
+          bookmarks.loadingMore == false &&
+          bookmarks.bookmarks.length < bookmarks.maxNumber) {
+        ref.read(bookmarksProvider.notifier).setLoadingMore(true);
+        ref.watch(bookmarksRequestLoadMoreProvider);
+      }
+      return false;
+    }
+
     return Scaffold(
       body: NestedScrollView(
         headerSliverBuilder: (context, innerBoxIsScrolled) => [
@@ -66,46 +77,53 @@ class BookmarksScreen extends ConsumerWidget {
           child: Builder(
             builder: (context) => RefreshIndicator(
               displacement: 120,
-              onRefresh: () => ref.refresh(bookmarksRequestProvider.future),
+              onRefresh: () => ref.read(bookmarksProvider.notifier).refresh(),
+              child: NotificationListener(
+                onNotification: scrollListener,
                 child: CustomScrollView(
                   slivers: [
                     SliverOverlapInjector(
                       handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
                     ),
-                  if (bookmarks.isLoading && !bookmarks.isRefreshing)
+                    if (bookmarks.inialLoadStatus == LoadStatus.loading)
                       const SliverFillRemaining(
                         child: Center(child: CircularProgressIndicator()),
                       ),
-                  if (bookmarks.value != null && bookmarks.value!.successful == false)
+                    if (bookmarks.inialLoadStatus == LoadStatus.error)
                       SliverFillRemaining(
                         child: ErrorScreen(
                           error: t.bookmarks.cannotLoadBookmarks,
                         ),
                       ),
-                  if (bookmarks.value != null &&
+                    if (bookmarks.bookmarks.isEmpty)
-                      bookmarks.value!.successful == true &&
-                      bookmarks.value!.content!.results!.isEmpty)
                       SliverFillRemaining(
                         child: NoDataScreen(
                           message: t.bookmarks.noBookmarksAdded,
                         ),
                       ),
-                  if (bookmarks.value != null &&
+                    if (bookmarks.bookmarks.isNotEmpty)
-                      bookmarks.value!.successful == true &&
-                      bookmarks.value!.content!.results!.isNotEmpty)
                       SliverList.builder(
-                      itemCount: bookmarks.value!.content!.results!.length + 1,
+                        itemCount: bookmarks.bookmarks.length + 1,
                         itemBuilder: (context, index) {
                           // index == bookmarks.value!.content!.results!.length -> itemCount + 1
-                        if (index == bookmarks.value!.content!.results!.length) {
+                          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);
                           }
-                        final link = bookmarks.value?.content?.results?[index];
+
+                          final link = bookmarks.bookmarks[index];
                           return Column(
                             children: [
-                            BookmarkItem(bookmark: link!),
+                              BookmarkItem(bookmark: link),
-                            if (index < bookmarks.value!.content!.results!.length - 1)
+                              if (index < bookmarks.bookmarks.length - 1)
                                 Padding(
                                   padding: const EdgeInsets.symmetric(horizontal: 16),
                                   child: Divider(
@@ -122,6 +140,7 @@ class BookmarksScreen extends ConsumerWidget {
             ),
           ),
         ),
+      ),
       floatingActionButton: FloatingActionButton(
         onPressed: openAddModal,
         child: const Icon(Icons.add_rounded),