Merge branch 'dev' into feat-jiosaavn

lib/collections/env.dart

@@ -1,4 +1,5 @@
 import 'package:envied/envied.dart';
+import 'package:flutter_desktop_tools/flutter_desktop_tools.dart';
 
 part 'env.g.dart';
 
@@ -30,5 +31,6 @@ abstract class Env {
   @EnviedField(varName: 'ENABLE_UPDATE_CHECK', defaultValue: "1")
   static final String _enableUpdateChecker = _Env._enableUpdateChecker;
 
-  static bool get enableUpdateChecker => _enableUpdateChecker == "1";
+  static bool get enableUpdateChecker =>
+      DesktopTools.platform.isFlatpak || _enableUpdateChecker == "1";
 }

lib/components/artist/artist_card.dart

@@ -5,8 +5,8 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:spotify/spotify.dart';
 import 'package:spotube/components/shared/image/universal_image.dart';
 import 'package:spotube/extensions/context.dart';
-import 'package:spotube/hooks/use_breakpoint_value.dart';
-import 'package:spotube/hooks/use_brightness_value.dart';
+import 'package:spotube/hooks/utils/use_breakpoint_value.dart';
+import 'package:spotube/hooks/utils/use_brightness_value.dart';
 import 'package:spotube/provider/blacklist_provider.dart';
 import 'package:spotube/utils/service_utils.dart';
 import 'package:spotube/utils/type_conversion_utils.dart';

lib/components/player/player.dart

@@ -18,8 +18,8 @@ import 'package:spotube/components/shared/image/universal_image.dart';
 import 'package:spotube/components/shared/panels/sliding_up_panel.dart';
 import 'package:spotube/extensions/constrains.dart';
 import 'package:spotube/extensions/context.dart';
-import 'package:spotube/hooks/use_custom_status_bar_color.dart';
-import 'package:spotube/hooks/use_palette_color.dart';
+import 'package:spotube/hooks/utils/use_custom_status_bar_color.dart';
+import 'package:spotube/hooks/utils/use_palette_color.dart';
 import 'package:spotube/models/local_track.dart';
 import 'package:spotube/pages/lyrics/lyrics.dart';
 import 'package:spotube/provider/authentication_provider.dart';

lib/components/player/player_controls.dart

@@ -8,7 +8,7 @@ import 'package:spotube/collections/spotube_icons.dart';
 import 'package:spotube/collections/intents.dart';
 import 'package:spotube/extensions/context.dart';
 import 'package:spotube/extensions/duration.dart';
-import 'package:spotube/hooks/use_progress.dart';
+import 'package:spotube/components/player/use_progress.dart';
 import 'package:spotube/models/logger.dart';
 import 'package:spotube/provider/proxy_playlist/proxy_playlist_provider.dart';
 import 'package:spotube/services/audio_player/audio_player.dart';

lib/components/player/player_overlay.dart

@@ -9,7 +9,7 @@ import 'package:spotube/components/root/spotube_navigation_bar.dart';
 import 'package:spotube/components/shared/panels/sliding_up_panel.dart';
 import 'package:spotube/collections/spotube_icons.dart';
 import 'package:spotube/collections/intents.dart';
-import 'package:spotube/hooks/use_progress.dart';
+import 'package:spotube/components/player/use_progress.dart';
 import 'package:spotube/components/player/player.dart';
 import 'package:spotube/provider/proxy_playlist/proxy_playlist_provider.dart';
 import 'package:spotube/services/audio_player/audio_player.dart';

lib/components/player/player_queue.dart

@@ -14,7 +14,7 @@ import 'package:spotube/components/shared/inter_scrollbar/inter_scrollbar.dart';
 import 'package:spotube/components/shared/track_table/track_tile.dart';
 import 'package:spotube/extensions/constrains.dart';
 import 'package:spotube/extensions/context.dart';
