Fixed maxrave-dev#457 - No album in Playlist Songs

sokoobo · Jul 28, 2024 · 15ee3c8 · 15ee3c8
1 parent f6f7b73
commit 15ee3c8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/app/src/main/java/com/maxrave/simpmusic/data/parser/PlaylistParser.kt b/app/src/main/java/com/maxrave/simpmusic/data/parser/PlaylistParser.kt
@@ -7,12 +7,14 @@ import com.maxrave.kotlinytmusicscraper.models.SectionListRenderer
 import com.maxrave.kotlinytmusicscraper.models.response.BrowseResponse
 import com.maxrave.kotlinytmusicscraper.models.response.SearchResponse
 import com.maxrave.kotlinytmusicscraper.pages.PodcastItem
+import com.maxrave.simpmusic.R
 import com.maxrave.simpmusic.data.db.entities.SetVideoIdEntity
 import com.maxrave.simpmusic.data.model.browse.album.Track
 import com.maxrave.simpmusic.data.model.browse.playlist.Author
 import com.maxrave.simpmusic.data.model.browse.playlist.PlaylistBrowse
 import com.maxrave.simpmusic.data.model.podcast.PodcastBrowse
 import com.maxrave.simpmusic.data.model.searchResult.playlists.PlaylistsResult
+import com.maxrave.simpmusic.data.model.searchResult.songs.Album
 import com.maxrave.simpmusic.data.model.searchResult.songs.Artist
 import com.maxrave.simpmusic.data.model.searchResult.songs.Thumbnail
 
@@ -105,7 +107,14 @@ fun parsePlaylistData(
         val listTrack: MutableList<Track> = arrayListOf()
         for (content in listContent){
             val track = Track(
-                album = null,
+                album = content.musicResponsiveListItemRenderer?.menu?.menuRenderer?.items?.find {
+                    it.menuNavigationItemRenderer?.icon?.iconType == "ALBUM"
+                }?.let {
+                    Album(
+                        id = it.menuNavigationItemRenderer?.navigationEndpoint?.browseEndpoint?.browseId ?: return null,
+                        name = context.getString(R.string.album)
+                    )
+                },
                 artists = content.musicResponsiveListItemRenderer?.let {
                     parseSongArtists(
                         it,

diff --git a/app/src/main/res/layout/fragment_album.xml b/app/src/main/res/layout/fragment_album.xml
@@ -106,7 +106,6 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="5sp"
                         android:fontFamily="@font/roboto"
-                        android:text="@string/year_and_category"
                         android:textSize="15sp"
                         android:textStyle="normal" />
 
@@ -210,7 +209,6 @@
                         android:maxLines="10"
                         app:expandAction="More"
                         app:limitedMaxLines="3"
-                        app:originalText="@string/demo_description"
                         android:fontFamily="@font/roboto"
                         android:textStyle="normal"
                         android:textSize="15sp" />
@@ -222,7 +220,6 @@
                         android:layout_marginTop="5sp"
                         android:layout_marginBottom="5sp"
                         android:fontFamily="@font/roboto"
-                        android:text="@string/album_length"
                         android:textSize="15sp"
                         android:textStyle="bold" />
                 </LinearLayout>

diff --git a/app/src/main/res/layout/fragment_playlist.xml b/app/src/main/res/layout/fragment_playlist.xml
@@ -71,7 +71,6 @@
                                 <TextView
                                     android:id="@+id/tvTitle"
                                     style="@style/album_name"
-                                    android:text="Playlist"
                                     android:singleLine="true"
                                     android:ellipsize="marquee"
                                     android:marqueeRepeatLimit="marquee_forever"
@@ -102,7 +101,6 @@
                                     android:layout_height="wrap_content"
                                     android:layout_marginTop="5sp"
                                     android:fontFamily="@font/roboto"
-                                    android:text="@string/year_and_category"
                                     android:textSize="15sp"
                                     android:textStyle="normal" />
 
@@ -199,7 +197,6 @@
                                     app:expandAction="@string/more"
                                     app:expandActionColor="@color/md_theme_dark_outlineVariant"
                                     app:limitedMaxLines="3"
-                                    app:originalText="@string/demo_description"
                                     android:fontFamily="@font/roboto"
                                     android:textStyle="normal"
                                     android:textSize="15sp" />
@@ -211,7 +208,6 @@
                                     android:layout_marginTop="5sp"
                                     android:layout_marginBottom="5sp"
                                     android:fontFamily="@font/roboto"
-                                    android:text="@string/album_length"
                                     android:textSize="15sp"
                                     android:textStyle="bold" />
                             </LinearLayout>