- Keep the code D.R.Y and use ClearStack as an overload method instead of a different name

Author: ncapdevi

frag-nav/src/main/java/com/ncapdevi/fragnav/FragNavController.kt

@@ -382,32 +382,7 @@ class FragNavController constructor(private val fragmentManger: FragmentManager,
      */
     @JvmOverloads
     fun clearStack(transactionOptions: FragNavTransactionOptions? = defaultTransactionOptions) {
-        if (currentStackIndex == NO_TAB) {
-            return
-        }
-
-        //Grab Current stack
-        val fragmentStack = fragmentStacksTags[currentStackIndex]
-
-        // Only need to start popping and reattach if the stack is greater than 1
-        if (fragmentStack.size > 1) {
-            val ft = createTransactionWithOptions(transactionOptions, true)
-
-            //Pop all of the fragments on the stack and remove them from the FragmentManager
-            while (fragmentStack.size > 1) {
-                val fragment = getFragment(fragmentStack.pop())
-                if (fragment != null) {
-                    ft.removeSafe(fragment)
-                }
-            }
-
-            // Attempt to reattach previous fragment
-            val fragment = addPreviousFragment(ft, shouldDetachAttachOnPushPop())
-
-            commitTransaction(ft, transactionOptions)
-            mCurrentFrag = fragment
-            transactionListener?.onFragmentTransaction(currentFrag, TransactionType.POP)
-        }
+        clearStack(currentStackIndex,transactionOptions)
     }
 
     /**
@@ -417,7 +392,7 @@ class FragNavController constructor(private val fragmentManger: FragmentManager,
      * @param transactionOptions Transaction options to be displayed
      */
     @JvmOverloads
-    fun clearTabStack(tabIndex: Int, transactionOptions: FragNavTransactionOptions? = defaultTransactionOptions) {
+    fun clearStack(tabIndex: Int, transactionOptions: FragNavTransactionOptions? = defaultTransactionOptions) {
         if (tabIndex == NO_TAB) {
             return
         }
@@ -427,7 +402,9 @@ class FragNavController constructor(private val fragmentManger: FragmentManager,
 
         // Only need to start popping and reattach if the stack is greater than 1
         if (fragmentStack.size > 1) {
-            val ft = createTransactionWithOptions(transactionOptions,true,false)
+            //Only animate if we're clearing the current stack
+            val shouldAnimate = tabIndex == currentStackIndex
+            val ft = createTransactionWithOptions(transactionOptions,true, shouldAnimate)
 
             //Pop all of the fragments on the stack and remove them from the FragmentManager
             while (fragmentStack.size > 1) {

frag-nav/src/test/java/com/ncapdevi/fragnav/FragNavControllerTest.kt

@@ -214,7 +214,7 @@ class FragNavControllerTest : FragNavController.TransactionListener {
 
         mFragNavController.switchTab(FragNavController.TAB2)
 
-        mFragNavController.clearTabStack(FragNavController.TAB1)
+        mFragNavController.clearStack(FragNavController.TAB1)
 
         mFragNavController.switchTab(FragNavController.TAB1)
         Assert.assertTrue(mFragNavController.currentStack?.size == 1)