Fix: onClick logic for ArtistsOverview and AlbumsOverview

app/src/main/java/org/listenbrainz/android/ui/components/BrainzPlayerActivityCard.kt

@@ -26,13 +26,22 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewLightDark
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import coil.compose.AsyncImage
 import org.listenbrainz.android.R
+import org.listenbrainz.android.ui.theme.ListenBrainzTheme
 
 @Composable
-fun BrainzPlayerActivityCards(icon: String, errorIcon : Int, title: String, subtitle : String,modifier : Modifier = Modifier) {
+fun BrainzPlayerActivityCards(
+    modifier: Modifier = Modifier,
+    icon: String,
+    errorIcon: Int,
+    title: String,
+    subtitle: String,
+) {
     Box(
         modifier = modifier
             .padding(4.dp)
@@ -100,8 +109,19 @@ fun BrainzPlayerActivityCards(icon: String, errorIcon : Int, title: String, subt
                     color = MaterialTheme.colorScheme.onSurface
                 )
             }
-
-
         }
     }
+}
+
+@PreviewLightDark
+@Composable
+private fun CardsPreview() {
+    ListenBrainzTheme {
+        BrainzPlayerActivityCards(
+            icon = "",
+            errorIcon = R.drawable.ic_album,
+            title = "Title",
+            subtitle = "Subtitle"
+        )
+    }
 }

app/src/main/java/org/listenbrainz/android/ui/screens/brainzplayer/BrainzPlayerScreen.kt

