feat: rename files to snake_case and reorganize folder structure

KRTirtho · Dec 8, 2022 · 7c25e1c · 7c25e1c
1 parent 3925f74
commit 7c25e1c
Show file tree

Hide file tree

Showing 115 changed files with 505 additions and 502 deletions.
diff --git a/lib/models/LocalStorageKeys.dart → lib/collections/cache_keys.dart b/lib/models/LocalStorageKeys.dart → lib/collections/cache_keys.dart
diff --git a/lib/models/Intents.dart → lib/collections/intents.dart b/lib/models/Intents.dart → lib/collections/intents.dart
@@ -4,10 +4,10 @@ import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
 import 'package:spotify/spotify.dart';
-import 'package:spotube/components/Player/PlayerControls.dart';
-import 'package:spotube/models/GoRouteDeclarations.dart';
-import 'package:spotube/models/Logger.dart';
-import 'package:spotube/provider/Playback.dart';
+import 'package:spotube/components/player/player_controls.dart';
+import 'package:spotube/collections/routes.dart';
+import 'package:spotube/models/logger.dart';
+import 'package:spotube/provider/playback_provider.dart';
 import 'package:spotube/utils/platform.dart';
 
 class PlayPauseIntent extends Intent {

diff --git a/lib/models/GoRouteDeclarations.dart → lib/collections/routes.dart b/lib/models/GoRouteDeclarations.dart → lib/collections/routes.dart
@@ -1,21 +1,21 @@
 import 'package:flutter/widgets.dart';
 import 'package:go_router/go_router.dart';
 import 'package:spotify/spotify.dart' hide Search;
-import 'package:spotube/components/Album/AlbumView.dart';
-import 'package:spotube/components/Artist/ArtistProfile.dart';
-import 'package:spotube/components/Home/Genres.dart';
-import 'package:spotube/components/Home/Shell.dart';
-import 'package:spotube/components/Library/UserLibrary.dart';
-import 'package:spotube/components/Login/LoginTutorial.dart';
-import 'package:spotube/components/Login/TokenLogin.dart';
-import 'package:spotube/components/Lyrics/Lyrics.dart';
-import 'package:spotube/components/Player/PlayerView.dart';
-import 'package:spotube/components/Playlist/PlaylistView.dart';
-import 'package:spotube/components/Search/Search.dart';
-import 'package:spotube/components/Settings/Settings.dart';
-import 'package:spotube/components/Shared/SpotubePageRoute.dart';
+import 'package:spotube/pages/album/album.dart';
+import 'package:spotube/pages/artist/artist.dart';
+import 'package:spotube/pages/genre/genres.dart';
+import 'package:spotube/pages/library/library.dart';
+import 'package:spotube/pages/desktop_login/login_tutorial.dart';
+import 'package:spotube/pages/desktop_login/desktop_login.dart';
+import 'package:spotube/pages/lyrics/lyrics.dart';
+import 'package:spotube/pages/player/player.dart';
+import 'package:spotube/pages/playlist/playlist.dart';
+import 'package:spotube/pages/root/root_app.dart';
+import 'package:spotube/pages/search/search.dart';
+import 'package:spotube/components/shared/spotube_page_route.dart';
+import 'package:spotube/pages/settings/settings.dart';
 import 'package:spotube/utils/platform.dart';
-import 'package:spotube/components/Login/WebViewLogin.dart';
+import 'package:spotube/pages/mobile_login/mobile_login.dart';
 
 final rootNavigatorKey = GlobalKey<NavigatorState>();
 final shellRouteNavigatorKey = GlobalKey<NavigatorState>();
@@ -24,46 +24,49 @@ final router = GoRouter(
   routes: [
     ShellRoute(
       navigatorKey: shellRouteNavigatorKey,
-      builder: (context, state, child) => Shell(child: child),
+      builder: (context, state, child) => RootApp(child: child),
       routes: [
         GoRoute(
           path: "/",
-          pageBuilder: (context, state) => SpotubePage(child: const Genres()),
+          pageBuilder: (context, state) =>
+              SpotubePage(child: const GenrePage()),
         ),
         GoRoute(
           path: "/search",
           name: "Search",
-          pageBuilder: (context, state) => SpotubePage(child: const Search()),
+          pageBuilder: (context, state) =>
+              SpotubePage(child: const SearchPage()),
         ),
         GoRoute(
           path: "/library",
           name: "Library",
           pageBuilder: (context, state) =>
-              SpotubePage(child: const UserLibrary()),
+              SpotubePage(child: const LibraryPage()),
         ),
         GoRoute(
           path: "/lyrics",
           name: "Lyrics",
-          pageBuilder: (context, state) => SpotubePage(child: const Lyrics()),
+          pageBuilder: (context, state) =>
+              SpotubePage(child: const LyricsPage()),
         ),
         GoRoute(
           path: "/settings",
           pageBuilder: (context, state) => SpotubePage(
-            child: const Settings(),
+            child: const SettingsPage(),
           ),
         ),
         GoRoute(
           path: "/album/:id",
           pageBuilder: (context, state) {
             assert(state.extra is AlbumSimple);
-            return SpotubePage(child: AlbumView(state.extra as AlbumSimple));
+            return SpotubePage(child: AlbumPage(state.extra as AlbumSimple));
           },
         ),
         GoRoute(
           path: "/artist/:id",
           pageBuilder: (context, state) {
             assert(state.params["id"] != null);
-            return SpotubePage(child: ArtistProfile(state.params["id"]!));
+            return SpotubePage(child: ArtistPage(state.params["id"]!));
           },
         ),
         GoRoute(
@@ -81,7 +84,7 @@ final router = GoRouter(
       path: "/login",
       parentNavigatorKey: rootNavigatorKey,
       pageBuilder: (context, state) => SpotubePage(
-        child: kIsMobile ? const WebViewLogin() : const TokenLogin(),
+        child: kIsMobile ? const WebViewLogin() : const DesktopLoginPage(),
       ),
     ),
     GoRoute(

diff --git a/lib/models/sideBarTiles.dart → lib/collections/side_bar_tiles.dart b/lib/models/sideBarTiles.dart → lib/collections/side_bar_tiles.dart
diff --git a/lib/models/SpotifyMarkets.dart → lib/collections/spotify_markets.dart b/lib/models/SpotifyMarkets.dart → lib/collections/spotify_markets.dart
diff --git a/lib/components/Album/AlbumCard.dart → lib/components/album/album_card.dart b/lib/components/Album/AlbumCard.dart → lib/components/album/album_card.dart
@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:spotify/spotify.dart';
-import 'package:spotube/components/Shared/PlaybuttonCard.dart';
-import 'package:spotube/hooks/useBreakpointValue.dart';
-import 'package:spotube/models/CurrentPlaylist.dart';
-import 'package:spotube/provider/Playback.dart';
-import 'package:spotube/provider/SpotifyDI.dart';
+import 'package:spotube/components/shared/playbutton_card.dart';
+import 'package:spotube/hooks/use_breakpoint_value.dart';
+import 'package:spotube/models/current_playlist.dart';
+import 'package:spotube/provider/playback_provider.dart';
+import 'package:spotube/provider/spotify_provider.dart';
 import 'package:spotube/utils/service_utils.dart';
 import 'package:spotube/utils/type_conversion_utils.dart';
 

diff --git a/lib/components/Artist/ArtistAlbumList.dart → lib/components/artist/artist_album_list.dart b/lib/components/Artist/ArtistAlbumList.dart → lib/components/artist/artist_album_list.dart
@@ -4,11 +4,11 @@ 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/Album/AlbumCard.dart';
-import 'package:spotube/components/LoaderShimmers/ShimmerPlaybuttonCard.dart';
-import 'package:spotube/components/Shared/Waypoint.dart';
-import 'package:spotube/models/Logger.dart';
-import 'package:spotube/provider/SpotifyDI.dart';
+import 'package:spotube/components/album/album_card.dart';
+import 'package:spotube/components/shared/shimmers/shimmer_playbutton_card.dart';
+import 'package:spotube/components/shared/waypoint.dart';
+import 'package:spotube/models/logger.dart';
+import 'package:spotube/provider/spotify_provider.dart';
 import 'package:spotube/provider/SpotifyRequests.dart';
 
 class ArtistAlbumList extends HookConsumerWidget {

diff --git a/lib/components/Artist/ArtistCard.dart → lib/components/artist/artist_card.dart b/lib/components/Artist/ArtistCard.dart → lib/components/artist/artist_card.dart
@@ -4,9 +4,9 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:platform_ui/platform_ui.dart';
 import 'package:spotify/spotify.dart';
-import 'package:spotube/components/Shared/HoverBuilder.dart';
-import 'package:spotube/components/Shared/UniversalImage.dart';
-import 'package:spotube/hooks/usePlatformProperty.dart';
+import 'package:spotube/components/shared/hover_builder.dart';
+import 'package:spotube/components/shared/image/universal_image.dart';
+import 'package:spotube/hooks/use_platform_property.dart';
 import 'package:spotube/utils/service_utils.dart';
 import 'package:spotube/utils/type_conversion_utils.dart';
 

diff --git a/lib/components/Login/TokenLoginForms.dart → lib/components/desktop_login/login_form.dart b/lib/components/Login/TokenLoginForms.dart → lib/components/desktop_login/login_form.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:platform_ui/platform_ui.dart';
-import 'package:spotube/provider/Auth.dart';
+import 'package:spotube/provider/auth_provider.dart';
 import 'package:spotube/utils/service_utils.dart';
 
 class TokenLoginForm extends HookConsumerWidget {

diff --git a/lib/components/Category/CategoryCard.dart → lib/components/genre/category_card.dart b/lib/components/Category/CategoryCard.dart → lib/components/genre/category_card.dart
@@ -5,11 +5,11 @@ import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:platform_ui/platform_ui.dart';
 import 'package:spotify/spotify.dart';
-import 'package:spotube/components/LoaderShimmers/ShimmerPlaybuttonCard.dart';
-import 'package:spotube/components/Playlist/PlaylistCard.dart';
-import 'package:spotube/components/Shared/Waypoint.dart';
-import 'package:spotube/models/Logger.dart';
-import 'package:spotube/provider/SpotifyDI.dart';
+import 'package:spotube/components/shared/shimmers/shimmer_playbutton_card.dart';
+import 'package:spotube/components/shared/waypoint.dart';
+import 'package:spotube/components/playlist/playlist_card.dart';
+import 'package:spotube/models/logger.dart';
+import 'package:spotube/provider/spotify_provider.dart';
 import 'package:spotube/provider/SpotifyRequests.dart';
 
 class CategoryCard extends HookConsumerWidget {

diff --git a/lib/components/Library/UserAlbums.dart → lib/components/library/user_albums.dart b/lib/components/Library/UserAlbums.dart → lib/components/library/user_albums.dart
@@ -2,11 +2,11 @@ import 'package:fl_query_hooks/fl_query_hooks.dart';
 import 'package:flutter/material.dart' hide Image;
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:platform_ui/platform_ui.dart';
-import 'package:spotube/components/Album/AlbumCard.dart';
-import 'package:spotube/components/LoaderShimmers/ShimmerPlaybuttonCard.dart';
-import 'package:spotube/components/Shared/AnonymousFallback.dart';
-import 'package:spotube/provider/Auth.dart';
-import 'package:spotube/provider/SpotifyDI.dart';
+import 'package:spotube/components/album/album_card.dart';
+import 'package:spotube/components/shared/shimmers/shimmer_playbutton_card.dart';
+import 'package:spotube/components/shared/fallbacks/anonymous_fallback.dart';
+import 'package:spotube/provider/auth_provider.dart';
+import 'package:spotube/provider/spotify_provider.dart';
 import 'package:spotube/provider/SpotifyRequests.dart';
 import 'package:spotube/utils/type_conversion_utils.dart';
 

diff --git a/lib/components/Library/UserArtists.dart → lib/components/library/user_artists.dart b/lib/components/Library/UserArtists.dart → lib/components/library/user_artists.dart
@@ -4,11 +4,11 @@ import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:platform_ui/platform_ui.dart';
 import 'package:spotify/spotify.dart';
-import 'package:spotube/components/Artist/ArtistCard.dart';
-import 'package:spotube/components/Shared/AnonymousFallback.dart';
-import 'package:spotube/components/Shared/Waypoint.dart';
-import 'package:spotube/provider/Auth.dart';
-import 'package:spotube/provider/SpotifyDI.dart';
+import 'package:spotube/components/shared/fallbacks/anonymous_fallback.dart';
+import 'package:spotube/components/shared/waypoint.dart';
+import 'package:spotube/components/artist/artist_card.dart';
+import 'package:spotube/provider/auth_provider.dart';
+import 'package:spotube/provider/spotify_provider.dart';
 import 'package:spotube/provider/SpotifyRequests.dart';
 
 class UserArtists extends HookConsumerWidget {

diff --git a/lib/components/Library/UserDownloads.dart → lib/components/library/user_downloads.dart b/lib/components/Library/UserDownloads.dart → lib/components/library/user_downloads.dart
@@ -3,8 +3,8 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:platform_ui/platform_ui.dart';
 import 'package:spotify/spotify.dart';
-import 'package:spotube/components/Shared/UniversalImage.dart';
-import 'package:spotube/provider/Downloader.dart';
+import 'package:spotube/components/shared/image/universal_image.dart';
+import 'package:spotube/provider/downloader_provider.dart';
 import 'package:spotube/utils/type_conversion_utils.dart';
 
 class UserDownloads extends HookConsumerWidget {

diff --git a/lib/components/Library/UserLocalTracks.dart → ...components/library/user_local_tracks.dart b/lib/components/Library/UserLocalTracks.dart → ...components/library/user_local_tracks.dart
@@ -11,14 +11,14 @@ import 'package:path_provider/path_provider.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:platform_ui/platform_ui.dart';
 import 'package:spotify/spotify.dart';
-import 'package:spotube/components/LoaderShimmers/ShimmerTrackTile.dart';
-import 'package:spotube/components/Shared/SortTracksDropdown.dart';
-import 'package:spotube/components/Shared/TrackTile.dart';
-import 'package:spotube/hooks/useAsyncEffect.dart';
-import 'package:spotube/models/CurrentPlaylist.dart';
-import 'package:spotube/models/Logger.dart';
-import 'package:spotube/provider/Playback.dart';
-import 'package:spotube/provider/UserPreferences.dart';
+import 'package:spotube/components/shared/shimmers/shimmer_track_tile.dart';
+import 'package:spotube/components/shared/sort_tracks_dropdown.dart';
+import 'package:spotube/components/shared/track_table/track_tile.dart';
+import 'package:spotube/hooks/use_async_effect.dart';
+import 'package:spotube/models/current_playlist.dart';
+import 'package:spotube/models/logger.dart';
+import 'package:spotube/provider/playback_provider.dart';
+import 'package:spotube/provider/user_preferences_provider.dart';
 import 'package:spotube/utils/platform.dart';
 import 'package:spotube/utils/primitive_utils.dart';
 import 'package:spotube/utils/service_utils.dart';

diff --git a/lib/components/Library/UserPlaylists.dart → lib/components/library/user_playlists.dart b/lib/components/Library/UserPlaylists.dart → lib/components/library/user_playlists.dart
@@ -3,12 +3,12 @@ import 'package:flutter/material.dart' hide Image;
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:platform_ui/platform_ui.dart';
 import 'package:spotify/spotify.dart';
-import 'package:spotube/components/LoaderShimmers/ShimmerPlaybuttonCard.dart';
-import 'package:spotube/components/Playlist/PlaylistCard.dart';
-import 'package:spotube/components/Playlist/PlaylistCreateDialog.dart';
-import 'package:spotube/components/Shared/AnonymousFallback.dart';
-import 'package:spotube/provider/Auth.dart';
-import 'package:spotube/provider/SpotifyDI.dart';
+import 'package:spotube/components/shared/shimmers/shimmer_playbutton_card.dart';
+import 'package:spotube/components/shared/fallbacks/anonymous_fallback.dart';
+import 'package:spotube/components/playlist/playlist_card.dart';
+import 'package:spotube/components/playlist/playlist_create_dialog.dart';
+import 'package:spotube/provider/auth_provider.dart';
+import 'package:spotube/provider/spotify_provider.dart';
 import 'package:spotube/provider/SpotifyRequests.dart';
 
 class UserPlaylists extends HookConsumerWidget {

diff --git a/...onents/Lyrics/LyricDelayAdjustDialog.dart → ...nts/lyrics/lyric_delay_adjust_dialog.dart b/...onents/Lyrics/LyricDelayAdjustDialog.dart → ...nts/lyrics/lyric_delay_adjust_dialog.dart
@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:platform_ui/platform_ui.dart';
-import 'package:spotube/components/Home/Sidebar.dart';
-import 'package:spotube/components/Lyrics/SyncedLyrics.dart';
+import 'package:spotube/components/root/sidebar.dart';
+import 'package:spotube/pages/lyrics/synced_lyrics.dart';
 
 class LyricDelayAdjustDialog extends HookConsumerWidget {
   const LyricDelayAdjustDialog({Key? key}) : super(key: key);

diff --git a/lib/components/Player/PlayerActions.dart → lib/components/player/player_actions.dart b/lib/components/Player/PlayerActions.dart → lib/components/player/player_actions.dart
@@ -4,13 +4,13 @@ import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:platform_ui/platform_ui.dart';
 import 'package:spotify/spotify.dart';
-import 'package:spotube/components/Library/UserLocalTracks.dart';
-import 'package:spotube/components/Player/PlayerQueue.dart';
-import 'package:spotube/components/Player/SiblingTracksSheet.dart';
-import 'package:spotube/components/Shared/HeartButton.dart';
-import 'package:spotube/models/Logger.dart';
-import 'package:spotube/provider/Downloader.dart';
-import 'package:spotube/provider/Playback.dart';
+import 'package:spotube/components/library/user_local_tracks.dart';
+import 'package:spotube/components/player/player_queue.dart';
+import 'package:spotube/components/player/sibling_tracks_sheet.dart';
+import 'package:spotube/components/shared/heart_button.dart';
+import 'package:spotube/models/logger.dart';
+import 'package:spotube/provider/downloader_provider.dart';
+import 'package:spotube/provider/playback_provider.dart';
 import 'package:spotube/utils/type_conversion_utils.dart';
 
 class PlayerActions extends HookConsumerWidget {

diff --git a/lib/components/Player/PlayerControls.dart → lib/components/player/player_controls.dart b/lib/components/Player/PlayerControls.dart → lib/components/player/player_controls.dart
@@ -3,10 +3,10 @@ import 'package:flutter/services.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:platform_ui/platform_ui.dart';
-import 'package:spotube/hooks/playback.dart';
-import 'package:spotube/models/Intents.dart';
-import 'package:spotube/models/Logger.dart';
-import 'package:spotube/provider/Playback.dart';
+import 'package:spotube/hooks/playback_hooks.dart';
+import 'package:spotube/collections/intents.dart';
+import 'package:spotube/models/logger.dart';
+import 'package:spotube/provider/playback_provider.dart';
 import 'package:spotube/utils/primitive_utils.dart';
 
 class PlayerControls extends HookConsumerWidget {

diff --git a/lib/components/Player/PlayerOverlay.dart → lib/components/player/player_overlay.dart b/lib/components/Player/PlayerOverlay.dart → lib/components/player/player_overlay.dart
@@ -4,11 +4,11 @@ import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:platform_ui/platform_ui.dart';
-import 'package:spotube/components/Player/PlayerTrackDetails.dart';
-import 'package:spotube/hooks/playback.dart';
-import 'package:spotube/hooks/usePaletteColor.dart';
-import 'package:spotube/models/Intents.dart';
-import 'package:spotube/provider/Playback.dart';
+import 'package:spotube/components/player/player_track_details.dart';
+import 'package:spotube/hooks/playback_hooks.dart';
+import 'package:spotube/hooks/use_palette_color.dart';
+import 'package:spotube/collections/intents.dart';
+import 'package:spotube/provider/playback_provider.dart';
 import 'package:spotube/utils/service_utils.dart';
 
 class PlayerOverlay extends HookConsumerWidget {

diff --git a/lib/components/Player/PlayerQueue.dart → lib/components/player/player_queue.dart b/lib/components/Player/PlayerQueue.dart → lib/components/player/player_queue.dart
@@ -5,10 +5,10 @@ import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:platform_ui/platform_ui.dart';
 import 'package:scroll_to_index/scroll_to_index.dart';
-import 'package:spotube/components/Shared/NotFound.dart';
-import 'package:spotube/components/Shared/TrackTile.dart';
-import 'package:spotube/hooks/useAutoScrollController.dart';
-import 'package:spotube/provider/Playback.dart';
+import 'package:spotube/components/shared/fallbacks/not_found.dart';
+import 'package:spotube/components/shared/track_table/track_tile.dart';
+import 'package:spotube/hooks/use_auto_scroll_controller.dart';
+import 'package:spotube/provider/playback_provider.dart';
 import 'package:spotube/utils/primitive_utils.dart';
 
 class PlayerQueue extends HookConsumerWidget {

diff --git a/...components/Player/PlayerTrackDetails.dart → ...mponents/player/player_track_details.dart b/...components/Player/PlayerTrackDetails.dart → ...mponents/player/player_track_details.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:platform_ui/platform_ui.dart';
-import 'package:spotube/components/Shared/UniversalImage.dart';
-import 'package:spotube/hooks/useBreakpoints.dart';
-import 'package:spotube/provider/Playback.dart';
+import 'package:spotube/components/shared/image/universal_image.dart';
+import 'package:spotube/hooks/use_breakpoints.dart';
+import 'package:spotube/provider/playback_provider.dart';
 import 'package:spotube/utils/type_conversion_utils.dart';
 
 class PlayerTrackDetails extends HookConsumerWidget {

diff --git a/...components/Player/SiblingTracksSheet.dart → ...mponents/player/sibling_tracks_sheet.dart b/...components/Player/SiblingTracksSheet.dart → ...mponents/player/sibling_tracks_sheet.dart
@@ -4,8 +4,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:platform_ui/platform_ui.dart';
-import 'package:spotube/components/Shared/UniversalImage.dart';
-import 'package:spotube/provider/Playback.dart';
+import 'package:spotube/components/shared/image/universal_image.dart';
+import 'package:spotube/provider/playback_provider.dart';
 import 'package:spotube/utils/primitive_utils.dart';
 
 class SiblingTracksSheet extends HookConsumerWidget {

diff --git a/lib/components/Playlist/PlaylistCard.dart → lib/components/playlist/playlist_card.dart b/lib/components/Playlist/PlaylistCard.dart → lib/components/playlist/playlist_card.dart
@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:spotify/spotify.dart';
-import 'package:spotube/components/Shared/PlaybuttonCard.dart';
-import 'package:spotube/hooks/useBreakpointValue.dart';
-import 'package:spotube/models/CurrentPlaylist.dart';
-import 'package:spotube/provider/Playback.dart';
-import 'package:spotube/provider/SpotifyDI.dart';
+import 'package:spotube/components/shared/playbutton_card.dart';
+import 'package:spotube/hooks/use_breakpoint_value.dart';
+import 'package:spotube/models/current_playlist.dart';
+import 'package:spotube/provider/playback_provider.dart';
+import 'package:spotube/provider/spotify_provider.dart';
 import 'package:spotube/utils/service_utils.dart';
 import 'package:spotube/utils/type_conversion_utils.dart';