Merge pull request #1616 from theovilardo/impl/tap-on-albumart-to-open-screen

Impl/tap on albumart to open screen

Author: theovilardo

app/src/main/java/com/theveloper/pixelplay/presentation/components/AlbumCarouselSelection.kt

@@ -3,6 +3,8 @@ package com.theveloper.pixelplay.presentation.components
 import androidx.compose.animation.core.FastOutSlowInEasing
 import androidx.compose.animation.core.tween
 import androidx.compose.runtime.*
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.*
@@ -39,6 +41,7 @@ fun AlbumCarouselSection(
     expansionFraction: Float,
     requestedScrollIndex: Int? = null,
     onSongSelected: (Song) -> Unit,
+    onAlbumClick: (Song) -> Unit = {},
     modifier: Modifier = Modifier,
     carouselStyle: String = CarouselStyle.NO_PEEK,
     itemSpacing: Dp = 8.dp,
@@ -141,11 +144,18 @@ fun AlbumCarouselSection(
             carouselWidth = availableWidth // Pass the full width for layout calculations
         ) { index ->
             val song = queue[index]
+            val isFocusedItem = carouselState.pagerState.currentPage == index
             key(song.id) {
                 Box(
                     Modifier
                         .fillMaxSize()
                         .aspectRatio(1f)
+                        .clickable(
+                            enabled = isFocusedItem && song.albumId > 0L,
+                            interactionSource = remember { MutableInteractionSource() },
+                            indication = null,
+                            onClick = { onAlbumClick(song) }
+                        )
                 ) { // Enforce 1:1 aspect ratio for the item itself
                     OptimizedAlbumArt(
                         uri = song.albumArtUriString,

app/src/main/java/com/theveloper/pixelplay/presentation/components/UnifiedPlayerSheet.kt

@@ -96,6 +96,7 @@ import androidx.navigation.compose.currentBackStackEntryAsState
 import coil.size.Size
 import com.theveloper.pixelplay.R
 import com.theveloper.pixelplay.data.model.Song
+import com.theveloper.pixelplay.presentation.components.scoped.PlayerAlbumNavigationEffect
 import com.theveloper.pixelplay.presentation.components.scoped.PlayerArtistNavigationEffect
 import com.theveloper.pixelplay.presentation.components.scoped.PlayerSheetPredictiveBackHandler
 import com.theveloper.pixelplay.presentation.components.scoped.QueueSheetRuntimeEffects
@@ -269,6 +270,12 @@ fun UnifiedPlayerSheet(
         sheetMotionController = sheetMotionController,
         playerViewModel = playerViewModel
     )
+    PlayerAlbumNavigationEffect(
+        navController = navController,
+        sheetCollapsedTargetY = sheetCollapsedTargetY,
+        sheetMotionController = sheetMotionController,
+        playerViewModel = playerViewModel
+    )
 
     val fullPlayerVisualState = rememberFullPlayerVisualState(
         expansionFraction = playerContentExpansionFraction,

app/src/main/java/com/theveloper/pixelplay/presentation/components/UnifiedPlayerSheetV2.kt

@@ -52,6 +52,7 @@ import androidx.media3.common.util.UnstableApi
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.currentBackStackEntryAsState
 import com.theveloper.pixelplay.data.model.Song
+import com.theveloper.pixelplay.presentation.components.scoped.PlayerAlbumNavigationEffect
 import com.theveloper.pixelplay.presentation.components.scoped.PlayerArtistNavigationEffect
 import com.theveloper.pixelplay.presentation.components.scoped.PlayerSheetPredictiveBackHandler
 import com.theveloper.pixelplay.presentation.components.scoped.QueueSheetRuntimeEffects
@@ -232,6 +233,12 @@ fun UnifiedPlayerSheetV2(
         sheetMotionController = sheetMotionController,
         playerViewModel = playerViewModel
     )
+    PlayerAlbumNavigationEffect(
+        navController = navController,
+        sheetCollapsedTargetY = sheetCollapsedTargetY,
+        sheetMotionController = sheetMotionController,
+        playerViewModel = playerViewModel
+    )
 
     // FullPlayerVisualState now holds lazy getters that read from the Animatable
     // inside graphicsLayer (draw-phase), avoiding per-frame recomposition.

app/src/main/java/com/theveloper/pixelplay/presentation/components/player/FullPlayerContent.kt

@@ -495,6 +495,9 @@ fun FullPlayerContent(
             albumArtQuality = albumArtQuality,
             requestedScrollIndex = pendingCarouselIndex,
             onSongSelected = onAlbumSongSelected,
+            onAlbumClick = { albumSong ->
+                playerViewModel.triggerAlbumNavigationFromPlayer(albumSong.albumId)
+            },
             modifier = modifier
         )
     }
@@ -994,6 +997,7 @@ private fun FullPlayerAlbumCoverSection(
     albumArtQuality: AlbumArtQuality,
     requestedScrollIndex: Int?,
     onSongSelected: (Song) -> Unit,
+    onAlbumClick: (Song) -> Unit,
     modifier: Modifier = Modifier
 ) {
     val shouldDelay = loadingTweaks.delayAll || loadingTweaks.delayAlbumCarousel
@@ -1065,6 +1069,7 @@ private fun FullPlayerAlbumCoverSection(
                         onSongSelected(newSong)
                     }
                 },
+                onAlbumClick = onAlbumClick,
                 carouselStyle = carouselStyle,
                 modifier = Modifier
                     .height(carouselHeight)

app/src/main/java/com/theveloper/pixelplay/presentation/components/scoped/PlayerAlbumNavigationEffect.kt

@@ -0,0 +1,33 @@
+package com.theveloper.pixelplay.presentation.components.scoped
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.navigation.NavHostController
+import com.theveloper.pixelplay.presentation.navigation.Screen
+import com.theveloper.pixelplay.presentation.navigation.navigateSafely
+import com.theveloper.pixelplay.presentation.viewmodel.PlayerViewModel
+import kotlinx.coroutines.flow.collectLatest
+
+@Composable
+internal fun PlayerAlbumNavigationEffect(
+    navController: NavHostController,
+    sheetCollapsedTargetY: Float,
+    sheetMotionController: SheetMotionController,
+    playerViewModel: PlayerViewModel
+) {
+    LaunchedEffect(navController, sheetCollapsedTargetY) {
+        playerViewModel.albumNavigationRequests.collectLatest { albumId ->
+            sheetMotionController.snapCollapsed(sheetCollapsedTargetY)
+            playerViewModel.collapsePlayerSheet()
+
+            navController.navigateSafely(Screen.AlbumDetail.createRoute(albumId)) {
+                launchSingleTop = false
+                navController.currentBackStackEntry?.destination?.route?.let { currentRoute ->
+                    if (currentRoute == Screen.AlbumDetail.route) {
+                        popUpTo(Screen.AlbumDetail.route) { inclusive = true }
+                    }
+                }
+            }
+        }
+    }
+}

app/src/main/java/com/theveloper/pixelplay/presentation/viewmodel/PlayerViewModel.kt

@@ -529,6 +529,8 @@ class PlayerViewModel @Inject constructor(
     )
     val toastEvents = _toastEvents.asSharedFlow()
 
+    private val _albumNavigationRequests = MutableSharedFlow<Long>(extraBufferCapacity = 1)
+    val albumNavigationRequests = _albumNavigationRequests.asSharedFlow()
     private val _artistNavigationRequests = MutableSharedFlow<Long>(extraBufferCapacity = 1)
     val artistNavigationRequests = _artistNavigationRequests.asSharedFlow()
     private val _searchNavDoubleTapEvents = MutableSharedFlow<Unit>(extraBufferCapacity = 1)
@@ -538,6 +540,7 @@ class PlayerViewModel @Inject constructor(
     private val _scrollToIndexEvent = MutableSharedFlow<Int>(extraBufferCapacity = 1)
     val scrollToIndexEvent = _scrollToIndexEvent.asSharedFlow()
 
+    private var albumNavigationJob: Job? = null
     private var artistNavigationJob: Job? = null
     private var fullQueuePlaybackJob: Job? = null
     private var fullQueuePlaybackToken: Long = 0L
@@ -2040,6 +2043,36 @@ class PlayerViewModel @Inject constructor(
         }
     }
 
+    fun triggerAlbumNavigationFromPlayer(albumId: Long) {
+        if (albumId <= 0) {
+            Log.d("AlbumDebug", "triggerAlbumNavigationFromPlayer ignored invalid albumId=$albumId")
+            return
+        }
+
+        val existingJob = albumNavigationJob
+        if (existingJob != null && existingJob.isActive) {
+            Log.d("AlbumDebug", "triggerAlbumNavigationFromPlayer ignored; navigation already in progress for albumId=$albumId")
+            return
+        }
+
+        albumNavigationJob?.cancel()
+        albumNavigationJob = viewModelScope.launch {
+            val currentSong = playbackStateHolder.stablePlayerState.value.currentSong
+            Log.d(
+                "AlbumDebug",
+                "triggerAlbumNavigationFromPlayer: albumId=$albumId, songId=${currentSong?.id}, title=${currentSong?.title}"
+            )
+            collapsePlayerSheet()
+
+            withTimeoutOrNull(900) {
+                awaitSheetState(PlayerSheetState.COLLAPSED)
+                awaitPlayerCollapse()
+            }
+
+            _albumNavigationRequests.emit(albumId)
+        }
+    }
+
     fun triggerArtistNavigationFromPlayer(artistId: Long) {
         if (artistId <= 0) {
             Log.d("ArtistDebug", "triggerArtistNavigationFromPlayer ignored invalid artistId=$artistId")