Merge pull request #22 from MrRuslanYT/fragmentClose

Fix the issue #21
massivemadness · Jun 17, 2023 · ec095cc · ec095cc
2 parents 305ad5b + f733ca6
commit ec095cc
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/fragula-core/src/main/kotlin/com/fragula2/navigation/SwipeBackFragment.kt b/fragula-core/src/main/kotlin/com/fragula2/navigation/SwipeBackFragment.kt
@@ -159,14 +159,18 @@ class SwipeBackFragment : Fragment(R.layout.fragment_swipeback), Navigable, Swip
     override fun popBackStack(popUpTo: NavBackStackEntry, onScrollFinished: () -> Unit) {
         if (popImmediately) {
             popImmediately = false
-            navBackStackAdapter?.pop()
+            viewPager?.post {
+                navBackStackAdapter?.pop()
+            }
             onScrollFinished()
             return
         }
         fakeScroll = true
         activity?.requestViewLock(true)
         viewPager?.fakeDragTo(false, swipeDirection, scrollDuration) {
-            navBackStackAdapter?.pop()
+            viewPager?.post {
+                navBackStackAdapter?.pop()
+            }
             onScrollFinished()
             activity?.requestViewLock(false)
             fakeScroll = false