-import 'package:spotube/hooks/use_auto_scroll_controller.dart';
+import 'package:spotube/hooks/controllers/use_auto_scroll_controller.dart';
 import 'package:spotube/provider/proxy_playlist/proxy_playlist_provider.dart';
 import 'package:spotube/utils/type_conversion_utils.dart';
 

lib/components/player/sibling_tracks_sheet.dart

@@ -12,7 +12,7 @@ import 'package:spotube/components/shared/inter_scrollbar/inter_scrollbar.dart';
 import 'package:spotube/extensions/constrains.dart';
 import 'package:spotube/extensions/context.dart';
 import 'package:spotube/extensions/duration.dart';
-import 'package:spotube/hooks/use_debounce.dart';
+import 'package:spotube/hooks/utils/use_debounce.dart';
 import 'package:spotube/provider/proxy_playlist/proxy_playlist_provider.dart';
 import 'package:spotube/provider/user_preferences_provider.dart';
 import 'package:spotube/services/sourced_track/models/source_info.dart';
@@ -150,7 +150,7 @@ class SiblingTracksSheet extends HookConsumerWidget {
             duration: const Duration(milliseconds: 300),
             child: Container(
               height: isSearching.value && mediaQuery.smAndDown
-                  ? mediaQuery.size.height - mediaQuery.padding.top
+                  ? mediaQuery.size.height - 50
                   : mediaQuery.size.height * .6,
               decoration: BoxDecoration(
                 borderRadius: borderRadius,

lib/components/root/bottom_player.dart

@@ -14,7 +14,7 @@ import 'package:spotube/components/player/player_controls.dart';
 import 'package:spotube/components/player/volume_slider.dart';
 import 'package:spotube/extensions/constrains.dart';
 import 'package:spotube/extensions/context.dart';
-import 'package:spotube/hooks/use_brightness_value.dart';
+import 'package:spotube/hooks/utils/use_brightness_value.dart';
 import 'package:spotube/models/logger.dart';
 import 'package:flutter/material.dart';
 import 'package:spotube/provider/authentication_provider.dart';

lib/components/root/sidebar.dart

@@ -11,8 +11,8 @@ import 'package:spotube/collections/spotube_icons.dart';
 import 'package:spotube/components/shared/image/universal_image.dart';
 import 'package:spotube/extensions/constrains.dart';
 import 'package:spotube/extensions/context.dart';
-import 'package:spotube/hooks/use_brightness_value.dart';
-import 'package:spotube/hooks/use_sidebarx_controller.dart';
+import 'package:spotube/hooks/utils/use_brightness_value.dart';
+import 'package:spotube/hooks/controllers/use_sidebarx_controller.dart';
 import 'package:spotube/provider/download_manager_provider.dart';
 import 'package:spotube/provider/authentication_provider.dart';
 

lib/components/root/spotube_navigation_bar.dart

@@ -9,7 +9,7 @@ import 'package:spotube/collections/side_bar_tiles.dart';
 import 'package:spotube/components/root/sidebar.dart';
 import 'package:spotube/extensions/constrains.dart';
 import 'package:spotube/extensions/context.dart';
-import 'package:spotube/hooks/use_brightness_value.dart';
+import 'package:spotube/hooks/utils/use_brightness_value.dart';
 import 'package:spotube/provider/download_manager_provider.dart';
 import 'package:spotube/provider/user_preferences_provider.dart';
 

lib/components/shared/dialogs/playlist_add_track_dialog.dart

@@ -1,4 +1,3 @@
-import 'package:async/async.dart';
 import 'package:fl_query_hooks/fl_query_hooks.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
@@ -21,32 +20,21 @@ class PlaylistAddTrackDialog extends HookConsumerWidget {
   @override
   Widget build(BuildContext context, ref) {
     final spotify = ref.watch(spotifyProvider);
-    final userPlaylists = useQueries.playlist.ofMine(ref);
-
-    useEffect(() {
-      final op = CancelableOperation.fromFuture(
-        () async {
-          while (userPlaylists.hasNextPage) {
-            await userPlaylists.fetchNext();
-          }
-        }(),
-      );
-
-      return () {
-        op.cancel();
-      };
-    }, [userPlaylists.hasNextPage]);
+    final userPlaylists = useQueries.playlist.ofMineAll(ref);
 
     final me = useQueries.user.me(ref);
 
     final filteredPlaylists = useMemoized(
-      () => userPlaylists.pages
-          .expand((page) => page.items?.toList() ?? <PlaylistSimple>[])
-          .where(
-            (playlist) =>
-                playlist.owner?.id != null && playlist.owner!.id == me.data?.id,
-          ),
-      [userPlaylists.pages, me.data?.id],
+      () =>
+          userPlaylists.data
+              ?.where(
+                (playlist) =>
+                    playlist.owner?.id != null &&
+                    playlist.owner!.id == me.data?.id,
+              )
+              .toList() ??
+          [],
+      [userPlaylists.data, me.data?.id],
     );
 
     final playlistsCheck = useState(<String, bool>{});
@@ -93,7 +81,7 @@ class PlaylistAddTrackDialog extends HookConsumerWidget {
       content: SizedBox(
         height: 300,
         width: 300,
-        child: userPlaylists.hasNextPage
+        child: userPlaylists.isLoading
             ? const Center(child: CircularProgressIndicator())
             : ListView.builder(
                 shrinkWrap: true,

lib/components/shared/horizontal_playbutton_card_view/horizontal_playbutton_card_view.dart

@@ -8,7 +8,7 @@ import 'package:spotube/components/artist/artist_card.dart';
 import 'package:spotube/components/playlist/playlist_card.dart';
 import 'package:spotube/components/shared/shimmers/shimmer_playbutton_card.dart';
 import 'package:spotube/components/shared/waypoint.dart';
-import 'package:spotube/hooks/use_breakpoint_value.dart';
+import 'package:spotube/hooks/utils/use_breakpoint_value.dart';
 
 class HorizontalPlaybuttonCardView<T> extends HookWidget {
   final Widget title;

lib/components/shared/playbutton_card.dart

@@ -6,8 +6,8 @@ import 'package:spotube/collections/assets.gen.dart';
 import 'package:spotube/collections/spotube_icons.dart';
 import 'package:spotube/components/shared/hover_builder.dart';
 import 'package:spotube/components/shared/image/universal_image.dart';
-import 'package:spotube/hooks/use_breakpoint_value.dart';
-import 'package:spotube/hooks/use_brightness_value.dart';
+import 'package:spotube/hooks/utils/use_breakpoint_value.dart';
+import 'package:spotube/hooks/utils/use_brightness_value.dart';
 
 final htmlTagRegexp = RegExp(r"<[^>]*>", caseSensitive: true);
 

lib/components/shared/shimmers/shimmer_artist_profile.dart

@@ -4,7 +4,7 @@ import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:skeleton_text/skeleton_text.dart';
 import 'package:spotube/components/shared/shimmers/shimmer_track_tile.dart';
 import 'package:spotube/extensions/theme.dart';
-import 'package:spotube/hooks/use_breakpoint_value.dart';
+import 'package:spotube/hooks/utils/use_breakpoint_value.dart';
 
 class ShimmerArtistProfile extends HookWidget {
   const ShimmerArtistProfile({Key? key}) : super(key: key);

lib/components/shared/shimmers/shimmer_categories.dart

@@ -3,7 +3,7 @@ import 'package:flutter_hooks/flutter_hooks.dart';
 
 import 'package:spotube/components/shared/shimmers/shimmer_playbutton_card.dart';
 import 'package:spotube/extensions/theme.dart';
-import 'package:spotube/hooks/use_breakpoint_value.dart';
+import 'package:spotube/hooks/utils/use_breakpoint_value.dart';
 
 class ShimmerCategories extends HookWidget {
   const ShimmerCategories({Key? key}) : super(key: key);

lib/components/shared/shimmers/shimmer_playbutton_card.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 
-import 'package:spotube/hooks/use_breakpoint_value.dart';
+import 'package:spotube/hooks/utils/use_breakpoint_value.dart';
 
 class ShimmerPlaybuttonCardPainter extends CustomPainter {
   final Color background;

lib/components/shared/themed_button_tab_bar.dart

@@ -1,8 +1,8 @@
 import 'package:buttons_tabbar/buttons_tabbar.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:spotube/hooks/use_breakpoint_value.dart';
-import 'package:spotube/hooks/use_brightness_value.dart';
+import 'package:spotube/hooks/utils/use_breakpoint_value.dart';
+import 'package:spotube/hooks/utils/use_brightness_value.dart';
 import 'package:spotube/utils/platform.dart';
 
 class ThemedButtonsTabBar extends HookWidget implements PreferredSizeWidget {

lib/components/shared/track_table/track_collection_view/track_collection_view.dart

@@ -13,8 +13,8 @@ import 'package:spotube/components/shared/page_window_title_bar.dart';
 import 'package:spotube/components/shared/track_table/track_collection_view/track_collection_heading.dart';
 import 'package:spotube/components/shared/track_table/tracks_table_view.dart';
 import 'package:spotube/extensions/context.dart';
-import 'package:spotube/hooks/use_custom_status_bar_color.dart';
-import 'package:spotube/hooks/use_palette_color.dart';
+import 'package:spotube/hooks/utils/use_custom_status_bar_color.dart';
+import 'package:spotube/hooks/utils/use_palette_color.dart';
 import 'package:spotube/models/logger.dart';
 import 'package:flutter/material.dart';
 import 'package:spotify/spotify.dart';
@@ -237,7 +237,7 @@ class TrackCollectionView<T> extends HookConsumerWidget {
                         ),
                       );
                     }
-          
+
                     return TracksTableView(
                       (tracksSnapshot.data ?? []).map(
                         (track) {

lib/hooks/configurators/use_disable_battery_optimizations.dart

@@ -1,7 +1,7 @@
 import 'package:disable_battery_optimization/disable_battery_optimization.dart';
 import 'package:flutter_desktop_tools/flutter_desktop_tools.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:spotube/hooks/use_async_effect.dart';
+import 'package:spotube/hooks/utils/use_async_effect.dart';
 
 bool _asked = false;
 void useDisableBatteryOptimizations() {

lib/hooks/configurators/use_get_storage_perms.dart

@@ -4,7 +4,7 @@ import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:spotube/components/library/user_local_tracks.dart';
-import 'package:spotube/hooks/use_async_effect.dart';
+import 'package:spotube/hooks/utils/use_async_effect.dart';
 
 void useGetStoragePermissions(WidgetRef ref) {
   final isMounted = useIsMounted();

lib/hooks/configurators/use_update_checker.dart

@@ -8,7 +8,7 @@ import 'package:http/http.dart' as http;
 import 'package:spotube/collections/env.dart';
 
 import 'package:spotube/components/shared/links/anchor_button.dart';
-import 'package:spotube/hooks/use_package_info.dart';
+import 'package:spotube/hooks/controllers/use_package_info.dart';
 import 'package:spotube/provider/user_preferences_provider.dart';
 import 'package:url_launcher/url_launcher_string.dart';
 import 'package:version/version.dart';

lib/hooks/use_is_current_route.dart

@@ -1,18 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:go_router/go_router.dart';
-
-bool? useIsCurrentRoute([String matcher = "/"]) {
-  final isCurrentRoute = useState<bool?>(null);
-  final context = useContext();
-  useEffect(() {
-    WidgetsBinding.instance.addPostFrameCallback((timer) {
-      final isCurrent = GoRouterState.of(context).matchedLocation == matcher;
-      if (isCurrent != isCurrentRoute.value) {
-        isCurrentRoute.value = isCurrent;
-      }
-    });
-    return null;
-  });
-  return isCurrentRoute.value;
-}

lib/hooks/use_shared_preferences.dart

@@ -1,9 +0,0 @@
-import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-
-SharedPreferences? useSharedPreferences() {
-  final future = useMemoized(SharedPreferences.getInstance);
-  final snapshot = useFuture(future, initialData: null);
-
-  return snapshot.data;
-}

lib/main.dart

@@ -14,8 +14,8 @@ import 'package:metadata_god/metadata_god.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:spotube/collections/routes.dart';
 import 'package:spotube/collections/intents.dart';
-import 'package:spotube/hooks/use_disable_battery_optimizations.dart';
-import 'package:spotube/hooks/use_get_storage_perms.dart';
+import 'package:spotube/hooks/configurators/use_disable_battery_optimizations.dart';
+import 'package:spotube/hooks/configurators/use_get_storage_perms.dart';
 import 'package:spotube/l10n/l10n.dart';
 import 'package:spotube/models/logger.dart';
 import 'package:spotube/models/skip_segment.dart';
@@ -29,7 +29,7 @@ import 'package:spotube/themes/theme.dart';
 import 'package:spotube/utils/persisted_state_notifier.dart';
 import 'package:system_theme/system_theme.dart';
 import 'package:path_provider/path_provider.dart';
-import 'package:spotube/hooks/use_init_sys_tray.dart';
+import 'package:spotube/hooks/configurators/use_init_sys_tray.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_native_splash/flutter_native_splash.dart';
 import 'package:flutter_displaymode/flutter_displaymode.dart';

lib/pages/artist/artist.dart

@@ -16,7 +16,7 @@ import 'package:spotube/components/artist/artist_album_list.dart';
 import 'package:spotube/components/artist/artist_card.dart';
 import 'package:spotube/extensions/constrains.dart';
 import 'package:spotube/extensions/context.dart';
-import 'package:spotube/hooks/use_breakpoint_value.dart';
+import 'package:spotube/hooks/utils/use_breakpoint_value.dart';
 import 'package:spotube/models/logger.dart';
 import 'package:spotube/provider/authentication_provider.dart';
 import 'package:spotube/provider/blacklist_provider.dart';

lib/pages/lyrics/lyrics.dart

@@ -11,8 +11,8 @@ import 'package:spotube/components/shared/image/universal_image.dart';
 import 'package:spotube/components/shared/themed_button_tab_bar.dart';
 import 'package:spotube/extensions/constrains.dart';
 import 'package:spotube/extensions/context.dart';
-import 'package:spotube/hooks/use_custom_status_bar_color.dart';
-import 'package:spotube/hooks/use_palette_color.dart';
+import 'package:spotube/hooks/utils/use_custom_status_bar_color.dart';
+import 'package:spotube/hooks/utils/use_palette_color.dart';
 import 'package:spotube/pages/lyrics/plain_lyrics.dart';
 import 'package:spotube/pages/lyrics/synced_lyrics.dart';
 import 'package:spotube/provider/authentication_provider.dart';

lib/pages/lyrics/mini_lyrics.dart

@@ -11,7 +11,7 @@ import 'package:spotube/components/root/sidebar.dart';
 import 'package:spotube/components/shared/fallbacks/anonymous_fallback.dart';
 import 'package:spotube/components/shared/page_window_title_bar.dart';
 import 'package:spotube/extensions/context.dart';
-import 'package:spotube/hooks/use_force_update.dart';
+import 'package:spotube/hooks/utils/use_force_update.dart';
 import 'package:spotube/pages/lyrics/plain_lyrics.dart';
 import 'package:spotube/pages/lyrics/synced_lyrics.dart';
 import 'package:spotube/provider/authentication_provider.dart';

lib/pages/lyrics/synced_lyrics.dart

@@ -7,8 +7,8 @@ import 'package:spotube/collections/spotube_icons.dart';
 import 'package:spotube/components/lyrics/zoom_controls.dart';
 import 'package:spotube/components/shared/shimmers/shimmer_lyrics.dart';
 import 'package:spotube/extensions/constrains.dart';
-import 'package:spotube/hooks/use_auto_scroll_controller.dart';
-import 'package:spotube/hooks/use_synced_lyrics.dart';
+import 'package:spotube/hooks/controllers/use_auto_scroll_controller.dart';
+import 'package:spotube/components/lyrics/use_synced_lyrics.dart';
 import 'package:scroll_to_index/scroll_to_index.dart';
 import 'package:spotube/provider/proxy_playlist/proxy_playlist_provider.dart';
 import 'package:spotube/services/audio_player/audio_player.dart';

lib/pages/root/root_app.dart

@@ -15,7 +15,7 @@ import 'package:spotube/components/root/bottom_player.dart';
 import 'package:spotube/components/root/sidebar.dart';
 import 'package:spotube/components/root/spotube_navigation_bar.dart';
 import 'package:spotube/extensions/context.dart';
-import 'package:spotube/hooks/use_update_checker.dart';
+import 'package:spotube/hooks/configurators/use_update_checker.dart';
 import 'package:spotube/provider/download_manager_provider.dart';
 import 'package:spotube/utils/persisted_state_notifier.dart';
 

lib/pages/settings/about.dart

@@ -5,7 +5,7 @@ import 'package:spotube/components/shared/image/universal_image.dart';
 import 'package:spotube/components/shared/links/hyper_link.dart';
 import 'package:spotube/components/shared/page_window_title_bar.dart';
 import 'package:spotube/extensions/context.dart';
-import 'package:spotube/hooks/use_package_info.dart';
+import 'package:spotube/hooks/controllers/use_package_info.dart';
 
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';

lib/services/mutations/album.dart

@@ -1,6 +1,6 @@
 import 'package:fl_query/fl_query.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:spotube/hooks/use_spotify_mutation.dart';
+import 'package:spotube/hooks/spotify/use_spotify_mutation.dart';
 
 class AlbumMutations {
   const AlbumMutations();

lib/services/mutations/playlist.dart

@@ -2,7 +2,7 @@ import 'package:fl_query/fl_query.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:spotify/spotify.dart';
-import 'package:spotube/hooks/use_spotify_mutation.dart';
+import 'package:spotube/hooks/spotify/use_spotify_mutation.dart';
 import 'package:spotube/services/queries/queries.dart';
 
 typedef PlaylistCRUDVariables = ({

lib/services/mutations/track.dart

@@ -1,6 +1,6 @@
 import 'package:fl_query/fl_query.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:spotube/hooks/use_spotify_mutation.dart';
+import 'package:spotube/hooks/spotify/use_spotify_mutation.dart';
 
 class TrackMutations {
   const TrackMutations();

lib/services/queries/album.dart

@@ -2,8 +2,8 @@ import 'package:catcher_2/catcher_2.dart';
 import 'package:fl_query/fl_query.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:spotify/spotify.dart';
-import 'package:spotube/hooks/use_spotify_infinite_query.dart';
-import 'package:spotube/hooks/use_spotify_query.dart';
+import 'package:spotube/hooks/spotify/use_spotify_infinite_query.dart';
+import 'package:spotube/hooks/spotify/use_spotify_query.dart';
 import 'package:spotube/provider/user_preferences_provider.dart';
 
 class AlbumQueries {

lib/services/queries/artist.dart

@@ -1,8 +1,8 @@
 import 'package:fl_query/fl_query.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:spotify/spotify.dart';
-import 'package:spotube/hooks/use_spotify_infinite_query.dart';
-import 'package:spotube/hooks/use_spotify_query.dart';
+import 'package:spotube/hooks/spotify/use_spotify_infinite_query.dart';
+import 'package:spotube/hooks/spotify/use_spotify_query.dart';
 
 class ArtistQueries {
   const ArtistQueries();

lib/services/queries/category.dart

@@ -4,7 +4,7 @@ import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:spotify/spotify.dart';
 import 'package:spotube/extensions/context.dart';
-import 'package:spotube/hooks/use_spotify_infinite_query.dart';
+import 'package:spotube/hooks/spotify/use_spotify_infinite_query.dart';
 import 'package:spotube/provider/custom_spotify_endpoint_provider.dart';
 import 'package:spotube/provider/user_preferences_provider.dart';
 

lib/services/queries/lyrics.dart

@@ -6,7 +6,7 @@ import 'package:fl_query_hooks/fl_query_hooks.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:spotify/spotify.dart';
 import 'package:spotube/extensions/map.dart';
-import 'package:spotube/hooks/use_spotify_query.dart';
+import 'package:spotube/hooks/spotify/use_spotify_query.dart';
 import 'package:spotube/models/lyrics.dart';
 import 'package:spotube/services/sourced_track/sourced_track.dart';
 import 'package:spotube/utils/service_utils.dart';

lib/services/queries/playlist.dart

@@ -7,8 +7,8 @@ import 'package:spotify/spotify.dart';
 import 'package:spotube/components/library/playlist_generate/recommendation_attribute_dials.dart';
 import 'package:spotube/extensions/map.dart';
 import 'package:spotube/extensions/track.dart';
-import 'package:spotube/hooks/use_spotify_infinite_query.dart';
-import 'package:spotube/hooks/use_spotify_query.dart';
+import 'package:spotube/hooks/spotify/use_spotify_infinite_query.dart';
+import 'package:spotube/hooks/spotify/use_spotify_query.dart';
 import 'package:spotube/pages/library/playlist_generate/playlist_generate.dart';
 import 'package:spotube/provider/custom_spotify_endpoint_provider.dart';
 import 'package:spotube/provider/user_preferences_provider.dart';
@@ -143,6 +143,29 @@ class PlaylistQueries {
     );
   }
 
+  Query<List<PlaylistSimple>, dynamic> ofMineAll(WidgetRef ref) {
+    return useSpotifyQuery<List<PlaylistSimple>, dynamic>(
+      "current-user-all-playlists",
+      (spotify) async {
+        var page = await spotify.playlists.me.getPage(50);
+        final playlists = <PlaylistSimple>[];
+
+        if (page.isLast == true) {
+          return page.items?.toList() ?? [];
+        }
+
+        playlists.addAll(page.items ?? []);
+        while (!page.isLast) {
+          page = await spotify.playlists.me.getPage(50, page.nextOffset);
+          playlists.addAll(page.items ?? []);
+        }
+
+        return playlists;
+      },
+      ref: ref,
+    );
+  }
+
   Future<List<Track>> likedTracks(
     SpotifyApi spotify,
     WidgetRef ref,

lib/services/queries/search.dart

@@ -1,7 +1,7 @@
 import 'package:fl_query/fl_query.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:spotify/spotify.dart';
-import 'package:spotube/hooks/use_spotify_infinite_query.dart';
+import 'package:spotube/hooks/spotify/use_spotify_infinite_query.dart';
 
 class SearchQueries {
   const SearchQueries();

lib/services/queries/user.dart

@@ -2,7 +2,7 @@ import 'package:fl_query/fl_query.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:spotify/spotify.dart';
-import 'package:spotube/hooks/use_spotify_query.dart';
+import 'package:spotube/hooks/spotify/use_spotify_query.dart';
 import 'package:spotube/provider/authentication_provider.dart';
 import 'package:spotube/utils/type_conversion_utils.dart';