Merge pull request #1613 from theovilardo/impr/artist-choose-bottomsheet

Implement a dedicated artist picker bottom sheet and enhance artist i…

Author: theovilardo

app/src/main/java/com/theveloper/pixelplay/data/repository/MusicRepositoryImpl.kt

@@ -62,6 +62,7 @@ import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
@@ -107,6 +108,7 @@ class MusicRepositoryImpl @Inject constructor(
     private val repositoryScope = CoroutineScope(Dispatchers.IO + SupervisorJob())
     // Tracks the active prefetch job so a new flow emission cancels the previous one.
     @Volatile private var prefetchJob: Job? = null
+    @Volatile private var currentSongArtistPrefetchJob: Job? = null
     @Volatile private var telegramDownloadSyncObserverStarted = false
     private val telegramCacheManager: com.theveloper.pixelplay.data.telegram.TelegramCacheManager
         get() = telegramCacheManagerProvider.get()
@@ -129,6 +131,13 @@ class MusicRepositoryImpl @Inject constructor(
         }
     }
 
+    private fun List<Artist>.missingImageCandidates(): List<Pair<Long, String>> =
+        asSequence()
+            .filter { it.effectiveImageUrl.isNullOrBlank() && it.name.isNotBlank() }
+            .map { it.id to it.name }
+            .distinctBy { (_, name) -> name.trim().lowercase() }
+            .toList()
+
     @OptIn(ExperimentalCoroutinesApi::class)
     override fun getAudioFiles(): Flow<List<Song>> {
         return combine(
@@ -269,11 +278,7 @@ class MusicRepositoryImpl @Inject constructor(
                 .map { entities ->
                     val artists = entities.map { it.toArtist() }
                     // Trigger prefetch for missing images (non-blocking)
-                    val missingImages = artists.asSequence()
-                        .filter { it.imageUrl.isNullOrEmpty() && it.name.isNotBlank() }
-                        .map { it.id to it.name }
-                        .distinctBy { (_, name) -> name.trim().lowercase() }
-                        .toList()
+                    val missingImages = artists.missingImageCandidates()
                     if (missingImages.isNotEmpty()) {
                         // Cancel any in-flight prefetch before starting a new one — the flow
                         // can emit multiple times during sync, and concurrent launches would
@@ -299,9 +304,19 @@ class MusicRepositoryImpl @Inject constructor(
     }
 
     override fun getArtistsForSong(songId: Long): Flow<List<Artist>> {
-        return musicDao.getArtistsForSong(songId).map { entities ->
-            entities.map { it.toArtist() }
-        }.flowOn(Dispatchers.IO)
+        return musicDao.getArtistsForSong(songId)
+            .map { entities -> entities.map { it.toArtist() } }
+            .distinctUntilChanged()
+            .onEach { artists ->
+                val missingImages = artists.missingImageCandidates()
+                if (missingImages.isNotEmpty()) {
+                    currentSongArtistPrefetchJob?.cancel()
+                    currentSongArtistPrefetchJob = repositoryScope.launch {
+                        artistImageRepository.prefetchArtistImages(missingImages)
+                    }
+                }
+            }
+            .flowOn(Dispatchers.IO)
     }
 
     override fun getSongsForArtist(artistId: Long): Flow<List<Song>> {

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

@@ -49,20 +49,17 @@ import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.FilledIconButton
 import androidx.compose.material3.Icon
-import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.IconButtonDefaults
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.CircularWavyProgressIndicator
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.LoadingIndicator
 // import androidx.compose.material3.pulltorefresh.PullToRefreshDefaults // Removed
 // import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState // Removed
-import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.SheetState
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -958,43 +955,18 @@ fun FullPlayerContent(
         )
     }
 
-    val artistPickerSheetState: SheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
+    val artistPickerSheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
     if (showArtistPicker && currentSongArtists.isNotEmpty()) {
-        ModalBottomSheet(
-            onDismissRequest = { showArtistPicker = false },
-            sheetState = artistPickerSheetState
-        ) {
-            Column(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(horizontal = 20.dp, vertical = 12.dp),
-                verticalArrangement = Arrangement.spacedBy(4.dp)
-            ) {
-                Text(
-                    text = stringResource(R.string.artist_picker_title), // short label; keep UI minimal
-                    style = MaterialTheme.typography.titleMedium,
-                    color = LocalMaterialTheme.current.onPrimaryContainer,
-                    modifier = Modifier.padding(bottom = 8.dp)
-                )
-                currentSongArtists.forEachIndexed { index, artistItem ->
-                    Text(
-                        text = artistItem.name,
-                        style = MaterialTheme.typography.bodyLarge,
-                        color = LocalMaterialTheme.current.onPrimaryContainer,
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .padding(vertical = 10.dp)
-                            .clickable {
-                                playerViewModel.triggerArtistNavigationFromPlayer(artistItem.id)
-                                showArtistPicker = false
-                            }
-                    )
-                    if (index != currentSongArtists.lastIndex) {
-                        HorizontalDivider(color = LocalMaterialTheme.current.outlineVariant)
-                    }
-                }
+        PlayerArtistPickerBottomSheet(
+            song = song,
+            artists = currentSongArtists,
+            sheetState = artistPickerSheetState,
+            onDismiss = { showArtistPicker = false },
+            onArtistClick = { artist ->
+                playerViewModel.triggerArtistNavigationFromPlayer(artist.id)
+                showArtistPicker = false
             }
-        }
+        )
     }
 }
 
@@ -1878,11 +1850,13 @@ private fun EfficientTimeLabels(
             Text(
                 posStr,
                 style = MaterialTheme.typography.bodySmall.copy(fontSize = 12.sp),
+                fontWeight = FontWeight.SemiBold,
                 color = textColor
             )
             Text(
                 durStr,
                 style = MaterialTheme.typography.bodySmall.copy(fontSize = 12.sp),
+                fontWeight = FontWeight.SemiBold,
                 color = textColor
             )
         }