Working towards single activity design

2020-08-11 23:59:44 +05:30 · 2020-08-11 23:59:44 +05:30 · 3ebf777d7b
commit 3ebf777d7b
parent 31534769a8
87 changed files with 1908 additions and 2423 deletions
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/GenreAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/GenreAdapter.kt
@ -1,14 +1,16 @@
 package code.name.monkey.retromusic.adapter

-import android.app.Activity
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.os.bundleOf
+import androidx.fragment.app.FragmentActivity
+import androidx.navigation.findNavController
 import androidx.recyclerview.widget.RecyclerView
+import code.name.monkey.retromusic.EXTRA_GENRE
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
 import code.name.monkey.retromusic.model.Genre
-import code.name.monkey.retromusic.util.NavigationUtil
 import java.util.*

 /**
@ -16,7 +18,7 @@ import java.util.*
 */

 class GenreAdapter(
-    private val activity: Activity,
+    private val activity: FragmentActivity,
    var dataSet: List<Genre>,
    private val mItemLayoutRes: Int
 ) : RecyclerView.Adapter<GenreAdapter.ViewHolder>() {
@ -48,9 +50,10 @@ class GenreAdapter(

    inner class ViewHolder(itemView: View) : MediaEntryViewHolder(itemView) {
        override fun onClick(v: View?) {
-            super.onClick(v)
-            val genre = dataSet[layoutPosition]
-            NavigationUtil.goToGenre(activity, genre)
+            activity.findNavController(R.id.fragment_container).navigate(
+                R.id.genreDetailsFragment,
+                bundleOf(EXTRA_GENRE to dataSet[layoutPosition])
+            )
        }
    }
 }
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt
@ -1,6 +1,5 @@
 package code.name.monkey.retromusic.adapter

-import android.util.DisplayMetrics
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@ -8,18 +7,24 @@ import android.widget.TextView
 import androidx.annotation.IntDef
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.AppCompatTextView
+import androidx.core.os.bundleOf
+import androidx.navigation.findNavController
 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.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.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
@ -29,8 +34,7 @@ import com.bumptech.glide.Glide
 import com.google.android.material.card.MaterialCardView

 class HomeAdapter(
-    private val activity: AppCompatActivity,
-    private val displayMetrics: DisplayMetrics
+    private val activity: AppCompatActivity
 ) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {

    private var list = listOf<Home>()
@ -143,21 +147,28 @@ class HomeAdapter(
        const val GENRES = 6
    }

-    private inner class AlbumViewHolder(view: View) : AbsHomeViewItem(view) {
+    private inner class AlbumViewHolder(view: View) : AbsHomeViewItem(view), AlbumClickListener {
        fun bindView(list: List<Album>, titleRes: Int) {
            if (list.isNotEmpty()) {
+                val albumAdapter = AlbumAdapter(activity, list, R.layout.pager_item, null, this)
                recyclerView.apply {
                    show()
-                    adapter = AlbumAdapter(activity, list, R.layout.pager_item, null)
-                    layoutManager =
-                        PeekingLinearLayoutManager(activity, HORIZONTAL, false)
+                    adapter = albumAdapter
+                    layoutManager = PeekingLinearLayoutManager(activity, HORIZONTAL, false)
                }
                title.text = activity.getString(titleRes)
            }
        }
+
+        override fun onAlbumClick(albumId: Int) {
+            activity.findNavController(R.id.fragment_container).navigate(
+                R.id.albumDetailsFragment,
+                bundleOf(EXTRA_ALBUM_ID to albumId)
+            )
+        }
    }

-    inner class ArtistViewHolder(view: View) : AbsHomeViewItem(view) {
+    private inner class ArtistViewHolder(view: View) : AbsHomeViewItem(view), ArtistClickListener {
        fun bindView(list: List<Artist>, titleRes: Int) {
            if (list.isNotEmpty()) {
                val manager = LinearLayoutManager(activity, LinearLayoutManager.HORIZONTAL, false)
@ -165,7 +176,8 @@ class HomeAdapter(
                    activity,
                    list,
                    PreferenceUtil.homeGridStyle,
-                    null
+                    null,
+                    this
                )
                recyclerView.apply {
                    show()
@ -175,6 +187,13 @@ class HomeAdapter(
                title.text = activity.getString(titleRes)
            }
        }
+
+        override fun onArtist(artistId: Int) {
+            activity.findNavController(R.id.fragment_container).navigate(
+                R.id.artistDetailsFragment,
+                bundleOf(EXTRA_ARTIST_ID to artistId)
+            )
+        }
    }

    private inner class SuggestionsViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt
@ -1,13 +1,14 @@
 package code.name.monkey.retromusic.adapter

-import android.app.ActivityOptions
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.appcompat.app.AppCompatActivity
+import androidx.core.os.bundleOf
+import androidx.fragment.app.FragmentActivity
+import androidx.navigation.findNavController
 import androidx.recyclerview.widget.RecyclerView
 import code.name.monkey.appthemehelper.ThemeStore
-import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.*
 import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
 import code.name.monkey.retromusic.glide.AlbumGlideRequest
 import code.name.monkey.retromusic.glide.ArtistGlideRequest
@ -17,13 +18,11 @@ import code.name.monkey.retromusic.loaders.PlaylistSongsLoader
 import code.name.monkey.retromusic.model.*
 import code.name.monkey.retromusic.model.smartplaylist.AbsSmartPlaylist
 import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.NavigationUtil
 import com.bumptech.glide.Glide
-import android.util.Pair as UtilPair

 class SearchAdapter(
-    private val activity: AppCompatActivity,
-    private var dataSet: List<Any>?
+    private val activity: FragmentActivity,
+    private var dataSet: List<Any>
 ) : RecyclerView.Adapter<SearchAdapter.ViewHolder>() {

    fun swapDataSet(dataSet: MutableList<Any>) {
@ -32,11 +31,11 @@ class SearchAdapter(
    }

    override fun getItemViewType(position: Int): Int {
-        if (dataSet!![position] is Album) return ALBUM
-        if (dataSet!![position] is Artist) return ARTIST
-        if (dataSet!![position] is Genre) return GENRE
-        if (dataSet!![position] is Playlist) return PLAYLIST
-        return if (dataSet!![position] is Song) SONG else HEADER
+        if (dataSet[position] is Album) return ALBUM
+        if (dataSet[position] is Artist) return ARTIST
+        if (dataSet[position] is Genre) return GENRE
+        if (dataSet[position] is Playlist) return PLAYLIST
+        return if (dataSet[position] is Song) SONG else HEADER
    }

    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
@ -57,35 +56,35 @@ class SearchAdapter(
    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
        when (getItemViewType(position)) {
            ALBUM -> {
-                val album = dataSet?.get(position) as Album
+                val album = dataSet.get(position) as Album
                holder.title?.text = album.title
                holder.text?.text = album.artistName
                AlbumGlideRequest.Builder.from(Glide.with(activity), album.safeGetFirstSong())
                    .checkIgnoreMediaStore(activity).build().into(holder.image)
            }
            ARTIST -> {
-                val artist = dataSet?.get(position) as Artist
+                val artist = dataSet.get(position) as Artist
                holder.title?.text = artist.name
                holder.text?.text = MusicUtil.getArtistInfoString(activity, artist)
                ArtistGlideRequest.Builder.from(Glide.with(activity), artist).build()
                    .into(holder.image)
            }
            SONG -> {
-                val song = dataSet?.get(position) as Song
+                val song = dataSet.get(position) as Song
                holder.title?.text = song.title
                holder.text?.text = song.albumName
            }
            GENRE -> {
-                val genre = dataSet?.get(position) as Genre
+                val genre = dataSet.get(position) as Genre
                holder.title?.text = genre.name
            }
            PLAYLIST -> {
-                val playlist = dataSet?.get(position) as Playlist
+                val playlist = dataSet.get(position) as Playlist
                holder.title?.text = playlist.name
                holder.text?.text = MusicUtil.getPlaylistInfoString(activity, getSongs(playlist))
            }
            else -> {
-                holder.title?.text = dataSet?.get(position).toString()
+                holder.title?.text = dataSet.get(position).toString()
                holder.title?.setTextColor(ThemeStore.accentColor(activity))
            }
        }
@ -102,7 +101,7 @@ class SearchAdapter(
    }

    override fun getItemCount(): Int {
-        return dataSet!!.size
+        return dataSet.size
    }

    inner class ViewHolder(itemView: View, itemViewType: Int) : MediaEntryViewHolder(itemView) {
@ -113,7 +112,7 @@ class SearchAdapter(
                menu?.visibility = View.VISIBLE
                menu?.setOnClickListener(object : SongMenuHelper.OnClickSongMenu(activity) {
                    override val song: Song
-                        get() = dataSet!![layoutPosition] as Song
+                        get() = dataSet[layoutPosition] as Song
                })
            } else {
                menu?.visibility = View.GONE
@ -130,27 +129,31 @@ class SearchAdapter(
        }

        override fun onClick(v: View?) {
-            val item = dataSet!![layoutPosition]
+            val item = dataSet[layoutPosition]
            when (itemViewType) {
                ALBUM -> {
-                    val options = ActivityOptions.makeSceneTransitionAnimation(
-                        activity,
-                        UtilPair.create(image, activity.getString(R.string.transition_album_art))
+                    activity.findNavController(R.id.fragment_container).navigate(
+                        R.id.albumDetailsFragment,
+                        bundleOf(EXTRA_ALBUM_ID to (item as Album).id)
                    )
-                    NavigationUtil.goToAlbumOptions(activity, (item as Album).id, options)
                }
                ARTIST -> {
-                    val options = ActivityOptions.makeSceneTransitionAnimation(
-                        activity,
-                        UtilPair.create(image, activity.getString(R.string.transition_artist_image))
+                    activity.findNavController(R.id.fragment_container).navigate(
+                        R.id.artistDetailsFragment,
+                        bundleOf(EXTRA_ARTIST_ID to (item as Artist).id)
                    )
-                    NavigationUtil.goToArtistOptions(activity, (item as Artist).id, options)
                }
                GENRE -> {
-                    NavigationUtil.goToGenre(activity, item as Genre)
+                    activity.findNavController(R.id.fragment_container).navigate(
+                        R.id.genreDetailsFragment,
+                        bundleOf(EXTRA_GENRE to (item as Genre))
+                    )
                }
                PLAYLIST -> {
-                    NavigationUtil.goToPlaylistNew(activity, item as Playlist)
+                    activity.findNavController(R.id.fragment_container).navigate(
+                        R.id.artistDetailsFragment,
+                        bundleOf(EXTRA_PLAYLIST to (item as Playlist))
+                    )
                }
                SONG -> {
                    val playList = ArrayList<Song>()
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt
@ -7,10 +7,11 @@ import android.view.LayoutInflater
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
-import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.FragmentActivity
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter
 import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
+import code.name.monkey.retromusic.fragments.albums.AlbumClickListener
 import code.name.monkey.retromusic.glide.AlbumGlideRequest
 import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
@ -20,17 +21,17 @@ import code.name.monkey.retromusic.interfaces.CabHolder
 import code.name.monkey.retromusic.model.Album
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.NavigationUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
 import com.bumptech.glide.Glide
 import me.zhanghai.android.fastscroll.PopupTextProvider

 open class AlbumAdapter(
-    protected val activity: AppCompatActivity,
+    protected val activity: FragmentActivity,
    var dataSet: List<Album>,
    protected var itemLayoutRes: Int,
-    cabHolder: CabHolder?
+    cabHolder: CabHolder?,
+    private val albumClickListener: AlbumClickListener?
 ) : AbsMultiSelectAdapter<AlbumAdapter.ViewHolder, Album>(
    activity,
    cabHolder,
@ -177,11 +178,12 @@ open class AlbumAdapter(
                    imageContainerCard ?: image,
                    activity.getString(R.string.transition_album_art)
                )
-                NavigationUtil.goToAlbumOptions(
+                albumClickListener?.onAlbumClick(dataSet[layoutPosition].id)
+                /*NavigationUtil.goToAlbumOptions(
                    activity,
                    dataSet[layoutPosition].id,
                    activityOptions
-                )
+                )*/
            }
        }

--- a/app/src/main/java/code/name/monkey/retromusic/adapter/album/HorizontalAlbumAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/album/HorizontalAlbumAdapter.kt
@ -1,10 +1,10 @@
 package code.name.monkey.retromusic.adapter.album

-import android.graphics.drawable.Drawable
 import android.view.View
 import android.view.ViewGroup
-import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.FragmentActivity
 import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.retromusic.fragments.albums.AlbumClickListener
 import code.name.monkey.retromusic.glide.AlbumGlideRequest
 import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
 import code.name.monkey.retromusic.helper.HorizontalAdapterHelper
@ -15,11 +15,12 @@ import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
 import com.bumptech.glide.Glide

 class HorizontalAlbumAdapter(
-    activity: AppCompatActivity,
+    activity: FragmentActivity,
    dataSet: List<Album>,
-    cabHolder: CabHolder?
+    cabHolder: CabHolder?,
+    albumClickListener: AlbumClickListener
 ) : AlbumAdapter(
-    activity, dataSet, HorizontalAdapterHelper.LAYOUT_RES, cabHolder
+    activity, dataSet, HorizontalAdapterHelper.LAYOUT_RES, cabHolder, albumClickListener
 ) {

    override fun createViewHolder(view: View, viewType: Int): ViewHolder {
@ -40,11 +41,6 @@ class HorizontalAlbumAdapter(
            .generatePalette(activity)
            .build()
            .into(object : RetroMusicColoredTarget(holder.image!!) {
-                override fun onLoadCleared(placeholder: Drawable?) {
-                    super.onLoadCleared(placeholder)
-                    //setColors(albumArtistFooterColor, holder)
-                }
-
                override fun onColorReady(colors: MediaNotificationProcessor) {
                    setColors(colors, holder)
                }
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt
@ -7,11 +7,12 @@ import android.view.LayoutInflater
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
-import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.FragmentActivity
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter
 import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
 import code.name.monkey.retromusic.extensions.hide
+import code.name.monkey.retromusic.fragments.artists.ArtistClickListener
 import code.name.monkey.retromusic.glide.ArtistGlideRequest
 import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
 import code.name.monkey.retromusic.helper.menu.SongsMenuHelper
@ -19,17 +20,17 @@ import code.name.monkey.retromusic.interfaces.CabHolder
 import code.name.monkey.retromusic.model.Artist
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.NavigationUtil
 import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
 import com.bumptech.glide.Glide
 import me.zhanghai.android.fastscroll.PopupTextProvider
 import java.util.*

 class ArtistAdapter(
-    val activity: AppCompatActivity,
+    val activity: FragmentActivity,
    var dataSet: List<Artist>,
    var itemLayoutRes: Int,
-    cabHolder: CabHolder?
+    cabHolder: CabHolder?,
+    private val artistClickListener: ArtistClickListener
 ) : AbsMultiSelectAdapter<ArtistAdapter.ViewHolder, Artist>(
    activity, cabHolder, R.menu.menu_media_selection
 ), PopupTextProvider {
@ -144,9 +145,10 @@ class ArtistAdapter(
                    imageContainerCard ?: image,
                    activity.getString(R.string.transition_artist_image)
                )
-                NavigationUtil.goToArtistOptions(
+                artistClickListener.onArtist(dataSet[layoutPosition].id)
+                /*NavigationUtil.goToArtistOptions(
                    activity, dataSet[layoutPosition].id, activityOptions
-                )
+                )*/
            }
        }

--- a/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt
@ -9,11 +9,14 @@ import android.view.LayoutInflater
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
-import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.PopupMenu
+import androidx.core.os.bundleOf
+import androidx.fragment.app.FragmentActivity
+import androidx.navigation.findNavController
 import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.appthemehelper.util.TintHelper
+import code.name.monkey.retromusic.EXTRA_PLAYLIST
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter
 import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
@ -29,12 +32,11 @@ import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.model.smartplaylist.AbsSmartPlaylist
 import code.name.monkey.retromusic.util.AutoGeneratedPlaylistBitmap
 import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.NavigationUtil
 import code.name.monkey.retromusic.util.RetroColorUtil
 import java.util.*

 class PlaylistAdapter(
-    private val activity: AppCompatActivity,
+    private val activity: FragmentActivity,
    var dataSet: List<Playlist>,
    private var itemLayoutRes: Int,
    cabHolder: CabHolder?
@ -165,9 +167,7 @@ class PlaylistAdapter(
                val popupMenu = PopupMenu(activity, view)
                popupMenu.inflate(R.menu.menu_item_playlist)
                popupMenu.setOnMenuItemClickListener { item ->
-                    PlaylistMenuHelper.handleMenuClick(
-                        activity, dataSet[layoutPosition], item
-                    )
+                    PlaylistMenuHelper.handleMenuClick(activity, dataSet[layoutPosition], item)
                }
                popupMenu.show()
            }
@ -182,8 +182,10 @@ class PlaylistAdapter(
            if (isInQuickSelectMode) {
                toggleChecked(layoutPosition)
            } else {
-                val playlist = dataSet[layoutPosition]
-                NavigationUtil.goToPlaylistNew(activity, playlist)
+                activity.findNavController(R.id.fragment_container).navigate(
+                    R.id.playlistDetailsFragment,
+                    bundleOf(EXTRA_PLAYLIST to dataSet[layoutPosition])
+                )
            }
        }

--- a/app/src/main/java/code/name/monkey/retromusic/adapter/song/OrderablePlaylistSongAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/OrderablePlaylistSongAdapter.kt
@ -2,7 +2,7 @@ package code.name.monkey.retromusic.adapter.song

 import android.view.MenuItem
 import android.view.View
-import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.FragmentActivity
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.R.menu
 import code.name.monkey.retromusic.dialogs.RemoveFromPlaylistDialog
@ -16,13 +16,16 @@ import com.h6ah4i.android.widget.advrecyclerview.draggable.ItemDraggableRange
 import com.h6ah4i.android.widget.advrecyclerview.draggable.annotation.DraggableItemStateFlags

 class OrderablePlaylistSongAdapter(
-    activity: AppCompatActivity,
+    activity: FragmentActivity,
    dataSet: ArrayList<Song>,
    itemLayoutRes: Int,
    cabHolder: CabHolder?,
    private val onMoveItemListener: OnMoveItemListener?
-) : PlaylistSongAdapter(
-    activity, dataSet, itemLayoutRes, cabHolder
+) : SongAdapter(
+    activity,
+    dataSet,
+    itemLayoutRes,
+    cabHolder
 ), DraggableItemAdapter<OrderablePlaylistSongAdapter.ViewHolder> {

    init {
@ -91,7 +94,7 @@ class OrderablePlaylistSongAdapter(
        fun onMoveItem(fromPosition: Int, toPosition: Int)
    }

-    inner class ViewHolder(itemView: View) : PlaylistSongAdapter.ViewHolder(itemView),
+    inner class ViewHolder(itemView: View) : SongAdapter.ViewHolder(itemView),
        DraggableItemViewHolder {
        @DraggableItemStateFlags
        private var mDragStateFlags: Int = 0
@ -132,8 +135,4 @@ class OrderablePlaylistSongAdapter(
            mDragStateFlags = flags
        }
    }
-
-    companion object {
-        val TAG: String = OrderablePlaylistSongAdapter::class.java.simpleName
-    }
 }
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlayingQueueAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlayingQueueAdapter.kt
@ -3,6 +3,7 @@ package code.name.monkey.retromusic.adapter.song
 import android.view.MenuItem
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.FragmentActivity
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.helper.MusicPlayerRemote.isPlaying
@ -192,7 +193,7 @@ class PlayingQueueAdapter(
    internal class SwipedResultActionRemoveItem(
        private val adapter: PlayingQueueAdapter,
        private val position: Int,
-        private val activity: AppCompatActivity
+        private val activity: FragmentActivity
    ) : SwipeResultActionRemoveItem() {

        private var songToRemove: Song? = null
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlaylistSongAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlaylistSongAdapter.kt
@ -1,14 +1,15 @@
 package code.name.monkey.retromusic.adapter.song

-import android.app.ActivityOptions
 import android.view.MenuItem
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.os.bundleOf
+import androidx.navigation.findNavController
+import code.name.monkey.retromusic.EXTRA_ALBUM_ID
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.interfaces.CabHolder
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.NavigationUtil
 import com.google.android.material.button.MaterialButton

 open class PlaylistSongAdapter(
@ -57,19 +58,14 @@ open class PlaylistSongAdapter(

        override fun onSongMenuItemClick(item: MenuItem): Boolean {
            if (item.itemId == R.id.action_go_to_album) {
-                val activityOptions = ActivityOptions.makeSceneTransitionAnimation(
-                    activity,
-                    imageContainerCard ?: image,
-                    activity.getString(R.string.transition_album_art)
-                )
-                NavigationUtil.goToAlbumOptions(activity, song.albumId, activityOptions)
+                activity.findNavController(R.id.fragment_container)
+                    .navigate(
+                        R.id.albumDetailsFragment,
+                        bundleOf(EXTRA_ALBUM_ID to song.albumId)
+                    )
                return true
            }
            return super.onSongMenuItemClick(item)
        }
    }
-
-    companion object {
-        val TAG: String = PlaylistSongAdapter::class.java.simpleName
-    }
 }
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/song/SimpleSongAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/SimpleSongAdapter.kt
@ -2,14 +2,14 @@ package code.name.monkey.retromusic.adapter.song

 import android.view.LayoutInflater
 import android.view.ViewGroup
-import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.FragmentActivity
 import code.name.monkey.retromusic.interfaces.CabHolder
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.util.MusicUtil
 import java.util.*

 class SimpleSongAdapter(
-    context: AppCompatActivity,
+    context: FragmentActivity,
    songs: ArrayList<Song>,
    layoutRes: Int,
    cabHolder: CabHolder?
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt
@ -1,13 +1,15 @@
 package code.name.monkey.retromusic.adapter.song

-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.appcompat.app.AppCompatActivity
+import androidx.core.os.bundleOf
+import androidx.fragment.app.FragmentActivity
+import androidx.navigation.findNavController
+import code.name.monkey.retromusic.EXTRA_ALBUM_ID
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter
 import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
@ -22,7 +24,6 @@ import code.name.monkey.retromusic.helper.menu.SongsMenuHelper
 import code.name.monkey.retromusic.interfaces.CabHolder
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.NavigationUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
 import com.afollestad.materialcab.MaterialCab
@ -34,7 +35,7 @@ import me.zhanghai.android.fastscroll.PopupTextProvider
 */

 open class SongAdapter(
-    protected val activity: AppCompatActivity,
+    protected val activity: FragmentActivity,
    var dataSet: MutableList<Song>,
    protected var itemLayoutRes: Int,
    cabHolder: CabHolder?,
@ -175,12 +176,11 @@ open class SongAdapter(
            if (image != null && image!!.visibility == View.VISIBLE) {
                when (item.itemId) {
                    R.id.action_go_to_album -> {
-                        val activityOptions = ActivityOptions.makeSceneTransitionAnimation(
-                            activity,
-                            imageContainerCard ?: image,
-                            activity.getString(R.string.transition_album_art)
-                        )
-                        NavigationUtil.goToAlbumOptions(activity, song.albumId, activityOptions)
+                        activity.findNavController(R.id.fragment_container)
+                            .navigate(
+                                R.id.albumDetailsFragment,
+                                bundleOf(EXTRA_ALBUM_ID to song.albumId)
+                            )
                        return true
                    }
                }