From 1eb0b5f8475a6ee9e9a07f03ff032ecb2e3c5b52 Mon Sep 17 00:00:00 2001 From: Kingkor Roy Tirtho Date: Thu, 19 Jun 2025 15:01:58 +0600 Subject: [PATCH] chore: uncomment important lines of code --- lib/collections/routes.dart | 16 - lib/collections/routes.gr.dart | 638 +++++++------------ lib/components/track_tile/track_options.dart | 6 +- lib/modules/stats/common/playlist_item.dart | 4 +- lib/pages/album/album.dart | 5 +- lib/pages/track/track.dart | 22 +- lib/provider/lyrics/synced.dart | 47 -- 7 files changed, 266 insertions(+), 472 deletions(-) diff --git a/lib/collections/routes.dart b/lib/collections/routes.dart index 2c1ad8ad..526da1c9 100644 --- a/lib/collections/routes.dart +++ b/lib/collections/routes.dart @@ -39,14 +39,6 @@ class AppRouter extends RootStackRouter { ), ], ), - AutoRoute( - path: "home/genres", - page: GenreRoute.page, - ), - AutoRoute( - path: "home/genre/:categoryId", - page: GenrePlaylistsRoute.page, - ), AutoRoute( path: "home/sections/:sectionId", page: HomeBrowseSectionItemsRoute.page, @@ -86,14 +78,6 @@ class AppRouter extends RootStackRouter { page: LocalLibraryRoute.page, // parentNavigatorKey: shellRouteNavigatorKey, ), - AutoRoute( - path: "library/generate", - page: PlaylistGeneratorRoute.page, - ), - AutoRoute( - path: "library/generate/result", - page: PlaylistGenerateResultRoute.page, - ), AutoRoute( path: "lyrics", page: LyricsRoute.page, diff --git a/lib/collections/routes.gr.dart b/lib/collections/routes.gr.dart index c97e4ce9..a3746de1 100644 --- a/lib/collections/routes.gr.dart +++ b/lib/collections/routes.gr.dart @@ -8,64 +8,56 @@ // coverage:ignore-file // ignore_for_file: no_leading_underscores_for_library_prefixes -import 'package:auto_route/auto_route.dart' as _i44; -import 'package:flutter/material.dart' as _i45; -import 'package:shadcn_flutter/shadcn_flutter.dart' as _i48; -import 'package:spotify/spotify.dart' as _i47; -import 'package:spotube/models/metadata/metadata.dart' as _i46; -import 'package:spotube/models/spotify/recommendation_seeds.dart' as _i49; +import 'package:auto_route/auto_route.dart' as _i40; +import 'package:flutter/material.dart' as _i41; +import 'package:shadcn_flutter/shadcn_flutter.dart' as _i43; +import 'package:spotube/models/metadata/metadata.dart' as _i42; import 'package:spotube/pages/album/album.dart' as _i2; import 'package:spotube/pages/artist/artist.dart' as _i3; import 'package:spotube/pages/connect/connect.dart' as _i6; import 'package:spotube/pages/connect/control/control.dart' as _i5; -import 'package:spotube/pages/getting_started/getting_started.dart' as _i9; -import 'package:spotube/pages/home/genres/genre_playlists.dart' as _i8; -import 'package:spotube/pages/home/genres/genres.dart' as _i7; -import 'package:spotube/pages/home/home.dart' as _i11; -import 'package:spotube/pages/home/sections/section_items.dart' as _i10; -import 'package:spotube/pages/lastfm_login/lastfm_login.dart' as _i12; -import 'package:spotube/pages/library/library.dart' as _i13; -import 'package:spotube/pages/library/playlist_generate/playlist_generate.dart' - as _i23; -import 'package:spotube/pages/library/playlist_generate/playlist_generate_result.dart' - as _i22; -import 'package:spotube/pages/library/user_albums.dart' as _i38; -import 'package:spotube/pages/library/user_artists.dart' as _i39; -import 'package:spotube/pages/library/user_downloads.dart' as _i40; +import 'package:spotube/pages/getting_started/getting_started.dart' as _i7; +import 'package:spotube/pages/home/home.dart' as _i9; +import 'package:spotube/pages/home/sections/section_items.dart' as _i8; +import 'package:spotube/pages/lastfm_login/lastfm_login.dart' as _i10; +import 'package:spotube/pages/library/library.dart' as _i11; +import 'package:spotube/pages/library/user_albums.dart' as _i34; +import 'package:spotube/pages/library/user_artists.dart' as _i35; +import 'package:spotube/pages/library/user_downloads.dart' as _i36; import 'package:spotube/pages/library/user_local_tracks/local_folder.dart' - as _i15; + as _i13; import 'package:spotube/pages/library/user_local_tracks/user_local_tracks.dart' - as _i41; -import 'package:spotube/pages/library/user_playlists.dart' as _i42; -import 'package:spotube/pages/lyrics/lyrics.dart' as _i17; -import 'package:spotube/pages/lyrics/mini_lyrics.dart' as _i18; -import 'package:spotube/pages/mobile_login/mobile_login.dart' as _i43; -import 'package:spotube/pages/player/lyrics.dart' as _i19; -import 'package:spotube/pages/player/queue.dart' as _i20; -import 'package:spotube/pages/player/sources.dart' as _i21; -import 'package:spotube/pages/playlist/liked_playlist.dart' as _i14; -import 'package:spotube/pages/playlist/playlist.dart' as _i24; -import 'package:spotube/pages/profile/profile.dart' as _i25; -import 'package:spotube/pages/root/root_app.dart' as _i26; -import 'package:spotube/pages/search/search.dart' as _i27; + as _i37; +import 'package:spotube/pages/library/user_playlists.dart' as _i38; +import 'package:spotube/pages/lyrics/lyrics.dart' as _i15; +import 'package:spotube/pages/lyrics/mini_lyrics.dart' as _i16; +import 'package:spotube/pages/mobile_login/mobile_login.dart' as _i39; +import 'package:spotube/pages/player/lyrics.dart' as _i17; +import 'package:spotube/pages/player/queue.dart' as _i18; +import 'package:spotube/pages/player/sources.dart' as _i19; +import 'package:spotube/pages/playlist/liked_playlist.dart' as _i12; +import 'package:spotube/pages/playlist/playlist.dart' as _i20; +import 'package:spotube/pages/profile/profile.dart' as _i21; +import 'package:spotube/pages/root/root_app.dart' as _i22; +import 'package:spotube/pages/search/search.dart' as _i23; import 'package:spotube/pages/settings/about.dart' as _i1; import 'package:spotube/pages/settings/blacklist.dart' as _i4; -import 'package:spotube/pages/settings/logs.dart' as _i16; -import 'package:spotube/pages/settings/metadata_plugins.dart' as _i28; -import 'package:spotube/pages/settings/settings.dart' as _i29; -import 'package:spotube/pages/stats/albums/albums.dart' as _i30; -import 'package:spotube/pages/stats/artists/artists.dart' as _i31; -import 'package:spotube/pages/stats/fees/fees.dart' as _i35; -import 'package:spotube/pages/stats/minutes/minutes.dart' as _i32; -import 'package:spotube/pages/stats/playlists/playlists.dart' as _i34; -import 'package:spotube/pages/stats/stats.dart' as _i33; -import 'package:spotube/pages/stats/streams/streams.dart' as _i36; -import 'package:spotube/pages/track/track.dart' as _i37; +import 'package:spotube/pages/settings/logs.dart' as _i14; +import 'package:spotube/pages/settings/metadata_plugins.dart' as _i24; +import 'package:spotube/pages/settings/settings.dart' as _i25; +import 'package:spotube/pages/stats/albums/albums.dart' as _i26; +import 'package:spotube/pages/stats/artists/artists.dart' as _i27; +import 'package:spotube/pages/stats/fees/fees.dart' as _i31; +import 'package:spotube/pages/stats/minutes/minutes.dart' as _i28; +import 'package:spotube/pages/stats/playlists/playlists.dart' as _i30; +import 'package:spotube/pages/stats/stats.dart' as _i29; +import 'package:spotube/pages/stats/streams/streams.dart' as _i32; +import 'package:spotube/pages/track/track.dart' as _i33; /// generated route for /// [_i1.AboutSpotubePage] -class AboutSpotubeRoute extends _i44.PageRouteInfo { - const AboutSpotubeRoute({List<_i44.PageRouteInfo>? children}) +class AboutSpotubeRoute extends _i40.PageRouteInfo { + const AboutSpotubeRoute({List<_i40.PageRouteInfo>? children}) : super( AboutSpotubeRoute.name, initialChildren: children, @@ -73,7 +65,7 @@ class AboutSpotubeRoute extends _i44.PageRouteInfo { static const String name = 'AboutSpotubeRoute'; - static _i44.PageInfo page = _i44.PageInfo( + static _i40.PageInfo page = _i40.PageInfo( name, builder: (data) { return const _i1.AboutSpotubePage(); @@ -83,12 +75,12 @@ class AboutSpotubeRoute extends _i44.PageRouteInfo { /// generated route for /// [_i2.AlbumPage] -class AlbumRoute extends _i44.PageRouteInfo { +class AlbumRoute extends _i40.PageRouteInfo { AlbumRoute({ - _i45.Key? key, + _i41.Key? key, required String id, - required _i46.SpotubeSimpleAlbumObject album, - List<_i44.PageRouteInfo>? children, + required _i42.SpotubeSimpleAlbumObject album, + List<_i40.PageRouteInfo>? children, }) : super( AlbumRoute.name, args: AlbumRouteArgs( @@ -102,7 +94,7 @@ class AlbumRoute extends _i44.PageRouteInfo { static const String name = 'AlbumRoute'; - static _i44.PageInfo page = _i44.PageInfo( + static _i40.PageInfo page = _i40.PageInfo( name, builder: (data) { final args = data.argsAs(); @@ -122,11 +114,11 @@ class AlbumRouteArgs { required this.album, }); - final _i45.Key? key; + final _i41.Key? key; final String id; - final _i46.SpotubeSimpleAlbumObject album; + final _i42.SpotubeSimpleAlbumObject album; @override String toString() { @@ -136,11 +128,11 @@ class AlbumRouteArgs { /// generated route for /// [_i3.ArtistPage] -class ArtistRoute extends _i44.PageRouteInfo { +class ArtistRoute extends _i40.PageRouteInfo { ArtistRoute({ required String artistId, - _i45.Key? key, - List<_i44.PageRouteInfo>? children, + _i41.Key? key, + List<_i40.PageRouteInfo>? children, }) : super( ArtistRoute.name, args: ArtistRouteArgs( @@ -153,7 +145,7 @@ class ArtistRoute extends _i44.PageRouteInfo { static const String name = 'ArtistRoute'; - static _i44.PageInfo page = _i44.PageInfo( + static _i40.PageInfo page = _i40.PageInfo( name, builder: (data) { final pathParams = data.inheritedPathParams; @@ -175,7 +167,7 @@ class ArtistRouteArgs { final String artistId; - final _i45.Key? key; + final _i41.Key? key; @override String toString() { @@ -185,8 +177,8 @@ class ArtistRouteArgs { /// generated route for /// [_i4.BlackListPage] -class BlackListRoute extends _i44.PageRouteInfo { - const BlackListRoute({List<_i44.PageRouteInfo>? children}) +class BlackListRoute extends _i40.PageRouteInfo { + const BlackListRoute({List<_i40.PageRouteInfo>? children}) : super( BlackListRoute.name, initialChildren: children, @@ -194,7 +186,7 @@ class BlackListRoute extends _i44.PageRouteInfo { static const String name = 'BlackListRoute'; - static _i44.PageInfo page = _i44.PageInfo( + static _i40.PageInfo page = _i40.PageInfo( name, builder: (data) { return const _i4.BlackListPage(); @@ -204,8 +196,8 @@ class BlackListRoute extends _i44.PageRouteInfo { /// generated route for /// [_i5.ConnectControlPage] -class ConnectControlRoute extends _i44.PageRouteInfo { - const ConnectControlRoute({List<_i44.PageRouteInfo>? children}) +class ConnectControlRoute extends _i40.PageRouteInfo { + const ConnectControlRoute({List<_i40.PageRouteInfo>? children}) : super( ConnectControlRoute.name, initialChildren: children, @@ -213,7 +205,7 @@ class ConnectControlRoute extends _i44.PageRouteInfo { static const String name = 'ConnectControlRoute'; - static _i44.PageInfo page = _i44.PageInfo( + static _i40.PageInfo page = _i40.PageInfo( name, builder: (data) { return const _i5.ConnectControlPage(); @@ -223,8 +215,8 @@ class ConnectControlRoute extends _i44.PageRouteInfo { /// generated route for /// [_i6.ConnectPage] -class ConnectRoute extends _i44.PageRouteInfo { - const ConnectRoute({List<_i44.PageRouteInfo>? children}) +class ConnectRoute extends _i40.PageRouteInfo { + const ConnectRoute({List<_i40.PageRouteInfo>? children}) : super( ConnectRoute.name, initialChildren: children, @@ -232,7 +224,7 @@ class ConnectRoute extends _i44.PageRouteInfo { static const String name = 'ConnectRoute'; - static _i44.PageInfo page = _i44.PageInfo( + static _i40.PageInfo page = _i40.PageInfo( name, builder: (data) { return const _i6.ConnectPage(); @@ -241,81 +233,9 @@ class ConnectRoute extends _i44.PageRouteInfo { } /// generated route for -/// [_i7.GenrePage] -class GenreRoute extends _i44.PageRouteInfo { - const GenreRoute({List<_i44.PageRouteInfo>? children}) - : super( - GenreRoute.name, - initialChildren: children, - ); - - static const String name = 'GenreRoute'; - - static _i44.PageInfo page = _i44.PageInfo( - name, - builder: (data) { - return const _i7.GenrePage(); - }, - ); -} - -/// generated route for -/// [_i8.GenrePlaylistsPage] -class GenrePlaylistsRoute extends _i44.PageRouteInfo { - GenrePlaylistsRoute({ - _i45.Key? key, - required String id, - required _i47.Category category, - List<_i44.PageRouteInfo>? children, - }) : super( - GenrePlaylistsRoute.name, - args: GenrePlaylistsRouteArgs( - key: key, - id: id, - category: category, - ), - rawPathParams: {'categoryId': id}, - initialChildren: children, - ); - - static const String name = 'GenrePlaylistsRoute'; - - static _i44.PageInfo page = _i44.PageInfo( - name, - builder: (data) { - final args = data.argsAs(); - return _i8.GenrePlaylistsPage( - key: args.key, - id: args.id, - category: args.category, - ); - }, - ); -} - -class GenrePlaylistsRouteArgs { - const GenrePlaylistsRouteArgs({ - this.key, - required this.id, - required this.category, - }); - - final _i45.Key? key; - - final String id; - - final _i47.Category category; - - @override - String toString() { - return 'GenrePlaylistsRouteArgs{key: $key, id: $id, category: $category}'; - } -} - -/// generated route for -/// [_i9.GettingStartedPage] -class GettingStartedRoute extends _i44.PageRouteInfo { - const GettingStartedRoute({List<_i44.PageRouteInfo>? children}) +/// [_i7.GettingStartedPage] +class GettingStartedRoute extends _i40.PageRouteInfo { + const GettingStartedRoute({List<_i40.PageRouteInfo>? children}) : super( GettingStartedRoute.name, initialChildren: children, @@ -323,23 +243,23 @@ class GettingStartedRoute extends _i44.PageRouteInfo { static const String name = 'GettingStartedRoute'; - static _i44.PageInfo page = _i44.PageInfo( + static _i40.PageInfo page = _i40.PageInfo( name, builder: (data) { - return const _i9.GettingStartedPage(); + return const _i7.GettingStartedPage(); }, ); } /// generated route for -/// [_i10.HomeBrowseSectionItemsPage] +/// [_i8.HomeBrowseSectionItemsPage] class HomeBrowseSectionItemsRoute - extends _i44.PageRouteInfo { + extends _i40.PageRouteInfo { HomeBrowseSectionItemsRoute({ - _i48.Key? key, + _i43.Key? key, required String sectionId, - required _i46.SpotubeBrowseSectionObject section, - List<_i44.PageRouteInfo>? children, + required _i42.SpotubeBrowseSectionObject section, + List<_i40.PageRouteInfo>? children, }) : super( HomeBrowseSectionItemsRoute.name, args: HomeBrowseSectionItemsRouteArgs( @@ -353,11 +273,11 @@ class HomeBrowseSectionItemsRoute static const String name = 'HomeBrowseSectionItemsRoute'; - static _i44.PageInfo page = _i44.PageInfo( + static _i40.PageInfo page = _i40.PageInfo( name, builder: (data) { final args = data.argsAs(); - return _i10.HomeBrowseSectionItemsPage( + return _i8.HomeBrowseSectionItemsPage( key: args.key, sectionId: args.sectionId, section: args.section, @@ -373,11 +293,11 @@ class HomeBrowseSectionItemsRouteArgs { required this.section, }); - final _i48.Key? key; + final _i43.Key? key; final String sectionId; - final _i46.SpotubeBrowseSectionObject section; + final _i42.SpotubeBrowseSectionObject section; @override String toString() { @@ -386,9 +306,9 @@ class HomeBrowseSectionItemsRouteArgs { } /// generated route for -/// [_i11.HomePage] -class HomeRoute extends _i44.PageRouteInfo { - const HomeRoute({List<_i44.PageRouteInfo>? children}) +/// [_i9.HomePage] +class HomeRoute extends _i40.PageRouteInfo { + const HomeRoute({List<_i40.PageRouteInfo>? children}) : super( HomeRoute.name, initialChildren: children, @@ -396,18 +316,18 @@ class HomeRoute extends _i44.PageRouteInfo { static const String name = 'HomeRoute'; - static _i44.PageInfo page = _i44.PageInfo( + static _i40.PageInfo page = _i40.PageInfo( name, builder: (data) { - return const _i11.HomePage(); + return const _i9.HomePage(); }, ); } /// generated route for -/// [_i12.LastFMLoginPage] -class LastFMLoginRoute extends _i44.PageRouteInfo { - const LastFMLoginRoute({List<_i44.PageRouteInfo>? children}) +/// [_i10.LastFMLoginPage] +class LastFMLoginRoute extends _i40.PageRouteInfo { + const LastFMLoginRoute({List<_i40.PageRouteInfo>? children}) : super( LastFMLoginRoute.name, initialChildren: children, @@ -415,18 +335,18 @@ class LastFMLoginRoute extends _i44.PageRouteInfo { static const String name = 'LastFMLoginRoute'; - static _i44.PageInfo page = _i44.PageInfo( + static _i40.PageInfo page = _i40.PageInfo( name, builder: (data) { - return const _i12.LastFMLoginPage(); + return const _i10.LastFMLoginPage(); }, ); } /// generated route for -/// [_i13.LibraryPage] -class LibraryRoute extends _i44.PageRouteInfo { - const LibraryRoute({List<_i44.PageRouteInfo>? children}) +/// [_i11.LibraryPage] +class LibraryRoute extends _i40.PageRouteInfo { + const LibraryRoute({List<_i40.PageRouteInfo>? children}) : super( LibraryRoute.name, initialChildren: children, @@ -434,21 +354,21 @@ class LibraryRoute extends _i44.PageRouteInfo { static const String name = 'LibraryRoute'; - static _i44.PageInfo page = _i44.PageInfo( + static _i40.PageInfo page = _i40.PageInfo( name, builder: (data) { - return const _i13.LibraryPage(); + return const _i11.LibraryPage(); }, ); } /// generated route for -/// [_i14.LikedPlaylistPage] -class LikedPlaylistRoute extends _i44.PageRouteInfo { +/// [_i12.LikedPlaylistPage] +class LikedPlaylistRoute extends _i40.PageRouteInfo { LikedPlaylistRoute({ - _i45.Key? key, - required _i46.SpotubeSimplePlaylistObject playlist, - List<_i44.PageRouteInfo>? children, + _i41.Key? key, + required _i42.SpotubeSimplePlaylistObject playlist, + List<_i40.PageRouteInfo>? children, }) : super( LikedPlaylistRoute.name, args: LikedPlaylistRouteArgs( @@ -460,11 +380,11 @@ class LikedPlaylistRoute extends _i44.PageRouteInfo { static const String name = 'LikedPlaylistRoute'; - static _i44.PageInfo page = _i44.PageInfo( + static _i40.PageInfo page = _i40.PageInfo( name, builder: (data) { final args = data.argsAs(); - return _i14.LikedPlaylistPage( + return _i12.LikedPlaylistPage( key: args.key, playlist: args.playlist, ); @@ -478,9 +398,9 @@ class LikedPlaylistRouteArgs { required this.playlist, }); - final _i45.Key? key; + final _i41.Key? key; - final _i46.SpotubeSimplePlaylistObject playlist; + final _i42.SpotubeSimplePlaylistObject playlist; @override String toString() { @@ -489,14 +409,14 @@ class LikedPlaylistRouteArgs { } /// generated route for -/// [_i15.LocalLibraryPage] -class LocalLibraryRoute extends _i44.PageRouteInfo { +/// [_i13.LocalLibraryPage] +class LocalLibraryRoute extends _i40.PageRouteInfo { LocalLibraryRoute({ required String location, - _i45.Key? key, + _i41.Key? key, bool isDownloads = false, bool isCache = false, - List<_i44.PageRouteInfo>? children, + List<_i40.PageRouteInfo>? children, }) : super( LocalLibraryRoute.name, args: LocalLibraryRouteArgs( @@ -510,11 +430,11 @@ class LocalLibraryRoute extends _i44.PageRouteInfo { static const String name = 'LocalLibraryRoute'; - static _i44.PageInfo page = _i44.PageInfo( + static _i40.PageInfo page = _i40.PageInfo( name, builder: (data) { final args = data.argsAs(); - return _i15.LocalLibraryPage( + return _i13.LocalLibraryPage( args.location, key: args.key, isDownloads: args.isDownloads, @@ -534,7 +454,7 @@ class LocalLibraryRouteArgs { final String location; - final _i45.Key? key; + final _i41.Key? key; final bool isDownloads; @@ -547,9 +467,9 @@ class LocalLibraryRouteArgs { } /// generated route for -/// [_i16.LogsPage] -class LogsRoute extends _i44.PageRouteInfo { - const LogsRoute({List<_i44.PageRouteInfo>? children}) +/// [_i14.LogsPage] +class LogsRoute extends _i40.PageRouteInfo { + const LogsRoute({List<_i40.PageRouteInfo>? children}) : super( LogsRoute.name, initialChildren: children, @@ -557,18 +477,18 @@ class LogsRoute extends _i44.PageRouteInfo { static const String name = 'LogsRoute'; - static _i44.PageInfo page = _i44.PageInfo( + static _i40.PageInfo page = _i40.PageInfo( name, builder: (data) { - return const _i16.LogsPage(); + return const _i14.LogsPage(); }, ); } /// generated route for -/// [_i17.LyricsPage] -class LyricsRoute extends _i44.PageRouteInfo { - const LyricsRoute({List<_i44.PageRouteInfo>? children}) +/// [_i15.LyricsPage] +class LyricsRoute extends _i40.PageRouteInfo { + const LyricsRoute({List<_i40.PageRouteInfo>? children}) : super( LyricsRoute.name, initialChildren: children, @@ -576,21 +496,21 @@ class LyricsRoute extends _i44.PageRouteInfo { static const String name = 'LyricsRoute'; - static _i44.PageInfo page = _i44.PageInfo( + static _i40.PageInfo page = _i40.PageInfo( name, builder: (data) { - return const _i17.LyricsPage(); + return const _i15.LyricsPage(); }, ); } /// generated route for -/// [_i18.MiniLyricsPage] -class MiniLyricsRoute extends _i44.PageRouteInfo { +/// [_i16.MiniLyricsPage] +class MiniLyricsRoute extends _i40.PageRouteInfo { MiniLyricsRoute({ - _i48.Key? key, - required _i48.Size prevSize, - List<_i44.PageRouteInfo>? children, + _i43.Key? key, + required _i43.Size prevSize, + List<_i40.PageRouteInfo>? children, }) : super( MiniLyricsRoute.name, args: MiniLyricsRouteArgs( @@ -602,11 +522,11 @@ class MiniLyricsRoute extends _i44.PageRouteInfo { static const String name = 'MiniLyricsRoute'; - static _i44.PageInfo page = _i44.PageInfo( + static _i40.PageInfo page = _i40.PageInfo( name, builder: (data) { final args = data.argsAs(); - return _i18.MiniLyricsPage( + return _i16.MiniLyricsPage( key: args.key, prevSize: args.prevSize, ); @@ -620,9 +540,9 @@ class MiniLyricsRouteArgs { required this.prevSize, }); - final _i48.Key? key; + final _i43.Key? key; - final _i48.Size prevSize; + final _i43.Size prevSize; @override String toString() { @@ -631,9 +551,9 @@ class MiniLyricsRouteArgs { } /// generated route for -/// [_i19.PlayerLyricsPage] -class PlayerLyricsRoute extends _i44.PageRouteInfo { - const PlayerLyricsRoute({List<_i44.PageRouteInfo>? children}) +/// [_i17.PlayerLyricsPage] +class PlayerLyricsRoute extends _i40.PageRouteInfo { + const PlayerLyricsRoute({List<_i40.PageRouteInfo>? children}) : super( PlayerLyricsRoute.name, initialChildren: children, @@ -641,18 +561,18 @@ class PlayerLyricsRoute extends _i44.PageRouteInfo { static const String name = 'PlayerLyricsRoute'; - static _i44.PageInfo page = _i44.PageInfo( + static _i40.PageInfo page = _i40.PageInfo( name, builder: (data) { - return const _i19.PlayerLyricsPage(); + return const _i17.PlayerLyricsPage(); }, ); } /// generated route for -/// [_i20.PlayerQueuePage] -class PlayerQueueRoute extends _i44.PageRouteInfo { - const PlayerQueueRoute({List<_i44.PageRouteInfo>? children}) +/// [_i18.PlayerQueuePage] +class PlayerQueueRoute extends _i40.PageRouteInfo { + const PlayerQueueRoute({List<_i40.PageRouteInfo>? children}) : super( PlayerQueueRoute.name, initialChildren: children, @@ -660,18 +580,18 @@ class PlayerQueueRoute extends _i44.PageRouteInfo { static const String name = 'PlayerQueueRoute'; - static _i44.PageInfo page = _i44.PageInfo( + static _i40.PageInfo page = _i40.PageInfo( name, builder: (data) { - return const _i20.PlayerQueuePage(); + return const _i18.PlayerQueuePage(); }, ); } /// generated route for -/// [_i21.PlayerTrackSourcesPage] -class PlayerTrackSourcesRoute extends _i44.PageRouteInfo { - const PlayerTrackSourcesRoute({List<_i44.PageRouteInfo>? children}) +/// [_i19.PlayerTrackSourcesPage] +class PlayerTrackSourcesRoute extends _i40.PageRouteInfo { + const PlayerTrackSourcesRoute({List<_i40.PageRouteInfo>? children}) : super( PlayerTrackSourcesRoute.name, initialChildren: children, @@ -679,88 +599,22 @@ class PlayerTrackSourcesRoute extends _i44.PageRouteInfo { static const String name = 'PlayerTrackSourcesRoute'; - static _i44.PageInfo page = _i44.PageInfo( + static _i40.PageInfo page = _i40.PageInfo( name, builder: (data) { - return const _i21.PlayerTrackSourcesPage(); + return const _i19.PlayerTrackSourcesPage(); }, ); } /// generated route for -/// [_i22.PlaylistGenerateResultPage] -class PlaylistGenerateResultRoute - extends _i44.PageRouteInfo { - PlaylistGenerateResultRoute({ - _i48.Key? key, - required _i49.GeneratePlaylistProviderInput state, - List<_i44.PageRouteInfo>? children, - }) : super( - PlaylistGenerateResultRoute.name, - args: PlaylistGenerateResultRouteArgs( - key: key, - state: state, - ), - initialChildren: children, - ); - - static const String name = 'PlaylistGenerateResultRoute'; - - static _i44.PageInfo page = _i44.PageInfo( - name, - builder: (data) { - final args = data.argsAs(); - return _i22.PlaylistGenerateResultPage( - key: args.key, - state: args.state, - ); - }, - ); -} - -class PlaylistGenerateResultRouteArgs { - const PlaylistGenerateResultRouteArgs({ - this.key, - required this.state, - }); - - final _i48.Key? key; - - final _i49.GeneratePlaylistProviderInput state; - - @override - String toString() { - return 'PlaylistGenerateResultRouteArgs{key: $key, state: $state}'; - } -} - -/// generated route for -/// [_i23.PlaylistGeneratorPage] -class PlaylistGeneratorRoute extends _i44.PageRouteInfo { - const PlaylistGeneratorRoute({List<_i44.PageRouteInfo>? children}) - : super( - PlaylistGeneratorRoute.name, - initialChildren: children, - ); - - static const String name = 'PlaylistGeneratorRoute'; - - static _i44.PageInfo page = _i44.PageInfo( - name, - builder: (data) { - return const _i23.PlaylistGeneratorPage(); - }, - ); -} - -/// generated route for -/// [_i24.PlaylistPage] -class PlaylistRoute extends _i44.PageRouteInfo { +/// [_i20.PlaylistPage] +class PlaylistRoute extends _i40.PageRouteInfo { PlaylistRoute({ - _i45.Key? key, + _i41.Key? key, required String id, - required _i46.SpotubeSimplePlaylistObject playlist, - List<_i44.PageRouteInfo>? children, + required _i42.SpotubeSimplePlaylistObject playlist, + List<_i40.PageRouteInfo>? children, }) : super( PlaylistRoute.name, args: PlaylistRouteArgs( @@ -774,11 +628,11 @@ class PlaylistRoute extends _i44.PageRouteInfo { static const String name = 'PlaylistRoute'; - static _i44.PageInfo page = _i44.PageInfo( + static _i40.PageInfo page = _i40.PageInfo( name, builder: (data) { final args = data.argsAs(); - return _i24.PlaylistPage( + return _i20.PlaylistPage( key: args.key, id: args.id, playlist: args.playlist, @@ -794,11 +648,11 @@ class PlaylistRouteArgs { required this.playlist, }); - final _i45.Key? key; + final _i41.Key? key; final String id; - final _i46.SpotubeSimplePlaylistObject playlist; + final _i42.SpotubeSimplePlaylistObject playlist; @override String toString() { @@ -807,9 +661,9 @@ class PlaylistRouteArgs { } /// generated route for -/// [_i25.ProfilePage] -class ProfileRoute extends _i44.PageRouteInfo { - const ProfileRoute({List<_i44.PageRouteInfo>? children}) +/// [_i21.ProfilePage] +class ProfileRoute extends _i40.PageRouteInfo { + const ProfileRoute({List<_i40.PageRouteInfo>? children}) : super( ProfileRoute.name, initialChildren: children, @@ -817,18 +671,18 @@ class ProfileRoute extends _i44.PageRouteInfo { static const String name = 'ProfileRoute'; - static _i44.PageInfo page = _i44.PageInfo( + static _i40.PageInfo page = _i40.PageInfo( name, builder: (data) { - return const _i25.ProfilePage(); + return const _i21.ProfilePage(); }, ); } /// generated route for -/// [_i26.RootAppPage] -class RootAppRoute extends _i44.PageRouteInfo { - const RootAppRoute({List<_i44.PageRouteInfo>? children}) +/// [_i22.RootAppPage] +class RootAppRoute extends _i40.PageRouteInfo { + const RootAppRoute({List<_i40.PageRouteInfo>? children}) : super( RootAppRoute.name, initialChildren: children, @@ -836,18 +690,18 @@ class RootAppRoute extends _i44.PageRouteInfo { static const String name = 'RootAppRoute'; - static _i44.PageInfo page = _i44.PageInfo( + static _i40.PageInfo page = _i40.PageInfo( name, builder: (data) { - return const _i26.RootAppPage(); + return const _i22.RootAppPage(); }, ); } /// generated route for -/// [_i27.SearchPage] -class SearchRoute extends _i44.PageRouteInfo { - const SearchRoute({List<_i44.PageRouteInfo>? children}) +/// [_i23.SearchPage] +class SearchRoute extends _i40.PageRouteInfo { + const SearchRoute({List<_i40.PageRouteInfo>? children}) : super( SearchRoute.name, initialChildren: children, @@ -855,18 +709,18 @@ class SearchRoute extends _i44.PageRouteInfo { static const String name = 'SearchRoute'; - static _i44.PageInfo page = _i44.PageInfo( + static _i40.PageInfo page = _i40.PageInfo( name, builder: (data) { - return const _i27.SearchPage(); + return const _i23.SearchPage(); }, ); } /// generated route for -/// [_i28.SettingsMetadataProviderPage] -class SettingsMetadataProviderRoute extends _i44.PageRouteInfo { - const SettingsMetadataProviderRoute({List<_i44.PageRouteInfo>? children}) +/// [_i24.SettingsMetadataProviderPage] +class SettingsMetadataProviderRoute extends _i40.PageRouteInfo { + const SettingsMetadataProviderRoute({List<_i40.PageRouteInfo>? children}) : super( SettingsMetadataProviderRoute.name, initialChildren: children, @@ -874,18 +728,18 @@ class SettingsMetadataProviderRoute extends _i44.PageRouteInfo { static const String name = 'SettingsMetadataProviderRoute'; - static _i44.PageInfo page = _i44.PageInfo( + static _i40.PageInfo page = _i40.PageInfo( name, builder: (data) { - return const _i28.SettingsMetadataProviderPage(); + return const _i24.SettingsMetadataProviderPage(); }, ); } /// generated route for -/// [_i29.SettingsPage] -class SettingsRoute extends _i44.PageRouteInfo { - const SettingsRoute({List<_i44.PageRouteInfo>? children}) +/// [_i25.SettingsPage] +class SettingsRoute extends _i40.PageRouteInfo { + const SettingsRoute({List<_i40.PageRouteInfo>? children}) : super( SettingsRoute.name, initialChildren: children, @@ -893,18 +747,18 @@ class SettingsRoute extends _i44.PageRouteInfo { static const String name = 'SettingsRoute'; - static _i44.PageInfo page = _i44.PageInfo( + static _i40.PageInfo page = _i40.PageInfo( name, builder: (data) { - return const _i29.SettingsPage(); + return const _i25.SettingsPage(); }, ); } /// generated route for -/// [_i30.StatsAlbumsPage] -class StatsAlbumsRoute extends _i44.PageRouteInfo { - const StatsAlbumsRoute({List<_i44.PageRouteInfo>? children}) +/// [_i26.StatsAlbumsPage] +class StatsAlbumsRoute extends _i40.PageRouteInfo { + const StatsAlbumsRoute({List<_i40.PageRouteInfo>? children}) : super( StatsAlbumsRoute.name, initialChildren: children, @@ -912,18 +766,18 @@ class StatsAlbumsRoute extends _i44.PageRouteInfo { static const String name = 'StatsAlbumsRoute'; - static _i44.PageInfo page = _i44.PageInfo( + static _i40.PageInfo page = _i40.PageInfo( name, builder: (data) { - return const _i30.StatsAlbumsPage(); + return const _i26.StatsAlbumsPage(); }, ); } /// generated route for -/// [_i31.StatsArtistsPage] -class StatsArtistsRoute extends _i44.PageRouteInfo { - const StatsArtistsRoute({List<_i44.PageRouteInfo>? children}) +/// [_i27.StatsArtistsPage] +class StatsArtistsRoute extends _i40.PageRouteInfo { + const StatsArtistsRoute({List<_i40.PageRouteInfo>? children}) : super( StatsArtistsRoute.name, initialChildren: children, @@ -931,18 +785,18 @@ class StatsArtistsRoute extends _i44.PageRouteInfo { static const String name = 'StatsArtistsRoute'; - static _i44.PageInfo page = _i44.PageInfo( + static _i40.PageInfo page = _i40.PageInfo( name, builder: (data) { - return const _i31.StatsArtistsPage(); + return const _i27.StatsArtistsPage(); }, ); } /// generated route for -/// [_i32.StatsMinutesPage] -class StatsMinutesRoute extends _i44.PageRouteInfo { - const StatsMinutesRoute({List<_i44.PageRouteInfo>? children}) +/// [_i28.StatsMinutesPage] +class StatsMinutesRoute extends _i40.PageRouteInfo { + const StatsMinutesRoute({List<_i40.PageRouteInfo>? children}) : super( StatsMinutesRoute.name, initialChildren: children, @@ -950,18 +804,18 @@ class StatsMinutesRoute extends _i44.PageRouteInfo { static const String name = 'StatsMinutesRoute'; - static _i44.PageInfo page = _i44.PageInfo( + static _i40.PageInfo page = _i40.PageInfo( name, builder: (data) { - return const _i32.StatsMinutesPage(); + return const _i28.StatsMinutesPage(); }, ); } /// generated route for -/// [_i33.StatsPage] -class StatsRoute extends _i44.PageRouteInfo { - const StatsRoute({List<_i44.PageRouteInfo>? children}) +/// [_i29.StatsPage] +class StatsRoute extends _i40.PageRouteInfo { + const StatsRoute({List<_i40.PageRouteInfo>? children}) : super( StatsRoute.name, initialChildren: children, @@ -969,18 +823,18 @@ class StatsRoute extends _i44.PageRouteInfo { static const String name = 'StatsRoute'; - static _i44.PageInfo page = _i44.PageInfo( + static _i40.PageInfo page = _i40.PageInfo( name, builder: (data) { - return const _i33.StatsPage(); + return const _i29.StatsPage(); }, ); } /// generated route for -/// [_i34.StatsPlaylistsPage] -class StatsPlaylistsRoute extends _i44.PageRouteInfo { - const StatsPlaylistsRoute({List<_i44.PageRouteInfo>? children}) +/// [_i30.StatsPlaylistsPage] +class StatsPlaylistsRoute extends _i40.PageRouteInfo { + const StatsPlaylistsRoute({List<_i40.PageRouteInfo>? children}) : super( StatsPlaylistsRoute.name, initialChildren: children, @@ -988,18 +842,18 @@ class StatsPlaylistsRoute extends _i44.PageRouteInfo { static const String name = 'StatsPlaylistsRoute'; - static _i44.PageInfo page = _i44.PageInfo( + static _i40.PageInfo page = _i40.PageInfo( name, builder: (data) { - return const _i34.StatsPlaylistsPage(); + return const _i30.StatsPlaylistsPage(); }, ); } /// generated route for -/// [_i35.StatsStreamFeesPage] -class StatsStreamFeesRoute extends _i44.PageRouteInfo { - const StatsStreamFeesRoute({List<_i44.PageRouteInfo>? children}) +/// [_i31.StatsStreamFeesPage] +class StatsStreamFeesRoute extends _i40.PageRouteInfo { + const StatsStreamFeesRoute({List<_i40.PageRouteInfo>? children}) : super( StatsStreamFeesRoute.name, initialChildren: children, @@ -1007,18 +861,18 @@ class StatsStreamFeesRoute extends _i44.PageRouteInfo { static const String name = 'StatsStreamFeesRoute'; - static _i44.PageInfo page = _i44.PageInfo( + static _i40.PageInfo page = _i40.PageInfo( name, builder: (data) { - return const _i35.StatsStreamFeesPage(); + return const _i31.StatsStreamFeesPage(); }, ); } /// generated route for -/// [_i36.StatsStreamsPage] -class StatsStreamsRoute extends _i44.PageRouteInfo { - const StatsStreamsRoute({List<_i44.PageRouteInfo>? children}) +/// [_i32.StatsStreamsPage] +class StatsStreamsRoute extends _i40.PageRouteInfo { + const StatsStreamsRoute({List<_i40.PageRouteInfo>? children}) : super( StatsStreamsRoute.name, initialChildren: children, @@ -1026,21 +880,21 @@ class StatsStreamsRoute extends _i44.PageRouteInfo { static const String name = 'StatsStreamsRoute'; - static _i44.PageInfo page = _i44.PageInfo( + static _i40.PageInfo page = _i40.PageInfo( name, builder: (data) { - return const _i36.StatsStreamsPage(); + return const _i32.StatsStreamsPage(); }, ); } /// generated route for -/// [_i37.TrackPage] -class TrackRoute extends _i44.PageRouteInfo { +/// [_i33.TrackPage] +class TrackRoute extends _i40.PageRouteInfo { TrackRoute({ - _i48.Key? key, + _i43.Key? key, required String trackId, - List<_i44.PageRouteInfo>? children, + List<_i40.PageRouteInfo>? children, }) : super( TrackRoute.name, args: TrackRouteArgs( @@ -1053,13 +907,13 @@ class TrackRoute extends _i44.PageRouteInfo { static const String name = 'TrackRoute'; - static _i44.PageInfo page = _i44.PageInfo( + static _i40.PageInfo page = _i40.PageInfo( name, builder: (data) { final pathParams = data.inheritedPathParams; final args = data.argsAs( orElse: () => TrackRouteArgs(trackId: pathParams.getString('id'))); - return _i37.TrackPage( + return _i33.TrackPage( key: args.key, trackId: args.trackId, ); @@ -1073,7 +927,7 @@ class TrackRouteArgs { required this.trackId, }); - final _i48.Key? key; + final _i43.Key? key; final String trackId; @@ -1084,9 +938,9 @@ class TrackRouteArgs { } /// generated route for -/// [_i38.UserAlbumsPage] -class UserAlbumsRoute extends _i44.PageRouteInfo { - const UserAlbumsRoute({List<_i44.PageRouteInfo>? children}) +/// [_i34.UserAlbumsPage] +class UserAlbumsRoute extends _i40.PageRouteInfo { + const UserAlbumsRoute({List<_i40.PageRouteInfo>? children}) : super( UserAlbumsRoute.name, initialChildren: children, @@ -1094,18 +948,18 @@ class UserAlbumsRoute extends _i44.PageRouteInfo { static const String name = 'UserAlbumsRoute'; - static _i44.PageInfo page = _i44.PageInfo( + static _i40.PageInfo page = _i40.PageInfo( name, builder: (data) { - return const _i38.UserAlbumsPage(); + return const _i34.UserAlbumsPage(); }, ); } /// generated route for -/// [_i39.UserArtistsPage] -class UserArtistsRoute extends _i44.PageRouteInfo { - const UserArtistsRoute({List<_i44.PageRouteInfo>? children}) +/// [_i35.UserArtistsPage] +class UserArtistsRoute extends _i40.PageRouteInfo { + const UserArtistsRoute({List<_i40.PageRouteInfo>? children}) : super( UserArtistsRoute.name, initialChildren: children, @@ -1113,18 +967,18 @@ class UserArtistsRoute extends _i44.PageRouteInfo { static const String name = 'UserArtistsRoute'; - static _i44.PageInfo page = _i44.PageInfo( + static _i40.PageInfo page = _i40.PageInfo( name, builder: (data) { - return const _i39.UserArtistsPage(); + return const _i35.UserArtistsPage(); }, ); } /// generated route for -/// [_i40.UserDownloadsPage] -class UserDownloadsRoute extends _i44.PageRouteInfo { - const UserDownloadsRoute({List<_i44.PageRouteInfo>? children}) +/// [_i36.UserDownloadsPage] +class UserDownloadsRoute extends _i40.PageRouteInfo { + const UserDownloadsRoute({List<_i40.PageRouteInfo>? children}) : super( UserDownloadsRoute.name, initialChildren: children, @@ -1132,18 +986,18 @@ class UserDownloadsRoute extends _i44.PageRouteInfo { static const String name = 'UserDownloadsRoute'; - static _i44.PageInfo page = _i44.PageInfo( + static _i40.PageInfo page = _i40.PageInfo( name, builder: (data) { - return const _i40.UserDownloadsPage(); + return const _i36.UserDownloadsPage(); }, ); } /// generated route for -/// [_i41.UserLocalLibraryPage] -class UserLocalLibraryRoute extends _i44.PageRouteInfo { - const UserLocalLibraryRoute({List<_i44.PageRouteInfo>? children}) +/// [_i37.UserLocalLibraryPage] +class UserLocalLibraryRoute extends _i40.PageRouteInfo { + const UserLocalLibraryRoute({List<_i40.PageRouteInfo>? children}) : super( UserLocalLibraryRoute.name, initialChildren: children, @@ -1151,18 +1005,18 @@ class UserLocalLibraryRoute extends _i44.PageRouteInfo { static const String name = 'UserLocalLibraryRoute'; - static _i44.PageInfo page = _i44.PageInfo( + static _i40.PageInfo page = _i40.PageInfo( name, builder: (data) { - return const _i41.UserLocalLibraryPage(); + return const _i37.UserLocalLibraryPage(); }, ); } /// generated route for -/// [_i42.UserPlaylistsPage] -class UserPlaylistsRoute extends _i44.PageRouteInfo { - const UserPlaylistsRoute({List<_i44.PageRouteInfo>? children}) +/// [_i38.UserPlaylistsPage] +class UserPlaylistsRoute extends _i40.PageRouteInfo { + const UserPlaylistsRoute({List<_i40.PageRouteInfo>? children}) : super( UserPlaylistsRoute.name, initialChildren: children, @@ -1170,18 +1024,18 @@ class UserPlaylistsRoute extends _i44.PageRouteInfo { static const String name = 'UserPlaylistsRoute'; - static _i44.PageInfo page = _i44.PageInfo( + static _i40.PageInfo page = _i40.PageInfo( name, builder: (data) { - return const _i42.UserPlaylistsPage(); + return const _i38.UserPlaylistsPage(); }, ); } /// generated route for -/// [_i43.WebViewLoginPage] -class WebViewLoginRoute extends _i44.PageRouteInfo { - const WebViewLoginRoute({List<_i44.PageRouteInfo>? children}) +/// [_i39.WebViewLoginPage] +class WebViewLoginRoute extends _i40.PageRouteInfo { + const WebViewLoginRoute({List<_i40.PageRouteInfo>? children}) : super( WebViewLoginRoute.name, initialChildren: children, @@ -1189,10 +1043,10 @@ class WebViewLoginRoute extends _i44.PageRouteInfo { static const String name = 'WebViewLoginRoute'; - static _i44.PageInfo page = _i44.PageInfo( + static _i40.PageInfo page = _i40.PageInfo( name, builder: (data) { - return const _i43.WebViewLoginPage(); + return const _i39.WebViewLoginPage(); }, ); } diff --git a/lib/components/track_tile/track_options.dart b/lib/components/track_tile/track_options.dart index d9e31d78..2ad7554c 100644 --- a/lib/components/track_tile/track_options.dart +++ b/lib/components/track_tile/track_options.dart @@ -230,9 +230,9 @@ class TrackOptions extends HookConsumerWidget { onSelected: (value) async { switch (value) { case TrackOptionValue.album: - // await context.navigateTo( - // AlbumRoute(id: track.album!.id!, album: track.album!), - // ); + await context.navigateTo( + AlbumRoute(id: track.album.id, album: track.album), + ); break; case TrackOptionValue.delete: await File((track as SpotubeLocalTrackObject).path).delete(); diff --git a/lib/modules/stats/common/playlist_item.dart b/lib/modules/stats/common/playlist_item.dart index 8121f946..64abe7d5 100644 --- a/lib/modules/stats/common/playlist_item.dart +++ b/lib/modules/stats/common/playlist_item.dart @@ -1,4 +1,6 @@ +import 'package:auto_route/auto_route.dart'; import 'package:shadcn_flutter/shadcn_flutter.dart'; +import 'package:spotube/collections/routes.gr.dart'; import 'package:spotube/components/image/universal_image.dart'; import 'package:spotube/components/ui/button_tile.dart'; import 'package:spotube/extensions/string.dart'; @@ -32,7 +34,7 @@ class StatsPlaylistItem extends StatelessWidget { ), trailing: info, onPressed: () { - // context.navigateTo(PlaylistRoute(id: playlist.id!, playlist: playlist)); + context.navigateTo(PlaylistRoute(id: playlist.id, playlist: playlist)); }, ); } diff --git a/lib/pages/album/album.dart b/lib/pages/album/album.dart index 11d06658..c3a9568a 100644 --- a/lib/pages/album/album.dart +++ b/lib/pages/album/album.dart @@ -55,11 +55,10 @@ class AlbumPage extends HookConsumerWidget { await tracksNotifier.fetchMore(); }, onFetchAll: () async { - // return tracksNotifier.fetchAll(); - return []; + return tracksNotifier.fetchAll(); }, onRefresh: () async { - // ref.invalidate(albumTracksProvider(album)); + ref.invalidate(metadataPluginAlbumTracksProvider(album.id)); }, ), routePath: "/album/${album.id}", diff --git a/lib/pages/track/track.dart b/lib/pages/track/track.dart index 128c5103..e55192e1 100644 --- a/lib/pages/track/track.dart +++ b/lib/pages/track/track.dart @@ -4,10 +4,12 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:shadcn_flutter/shadcn_flutter.dart'; import 'package:skeletonizer/skeletonizer.dart'; import 'package:spotube/collections/fake.dart'; +import 'package:spotube/collections/routes.gr.dart'; import 'package:spotube/collections/spotube_icons.dart'; import 'package:spotube/components/heart_button/heart_button.dart'; import 'package:spotube/components/image/universal_image.dart'; import 'package:spotube/components/links/artist_link.dart'; +import 'package:spotube/components/links/link_text.dart'; import 'package:spotube/components/titlebar/titlebar.dart'; import 'package:spotube/components/track_tile/track_options.dart'; import 'package:spotube/extensions/context.dart'; @@ -140,16 +142,16 @@ class TrackPage extends HookConsumerWidget { children: [ const Icon(SpotubeIcons.album), const Gap(5), - // Flexible( - // child: LinkText( - // track.album!.name!, - // AlbumRoute( - // id: track.album!.id!, - // album: track.album!, - // ), - // push: true, - // ), - // ), + Flexible( + child: LinkText( + track.album.name, + AlbumRoute( + id: track.album.id, + album: track.album, + ), + push: true, + ), + ), ], ), const Gap(10), diff --git a/lib/provider/lyrics/synced.dart b/lib/provider/lyrics/synced.dart index 0c43d53e..de34005a 100644 --- a/lib/provider/lyrics/synced.dart +++ b/lib/provider/lyrics/synced.dart @@ -16,53 +16,6 @@ class SyncedLyricsNotifier extends FamilyAsyncNotifier { SpotubeTrackObject get _track => arg!; - // Future getSpotifyLyrics(String? token) async { - // final res = await globalDio.getUri( - // Uri.parse( - // "https://spclient.wg.spotify.com/color-lyrics/v2/track/${_track.id}?format=json&market=from_token", - // ), - // options: Options( - // headers: { - // "User-Agent": - // "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.0.0 Safari/537.36", - // "App-platform": "WebPlayer", - // "authorization": "Bearer $token" - // }, - // responseType: ResponseType.json, - // validateStatus: (status) => true, - // ), - // ); - - // if (res.statusCode != 200) { - // return SubtitleSimple( - // lyrics: [], - // name: _track.name!, - // uri: res.realUri, - // rating: 0, - // provider: "Spotify", - // ); - // } - // final linesRaw = - // Map.castFrom(res.data)["lyrics"] - // ?["lines"] as List?; - - // final lines = linesRaw?.map((line) { - // return LyricSlice( - // time: Duration(milliseconds: int.parse(line["startTimeMs"])), - // text: line["words"] as String, - // ); - // }).toList() ?? - // []; - - // return SubtitleSimple( - // lyrics: lines, - // name: _track.name!, - // uri: res.realUri, - // rating: 100, - // provider: "Spotify", - // ); - // } - /// Lyrics credits: [lrclib.net](https://lrclib.net) and their contributors /// Thanks for their generous public API Future getLRCLibLyrics() async {