Added some animations

Renamed some interface classes

app/src/main/java/code/name/monkey/retromusic/activities/LyricsActivity.kt

@@ -3,7 +3,9 @@ package code.name.monkey.retromusic.activities
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
+import android.view.View
 import android.view.WindowManager
+import androidx.interpolator.view.animation.FastOutSlowInInterpolator
 import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.R
@@ -15,8 +17,13 @@ import code.name.monkey.retromusic.lyrics.LrcView
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.util.LyricUtil
 import code.name.monkey.retromusic.util.RetroUtil
+import com.google.android.material.color.MaterialColors
+import com.google.android.material.transition.platform.MaterialArcMotion
+import com.google.android.material.transition.platform.MaterialContainerTransform
+import com.google.android.material.transition.platform.MaterialContainerTransformSharedElementCallback
 import kotlinx.android.synthetic.main.activity_lyrics.*
 
+
 class LyricsActivity : AbsMusicServiceActivity(), MusicProgressViewUpdateHelper.Callback {
     private lateinit var updateHelper: MusicProgressViewUpdateHelper
 
@@ -31,7 +38,23 @@ class LyricsActivity : AbsMusicServiceActivity(), MusicProgressViewUpdateHelper.
             return baseUrl
         }
 
+    private fun buildContainerTransform( ): MaterialContainerTransform {
+        val transform = MaterialContainerTransform()
+        transform.setAllContainerColors(
+            MaterialColors.getColor(findViewById(android.R.id.content), R.attr.colorSurface)
+        )
+        transform.addTarget(android.R.id.content)
+        transform.duration = 300
+        transform.interpolator = FastOutSlowInInterpolator()
+        transform.pathMotion = MaterialArcMotion()
+        return transform
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
+        findViewById<View>(android.R.id.content).transitionName = "lyrics"
+        setEnterSharedElementCallback(MaterialContainerTransformSharedElementCallback())
+        window.sharedElementEnterTransition = buildContainerTransform( )
+        window.sharedElementReturnTransition = buildContainerTransform( )
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_lyrics)
         setStatusbarColorAuto()

app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt

@@ -38,10 +38,7 @@ class MainActivity : AbsSlidingMusicPanelActivity(), OnSharedPreferenceChangeLis
     override fun onCreate(savedInstanceState: Bundle?) {
         setDrawUnderStatusBar()
         super.onCreate(savedInstanceState)
-        setupNavigationController()
-        if (!hasPermissions()) {
-            findNavController(R.id.fragment_container).navigate(R.id.permissionFragment)
-        }
+
         setStatusbarColorAuto()
         setNavigationbarColorAuto()
         setLightNavigationBar(true)
@@ -51,7 +48,10 @@ class MainActivity : AbsSlidingMusicPanelActivity(), OnSharedPreferenceChangeLis
         updateTabs()
 
         //NavigationUI.setupWithNavController(getBottomNavigationView(), findNavController(R.id.fragment_container))
-
+        setupNavigationController()
+        if (!hasPermissions()) {
+            findNavController(R.id.fragment_container).navigate(R.id.permissionFragment)
+        }
     }
 
     private fun setupNavigationController() {

app/src/main/java/code/name/monkey/retromusic/activities/PlayingQueueActivity.kt

@@ -13,6 +13,7 @@ import code.name.monkey.retromusic.adapter.song.PlayingQueueAdapter
 import code.name.monkey.retromusic.extensions.accentColor
 import code.name.monkey.retromusic.extensions.surfaceColor
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
+import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.ThemedFastScroller
 import com.h6ah4i.android.widget.advrecyclerview.animator.DraggableItemAnimator
 import com.h6ah4i.android.widget.advrecyclerview.draggable.RecyclerViewDragDropManager
@@ -20,7 +21,6 @@ import com.h6ah4i.android.widget.advrecyclerview.swipeable.RecyclerViewSwipeMana
 import com.h6ah4i.android.widget.advrecyclerview.touchguard.RecyclerViewTouchActionGuardManager
 import com.h6ah4i.android.widget.advrecyclerview.utils.WrapperAdapterUtils
 import kotlinx.android.synthetic.main.activity_playing_queue.*
-import kotlinx.android.synthetic.main.activity_playing_queue.title as NoImageTitle
 
 open class PlayingQueueActivity : AbsMusicServiceActivity() {
 
@@ -31,6 +31,13 @@ open class PlayingQueueActivity : AbsMusicServiceActivity() {
     private var playingQueueAdapter: PlayingQueueAdapter? = null
     private lateinit var linearLayoutManager: LinearLayoutManager
 
+    private fun getUpNextAndQueueTime(): String {
+        val duration = MusicPlayerRemote.getQueueDurationMillis(MusicPlayerRemote.position)
+        return MusicUtil.buildInfoString(
+            resources.getString(R.string.up_next),
+            MusicUtil.getReadableDurationString(duration)
+        )
+    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         setDrawUnderStatusBar()
@@ -47,6 +54,7 @@ open class PlayingQueueActivity : AbsMusicServiceActivity() {
         clearQueue.setOnClickListener {
             MusicPlayerRemote.clearQueue()
         }
+        checkForPadding()
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -99,8 +107,7 @@ open class PlayingQueueActivity : AbsMusicServiceActivity() {
         ThemedFastScroller.create(recyclerView)
     }
 
-    override fun onServiceConnected() {
-        updateCurrentSong()
+    private fun checkForPadding() {
     }
 
     override fun onQueueChanged() {
@@ -108,6 +115,7 @@ open class PlayingQueueActivity : AbsMusicServiceActivity() {
             finish()
             return
         }
+        checkForPadding()
         updateQueue()
         updateCurrentSong()
     }
@@ -118,9 +126,7 @@ open class PlayingQueueActivity : AbsMusicServiceActivity() {
     }
 
     private fun updateCurrentSong() {
-        NoImageTitle.text = MusicPlayerRemote.currentSong.title
-        text.text = MusicPlayerRemote.currentSong.artistName
-        text2?.text = MusicPlayerRemote.currentSong.albumName
+        toolbar.subtitle = getUpNextAndQueueTime()
     }
 
     override fun onPlayingMetaChanged() {
@@ -130,6 +136,7 @@ open class PlayingQueueActivity : AbsMusicServiceActivity() {
     private fun updateQueuePosition() {
         playingQueueAdapter?.setCurrent(MusicPlayerRemote.position)
         resetToCurrentPosition()
+        toolbar.subtitle = getUpNextAndQueueTime()
     }
 
     private fun updateQueue() {
@@ -167,6 +174,7 @@ open class PlayingQueueActivity : AbsMusicServiceActivity() {
     }
 
     private fun setupToolbar() {
+        toolbar.subtitle = getUpNextAndQueueTime()
         toolbar.setBackgroundColor(surfaceColor())
         setSupportActionBar(toolbar)
         clearQueue.backgroundTintList = ColorStateList.valueOf(accentColor())
@@ -177,4 +185,4 @@ open class PlayingQueueActivity : AbsMusicServiceActivity() {
             clearQueue.iconTint = this
         }
     }
-}
+}