Add null type for initial fragment transition animation

Trendyol · Nov 10, 2019 · cdac38e · cdac38e
1 parent a22da38
commit cdac38e
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 9 deletions.
diff --git a/app/src/main/java/com/trendyol/medusa/MainActivity.kt b/app/src/main/java/com/trendyol/medusa/MainActivity.kt
@@ -33,8 +33,7 @@ class MainActivity : AppCompatActivity(), Navigator.NavigatorListener {
             R.id.fragmentContainer,
             rootFragmentProvider,
             navigatorListener = this,
-            navigatorConfiguration = NavigatorConfiguration(1, true, NavigatorTransaction.SHOW_HIDE),
-            transitionAnimationType = TransitionAnimationType.BOTTOM_TO_TOP)
+            navigatorConfiguration = NavigatorConfiguration(1, true, NavigatorTransaction.SHOW_HIDE))
 
     private val mOnNavigationItemSelectedListener = BottomNavigationView.OnNavigationItemSelectedListener { item ->
         when (item.itemId) {

diff --git a/app/src/main/java/com/trendyol/medusa/MainActivity2.java b/app/src/main/java/com/trendyol/medusa/MainActivity2.java
@@ -81,7 +81,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
                 rootsFragmentProvider,
                 this,
                 new NavigatorConfiguration(1, true, NavigatorTransaction.SHOW_HIDE),
-                TransitionAnimationType.BOTTOM_TO_TOP);
+                null);
 
         multipleStackNavigator.initialize(savedInstanceState);
         final SwitchCompat restartRootFragmentCheckBox = findViewById(R.id.restartSwitch);

diff --git a/app/src/main/java/com/trendyol/medusa/SampleFragment.kt b/app/src/main/java/com/trendyol/medusa/SampleFragment.kt
@@ -8,6 +8,7 @@ import android.view.ViewGroup
 import android.widget.Button
 import android.widget.LinearLayout
 import android.widget.TextView
+import com.trendyol.medusalib.navigator.transitionanimation.TransitionAnimationType
 import kotlin.random.Random
 
 class SampleFragment : BaseFragment() {
@@ -19,7 +20,7 @@ class SampleFragment : BaseFragment() {
         view.findViewById<LinearLayout>(R.id.root).setBackgroundColor(Color.argb(255, Random.nextInt(256), Random.nextInt(256), Random.nextInt(256)))
 
         view.findViewById<Button>(R.id.button).setOnClickListener {
-            multipleStackNavigator!!.start(FragmentGenerator.generateNewFragment())
+            multipleStackNavigator!!.start(FragmentGenerator.generateNewFragment(), TransitionAnimationType.RIGHT_TO_LEFT)
         }
         return view
     }

diff --git a/medusalib/src/main/java/com/trendyol/medusalib/navigator/MultipleStackNavigator.kt b/medusalib/src/main/java/com/trendyol/medusalib/navigator/MultipleStackNavigator.kt
@@ -16,7 +16,7 @@ open class MultipleStackNavigator(
     private val rootFragmentProvider: List<() -> Fragment>,
     private var navigatorListener: Navigator.NavigatorListener? = null,
     private val navigatorConfiguration: NavigatorConfiguration = NavigatorConfiguration(),
-    private val transitionAnimationType: TransitionAnimationType
+    private val transitionAnimationType: TransitionAnimationType? = null
 ) : Navigator {
 
     private val tagCreator: TagCreator = UniqueTagCreator()
@@ -52,7 +52,7 @@ open class MultipleStackNavigator(
         start(fragment, DEFAULT_GROUP_NAME, transitionAnimation)
     }
 
-    override fun start(fragment: Fragment, fragmentGroupName: String, transitionAnimation: TransitionAnimationType) {
+    override fun start(fragment: Fragment, fragmentGroupName: String, transitionAnimation: TransitionAnimationType?) {
 
         val createdTag = tagCreator.create(fragment)
         val currentTabIndex = fragmentStackState.getSelectedTabIndex()

diff --git a/medusalib/src/main/java/com/trendyol/medusalib/navigator/Navigator.kt b/medusalib/src/main/java/com/trendyol/medusalib/navigator/Navigator.kt
@@ -56,7 +56,7 @@ interface Navigator {
      * @param transitionAnimation will be used start and remove fragment transition animation
      * all fragments which has the same group name.
      */
-    fun start(fragment: Fragment, fragmentGroupName: String, transitionAnimation: TransitionAnimationType)
+    fun start(fragment: Fragment, fragmentGroupName: String, transitionAnimation: TransitionAnimationType?)
 
     /**
      * Adds new fragment to the fragment stack with given tab index.

diff --git a/...ib/src/main/java/com/trendyol/medusalib/navigator/controller/FragmentManagerController.kt b/...ib/src/main/java/com/trendyol/medusalib/navigator/controller/FragmentManagerController.kt
@@ -52,7 +52,6 @@ class FragmentManagerController(private val fragmentManager: FragmentManager,
             TransitionAnimationType.BOTTOM_TO_TOP -> setCustomAnimations(R.anim.empty_animation, R.anim.exit_to_bottom)
             TransitionAnimationType.TOP_TO_BOTTOM -> setCustomAnimations(R.anim.empty_animation, R.anim.exit_to_top)
             TransitionAnimationType.FADE_IN_OUT -> setCustomAnimations(R.anim.empty_animation, R.anim.fade_out)
-            else -> setCustomAnimations(R.anim.empty_animation, R.anim.exit_to_right)
         }
 
         currentTransaction?.remove(getFragment(fragmentTag))
@@ -88,7 +87,6 @@ class FragmentManagerController(private val fragmentManager: FragmentManager,
                 TransitionAnimationType.BOTTOM_TO_TOP -> setCustomAnimations(R.anim.enter_from_bottom, R.anim.empty_animation)
                 TransitionAnimationType.TOP_TO_BOTTOM -> setCustomAnimations(R.anim.enter_from_top, R.anim.empty_animation)
                 TransitionAnimationType.FADE_IN_OUT -> setCustomAnimations(R.anim.fade_in, R.anim.empty_animation)
-                else -> setCustomAnimations(R.anim.enter_from_left, R.anim.empty_animation)
             }
             currentTransaction?.add(containerId, fragmentData.fragment, fragmentData.fragmentTag)
         }