Bläddra i källkod

nav controller fix

Milan Jurkulak 3 år sedan
förälder
incheckning
7933ebecbe
1 ändrade filer med 12 tillägg och 9 borttagningar
  1. 12 9
      tvlib/src/main/kotlin/org/mjdev/tvlib/activity/ComposableActivity.kt

+ 12 - 9
tvlib/src/main/kotlin/org/mjdev/tvlib/activity/ComposableActivity.kt

@@ -48,7 +48,7 @@ import timber.log.Timber
 open class ComposableActivity : ComponentActivity() {
 
     @Suppress("PropertyName")
-    val ANR_TIMEOUT = 5000
+    val ANR_TIMEOUT = 2000
 
     val activityResultListeners = mutableListOf<ActivityResultHandler<*>>()
 
@@ -60,20 +60,14 @@ open class ComposableActivity : ComponentActivity() {
     open val roundCornerSize: Dp = 0.dp
     open val backgroundShape: Shape = RoundedCornerShape(roundCornerSize)
 
-    fun reportANR() {
-        ANRWatchDog(ANR_TIMEOUT)
-            .setIgnoreDebugger(true)
-            .setANRListener { anr ->
-                anr.printStackTrace()
-            }.start()
-    }
+    lateinit var navController : NavHostControllerEx
 
     @TvPreview
     @OptIn(ExperimentalTvMaterial3Api::class)
     @Composable
     @CallSuper
     open fun Compose() {
-        val navController = rememberNavControllerEx()
+        navController = rememberNavControllerEx()
         MaterialTheme {
             Surface(
                 modifier = Modifier
@@ -107,6 +101,7 @@ open class ComposableActivity : ComponentActivity() {
     // todo
     override fun onNewIntent(intent: Intent?) {
         super.onNewIntent(intent)
+        onIntent(navController, intent)
     }
 
     override fun onConfigurationChanged(newConfig: Configuration) {
@@ -151,4 +146,12 @@ open class ComposableActivity : ComponentActivity() {
         onActivityResult
     )
 
+    fun reportANR() {
+        ANRWatchDog(ANR_TIMEOUT)
+            .setIgnoreDebugger(true)
+            .setANRListener { anr ->
+                anr.printStackTrace()
+            }.start()
+    }
+
 }