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 87227dc9c..3167e9d49 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
@@ -18,6 +18,7 @@ import android.os.Bundle
import android.view.*
import androidx.annotation.NonNull
import androidx.annotation.StringRes
+import androidx.appcompat.widget.Toolbar
import androidx.coordinatorlayout.widget.CoordinatorLayout
import androidx.core.view.doOnPreDraw
import androidx.core.view.updatePadding
@@ -48,8 +49,6 @@ abstract class AbsRecyclerViewFragment, LM : Recycle
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
_binding = FragmentMainRecyclerBinding.bind(view)
- enterTransition = MaterialFadeThrough()
- exitTransition = MaterialFadeThrough()
postponeEnterTransition()
view.doOnPreDraw { startPostponedEnterTransition() }
@@ -61,6 +60,10 @@ abstract class AbsRecyclerViewFragment, LM : Recycle
setupToolbar()
}
+ fun toolbar(): Toolbar {
+ return binding.toolbar
+ }
+
private fun setupToolbar() {
binding.toolbar.setNavigationOnClickListener {
exitTransition = MaterialSharedAxis(MaterialSharedAxis.Z, true).addTarget(requireView())
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 b35c90a40..d55f196b0 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
@@ -53,8 +53,6 @@ class HomeFragment :
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
_binding = getBinding(PreferenceUtil.isHomeBanner, view)
- enterTransition = MaterialFadeThrough()
- exitTransition = MaterialFadeThrough()
mainActivity.setSupportActionBar(binding.toolbar)
mainActivity.supportActionBar?.title = null
setStatusBarColorAuto(view)
diff --git a/app/src/main/res/animator/nav_default_enter_anim.xml b/app/src/main/res/animator/nav_default_enter_anim.xml
new file mode 100644
index 000000000..c8663ea41
--- /dev/null
+++ b/app/src/main/res/animator/nav_default_enter_anim.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/animator/nav_default_exit_anim.xml b/app/src/main/res/animator/nav_default_exit_anim.xml
new file mode 100644
index 000000000..079bd11a8
--- /dev/null
+++ b/app/src/main/res/animator/nav_default_exit_anim.xml
@@ -0,0 +1,9 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/animator/nav_default_pop_enter_anim.xml b/app/src/main/res/animator/nav_default_pop_enter_anim.xml
new file mode 100644
index 000000000..c8663ea41
--- /dev/null
+++ b/app/src/main/res/animator/nav_default_pop_enter_anim.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/animator/nav_default_pop_exit_anim.xml b/app/src/main/res/animator/nav_default_pop_exit_anim.xml
new file mode 100644
index 000000000..079bd11a8
--- /dev/null
+++ b/app/src/main/res/animator/nav_default_pop_exit_anim.xml
@@ -0,0 +1,9 @@
+
+
+
+
\ No newline at end of file