Skip to content

feat(sample): [Nav3 Lifecycle 5] Add Nav3 lifecycle scenarios to sample app #6309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
0xadam-brown wants to merge 1 commit into
base: feat/part-4-sentry-nav-effect-lifecycle
Choose a base branch
from
Open

feat(sample): [Nav3 Lifecycle 5] Add Nav3 lifecycle scenarios to sample app #6309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions sentry-samples/sentry-samples-android/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ dependencies {
implementation(libs.androidx.navigation3.runtime)
implementation(libs.androidx.navigation3.ui)
implementation(libs.androidx.recyclerview)
implementation(libs.androidx.viewpager2)
implementation(libs.androidx.browser)
implementation(libs.androidx.room3.runtime)
implementation(libs.bundles.androidx.room2)
Expand All @@ -230,6 +231,9 @@ dependencies {

debugImplementation(projects.sentryAndroidDistribution)
debugImplementation(libs.leakcanary)

testImplementation(libs.google.truth)
testImplementation(libs.kotlin.test.junit)
}

abstract class ToggleNativeLoggingTask : Exec() {
Expand Down
24 changes: 24 additions & 0 deletions sentry-samples/sentry-samples-android/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,30 @@
android:screenOrientation="portrait"
android:theme="@style/AppTheme.Main" />

<activity
android:name=".navigation.nav3.Nav3ProductsActivity"
android:exported="false"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.Main" />

<activity
android:name=".navigation.nav3.Nav3CheckoutActivity"
android:exported="false"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.Main" />

<!-- No screenOrientation: translucent Activities can't request one on Android 8.0. -->
<activity
android:name=".navigation.nav3.Nav3TranslucentCheckoutActivity"
android:exported="false"
android:theme="@style/AppTheme.Main.Translucent" />

<activity
android:name=".navigation.nav3.Nav3FragmentsActivity"
android:exported="false"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.Main" />

<activity
android:name=".FrameDataForSpansActivity"
android:exported="false" />
Expand Down
42 changes: 29 additions & 13 deletions ...y-samples-android/src/main/java/io/sentry/samples/android/navigation/nav3/Nav3Activity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ import androidx.compose.ui.ExperimentalComposeUiApi
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.drawWithContent
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.semantics.testTagsAsResourceId
import androidx.navigation3.runtime.entryProvider
import androidx.navigation3.ui.NavDisplay
import io.sentry.compose.navigation3.SentryBackStackEntry
Expand Down Expand Up @@ -75,9 +77,6 @@ class Nav3Activity : ComponentActivity() {

private var routeWorkOptions by mutableStateOf(setOf(RouteWorkOption.MANUAL_CHILD_SPAN))

private var isTransactionHistoryActive = false
private val transactionHistory =
NavigationTransactionHistory(isActive = { isTransactionHistoryActive })
private var showTransactionHistorySheet by mutableStateOf(false)

private var showActivityUiLoadTransactionDelayMessage = false
Expand All @@ -99,14 +98,14 @@ class Nav3Activity : ComponentActivity() {
cancelCurrentActivityUiLoadTransaction()
}

transactionHistory.install()
NavigationTransactionHistory.install()

setContent {
Nav3SampleTheme {
Nav3SampleApp(
performanceState = performanceState,
configuration = configuration,
transactions = transactionHistory.transactions,
transactions = NavigationTransactionHistory.transactions,
showActivityUiLoadTransactionDelayMessage = showActivityUiLoadTransactionDelayMessage,
routeWorkOptions = routeWorkOptions,
showTransactionHistorySheet = showTransactionHistorySheet,
Expand All @@ -124,13 +123,7 @@ class Nav3Activity : ComponentActivity() {
}
}

override fun onStart() {
super.onStart()
isTransactionHistoryActive = true
}

override fun onStop() {
isTransactionHistoryActive = false
performanceState.stopAutomaticWork()
super.onStop()
}
Expand All @@ -139,7 +132,6 @@ class Nav3Activity : ComponentActivity() {
if (isFinishing) {
previousConfig.applyToCurrentOptions()
}
transactionHistory.uninstall()
super.onDestroy()
}

Expand Down Expand Up @@ -361,7 +353,9 @@ private fun Nav3SampleApp(
}

Scaffold(
modifier = Modifier.fillMaxSize().safeDrawingPadding(),
// Expose test tags as resource IDs so adb/uiautomator can target them.
modifier =
Modifier.fillMaxSize().safeDrawingPadding().semantics { testTagsAsResourceId = true },
containerColor = MaterialTheme.colorScheme.background,
topBar = {
Nav3TopBar(
Expand Down Expand Up @@ -464,6 +458,28 @@ private fun Nav3SampleApp(
)
}
}
entry<Nav3Route.MultiActivity> { route ->
TracedNav3Route(route, selectedScenario) {
Nav3RouteWorkEffect(route, routeWorkOptions)
MultiActivityRoute {
activity?.startActivity(
Intent(activity, Nav3ProductsActivity::class.java)
.putExtras(Bundle().apply { putNav3SampleConfiguration(configuration) })
)
}
}
}
entry<Nav3Route.MultiFragment> { route ->
TracedNav3Route(route, selectedScenario) {
Nav3RouteWorkEffect(route, routeWorkOptions)
MultiFragmentRoute {
activity?.startActivity(
Intent(activity, Nav3FragmentsActivity::class.java)
.putExtras(Bundle().apply { putNav3SampleConfiguration(configuration) })
)
}
}
}
entry<Nav3Route.Landing> { route ->
TracedNav3Route(route, selectedScenario) {
Nav3RouteWorkEffect(route, routeWorkOptions)
Expand Down
Loading
Loading