Android Navigation code refactor

app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt

@@ -3,8 +3,8 @@ package code.name.monkey.retromusic.adapter
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageView
 import android.widget.TextView
-import androidx.annotation.IntDef
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.AppCompatTextView
 import androidx.core.os.bundleOf
@@ -13,22 +13,17 @@ import androidx.navigation.fragment.FragmentNavigatorExtras
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import androidx.recyclerview.widget.RecyclerView.HORIZONTAL
 import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.ColorUtil
-import code.name.monkey.retromusic.EXTRA_ALBUM_ID
-import code.name.monkey.retromusic.EXTRA_ARTIST_ID
-import code.name.monkey.retromusic.PeekingLinearLayoutManager
-import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.*
 import code.name.monkey.retromusic.adapter.album.AlbumAdapter
 import code.name.monkey.retromusic.adapter.artist.ArtistAdapter
 import code.name.monkey.retromusic.adapter.song.SongAdapter
-import code.name.monkey.retromusic.extensions.show
+import code.name.monkey.retromusic.extensions.hide
 import code.name.monkey.retromusic.fragments.albums.AlbumClickListener
 import code.name.monkey.retromusic.fragments.artists.ArtistClickListener
 import code.name.monkey.retromusic.glide.SongGlideRequest
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.loaders.PlaylistSongsLoader
 import code.name.monkey.retromusic.model.*
 import code.name.monkey.retromusic.util.PreferenceUtil
 import com.bumptech.glide.Glide
