From ec45a020a56238d25b1a896d46bc0595cd68a19f Mon Sep 17 00:00:00 2001
From: OxygenCobalt <alexyx@tutanota.com>
Date: Thu, 17 Sep 2020 15:20:41 -0600
Subject: [PATCH] Add song list to AlbumDetailFragment

Add a list of the albums songs to AlbumDetailFragment.
---
 .../auxio/detail/AlbumDetailFragment.kt       | 12 +++
 .../detail/adapters/DetailSongAdapter.kt      | 52 +++++++++++++
 .../org/oxycblt/auxio/music/models/Album.kt   |  2 +-
 .../auxio/music/processing/MusicLoader.kt     |  2 +-
 .../auxio/music/processing/MusicSorter.kt     |  2 +
 .../main/res/layout/fragment_album_detail.xml | 55 +++++++++++---
 .../res/layout/fragment_artist_detail.xml     |  4 -
 app/src/main/res/layout/item_album_song.xml   | 74 +++++++++++++++++++
 app/src/main/res/values/dimens.xml            |  2 +
 app/src/main/res/values/strings.xml           |  1 +
 10 files changed, 188 insertions(+), 18 deletions(-)
 create mode 100644 app/src/main/java/org/oxycblt/auxio/detail/adapters/DetailSongAdapter.kt
 create mode 100644 app/src/main/res/layout/item_album_song.xml

diff --git a/app/src/main/java/org/oxycblt/auxio/detail/AlbumDetailFragment.kt b/app/src/main/java/org/oxycblt/auxio/detail/AlbumDetailFragment.kt
index 643aa3750..39010e7be 100644
--- a/app/src/main/java/org/oxycblt/auxio/detail/AlbumDetailFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/detail/AlbumDetailFragment.kt
@@ -8,8 +8,11 @@ import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.navArgs
+import org.oxycblt.auxio.ClickListener
 import org.oxycblt.auxio.databinding.FragmentAlbumDetailBinding
+import org.oxycblt.auxio.detail.adapters.DetailSongAdapter
 import org.oxycblt.auxio.music.MusicViewModel
+import org.oxycblt.auxio.theme.applyDivider
 
 class AlbumDetailFragment : Fragment() {
 
@@ -30,6 +33,15 @@ class AlbumDetailFragment : Fragment() {
         binding.lifecycleOwner = this
         binding.album = album
 
+        binding.songRecycler.adapter = DetailSongAdapter(
+            album.songs,
+            ClickListener {
+                Log.d(this::class.simpleName, it.name)
+            }
+        )
+        binding.songRecycler.applyDivider()
+        binding.songRecycler.setHasFixedSize(true)
+
         Log.d(this::class.simpleName, "Fragment created.")
 
         return binding.root
diff --git a/app/src/main/java/org/oxycblt/auxio/detail/adapters/DetailSongAdapter.kt b/app/src/main/java/org/oxycblt/auxio/detail/adapters/DetailSongAdapter.kt
new file mode 100644
index 000000000..9d42206b0
--- /dev/null
+++ b/app/src/main/java/org/oxycblt/auxio/detail/adapters/DetailSongAdapter.kt
@@ -0,0 +1,52 @@
+package org.oxycblt.auxio.detail.adapters
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import org.oxycblt.auxio.ClickListener
+import org.oxycblt.auxio.databinding.ItemAlbumSongBinding
+import org.oxycblt.auxio.music.models.Song
+
+class DetailSongAdapter(
+    private val data: List<Song>,
+    private val listener: ClickListener<Song>
+) : RecyclerView.Adapter<DetailSongAdapter.ViewHolder>() {
+
+    override fun getItemCount(): Int = data.size
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        return ViewHolder(
+            ItemAlbumSongBinding.inflate(LayoutInflater.from(parent.context))
+        )
+    }
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        holder.bind(data[position])
+    }
+
+    // Generic ViewHolder for an album
+    inner class ViewHolder(
+        private val binding: ItemAlbumSongBinding
+    ) : RecyclerView.ViewHolder(binding.root) {
+
+        init {
+            // Force the viewholder to *actually* be the screen width so ellipsizing can work.
+            binding.root.layoutParams = RecyclerView.LayoutParams(
+                RecyclerView.LayoutParams.MATCH_PARENT, RecyclerView.LayoutParams.WRAP_CONTENT
+            )
+        }
+
+        // Bind the view w/new data
+        fun bind(song: Song) {
+            binding.song = song
+
+            binding.root.setOnClickListener {
+                listener.onClick(song)
+            }
+
+            // Force-update the layout so ellipsizing works.
+            binding.songName.requestLayout()
+            binding.executePendingBindings()
+        }
+    }
+}
diff --git a/app/src/main/java/org/oxycblt/auxio/music/models/Album.kt b/app/src/main/java/org/oxycblt/auxio/music/models/Album.kt
index b04744459..1c215d536 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/models/Album.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/models/Album.kt
@@ -8,7 +8,7 @@ data class Album(
     var name: String = "",
     val artistName: String = "", // only used for sorting. Use artist.name instead.
     val coverUri: Uri = Uri.EMPTY,
-    val year: String = ""
+    val year: Int = 0
 ) {
     lateinit var artist: Artist
 
diff --git a/app/src/main/java/org/oxycblt/auxio/music/processing/MusicLoader.kt b/app/src/main/java/org/oxycblt/auxio/music/processing/MusicLoader.kt
index a7f466fe3..a001332d8 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/processing/MusicLoader.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/processing/MusicLoader.kt
@@ -191,7 +191,7 @@ class MusicLoader(private val resolver: ContentResolver) {
                 albums.add(
                     Album(
                         id, name, artist,
-                        coverUri, year.toString()
+                        coverUri, year
                     )
                 )
             }
diff --git a/app/src/main/java/org/oxycblt/auxio/music/processing/MusicSorter.kt b/app/src/main/java/org/oxycblt/auxio/music/processing/MusicSorter.kt
index 32a29a050..a338b5d05 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/processing/MusicSorter.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/processing/MusicSorter.kt
@@ -40,6 +40,8 @@ class MusicSorter(
                 album.songs.add(song)
             }
 
+            album.finalize()
+
             unknownSongs.removeAll(albumSongs)
         }
 