@@ -170,7 +170,8 @@ fun BrainzPlayerHomeScreen(
                 goToAlbumScreen = { currentTab.value = 3 },
                 brainzPlayerViewModel = brainzPlayerViewModel,
                 artists = previewArtists,
-                albums = previewAlbums
+                albums = previewAlbums,
+                albumSongsMap = albumSongsMap
             )
 
             1 -> RecentPlaysScreen(

app/src/main/java/org/listenbrainz/android/ui/screens/brainzplayer/overview/OverviewScreen.kt

@@ -38,7 +38,8 @@ fun OverviewScreen(
     recentlyPlayedSongs: List<Song>,
     brainzPlayerViewModel: BrainzPlayerViewModel = hiltViewModel(),
     artists: List<Artist>,
-    albums: List<Album>
+    albums: List<Album>,
+    albumSongsMap: Map<Album, List<Song>>
 ) {
     Column(
         modifier = Modifier
@@ -49,17 +50,49 @@ fun OverviewScreen(
             modifier = Modifier.fillMaxWidth(),
             recentlyPlayedSongs = recentlyPlayedSongs,
             goToRecentScreen = goToRecentScreen,
-            brainzPlayerViewModel = brainzPlayerViewModel
+            onClick = { song ->
+                brainzPlayerViewModel.changePlayable(
+                    recentlyPlayedSongs,
+                    PlayableType.ALL_SONGS,
+                    song.mediaID,
+                    recentlyPlayedSongs.indexOf(song),
+                    0L
+                )
+                brainzPlayerViewModel.playOrToggleSong(song, true)
+            }
         )
         ArtistsOverview(
             modifier = Modifier.fillMaxWidth(),
             artists = artists,
-            goToArtistScreen = goToArtistScreen
+            goToArtistScreen = goToArtistScreen,
+            onClick = { artist ->
+                brainzPlayerViewModel.changePlayable(
+                    artist.songs,
+                    PlayableType.ARTIST,
+                    artist.id,
+                    0,
+                    0L
+                )
+                brainzPlayerViewModel.playOrToggleSong(artist.songs[0], true)
+            }
         )
         AlbumsOverview(
             modifier = Modifier.fillMaxWidth(),
             albums = albums,
-            goToAlbumScreen = goToAlbumScreen
+            goToAlbumScreen = goToAlbumScreen,
+            onClick = { album ->
+                val albumSongs = albumSongsMap[album]?.sortedBy { it.trackNumber }
+                if (!albumSongs.isNullOrEmpty()) {
+                    brainzPlayerViewModel.changePlayable(
+                        albumSongs,
+                        PlayableType.ALBUM,
+                        album.albumId,
+                        0,
+                        0L
+                    )
+                    brainzPlayerViewModel.playOrToggleSong(albumSongs[0], true)
+                }
+            }
         )
     }
 }
@@ -68,8 +101,8 @@ fun OverviewScreen(
 private fun RecentlyPlayedOverview(
     modifier: Modifier = Modifier,
     recentlyPlayedSongs: List<Song>,
-    brainzPlayerViewModel: BrainzPlayerViewModel,
-    goToRecentScreen: () -> Unit
+    goToRecentScreen: () -> Unit,
+    onClick: (Song) -> Unit
 ) {
     Column(
         modifier = modifier
@@ -88,23 +121,15 @@ private fun RecentlyPlayedOverview(
                 .height(250.dp)
         ) {
             items(items = recentlyPlayedSongs) { song ->
-                BrainzPlayerActivityCards(icon = song.albumArt,
+                BrainzPlayerActivityCards(
+                    icon = song.albumArt,
                     errorIcon = R.drawable.ic_song,
                     title = song.artist,
                     subtitle = song.title,
-                    modifier = Modifier
-                        .clickable {
-                            brainzPlayerViewModel.changePlayable(
-                                recentlyPlayedSongs,
-                                PlayableType.ALL_SONGS,
-                                song.mediaID,
-                                recentlyPlayedSongs.indexOf(song),
-                                0L
-                            )
-                            brainzPlayerViewModel.playOrToggleSong(song, true)
-                        }
+                    modifier = Modifier.clickable {
+                        onClick(song)
+                    }
                 )
-
             }
             if (recentlyPlayedSongs.isNotEmpty())
                 item {
@@ -121,13 +146,12 @@ private fun RecentlyPlayedOverview(
 private fun ArtistsOverview(
     modifier: Modifier = Modifier,
     artists: List<Artist>,
-    goToArtistScreen: () -> Unit
+    goToArtistScreen: () -> Unit,
+    onClick: (Artist) -> Unit
 ) {
     Column(
         modifier = modifier
-            .background(
-                brush = ListenBrainzTheme.colorScheme.gradientBrush
-            )
+            .background(brush = ListenBrainzTheme.colorScheme.gradientBrush)
             .padding(top = 15.dp, bottom = 15.dp)
     ) {
         Text(
@@ -143,19 +167,23 @@ private fun ArtistsOverview(
         ) {
             items(items = artists) { artist ->
                 BrainzPlayerActivityCards(
+                    modifier = Modifier.clickable {
+                        onClick(artist)
+                    },
                     icon = "",
                     errorIcon = R.drawable.ic_artist,
                     title = "",
                     subtitle = artist.name,
                 )
             }
-            if (artists.isNotEmpty())
+            if (artists.isNotEmpty()) {
                 item {
                     BrainzPlayerSeeAllCard(
                         onCardClicked = goToArtistScreen,
                         cardText = " All \n Artists"
                     )
                 }
+            }
         }
     }
 }
@@ -164,7 +192,8 @@ private fun ArtistsOverview(
 private fun AlbumsOverview(
     modifier: Modifier = Modifier,
     albums: List<Album>,
-    goToAlbumScreen: () -> Unit
+    goToAlbumScreen: () -> Unit,
+    onClick: (Album) -> Unit
 ) {
     Column(
         modifier = modifier
@@ -184,6 +213,9 @@ private fun AlbumsOverview(
         ) {
             items(items = albums) { album ->
                 BrainzPlayerActivityCards(
+                    modifier = Modifier.clickable {
+                        onClick(album)
+                    },
                     icon = album.albumArt,
                     errorIcon = R.drawable.ic_album,
                     title = album.artist,