Update ViewHolder structure

Make some minor improvements to the ViewHolder structure.

app/build.gradle

@@ -61,7 +61,7 @@ dependencies {
     implementation 'androidx.viewpager2:viewpager2:1.0.0'
 
     // Navigation
-    def navigation_version = "2.3.0"
+    def navigation_version = "2.3.1"
     implementation "androidx.navigation:navigation-fragment-ktx:$navigation_version"
     implementation "androidx.navigation:navigation-ui-ktx:$navigation_version"
 

app/src/main/java/org/oxycblt/auxio/detail/adapters/DetailAlbumAdapter.kt

@@ -9,7 +9,7 @@ import org.oxycblt.auxio.recycler.DiffCallback
 import org.oxycblt.auxio.recycler.viewholders.BaseViewHolder
 
 class DetailAlbumAdapter(
-    private val doOnClick: (Album) -> Unit
+    private val doOnClick: (data: Album) -> Unit
 ) : ListAdapter<Album, DetailAlbumAdapter.ViewHolder>(DiffCallback()) {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
@@ -27,8 +27,8 @@ class DetailAlbumAdapter(
         private val binding: ItemArtistAlbumBinding,
     ) : BaseViewHolder<Album>(binding, doOnClick) {
 
-        override fun onBind(model: Album) {
+        override fun onBind(data: Album) {
-            binding.album = model
+            binding.album = data
 
             binding.albumName.requestLayout()
         }

app/src/main/java/org/oxycblt/auxio/detail/adapters/DetailArtistAdapter.kt

@@ -9,7 +9,7 @@ import org.oxycblt.auxio.recycler.DiffCallback
 import org.oxycblt.auxio.recycler.viewholders.BaseViewHolder
 
 class DetailArtistAdapter(
-    private val doOnClick: (Artist) -> Unit
+    private val doOnClick: (data: Artist) -> Unit
 ) : ListAdapter<Artist, DetailArtistAdapter.ViewHolder>(DiffCallback()) {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
@@ -27,8 +27,8 @@ class DetailArtistAdapter(
         private val binding: ItemGenreArtistBinding
     ) : BaseViewHolder<Artist>(binding, doOnClick) {
 
-        override fun onBind(model: Artist) {
+        override fun onBind(data: Artist) {
-            binding.artist = model
+            binding.artist = data
 
             binding.artistName.requestLayout()
         }

app/src/main/java/org/oxycblt/auxio/detail/adapters/DetailSongAdapter.kt

@@ -2,24 +2,18 @@ package org.oxycblt.auxio.detail.adapters
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import androidx.annotation.ColorInt
 import androidx.recyclerview.widget.ListAdapter
 import org.oxycblt.auxio.databinding.ItemAlbumSongBinding
 import org.oxycblt.auxio.music.Song
 import org.oxycblt.auxio.recycler.DiffCallback
 import org.oxycblt.auxio.recycler.viewholders.BaseViewHolder
-import org.oxycblt.auxio.theme.accent
-import org.oxycblt.auxio.theme.toColor
 
 class DetailSongAdapter(
-    private val doOnClick: (Song) -> Unit
+    private val doOnClick: (data: Song) -> Unit
 ) : ListAdapter<Song, DetailSongAdapter.ViewHolder>(DiffCallback()) {
-    private var currentSong: Song? = null
-
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
         return ViewHolder(
-            ItemAlbumSongBinding.inflate(LayoutInflater.from(parent.context)),
+            ItemAlbumSongBinding.inflate(LayoutInflater.from(parent.context))
-            accent.first.toColor(parent.context)
         )
     }
 
@@ -30,15 +24,10 @@ class DetailSongAdapter(
     // Generic ViewHolder for a song
     inner class ViewHolder(
         private val binding: ItemAlbumSongBinding,
-        @ColorInt private val resolvedAccent: Int
     ) : BaseViewHolder<Song>(binding, doOnClick) {
 
-        override fun onBind(model: Song) {
+        override fun onBind(data: Song) {
-            binding.song = model
+            binding.song = data
-
-            if (model == currentSong) {
-                binding.songName.setTextColor(resolvedAccent)
-            }
 
             binding.songName.requestLayout()
         }

app/src/main/java/org/oxycblt/auxio/library/adapters/LibraryAdapter.kt

@@ -16,7 +16,7 @@ import org.oxycblt.auxio.recycler.viewholders.GenreViewHolder
 // It cannot display multiple ViewHolders *at once* however. That's what SearchAdapter is for.
 class LibraryAdapter(
     private val showMode: ShowMode,
-    private val doOnClick: (BaseModel) -> Unit
+    private val doOnClick: (data: BaseModel) -> Unit
 ) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
     private var data: List<BaseModel>

app/src/main/java/org/oxycblt/auxio/library/adapters/SearchAdapter.kt

@@ -17,7 +17,7 @@ import org.oxycblt.auxio.recycler.viewholders.HeaderViewHolder
 import org.oxycblt.auxio.recycler.viewholders.SongViewHolder
 
 class SearchAdapter(
-    private val doOnClick: (BaseModel) -> Unit
+    private val doOnClick: (data: BaseModel) -> Unit
 ) : ListAdapter<BaseModel, RecyclerView.ViewHolder>(DiffCallback<BaseModel>()) {
 
     override fun getItemViewType(position: Int): Int {

app/src/main/java/org/oxycblt/auxio/playback/PlaybackViewModel.kt

@@ -15,7 +15,7 @@ import org.oxycblt.auxio.music.toDuration
 import kotlin.random.Random
 import kotlin.random.Random.Default.nextLong
 
-// TODO: Editing/Adding to Queue
+// TODO: Adding to Queue
 // TODO: Add the playback service itself
 // TODO: Add loop control [From playback]
 // TODO: Implement persistence through Bundles [I want to keep my shuffles, okay?]

app/src/main/java/org/oxycblt/auxio/playback/queue/QueueAdapter.kt

@@ -28,8 +28,12 @@ class QueueAdapter(
     ) : BaseViewHolder<Song>(binding, null) {
 
         @SuppressLint("ClickableViewAccessibility")
-        override fun onBind(model: Song) {
+        override fun onBind(data: Song) {
-            binding.song = model
+            binding.song = data
+
+            binding.songName.requestLayout()
+            binding.songInfo.requestLayout()
+
             binding.songDragHandle.setOnTouchListener { _, motionEvent ->
                 binding.songDragHandle.performClick()
 
@@ -40,9 +44,6 @@ class QueueAdapter(
 
                 false
             }
-
-            binding.songName.requestLayout()
-            binding.songInfo.requestLayout()
         }
     }
 }

app/src/main/java/org/oxycblt/auxio/recycler/viewholders/BaseViewHolder.kt

@@ -7,7 +7,7 @@ import org.oxycblt.auxio.music.BaseModel
 // ViewHolder abstraction that automates some of the things that are common for all ViewHolders.
 abstract class BaseViewHolder<T : BaseModel>(
     private val baseBinding: ViewDataBinding,
-    private val doOnClick: ((T) -> Unit)?
+    private val doOnClick: ((data: T) -> Unit)?
 ) : RecyclerView.ViewHolder(baseBinding.root) {
     init {
         // Force the layout to *actually* be the screen width
@@ -16,15 +16,17 @@ abstract class BaseViewHolder<T : BaseModel>(
         )
     }
 
-    fun bind(model: T) {
+    fun bind(data: T) {
-        doOnClick?.let {
+        doOnClick?.let { onClick ->
-            baseBinding.root.setOnClickListener { it(model) }
+            baseBinding.root.setOnClickListener {
+                onClick(data)
+            }
         }
 
-        onBind(model)
+        onBind(data)
 
         baseBinding.executePendingBindings()
     }
 
-    abstract fun onBind(model: T)
+    protected abstract fun onBind(data: T)
 }

app/src/main/java/org/oxycblt/auxio/recycler/viewholders/ModelHolders.kt

@@ -17,12 +17,12 @@ import org.oxycblt.auxio.music.Song
 // All new instances should be created with from() instead of direct instantiation.
 
 class GenreViewHolder private constructor(
-    doOnClick: (Genre) -> Unit,
+    private val binding: ItemGenreBinding,
-    private val binding: ItemGenreBinding
+    doOnClick: (Genre) -> Unit
 ) : BaseViewHolder<Genre>(binding, doOnClick) {
 
-    override fun onBind(model: Genre) {
+    override fun onBind(data: Genre) {
-        binding.genre = model
+        binding.genre = data
         binding.genreName.requestLayout()
     }
 
@@ -31,20 +31,20 @@ class GenreViewHolder private constructor(
 
         fun from(context: Context, doOnClick: (Genre) -> Unit): GenreViewHolder {
             return GenreViewHolder(
-                doOnClick,
+                ItemGenreBinding.inflate(LayoutInflater.from(context)),
-                ItemGenreBinding.inflate(LayoutInflater.from(context))
+                doOnClick
             )
         }
     }
 }
 
 class ArtistViewHolder private constructor(
+    private val binding: ItemArtistBinding,
     doOnClick: (Artist) -> Unit,
-    private val binding: ItemArtistBinding
 ) : BaseViewHolder<Artist>(binding, doOnClick) {
 
-    override fun onBind(model: Artist) {
+    override fun onBind(data: Artist) {
-        binding.artist = model
+        binding.artist = data
         binding.artistName.requestLayout()
     }
 
@@ -53,30 +53,30 @@ class ArtistViewHolder private constructor(
 
         fun from(context: Context, doOnClick: (Artist) -> Unit): ArtistViewHolder {
             return ArtistViewHolder(
-                doOnClick,
+                ItemArtistBinding.inflate(LayoutInflater.from(context)),
-                ItemArtistBinding.inflate(LayoutInflater.from(context))
+                doOnClick
             )
         }
     }
 }
 
 class AlbumViewHolder private constructor(
-    doOnClick: (Album) -> Unit,
+    private val binding: ItemAlbumBinding,
-    private val binding: ItemAlbumBinding
+    doOnClick: (data: Album) -> Unit
 ) : BaseViewHolder<Album>(binding, doOnClick) {
 
-    override fun onBind(model: Album) {
+    override fun onBind(data: Album) {
-        binding.album = model
+        binding.album = data
         binding.albumName.requestLayout()
     }
 
     companion object {
         const val ITEM_TYPE = 12
 
-        fun from(context: Context, doOnClick: (Album) -> Unit): AlbumViewHolder {
+        fun from(context: Context, doOnClick: (data: Album) -> Unit): AlbumViewHolder {
             return AlbumViewHolder(
+                ItemAlbumBinding.inflate(LayoutInflater.from(context)),
                 doOnClick,
-                ItemAlbumBinding.inflate(LayoutInflater.from(context))
             )
         }
     }
@@ -85,12 +85,12 @@ class AlbumViewHolder private constructor(
 // TODO: Add indicators to song recycler items when they're being played?
 
 class SongViewHolder private constructor(
-    doOnClick: (Song) -> Unit,
+    private val binding: ItemSongBinding,
-    private val binding: ItemSongBinding
+    doOnClick: (data: Song) -> Unit,
 ) : BaseViewHolder<Song>(binding, doOnClick) {
 
-    override fun onBind(model: Song) {
+    override fun onBind(data: Song) {
-        binding.song = model
+        binding.song = data
 
         binding.songName.requestLayout()
         binding.songInfo.requestLayout()
@@ -99,10 +99,13 @@ class SongViewHolder private constructor(
     companion object {
         const val ITEM_TYPE = 13
 
-        fun from(context: Context, doOnClick: (Song) -> Unit): SongViewHolder {
+        fun from(
+            context: Context,
+            doOnClick: (data: Song) -> Unit,
+        ): SongViewHolder {
             return SongViewHolder(
-                doOnClick,
+                ItemSongBinding.inflate(LayoutInflater.from(context)),
-                ItemSongBinding.inflate(LayoutInflater.from(context))
+                doOnClick
             )
         }
     }
@@ -111,8 +114,9 @@ class SongViewHolder private constructor(
 class HeaderViewHolder(
     private val binding: ItemHeaderBinding
 ) : BaseViewHolder<Header>(binding, null) {
-    override fun onBind(model: Header) {
+
-        binding.header = model
+    override fun onBind(data: Header) {
+        binding.header = data
     }
 
     companion object {

app/src/main/java/org/oxycblt/auxio/songs/SongAdapter.kt

@@ -7,7 +7,7 @@ import org.oxycblt.auxio.recycler.viewholders.SongViewHolder
 
 class SongAdapter(
     private val data: List<Song>,
-    private val doOnClick: (Song) -> Unit
+    private val doOnClick: (data: Song) -> Unit
 ) : RecyclerView.Adapter<SongViewHolder>() {
 
     override fun getItemCount(): Int = data.size

app/src/main/res/values/strings.xml

@@ -26,6 +26,7 @@
     <string name="label_shuffle">Shuffle</string>
     <string name="label_play">Play</string>
     <string name="label_queue">Queue</string>
+    <string name="label_queue_add">Add to queue</string>
 
     <!-- Hint Namespace | EditText Hints -->
     <string name="hint_search_library">Search Library…</string>