fix: scope on other albums

Malopieds · Aug 30, 2024 · 94aee05 · 94aee05
1 parent 75f9006
commit 94aee05
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 16 deletions.
diff --git a/app/src/main/java/com/malopieds/innertune/ui/screens/AlbumScreen.kt b/app/src/main/java/com/malopieds/innertune/ui/screens/AlbumScreen.kt
@@ -107,6 +107,9 @@ fun AlbumScreen(
     val haptic = LocalHapticFeedback.current
     val coroutineScope = rememberCoroutineScope()
     val playerConnection = LocalPlayerConnection.current ?: return
+
+    val scope = rememberCoroutineScope()
+
     val isPlaying by playerConnection.isPlaying.collectAsState()
     val mediaMetadata by playerConnection.mediaMetadata.collectAsState()
 
@@ -520,7 +523,7 @@ fun AlbumScreen(
                                 item = item,
                                 isActive = mediaMetadata?.album?.id == item.id,
                                 isPlaying = isPlaying,
-                                coroutineScope = coroutineScope,
+                                coroutineScope = scope,
                                 modifier =
                                     Modifier
                                         .combinedClickable(

diff --git a/app/src/main/java/com/malopieds/innertune/viewmodels/AlbumViewModel.kt b/app/src/main/java/com/malopieds/innertune/viewmodels/AlbumViewModel.kt
@@ -37,7 +37,7 @@ class AlbumViewModel
                     .album(albumId)
                     .onSuccess {
                         playlistId.value = it.album.playlistId
-                        otherVersions.value = it.album.otherVersions
+                        otherVersions.value = it.otherVersions
                         database.transaction {
                             if (album == null) {
                                 insert(it)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -62,7 +62,7 @@
     <string name="from_your_library">From your library</string>
 
     <!-- Album screen -->
-    <string name="other_versions">Other Versions</string>
+    <string name="other_versions">Other versions</string>
 
     <!-- Library -->
     <string name="liked">Liked</string>

diff --git a/innertube/src/main/java/com/malopieds/innertube/YouTube.kt b/innertube/src/main/java/com/malopieds/innertube/YouTube.kt
@@ -311,19 +311,19 @@ object YouTube {
                                 ?.thumbnails
                                 ?.lastOrNull()
                                 ?.url!!,
-                        otherVersions =
-                            response.contents.twoColumnBrowseResultsRenderer.secondaryContents
-                                ?.sectionListRenderer
-                                ?.contents
-                                ?.getOrNull(
-                                    1,
-                                )?.musicCarouselShelfRenderer
-                                ?.contents
-                                ?.mapNotNull { it.musicTwoRowItemRenderer }
-                                ?.mapNotNull(NewReleaseAlbumPage::fromMusicTwoRowItemRenderer)
-                                .orEmpty(),
                     ),
                 songs = if (withSongs) albumSongs(playlistId).getOrThrow() else emptyList(),
+                otherVersions =
+                    response.contents.twoColumnBrowseResultsRenderer.secondaryContents
+                        ?.sectionListRenderer
+                        ?.contents
+                        ?.getOrNull(
+                            1,
+                        )?.musicCarouselShelfRenderer
+                        ?.contents
+                        ?.mapNotNull { it.musicTwoRowItemRenderer }
+                        ?.mapNotNull(NewReleaseAlbumPage::fromMusicTwoRowItemRenderer)
+                        .orEmpty(),
             )
         }
 
@@ -922,7 +922,16 @@ object YouTube {
                         endpoint.params,
                         continuation,
                     ).body<NextResponse>()
-            val title = response.contents.singleColumnMusicWatchNextResultsRenderer.tabbedRenderer.watchNextTabbedResultsRenderer.tabs[0].tabRenderer.content?.musicQueueRenderer?.header?.musicQueueHeaderRenderer?.subtitle?.runs?.firstOrNull()?.text
+            val title =
+                response.contents.singleColumnMusicWatchNextResultsRenderer.tabbedRenderer.watchNextTabbedResultsRenderer.tabs[0]
+                    .tabRenderer.content
+                    ?.musicQueueRenderer
+                    ?.header
+                    ?.musicQueueHeaderRenderer
+                    ?.subtitle
+                    ?.runs
+                    ?.firstOrNull()
+                    ?.text
             val playlistPanelRenderer =
                 response.continuationContents?.playlistPanelContinuation
                     ?: response.contents.singleColumnMusicWatchNextResultsRenderer.tabbedRenderer.watchNextTabbedResultsRenderer.tabs[0]

diff --git a/innertube/src/main/java/com/malopieds/innertube/models/YTItem.kt b/innertube/src/main/java/com/malopieds/innertube/models/YTItem.kt
@@ -41,7 +41,6 @@ data class AlbumItem(
     val year: Int? = null,
     override val thumbnail: String,
     override val explicit: Boolean = false,
-    val otherVersions: List<AlbumItem> = emptyList(),
 ) : YTItem() {
     override val shareLink: String
         get() = "https://music.youtube.com/playlist?list=$playlistId"

diff --git a/innertube/src/main/java/com/malopieds/innertube/pages/AlbumPage.kt b/innertube/src/main/java/com/malopieds/innertube/pages/AlbumPage.kt
@@ -11,6 +11,7 @@ import com.malopieds.innertube.utils.parseTime
 data class AlbumPage(
     val album: AlbumItem,
     val songs: List<SongItem>,
+    val otherVersions: List<AlbumItem>,
 ) {
     companion object {
         fun fromMusicResponsiveListItemRenderer(renderer: MusicResponsiveListItemRenderer): SongItem? {