feat: improved caching based on riverpod

.vscode/settings.json

@@ -2,6 +2,7 @@
   "cmake.configureOnOpen": false,
   "cSpell.words": [
     "acousticness",
+    "Buildless",
     "danceability",
     "instrumentalness",
     "Mpris",

.vscode/snippets.code-snippets

@@ -0,0 +1,170 @@
+{
+  "PaginatedState": {
+    "scope": "dart",
+    "prefix": "paginatedState",
+    "description": "Generate a PaginatedState",
+    "body": [
+      "class ${1:Model}State extends PaginatedState<${2:Model}> {",
+      "  ${1:Model}State({",
+      "    required super.items,",
+      "    required super.offset,",
+      "    required super.limit,",
+      "    required super.hasMore,",
+      "  });",
+      "  ",
+      "  @override",
+      "  ${1:Model}State copyWith({",
+      "    List<${2:Model}>? items,",
+      "    int? offset,",
+      "    int? limit,",
+      "    bool? hasMore,",
+      "  }) {",
+      "    return ${1:Model}State(",
+      "      items: items ?? this.items,",
+      "      offset: offset ?? this.offset,",
+      "      limit: limit ?? this.limit,",
+      "      hasMore: hasMore ?? this.hasMore,",
+      "    );",
+      "  }",
+      "}"
+    ]
+  },
+  "PaginatedAsyncNotifier": {
+    "scope": "dart",
+    "prefix": "paginatedAsyncNotifier",
+    "description": "Generate a PaginatedAsyncNotifier",
+    "body": [
+      "class ${1:NotifierName}Notifier extends PaginatedAsyncNotifier<${3:Item}, ${2:Model}State> {",
+      "  ${1:NotifierName}Notifier() : super();",
+      "  ",
+      "  @override",
+      "  fetch(int offset, int limit) async {",
+      "   throw UnimplementedError();",
+      "  }",
+      "  ",
+      "  @override",
+      "  build() async {",
+      "    throw UnimplementedError();",
+      "  }",
+      "}"
+    ]
+  },
+  "PaginaitedNotifierWithState": {
+    "scope": "dart",
+    "prefix": "paginatedNotifierWithState",
+    "description": "Generate a PaginatedNotifier with PaginatedState",
+    "body": [
+      "class $1State extends PaginatedState<$2> {",
+      "  $1State({",
+      "    required super.items,",
+      "    required super.offset,",
+      "    required super.limit,",
+      "    required super.hasMore,",
+      "  });",
+      "  ",
+      "  @override",
+      "  $1State copyWith({",
+      "    List<$2>? items,",
+      "    int? offset,",
+      "    int? limit,",
+      "    bool? hasMore,",
+      "  }) {",
+      "    return $1State(",
+      "      items: items ?? this.items,",
+      "      offset: offset ?? this.offset,",
+      "      limit: limit ?? this.limit,",
+      "      hasMore: hasMore ?? this.hasMore,",
+      "    );",
+      "  }",
+      "}",
+      "  ",
+      "class $1Notifier",
+      "    extends PaginatedAsyncNotifier<$2, $1State> {",
+      "  $1Notifier() : super();",
+      "  ",
+      "  @override",
+      "  fetch(int offset, int limit) async {",
+      "    throw UnimplementedError();",
+      "  }",
+      "  ",
+      "  @override",
+      "  build() async {",
+      "    throw UnimplementedError();",
+      "  }",
+      "}",
+      "  ",
+      "final ${1/(.*)/${1:/camelcase}/}Provider = AsyncNotifierProvider<$1Notifier, $1State>(",
+      "  ()=> $1Notifier(),",
+      ");"
+    ]
+  },
+  "FamilyPaginatedAsyncNotifier": {
+    "scope": "dart",
+    "prefix": "familyPaginatedAsyncNotifier",
+    "description": "Generate a FamilyPaginatedAsyncNotifier",
+    "body": [
+      "class ${1:NotifierName}Notifier extends FamilyPaginatedAsyncNotifier<${3:Item}, ${2:Model}State, {$4:Arg}> {",
+      "  ${1:NotifierName}Notifier() : super();",
+      "  ",
+      "  @override",
+      "  fetch(arg, offset, limit) async {",
+      "   throw UnimplementedError();",
+      "  }",
+      "  ",
+      "  @override",
+      "  build(arg) async {",
+      "    throw UnimplementedError();",
+      "  }",
+      "}"
+    ]
+  },
+  "FamilyPaginaitedNotifierWithState": {
+    "scope": "dart",
+    "prefix": "familyPaginatedNotifierWithState",
+    "description": "Generate a FamilyPaginatedAsyncNotifier with PaginatedState",
+    "body": [
+      "class $1State extends PaginatedState<$2> {",
+      "  $1State({",
+      "    required super.items,",
+      "    required super.offset,",
+      "    required super.limit,",
+      "    required super.hasMore,",
+      "  });",
+      "  ",
+      "  @override",
+      "  $1State copyWith({",
+      "    List<$2>? items,",
+      "    int? offset,",
+      "    int? limit,",
+      "    bool? hasMore,",
+      "  }) {",
+      "    return $1State(",
+      "      items: items ?? this.items,",
+      "      offset: offset ?? this.offset,",
+      "      limit: limit ?? this.limit,",
+      "      hasMore: hasMore ?? this.hasMore,",
+      "    );",
+      "  }",
+      "}",
+      "  ",
+      "class $1Notifier",
+      "    extends FamilyPaginatedAsyncNotifier<$2, $1State, $3> {",
+      "  $1Notifier() : super();",
+      "  ",
+      "  @override",
+      "  fetch(arg, offset, limit) async {",
+      "    throw UnimplementedError();",
+      "  }",
+      "  ",
+      "  @override",
+      "  build(arg) async {",
+      "    throw UnimplementedError();",
+      "  }",
+      "}",
+      "  ",
+      "final ${1/(.*)/${1:/camelcase}/}Provider = AsyncNotifierProviderFamily<$1Notifier, $1State, $3>(",
+      "  ()=> $1Notifier(),",
+      ");"
+    ]
+  },
+}

analysis_options.yaml

@@ -25,6 +25,7 @@ linter:
     # avoid_print: false  # Uncomment to disable the `avoid_print` rule
     # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
     file_names: false
+    avoid_renaming_method_parameters: false
 
 # Additional information about this file can be found at
 # https://dart.dev/guides/language/analysis-options

lib/collections/routes.dart

@@ -4,6 +4,7 @@ import 'package:flutter/widgets.dart';
 import 'package:go_router/go_router.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:spotify/spotify.dart' hide Search;
+import 'package:spotube/models/spotify/recommendation_seeds.dart';
 import 'package:spotube/pages/album/album.dart';
 import 'package:spotube/pages/getting_started/getting_started.dart';
 import 'package:spotube/pages/home/genres/genre_playlists.dart';
@@ -96,8 +97,7 @@ final routerProvider = Provider((ref) {
                         path: "result",
                         pageBuilder: (context, state) => SpotubePage(
                           child: PlaylistGenerateResultPage(
-                            state:
-                                state.extra as PlaylistGenerateResultRouteState,
+                            state: state.extra as GeneratePlaylistProviderInput,
                           ),
                         ),
                       ),

lib/components/album/album_card.dart

@@ -1,15 +1,12 @@
-import 'package:fl_query_hooks/fl_query_hooks.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:spotify/spotify.dart';
 import 'package:spotube/components/shared/playbutton_card.dart';
 import 'package:spotube/extensions/context.dart';
-import 'package:spotube/extensions/infinite_query.dart';
 import 'package:spotube/provider/proxy_playlist/proxy_playlist_provider.dart';
-import 'package:spotube/provider/spotify_provider.dart';
+import 'package:spotube/provider/spotify/spotify.dart';
 import 'package:spotube/services/audio_player/audio_player.dart';
-import 'package:spotube/services/queries/album.dart';
 import 'package:spotube/utils/service_utils.dart';
 import 'package:spotube/utils/type_conversion_utils.dart';
 
@@ -31,15 +28,12 @@ class AlbumCard extends HookConsumerWidget {
         useStream(audioPlayer.playingStream).data ?? audioPlayer.isPlaying;
     final playlistNotifier = ref.watch(ProxyPlaylistNotifier.notifier);
 
-    final queryClient = useQueryClient();
-
     bool isPlaylistPlaying = useMemoized(
       () => playlist.containsCollection(album.id!),
       [playlist, album.id],
     );
 
     final updating = useState(false);
-    final spotify = ref.watch(spotifyProvider);
 
     final scaffoldMessenger = ScaffoldMessenger.maybeOf(context);
 
@@ -50,23 +44,8 @@ class AlbumCard extends HookConsumerWidget {
                 TypeConversionUtils.simpleTrack_X_Track(track, album))
             .toList();
       }
-      final job = AlbumQueries.tracksOfJob(album.id!);
-
-      final query = queryClient.createInfiniteQuery(
-        job.queryKey,
-        (page) => job.task(page, (spotify: spotify, album: album)),
-        initialPage: 0,
-        nextPage: job.nextPage,
-      );
-
-      return await query.fetchAllTracks(
-        getAllTracks: () async {
-          final res = await spotify.albums.tracks(album.id!).all();
-          return res
-              .map((e) => TypeConversionUtils.simpleTrack_X_Track(e, album))
-              .toList();
-        },
-      );
+      await ref.read(albumTracksProvider(album).future);
+      return ref.read(albumTracksProvider(album).notifier).fetchAll();
     }
 
     return PlaybuttonCard(

lib/components/artist/artist_album_list.dart

@@ -1,38 +1,35 @@
 import 'package:flutter/material.dart' hide Page;
-import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:spotify/spotify.dart';
 import 'package:spotube/components/shared/horizontal_playbutton_card_view/horizontal_playbutton_card_view.dart';
 import 'package:spotube/extensions/context.dart';
 import 'package:spotube/models/logger.dart';
-import 'package:spotube/services/queries/queries.dart';
+import 'package:spotube/provider/spotify/spotify.dart';
 
 class ArtistAlbumList extends HookConsumerWidget {
   final String artistId;
   ArtistAlbumList(
     this.artistId, {
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
 
   final logger = getLogger(ArtistAlbumList);
 
   @override
   Widget build(BuildContext context, ref) {
-    final albumsQuery = useQueries.artist.albumsOf(ref, artistId);
+    final albumsQuery = ref.watch(artistAlbumsProvider(artistId));
+    final albumsQueryNotifier =
+        ref.watch(artistAlbumsProvider(artistId).notifier);
 
-    final albums = useMemoized(() {
-      return albumsQuery.pages
-          .expand<Album>((page) => page.items ?? const Iterable.empty())
-          .toList();
-    }, [albumsQuery.pages]);
+    final albums = albumsQuery.asData?.value.items ?? [];
 
     final theme = Theme.of(context);
 
     return HorizontalPlaybuttonCardView<Album>(
       isLoadingNextPage: albumsQuery.isLoadingNextPage,
-      hasNextPage: albumsQuery.hasNextPage,
+      hasNextPage: albumsQuery.asData?.value.hasMore ?? false,
       items: albums,
-      onFetchMore: albumsQuery.fetchNext,
+      onFetchMore: albumsQueryNotifier.fetchMore,
       title: Text(
         context.l10n.albums,
         style: theme.textTheme.headlineSmall,

lib/components/artist/artist_card.dart

@@ -14,7 +14,7 @@ import 'package:spotube/utils/type_conversion_utils.dart';
 
 class ArtistCard extends HookConsumerWidget {
   final Artist artist;
-  const ArtistCard(this.artist, {Key? key}) : super(key: key);
+  const ArtistCard(this.artist, {super.key});
 
   @override
   Widget build(BuildContext context, ref) {

lib/components/desktop_login/login_form.dart

@@ -8,9 +8,9 @@ import 'package:spotube/provider/authentication_provider.dart';
 class TokenLoginForm extends HookConsumerWidget {
   final void Function()? onDone;
   const TokenLoginForm({
-    Key? key,
+    super.key,
     this.onDone,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context, ref) {

lib/components/home/sections/featured.dart

@@ -1,35 +1,28 @@
 import 'package:flutter/material.dart' hide Page;
-import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:skeletonizer/skeletonizer.dart';
 import 'package:spotify/spotify.dart';
 import 'package:spotube/components/shared/horizontal_playbutton_card_view/horizontal_playbutton_card_view.dart';
 import 'package:spotube/extensions/context.dart';
-import 'package:spotube/services/queries/queries.dart';
+import 'package:spotube/provider/spotify/spotify.dart';
 
 class HomeFeaturedSection extends HookConsumerWidget {
-  const HomeFeaturedSection({Key? key}) : super(key: key);
+  const HomeFeaturedSection({super.key});
 
   @override
   Widget build(BuildContext context, ref) {
-    final featuredPlaylistsQuery = useQueries.playlist.featured(ref);
-    final playlists = useMemoized(
-      () => featuredPlaylistsQuery.pages
-          .whereType<Page<PlaylistSimple>>()
-          .expand((page) => page.items ?? const <PlaylistSimple>[]),
-      [featuredPlaylistsQuery.pages],
-    );
-    final isLoadingFeaturedPlaylists = !featuredPlaylistsQuery.hasPageData &&
-        !featuredPlaylistsQuery.isLoadingNextPage;
+    final featuredPlaylists = ref.watch(featuredPlaylistsProvider);
+    final featuredPlaylistsNotifier =
+        ref.watch(featuredPlaylistsProvider.notifier);
 
     return Skeletonizer(
-      enabled: isLoadingFeaturedPlaylists,
+      enabled: featuredPlaylists.isLoading,
       child: HorizontalPlaybuttonCardView<PlaylistSimple>(
-        items: playlists.toList(),
+        items: featuredPlaylists.asData?.value.items ?? [],
         title: Text(context.l10n.featured),
-        isLoadingNextPage: featuredPlaylistsQuery.isLoadingNextPage,
-        hasNextPage: featuredPlaylistsQuery.hasNextPage,
-        onFetchMore: featuredPlaylistsQuery.fetchNext,
+        isLoadingNextPage: featuredPlaylists.isLoadingNextPage,
+        hasNextPage: featuredPlaylists.asData?.value.hasMore ?? false,
+        onFetchMore: featuredPlaylistsNotifier.fetchMore,
       ),
     );
   }