diff --git a/app/src/main/res/layout/fragment_album_detail.xml b/app/src/main/res/layout/fragment_album_detail.xml
index 8c41b0eb5..c4535b4cd 100644
--- a/app/src/main/res/layout/fragment_album_detail.xml
+++ b/app/src/main/res/layout/fragment_album_detail.xml
@@ -47,7 +47,7 @@
                     tools:src="@drawable/ic_album" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    android:id="@+id/artist_name"
+                    android:id="@+id/album_name"
                     style="@style/DetailHeader"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -65,6 +65,18 @@
                     app:layout_constraintTop_toBottomOf="@+id/cover"
                     tools:text="Album Name" />
 
+                <TextView
+                    android:id="@+id/artist_name"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="?android:attr/textAppearanceListItem"
+                    android:textColor="?android:attr/textColorSecondary"
+                    android:layout_marginStart="@dimen/margin_medium"
+                    android:text="@{album.artist.name}"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/album_name"
+                    tools:text="Artist Name" />
+
                 <TextView
                     android:id="@+id/album_year"
                     android:layout_width="0dp"
@@ -72,25 +84,44 @@
                     android:textAppearance="?android:attr/textAppearanceListItem"
                     android:textColor="?android:attr/textColorSecondary"
                     android:layout_marginStart="@dimen/margin_medium"
-                    android:text="@{album.year}"
+                    android:text="@{String.valueOf(album.year)}"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/artist_name"
                     tools:text="2020" />
 
                 <TextView
-                    android:id="@+id/artist_counts"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:textAppearance="?android:attr/textAppearanceListItem"
-                    android:textColor="?android:attr/textColorSecondary"
-                    android:layout_marginStart="@dimen/margin_medium"
-                    app:songCount="@{album}"
-                    app:layout_constraintStart_toStartOf="parent"
+                    android:id="@+id/header_songs"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:text="@string/label_songs"
+                    android:textAppearance="@style/TextAppearance.MaterialComponents.Overline"
+                    android:textSize="16sp"
+                    android:fontFamily="@font/inter_bold"
+                    android:layout_marginTop="@dimen/padding_medium"
+                    android:paddingStart="@dimen/padding_medium"
+                    android:paddingEnd="@dimen/padding_small"
+                    android:paddingTop="@dimen/padding_small"
+                    android:paddingBottom="@dimen/padding_small"
+                    android:background="@drawable/header_dividers"
                     app:layout_constraintTop_toBottomOf="@+id/album_year"
