Merge pull request #676 from RounakDadsena/jetpack_compose

fixed Text artist Double artist page
maxrave-dev · Jan 19, 2025 · 74ef2b0 · 74ef2b0
2 parents 4f21bee + eff9fa1
commit 74ef2b0
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/app/src/main/java/com/maxrave/simpmusic/ui/screen/player/NowPlayingScreen.kt b/app/src/main/java/com/maxrave/simpmusic/ui/screen/player/NowPlayingScreen.kt
@@ -817,9 +817,13 @@ fun NowPlayingScreen(
                                                         animationMode = MarqueeAnimationMode.Immediately,
                                                     ).focusable()
                                                     .clickable {
+                                                        val song = sharedViewModel.nowPlayingState.value?.songEntity
                                                         navController.navigateSafe(
                                                             R.id.action_global_artistFragment,
-                                                            bundleOf("channelId" to screenDataState.songInfoData?.authorId),
+                                                            bundleOf(
+                                                                "channelId" to
+                                                                    (song?.artistId?.firstOrNull() ?: screenDataState.songInfoData?.authorId),
+                                                            ),
                                                         )
                                                     },
                                         )