From 2d7567584aee502799c6f632c707978a18589e24 Mon Sep 17 00:00:00 2001
From: Prathamesh More <prathameshmm02@gmail.com>
Date: Mon, 6 Dec 2021 15:07:42 +0530
Subject: [PATCH] Fixed transition for startDestination

---
 .../name/monkey/retromusic/activities/MainActivity.kt     | 3 ---
 .../monkey/retromusic/fragments/base/AbsPlayerFragment.kt | 1 +
 .../retromusic/fragments/base/AbsRecyclerViewFragment.kt  | 5 ++---
 .../name/monkey/retromusic/fragments/home/HomeFragment.kt | 8 ++++----
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt
index b647400e3..b1dc8427d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt
@@ -95,9 +95,6 @@ class MainActivity : AbsCastActivity(), OnSharedPreferenceChangeListener {
                 }
             }
         }
-        // This is more like a work-around as for start destination of navGraph
-        // enterTransition won't work as expected
-        navGraph.setStartDestination(R.id.libraryFragment)
         navController.addOnDestinationChangedListener { _, destination, _ ->
             when (destination.id) {
                 R.id.action_home, R.id.action_song, R.id.action_album, R.id.action_artist, R.id.action_folder, R.id.action_playlist, R.id.action_genre -> {
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt
index c3f9b94e0..7acfc1112 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt
@@ -38,6 +38,7 @@ import androidx.core.os.bundleOf
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.findNavController
 import androidx.navigation.navOptions
+import androidx.transition.Fade
 import androidx.viewpager.widget.ViewPager
 import code.name.monkey.retromusic.EXTRA_ALBUM_ID
 import code.name.monkey.retromusic.EXTRA_ARTIST_ID
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsRecyclerViewFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsRecyclerViewFragment.kt
index c7eeebe77..2f79563b2 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsRecyclerViewFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsRecyclerViewFragment.kt
@@ -57,9 +57,8 @@ abstract class AbsRecyclerViewFragment<A : RecyclerView.Adapter<*>, LM : Recycle
         _binding = FragmentMainRecyclerBinding.bind(view)
         postponeEnterTransition()
         view.doOnPreDraw { startPostponedEnterTransition() }
-        enterTransition = MaterialFadeThrough().apply {
-            addTarget(binding.recyclerView)
-        }
+        enterTransition = MaterialFadeThrough().addTarget(binding.recyclerView)
+        reenterTransition = MaterialFadeThrough().addTarget(binding.recyclerView)
         mainActivity.setSupportActionBar(binding.toolbar)
         mainActivity.supportActionBar?.title = null
         initLayoutManager()
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt
index 4bc9ca231..bff61411d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt
@@ -48,7 +48,8 @@ import com.google.android.material.transition.MaterialFadeThrough
 import com.google.android.material.transition.MaterialSharedAxis
 
 class HomeFragment :
-    AbsMainActivityFragment(if (PreferenceUtil.isHomeBanner) R.layout.fragment_banner_home else R.layout.fragment_home), IScrollHelper {
+    AbsMainActivityFragment(if (PreferenceUtil.isHomeBanner) R.layout.fragment_banner_home else R.layout.fragment_home),
+    IScrollHelper {
 
     private var _binding: HomeBindingAdapter? = null
     private val binding get() = _binding!!
@@ -61,9 +62,8 @@ class HomeFragment :
         setupListeners()
         binding.titleWelcome.text = String.format("%s", PreferenceUtil.userName)
 
-        enterTransition = MaterialFadeThrough().apply {
-            addTarget(binding.contentContainer)
-        }
+        enterTransition = MaterialFadeThrough().addTarget(binding.contentContainer)
+        reenterTransition = MaterialFadeThrough().addTarget(binding.contentContainer)
 
         val homeAdapter = HomeAdapter(mainActivity)
         binding.recyclerView.apply {