-                    tools:text="20 Songs" />
+                    tools:layout_editor_absoluteX="60dp" />
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/song_recycler"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:nestedScrollingEnabled="true"
+                    android:overScrollMode="never"
+                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/header_songs"
+                    app:layout_constraintVertical_bias="0.0"
+                    tools:itemCount="4"
+                    tools:layout_editor_absoluteX="0dp"
+                    tools:listitem="@layout/item_album_song" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.core.widget.NestedScrollView>
     </LinearLayout>
-
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_artist_detail.xml b/app/src/main/res/layout/fragment_artist_detail.xml
index 60c521dec..d14c81684 100644
--- a/app/src/main/res/layout/fragment_artist_detail.xml
+++ b/app/src/main/res/layout/fragment_artist_detail.xml
@@ -97,8 +97,6 @@
                     android:textAppearance="@style/TextAppearance.MaterialComponents.Overline"
                     android:textSize="16sp"
                     android:fontFamily="@font/inter_bold"
-                    android:clickable="true"
-                    android:focusable="true"
                     android:layout_marginTop="@dimen/padding_medium"
                     android:paddingStart="@dimen/padding_medium"
                     android:paddingEnd="@dimen/padding_small"
@@ -118,9 +116,7 @@
                     app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/header_albums"
-                    app:layout_constraintVertical_bias="0.0"
                     tools:itemCount="4"
-                    tools:layout_editor_absoluteX="0dp"
                     tools:listitem="@layout/item_album" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_album_song.xml b/app/src/main/res/layout/item_album_song.xml
new file mode 100644
index 000000000..9e238fe9b
--- /dev/null
+++ b/app/src/main/res/layout/item_album_song.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <variable
+            name="song"
+            type="org.oxycblt.auxio.music.models.Song" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/ripple"
+        android:clickable="true"
+        android:focusable="true"
+        android:padding="@dimen/padding_medium">
+
+        <TextView
+            android:id="@+id/track_number"
+            android:layout_width="@dimen/track_number_size"
+            android:layout_height="wrap_content"
+            android:text="@{String.valueOf(song.track)}"
+            android:textAlignment="center"
+            android:textAppearance="?android:attr/textAppearanceListItem"
+            android:textColor="?android:attr/textColorTertiary"
+            android:textSize="20sp"
+            android:maxLines="1"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:ignore="ContentDescription"
+            tools:src="@drawable/ic_song"
+            tools:text="1" />
+
+        <TextView
+            android:id="@+id/song_name"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/margin_medium"
+            android:layout_marginEnd="@dimen/margin_medium"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:text="@{song.name}"
+            android:textAppearance="?android:attr/textAppearanceListItem"
+            android:textColor="?android:attr/textColorPrimary"
+            app:layout_constraintBottom_toTopOf="@+id/duration"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/track_number"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_chainStyle="packed"
+            tools:text="Song Name" />
+
+        <TextView
+            android:id="@+id/duration"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/margin_medium"
+            android:layout_marginEnd="@dimen/margin_medium"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textAppearance="?android:attr/textAppearanceListItemSecondary"
+            android:textColor="?android:attr/textColorSecondary"
+            android:text="@{song.formattedDuration}"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/track_number"
+            app:layout_constraintTop_toBottomOf="@+id/song_name"
+            tools:text="16:16" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 96c57bc90..d5dc5840a 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -16,6 +16,8 @@
     <dimen name="cover_size_large">80dp</dimen>
     <dimen name="cover_size_huge">230dp</dimen>
 
+    <dimen name="track_number_size">32dp</dimen>
+
     <dimen name="detail_header_size_max">26sp</dimen>
     <dimen name="detail_header_size_min">10sp</dimen>'
     <dimen name="detail_header_size_increment">2sp</dimen>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 08158a80c..6e2a34c02 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -12,6 +12,7 @@
     <string name="label_retry">Retry</string>
     <string name="label_grant">Grant</string>
     <string name="label_albums">Albums</string>
+    <string name="label_songs">Songs</string>
 
     <string name="placeholder_unknown_genre">Unknown Genre</string>
     <string name="placeholder_unknown_artist">Unknown Artist</string>