Merge 110994b into 649f171

markushi · web-flow · commit 3dc8731e05f2 · 2022-10-24T05:58:29.000Z
diff --git a/sentry-compose/api/android/sentry-compose.api b/sentry-compose/api/android/sentry-compose.api
@@ -7,6 +7,7 @@ public final class io/sentry/compose/BuildConfig {
 }
 
 public final class io/sentry/compose/SentryNavigationIntegrationKt {
+	public static final fun rememberNavController ([Landroidx/navigation/Navigator;Landroidx/compose/runtime/Composer;I)Landroidx/navigation/NavHostController;
 	public static final fun withSentryObservableEffect (Landroidx/navigation/NavHostController;ZZLandroidx/compose/runtime/Composer;II)Landroidx/navigation/NavHostController;
 }
 
diff --git a/sentry-compose/src/androidMain/kotlin/io/sentry/compose/SentryNavigationIntegration.kt b/sentry-compose/src/androidMain/kotlin/io/sentry/compose/SentryNavigationIntegration.kt
@@ -10,7 +10,9 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.LifecycleOwner
 import androidx.navigation.NavController
+import androidx.navigation.NavDestination
 import androidx.navigation.NavHostController
+import androidx.navigation.Navigator
 import io.sentry.Breadcrumb
 import io.sentry.ITransaction
 import io.sentry.SentryOptions
@@ -73,3 +75,9 @@ public fun NavHostController.withSentryObservableEffect(
     }
     return this
 }
+
+@Composable
+public fun rememberNavController(vararg navigators: Navigator<out NavDestination>): NavHostController {
+    return androidx.navigation.compose.rememberNavController(navigators = navigators)
+        .withSentryObservableEffect()
+}

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ public final class io/sentry/compose/BuildConfig {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`public final class io/sentry/compose/SentryNavigationIntegrationKt {`
	`10`	`+ public static final fun rememberNavController ([Landroidx/navigation/Navigator;Landroidx/compose/runtime/Composer;I)Landroidx/navigation/NavHostController;`
`10`	`11`	`public static final fun withSentryObservableEffect (Landroidx/navigation/NavHostController;ZZLandroidx/compose/runtime/Composer;II)Landroidx/navigation/NavHostController;`
`11`	`12`	`}`
`12`	`13`