From f126972f2dc17f62da3b16caf4b5561c147792f2 Mon Sep 17 00:00:00 2001 From: vfsfitvnm Date: Thu, 30 Jun 2022 15:32:25 +0200 Subject: [PATCH] Add playlistRoute in SearchResultScreen --- .../vimusic/ui/screens/SearchResultScreen.kt | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/SearchResultScreen.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/SearchResultScreen.kt index eae6ea2..a4cf952 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/SearchResultScreen.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/SearchResultScreen.kt @@ -90,18 +90,25 @@ fun SearchResultScreen( } } - val playlistOrAlbumRoute = rememberAlbumRoute() + val albumRoute = rememberAlbumRoute() + val playlistRoute = rememberPlaylistRoute() val artistRoute = rememberArtistRoute() RouteHandler( listenToGlobalEmitter = true ) { - playlistOrAlbumRoute { browseId -> + albumRoute { browseId -> AlbumScreen( browseId = browseId ?: "browseId cannot be null" ) } + playlistRoute { browseId -> + PlaylistScreen( + browseId = browseId ?: "browseId cannot be null" + ) + } + artistRoute { browseId -> ArtistScreen( browseId = browseId ?: "browseId cannot be null" @@ -212,9 +219,9 @@ fun SearchResultScreen( thumbnailSizePx = thumbnailSizePx, onClick = { when (item) { - is YouTube.Item.Album -> playlistOrAlbumRoute(item.info.endpoint!!.browseId) + is YouTube.Item.Album -> albumRoute(item.info.endpoint!!.browseId) is YouTube.Item.Artist -> artistRoute(item.info.endpoint!!.browseId) - is YouTube.Item.Playlist -> playlistOrAlbumRoute(item.info.endpoint!!.browseId) + is YouTube.Item.Playlist -> playlistRoute(item.info.endpoint!!.browseId) is YouTube.Item.Song -> { binder?.player?.forcePlay(item.asMediaItem) binder?.setupRadio(item.info.endpoint)