Added some animations

Renamed some interface classes

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

@@ -20,10 +20,10 @@ 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.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.interfaces.IAlbumClickListener
+import code.name.monkey.retromusic.interfaces.IArtistClickListener
 import code.name.monkey.retromusic.model.*
 import code.name.monkey.retromusic.util.PreferenceUtil
 import com.bumptech.glide.Glide
@@ -31,7 +31,7 @@ import com.google.android.material.card.MaterialCardView
 
 class HomeAdapter(
     private val activity: AppCompatActivity
-) : RecyclerView.Adapter<RecyclerView.ViewHolder>(), ArtistClickListener, AlbumClickListener {
+) : RecyclerView.Adapter<RecyclerView.ViewHolder>(), IArtistClickListener, IAlbumClickListener {
 
     private var list = listOf<Home>()
 
@@ -231,15 +231,16 @@ class HomeAdapter(
         AlbumAdapter(activity, albums, PreferenceUtil.homeAlbumGridStyle, null, this)
 
     fun gridLayoutManager() = GridLayoutManager(activity, 1, GridLayoutManager.HORIZONTAL, false)
+
     fun linearLayoutManager() = LinearLayoutManager(activity, LinearLayoutManager.HORIZONTAL, false)
 
-    override fun onArtist(artistId: Long, imageView: ImageView) {
+    override fun onArtist(artistId: Long, view: View) {
         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)
+                view to "artist"
             )
         )
     }
@@ -250,7 +251,7 @@ class HomeAdapter(
             bundleOf(EXTRA_ALBUM_ID to albumId),
             null,
             FragmentNavigatorExtras(
-                view to activity.getString(R.string.transition_album_art)
+                view to "album"
             )
         )
     }

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

@@ -6,16 +6,17 @@ 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
 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
 import code.name.monkey.retromusic.helper.SortOrder
 import code.name.monkey.retromusic.helper.menu.SongsMenuHelper
+import code.name.monkey.retromusic.interfaces.IAlbumClickListener
 import code.name.monkey.retromusic.interfaces.ICabHolder
 import code.name.monkey.retromusic.model.Album
 import code.name.monkey.retromusic.model.Song
@@ -30,7 +31,7 @@ open class AlbumAdapter(
     var dataSet: List<Album>,
     protected var itemLayoutRes: Int,
     ICabHolder: ICabHolder?,
-    private val albumClickListener: AlbumClickListener?
+    private val albumClickListener: IAlbumClickListener?
 ) : AbsMultiSelectAdapter<AlbumAdapter.ViewHolder, Album>(
     activity,
     ICabHolder,
@@ -75,7 +76,7 @@ open class AlbumAdapter(
         holder.title?.text = getAlbumTitle(album)
         holder.text?.text = getAlbumText(album)
         holder.playSongs?.setOnClickListener {
-            album.songs?.let { songs ->
+            album.songs.let { songs ->
                 MusicPlayerRemote.openQueue(
                     songs,
                     0,
@@ -116,7 +117,7 @@ open class AlbumAdapter(
     }
 
     override fun getItemId(position: Int): Long {
-        return dataSet[position].id.toLong()
+        return dataSet[position].id
     }
 
     override fun getIdentifier(position: Int): Album? {
@@ -161,7 +162,7 @@ open class AlbumAdapter(
     inner class ViewHolder(itemView: View) : MediaEntryViewHolder(itemView) {
 
         init {
-            setImageTransitionName(activity.getString(R.string.transition_album_art))
+            setImageTransitionName("Album")
             menu?.visibility = View.GONE
         }
 
@@ -170,6 +171,7 @@ open class AlbumAdapter(
             if (isInQuickSelectMode) {
                 toggleChecked(layoutPosition)
             } else {
+                ViewCompat.setTransitionName(itemView, "album")
                 albumClickListener?.onAlbumClick(dataSet[layoutPosition].id, itemView)
             }
         }

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

@@ -1,14 +1,17 @@
 package code.name.monkey.retromusic.adapter.album
 
+import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
+import androidx.core.app.ActivityOptionsCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.lifecycleScope
 import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.activities.LyricsActivity
 import code.name.monkey.retromusic.fragments.AlbumCoverStyle
 import code.name.monkey.retromusic.fragments.NowPlayingScreen.*
 import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
@@ -90,8 +93,13 @@ class AlbumCoverPagerAdapter(
             val view = inflater.inflate(getLayoutWithPlayerTheme(), container, false)
             albumCover = view.findViewById(R.id.player_image)
             albumCover.setOnClickListener {
-                //LyricsDialog().show(childFragmentManager, "LyricsDialog")
-                showLyricsDialog()
+                val intent = Intent(requireContext(), LyricsActivity::class.java)
+                val activityOptions = ActivityOptionsCompat.makeSceneTransitionAnimation(
+                    requireActivity(),
+                    it,
+                    "lyrics"
+                )
+                startActivity(intent, activityOptions.toBundle())
             }
             return view
         }

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

@@ -3,10 +3,10 @@ package code.name.monkey.retromusic.adapter.album
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.FragmentActivity
-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
+import code.name.monkey.retromusic.interfaces.IAlbumClickListener
 import code.name.monkey.retromusic.interfaces.ICabHolder
 import code.name.monkey.retromusic.model.Album
 import code.name.monkey.retromusic.util.MusicUtil
@@ -17,7 +17,7 @@ class HorizontalAlbumAdapter(
     activity: FragmentActivity,
     dataSet: List<Album>,
     ICabHolder: ICabHolder?,
-    albumClickListener: AlbumClickListener
+    albumClickListener: IAlbumClickListener
 ) : AlbumAdapter(
     activity, dataSet, HorizontalAdapterHelper.LAYOUT_RES, ICabHolder, albumClickListener
 ) {

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

@@ -12,10 +12,10 @@ 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
+import code.name.monkey.retromusic.interfaces.IArtistClickListener
 import code.name.monkey.retromusic.interfaces.ICabHolder
 import code.name.monkey.retromusic.model.Artist
 import code.name.monkey.retromusic.model.Song
@@ -29,8 +29,8 @@ class ArtistAdapter(
     val activity: FragmentActivity,
     var dataSet: List<Artist>,
     var itemLayoutRes: Int,
-    ICabHolder: ICabHolder?,
-    private val artistClickListener: ArtistClickListener
+    val ICabHolder: ICabHolder?,
+    val IArtistClickListener: IArtistClickListener
 ) : AbsMultiSelectAdapter<ArtistAdapter.ViewHolder, Artist>(
     activity, ICabHolder, R.menu.menu_media_selection
 ), PopupTextProvider {
@@ -45,7 +45,7 @@ class ArtistAdapter(
     }
 
     override fun getItemId(position: Int): Long {
-        return dataSet[position].id.toLong()
+        return dataSet[position].id
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
@@ -140,11 +140,8 @@ class ArtistAdapter(
                 toggleChecked(layoutPosition)
             } else {
                 image?.let {
-                    ViewCompat.setTransitionName(
-                        it,
-                        activity.getString(R.string.transition_artist_image)
-                    )
-                    artistClickListener.onArtist(dataSet[layoutPosition].id, it)
+                    ViewCompat.setTransitionName(itemView, "album")
+                    IArtistClickListener.onArtist(dataSet[layoutPosition].id, itemView)
                 }
             }
         }