@@ -36,7 +31,7 @@ import com.google.android.material.card.MaterialCardView
 
 class HomeAdapter(
     private val activity: AppCompatActivity
-) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+) : RecyclerView.Adapter<RecyclerView.ViewHolder>(), ArtistClickListener, AlbumClickListener {
 
     private var list = listOf<Home>()
 
@@ -49,14 +44,9 @@ class HomeAdapter(
             .inflate(R.layout.section_recycler_view, parent, false)
         return when (viewType) {
             RECENT_ARTISTS, TOP_ARTISTS -> ArtistViewHolder(layout)
-            TOP_ALBUMS, RECENT_ALBUMS -> {
-                AlbumViewHolder(
-                    LayoutInflater.from(activity)
-                        .inflate(R.layout.metal_section_recycler_view, parent, false)
-                )
-            }
             GENRES -> GenreViewHolder(layout)
             FAVOURITES -> PlaylistViewHolder(layout)
+            TOP_ALBUMS, RECENT_ALBUMS -> AlbumViewHolder(layout)
             else -> {
                 SuggestionsViewHolder(
                     LayoutInflater.from(activity).inflate(
@@ -70,55 +60,62 @@ class HomeAdapter(
     }
 
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        val home = list[position]
         when (getItemViewType(position)) {
             RECENT_ALBUMS -> {
                 val viewHolder = holder as AlbumViewHolder
-                viewHolder.bindView(
-                    list[position].arrayList as List<Album>,
-                    R.string.recent_albums,
-                    "Most recently added albums"
-                )
+                viewHolder.bindView(home.arrayList as List<Album>, R.string.recent_albums)
+                viewHolder.clickableArea.setOnClickListener {
+                    activity.findNavController(R.id.fragment_container).navigate(
+                        R.id.detailListFragment,
+                        bundleOf("type" to RECENT_ALBUMS)
+                    )
+                }
             }
             TOP_ALBUMS -> {
                 val viewHolder = holder as AlbumViewHolder
-                viewHolder.bindView(
-                    list[position].arrayList as List<Album>,
-                    R.string.top_albums,
-                    "Most played albums"
-                )
+                viewHolder.bindView(home.arrayList as List<Album>, R.string.top_albums)
+                viewHolder.clickableArea.setOnClickListener {
+                    activity.findNavController(R.id.fragment_container).navigate(
+                        R.id.detailListFragment,
+                        bundleOf("type" to TOP_ALBUMS)
+                    )
+                }
             }
             RECENT_ARTISTS -> {
                 val viewHolder = holder as ArtistViewHolder
-                viewHolder.bindView(
-                    list[position].arrayList as List<Artist>,
-                    R.string.recent_artists,
-                    "Most recently added artists"
-                )
+                viewHolder.bindView(home.arrayList, R.string.recent_artists)
+                viewHolder.clickableArea.setOnClickListener {
+                    activity.findNavController(R.id.fragment_container).navigate(
+                        R.id.detailListFragment,
+                        bundleOf("type" to RECENT_ARTISTS)
+                    )
+                }
             }
             TOP_ARTISTS -> {
                 val viewHolder = holder as ArtistViewHolder
-                viewHolder.bindView(
-                    list[position].arrayList as List<Artist>,
-                    R.string.top_artists,
-                    "Most played artists"
-                )
+                viewHolder.bindView(home.arrayList, R.string.top_artists)
+                viewHolder.clickableArea.setOnClickListener {
+                    activity.findNavController(R.id.fragment_container).navigate(
+                        R.id.detailListFragment,
+                        bundleOf("type" to TOP_ARTISTS)
+                    )
+                }
             }
             SUGGESTIONS -> {
                 val viewHolder = holder as SuggestionsViewHolder
-                viewHolder.bindView(
-                    list[position].arrayList as List<Song>
-                )
+                viewHolder.bindView(home.arrayList)
             }
             FAVOURITES -> {
                 val viewHolder = holder as PlaylistViewHolder
-                viewHolder.bindView(
-                    list[position].arrayList as List<Playlist>,
-                    R.string.favorites
-                )
+                viewHolder.bindView(home.arrayList, R.string.favorites)
             }
             GENRES -> {
                 val viewHolder = holder as GenreViewHolder
-                viewHolder.bind(list[position].arrayList as List<Genre>, R.string.genres)
+                viewHolder.bind(home.arrayList, R.string.genres)
+            }
+            PLAYLISTS -> {
+
             }
         }
     }
@@ -132,79 +129,23 @@ class HomeAdapter(
         notifyDataSetChanged()
     }
 
-    companion object {
-
-        @IntDef(
-            RECENT_ALBUMS,
-            TOP_ALBUMS,
-            RECENT_ARTISTS,
-            TOP_ARTISTS,
-            SUGGESTIONS,
-            FAVOURITES,
-            GENRES
-        )
-        @Retention(AnnotationRetention.SOURCE)
-        annotation class HomeSection
-
-        const val RECENT_ALBUMS = 3
-        const val TOP_ALBUMS = 1
-        const val RECENT_ARTISTS = 2
-        const val TOP_ARTISTS = 0
-        const val SUGGESTIONS = 5
-        const val FAVOURITES = 4
-        const val GENRES = 6
-    }
-
-    private inner class AlbumViewHolder(view: View) : AbsHomeViewItem(view), AlbumClickListener {
-        fun bindView(list: List<Album>, titleRes: Int, message: String) {
-            if (list.isNotEmpty()) {
-                val albumAdapter = AlbumAdapter(activity, list, R.layout.pager_item, null, this)
-                recyclerView.apply {
-                    show()
-                    adapter = albumAdapter
-                    layoutManager = PeekingLinearLayoutManager(activity, HORIZONTAL, false)
-                }
-                title.text = activity.getString(titleRes)
+    private inner class AlbumViewHolder(view: View) : AbsHomeViewItem(view) {
+        fun bindView(albums: List<Album>, titleRes: Int) {
+            title.text = activity.getString(titleRes)
+            recyclerView.apply {
+                adapter = albumAdapter(albums)
+                layoutManager = gridLayoutManager()
             }
         }
-
-        override fun onAlbumClick(albumId: Int, view: View) {
-            activity.findNavController(R.id.fragment_container).navigate(
-                R.id.albumDetailsFragment,
-                bundleOf(EXTRA_ALBUM_ID to albumId),
-                null,
-                FragmentNavigatorExtras(
-                    view to activity.getString(R.string.transition_album_art)
-                )
-            )
-        }
     }
 
-    private inner class ArtistViewHolder(view: View) : AbsHomeViewItem(view), ArtistClickListener {
-        fun bindView(list: List<Artist>, titleRes: Int, message: String) {
-            if (list.isNotEmpty()) {
-                val manager = LinearLayoutManager(activity, LinearLayoutManager.HORIZONTAL, false)
-                val artistAdapter = ArtistAdapter(
-                    activity,
-                    list,
-                    PreferenceUtil.homeGridStyle,
-                    null,
-                    this
-                )
-                recyclerView.apply {
-                    show()
-                    layoutManager = manager
-                    adapter = artistAdapter
-                }
-                title.text = activity.getString(titleRes)
+    private inner class ArtistViewHolder(view: View) : AbsHomeViewItem(view) {
+        fun bindView(artists: List<Any>, titleRes: Int) {
+            recyclerView.apply {
+                layoutManager = linearLayoutManager()
+                adapter = artistsAdapter(artists as List<Artist>)
             }
-        }
-
-        override fun onArtist(artistId: Int) {
-            activity.findNavController(R.id.fragment_container).navigate(
-                R.id.artistDetailsFragment,
-                bundleOf(EXTRA_ARTIST_ID to artistId)
-            )
+            title.text = activity.getString(titleRes)
         }
     }
 
@@ -220,18 +161,19 @@ class HomeAdapter(
             R.id.image8
         )
 
-        fun bindView(arrayList: List<Song>) {
+        fun bindView(songs: List<Any>) {
+            songs as List<Song>
             val color = ThemeStore.accentColor(activity)
             itemView.findViewById<TextView>(R.id.message).setTextColor(color)
             itemView.findViewById<MaterialCardView>(R.id.card6).apply {
                 setCardBackgroundColor(ColorUtil.withAlpha(color, 0.2f))
             }
-            if (arrayList.size > 9)
+            if (songs.size > 9)
                 images.forEachIndexed { index, i ->
                     itemView.findViewById<View>(i).setOnClickListener {
-                        MusicPlayerRemote.playNext(arrayList[index])
+                        MusicPlayerRemote.playNext(songs[index])
                     }
-                    SongGlideRequest.Builder.from(Glide.with(activity), arrayList[index])
+                    SongGlideRequest.Builder.from(Glide.with(activity), songs[index])
                         .asBitmap()
                         .build()
                         .into(itemView.findViewById(i))
@@ -241,33 +183,29 @@ class HomeAdapter(
     }
 
     private inner class PlaylistViewHolder(view: View) : AbsHomeViewItem(view) {
-        fun bindView(arrayList: List<Playlist>, titleRes: Int) {
-            text.text = "You're all time favorites"
-            if (arrayList.isNotEmpty()) {
-                val songs = PlaylistSongsLoader.getPlaylistSongList(activity, arrayList[0])
-                if (songs.isNotEmpty()) {
-                    recyclerView.apply {
-                        show()
-                        val songAdapter =
-                            SongAdapter(activity, songs, R.layout.item_album_card, null)
-                        layoutManager =
-                            GridLayoutManager(activity, 1, GridLayoutManager.HORIZONTAL, false)
-                        adapter = songAdapter
-                    }
-                    title.text = activity.getString(titleRes)
-                }
+        fun bindView(songs: List<Any>, titleRes: Int) {
+            arrow.hide()
+            recyclerView.apply {
+                val songAdapter = SongAdapter(
+                    activity,
+                    songs as MutableList<Song>,
+                    R.layout.item_album_card, null
+                )
+                layoutManager = linearLayoutManager()
+                adapter = songAdapter
             }
+            title.text = activity.getString(titleRes)
         }
     }
 
     private inner class GenreViewHolder(itemView: View) : AbsHomeViewItem(itemView) {
-        fun bind(genres: List<Genre>, titleRes: Int) {
+        fun bind(genres: List<Any>, titleRes: Int) {
+            arrow.hide()
             title.text = activity.getString(titleRes)
-            text.text = "Genres for you"
             recyclerView.apply {
-                show()
-                layoutManager = GridLayoutManager(activity, 2, GridLayoutManager.HORIZONTAL, false)
-                val genreAdapter = GenreAdapter(activity, genres, R.layout.item_grid_genre)
+                layoutManager = GridLayoutManager(activity, 3, GridLayoutManager.HORIZONTAL, false)
+                val genreAdapter =
+                    GenreAdapter(activity, genres as List<Genre>, R.layout.item_grid_genre)
                 adapter = genreAdapter
             }
         }
@@ -276,6 +214,38 @@ class HomeAdapter(
     open inner class AbsHomeViewItem(itemView: View) : RecyclerView.ViewHolder(itemView) {
         val recyclerView: RecyclerView = itemView.findViewById(R.id.recyclerView)
         val title: AppCompatTextView = itemView.findViewById(R.id.title)
-        val text: AppCompatTextView = itemView.findViewById(R.id.text)
+        val arrow: ImageView = itemView.findViewById(R.id.arrow)
+        val clickableArea: ViewGroup = itemView.findViewById(R.id.clickable_area)
+    }
+
+    fun artistsAdapter(artists: List<Artist>) =
+        ArtistAdapter(activity, artists, PreferenceUtil.homeGridStyle, null, this)
+
+    fun albumAdapter(albums: List<Album>) =
+        AlbumAdapter(activity, albums, R.layout.item_image, null, this)
+
+    fun gridLayoutManager() = GridLayoutManager(activity, 1, GridLayoutManager.HORIZONTAL, false)
+    fun linearLayoutManager() = LinearLayoutManager(activity, LinearLayoutManager.HORIZONTAL, false)
+
+    override fun onArtist(artistId: Int, imageView: ImageView) {
+        activity.findNavController(R.id.fragment_container).navigate(
+            R.id.artistDetailsFragment,
+            bundleOf(EXTRA_ARTIST_ID to artistId),
+            null,
+            FragmentNavigatorExtras(
+                imageView to activity.getString(R.string.transition_album_art)
+            )
+        )
+    }
+
+    override fun onAlbumClick(albumId: Int, view: View) {
+        activity.findNavController(R.id.fragment_container).navigate(
+            R.id.albumDetailsFragment,
+            bundleOf(EXTRA_ALBUM_ID to albumId),
+            null,
+            FragmentNavigatorExtras(
+                view to activity.getString(R.string.transition_album_art)
+            )
+        )
     }
 }

app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt

@@ -1,12 +1,12 @@
 package code.name.monkey.retromusic.adapter.artist
 
-import android.app.ActivityOptions
 import android.content.res.ColorStateList
 import android.content.res.Resources
 import android.view.LayoutInflater
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.ViewCompat
 import androidx.fragment.app.FragmentActivity
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter
@@ -131,7 +131,6 @@ class ArtistAdapter(
     inner class ViewHolder(itemView: View) : MediaEntryViewHolder(itemView) {
 
         init {
-            setImageTransitionName(activity.getString(R.string.transition_artist_image))
             menu?.visibility = View.GONE
         }
 
@@ -140,15 +139,13 @@ class ArtistAdapter(
             if (isInQuickSelectMode) {
                 toggleChecked(layoutPosition)
             } else {
-                val activityOptions = ActivityOptions.makeSceneTransitionAnimation(
-                    activity,
-                    imageContainerCard ?: image,
-                    activity.getString(R.string.transition_artist_image)
-                )
-                artistClickListener.onArtist(dataSet[layoutPosition].id)
-                /*NavigationUtil.goToArtistOptions(
-                    activity, dataSet[layoutPosition].id, activityOptions
-                )*/
+                image?.let {
+                    ViewCompat.setTransitionName(
+                        it,
+                        activity.getString(R.string.transition_artist_image)
+                    )
+                    artistClickListener.onArtist(dataSet[layoutPosition].id, it)
+                }
             }
         }
 

app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt

@@ -148,7 +148,6 @@ open class SongAdapter(
                 return ""
             }
         }
-
         return MusicUtil.getSectionName(sectionName)
     }