Merge pull request #151 from VitalyPeryatin/handle_transactions_by_ui…

…_handler Add navigation transactions in message queue
terrakok · Apr 8, 2021 · 7a862cb · 7a862cb
2 parents 4c674c2 + f2de564
commit 7a862cb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/library/src/main/kotlin/com/github/terrakok/cicerone/androidx/AppNavigator.kt b/library/src/main/kotlin/com/github/terrakok/cicerone/androidx/AppNavigator.kt
@@ -2,6 +2,8 @@ package com.github.terrakok.cicerone.androidx
 
 import android.content.ActivityNotFoundException
 import android.content.Intent
+import android.os.Handler
+import android.os.Looper
 import androidx.fragment.app.*
 import com.github.terrakok.cicerone.*
 import com.github.terrakok.cicerone.androidx.TransactionInfo.Type.ADD
@@ -22,8 +24,15 @@ open class AppNavigator @JvmOverloads constructor(
 ) : Navigator {
 
     protected val localStackCopy = mutableListOf<TransactionInfo>()
+    private val mainHandler = Handler(Looper.getMainLooper())
 
     override fun applyCommands(commands: Array<out Command>) {
+        mainHandler.post {
+            applyCommandsSync(commands)
+        }
+    }
+
+    protected open fun applyCommandsSync(commands: Array<out Command>) {
         fragmentManager.executePendingTransactions()
 
         //copy stack before apply commands

diff --git a/sample/src/main/java/com/github/terrakok/cicerone/sample/ui/main/MainActivity.kt b/sample/src/main/java/com/github/terrakok/cicerone/sample/ui/main/MainActivity.kt
@@ -33,8 +33,8 @@ class MainActivity : MvpAppCompatActivity(), ChainHolder {
 
     private val navigator: Navigator = object : AppNavigator(this, R.id.main_container) {
 
-        override fun applyCommands(commands: Array<out Command>) {
-            super.applyCommands(commands)
+        override fun applyCommandsSync(commands: Array<out Command>) {
+            super.applyCommandsSync(commands)
             supportFragmentManager.executePendingTransactions()
             printScreensScheme()
         }