fixes in initNavigation

InsanusMokrassar · Mar 12, 2024 · 9942d4f · 9942d4f
1 parent fb280d4
commit 9942d4f
Showing 1 changed file with 21 additions and 6 deletions.
diff --git a/mvvm/src/androidMain/kotlin/NavigationMVVMSingleActivity.kt b/mvvm/src/androidMain/kotlin/NavigationMVVMSingleActivity.kt
@@ -5,6 +5,8 @@ import android.view.View
 import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
+import dev.inmo.kslog.common.d
+import dev.inmo.kslog.common.logger
 import dev.inmo.micro_utils.coroutines.doInUI
 import dev.inmo.micro_utils.coroutines.launchSafelyWithoutExceptions
 import dev.inmo.micro_utils.koin.getAllDistinct
@@ -19,9 +21,21 @@ import org.koin.core.component.KoinComponent
 abstract class NavigationMVVMSingleActivity : AppCompatActivity(), KoinComponent {
     protected open val fragmentTransactionConfigurator: FragmentTransactionConfigurator<NavigationNodeDefaultConfig>? = null
     protected var currentAndroidNavigationHost: AndroidNavigationHost<NavigationNodeDefaultConfig>? = null
+    protected var latestLoadingFragment: Fragment? = null
     protected open fun allocateLoadingFragment(): Fragment? = null
     protected abstract fun createInitialConfig(rootFragmentTag: String): NavigationNodeDefaultConfig
 
+    protected fun initNavigation() {
+        val rootFragmentTag = findViewById<View>(R.id.main_activity_main_fragment).navigationTag.toString()
+        val currentFragment = supportFragmentManager.findFragmentById(R.id.main_activity_main_fragment)
+
+        if (currentFragment === latestLoadingFragment || currentFragment == null) {
+            CoroutineScope(Dispatchers.Default).launchSafelyWithoutExceptions {
+                onStartNavigation(rootFragmentTag)
+            }
+        }
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
@@ -31,12 +45,7 @@ abstract class NavigationMVVMSingleActivity : AppCompatActivity(), KoinComponent
             supportFragmentManager.beginTransaction().apply {
                 replace(R.id.main_activity_main_fragment, loadingFragment)
             }.commitNow()
-        }
-
-        val rootFragmentTag = findViewById<View>(R.id.main_activity_main_fragment).navigationTag.toString()
-
-        CoroutineScope(Dispatchers.Default).launchSafelyWithoutExceptions {
-            onStartNavigation(rootFragmentTag)
+            latestLoadingFragment = loadingFragment
         }
 
         onBackPressedDispatcher.addCallback(
@@ -48,6 +57,12 @@ abstract class NavigationMVVMSingleActivity : AppCompatActivity(), KoinComponent
         )
     }
 
+    override fun onStart() {
+        super.onStart()
+
+        initNavigation()
+    }
+
     open suspend fun onStartNavigation(rootFragmentTag: String) {
         doInUI {
             currentAndroidNavigationHost ?.job ?.cancel()