diff --git a/lib/components/album/album_card.dart b/lib/components/album/album_card.dart index 821194aab..5c94caf0d 100644 --- a/lib/components/album/album_card.dart +++ b/lib/components/album/album_card.dart @@ -70,7 +70,7 @@ class AlbumCard extends HookConsumerWidget { description: "${AlbumType.from(album.albumType!).formatted} • ${TypeConversionUtils.artists_X_String(album.artists ?? [])}", onTap: () { - ServiceUtils.navigate(context, "/album/${album.id}", extra: album); + ServiceUtils.push(context, "/album/${album.id}", extra: album); }, onPlaybuttonPressed: () async { updating.value = true; diff --git a/lib/components/artist/artist_card.dart b/lib/components/artist/artist_card.dart index 77e22c226..cb695f6f1 100644 --- a/lib/components/artist/artist_card.dart +++ b/lib/components/artist/artist_card.dart @@ -62,7 +62,7 @@ class ArtistCard extends HookConsumerWidget { ), child: InkWell( onTap: () { - ServiceUtils.navigate(context, "/artist/${artist.id}"); + ServiceUtils.push(context, "/artist/${artist.id}"); }, borderRadius: radius, child: Padding( diff --git a/lib/components/player/player_overlay.dart b/lib/components/player/player_overlay.dart index 88ca54881..e51d11efa 100644 --- a/lib/components/player/player_overlay.dart +++ b/lib/components/player/player_overlay.dart @@ -44,7 +44,7 @@ class PlayerOverlay extends HookConsumerWidget { int sensitivity = 8; if (details.primaryVelocity != null && details.primaryVelocity! < -sensitivity) { - ServiceUtils.navigate(context, "/player"); + ServiceUtils.push(context, "/player"); } }, child: ClipRRect( diff --git a/lib/components/playlist/playlist_card.dart b/lib/components/playlist/playlist_card.dart index ff3540cfc..5c801ee5b 100644 --- a/lib/components/playlist/playlist_card.dart +++ b/lib/components/playlist/playlist_card.dart @@ -48,7 +48,7 @@ class PlaylistCard extends HookConsumerWidget { isLoading: (isPlaylistPlaying && playlistQueue.isFetching) || updating.value, onTap: () { - ServiceUtils.navigate( + ServiceUtils.push( context, "/playlist/${playlist.id}", extra: playlist, diff --git a/lib/components/shared/fallbacks/anonymous_fallback.dart b/lib/components/shared/fallbacks/anonymous_fallback.dart index fce80a083..7a6eb0468 100644 --- a/lib/components/shared/fallbacks/anonymous_fallback.dart +++ b/lib/components/shared/fallbacks/anonymous_fallback.dart @@ -24,7 +24,7 @@ class AnonymousFallback extends ConsumerWidget { const SizedBox(height: 10), FilledButton( child: const Text("Login with Spotify"), - onPressed: () => ServiceUtils.navigate(context, "/settings"), + onPressed: () => ServiceUtils.push(context, "/settings"), ) ], ), diff --git a/lib/pages/desktop_login/login_tutorial.dart b/lib/pages/desktop_login/login_tutorial.dart index 355df838d..24373e75d 100644 --- a/lib/pages/desktop_login/login_tutorial.dart +++ b/lib/pages/desktop_login/login_tutorial.dart @@ -54,7 +54,7 @@ class LoginTutorial extends ConsumerWidget { overrideDone: FilledButton( onPressed: authenticationNotifier.isLoggedIn ? () { - ServiceUtils.navigate(context, "/"); + ServiceUtils.push(context, "/"); } : null, child: Center(child: Text(context.l10n.done)),