clear fragmentManager backStack in pushTo()

see: #47
vitaviva · Aug 19, 2021 · 559bc5b · 559bc5b
1 parent bcd8218
commit 559bc5b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/app/src/main/java/com/github/fragivity/example/HomeFragment.kt b/app/src/main/java/com/github/fragivity/example/HomeFragment.kt
@@ -33,16 +33,16 @@ class HomeFragment : AbsBaseFragment(false) {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        requireActivity().onBackPressedDispatcher
-            .addCallback(this) {
-                val current = System.currentTimeMillis()
-                if (current - lastClickTime > 2000) {
-                    showToast("再按一次退出")
-                    lastClickTime = current
-                } else {
-                    finish()
-                }
-            }
+//        requireActivity().onBackPressedDispatcher
+//            .addCallback(this) {
+//                val current = System.currentTimeMillis()
+//                if (current - lastClickTime > 2000) {
+//                    showToast("再按一次退出")
+//                    lastClickTime = current
+//                } else {
+//                    finish()
+//                }
+//            }
     }
 
     override fun onCreateView(

diff --git a/library/src/main/kotlin/androidx/fragment/app/FragivityFragmentNavigator.kt b/library/src/main/kotlin/androidx/fragment/app/FragivityFragmentNavigator.kt
@@ -117,7 +117,7 @@ class FragivityFragmentNavigator(
         }
 
         val destId = destination.id
-        val initialNavigation = backStack.isEmpty()
+        val initialNavigation = backStack.isEmpty() || isPushTo
 
         val fragment = createFragment(destination, args)
         ft.add(containerId, fragment, generateBackStackName(backStack.size, destId))
@@ -173,6 +173,11 @@ class FragivityFragmentNavigator(
         ft.setReorderingAllowed(true)
         ft.commit()
 
+        if (isPushTo) {
+            // pushTo情况下清空返回栈
+            fragmentManager.mBackStack?.clear()
+        }
+
         if (isPopSelf) {
             backStack.removeLast()
             backStack.add(destId)