Skip to content

Commit f299e75

Browse files
committed
Create .lifecycle package
1 parent 7de79b8 commit f299e75

13 files changed

Lines changed: 39 additions & 15 deletions

File tree

‎sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/BackStackObserver.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ import io.sentry.compose.navigation3.BackStackConverter.RetentionPolicy
1313
import io.sentry.compose.navigation3.PreparedChange.BackStackHasNewTop
1414
import io.sentry.compose.navigation3.PreparedChange.BackStackHasSameTop
1515
import io.sentry.compose.navigation3.PreparedChange.BackStackIsEmpty
16+
import io.sentry.compose.navigation3.lifecycle.INavScope
17+
import io.sentry.compose.navigation3.lifecycle.INavScopes
1618
import io.sentry.protocol.App
1719
import io.sentry.protocol.TransactionNameSource
1820
import io.sentry.util.IntegrationUtils.addIntegrationToSdkVersion

‎sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/SentryNavEffect.kt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ import androidx.lifecycle.compose.LocalLifecycleOwner
88
import io.sentry.IScopes
99
import io.sentry.ScopesAdapter
1010
import io.sentry.SentryOptions
11+
import io.sentry.compose.navigation3.lifecycle.CoordinatedBackStackObserver
12+
import io.sentry.compose.navigation3.lifecycle.NavLeaseCoordinator
13+
import io.sentry.compose.navigation3.lifecycle.defaultNavLeaseCoordinator
1114
import org.jetbrains.annotations.ApiStatus
1215

1316
/**

sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/CoordinatedBackStackObserver.kt renamed to sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/lifecycle/CoordinatedBackStackObserver.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
package io.sentry.compose.navigation3
1+
package io.sentry.compose.navigation3.lifecycle
22

33
import androidx.lifecycle.Lifecycle
44
import androidx.lifecycle.LifecycleEventObserver
55
import io.sentry.IScope
66
import io.sentry.IScopes
7+
import io.sentry.compose.navigation3.BackStackObserver
8+
import io.sentry.compose.navigation3.ForwardingBackStackEntryMapper
9+
import io.sentry.compose.navigation3.SentryNavOptions
710

811
/**
912
* A [BackStackObserver] that coordinates its updates to a shared [IScope] instance with other

sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/NavLeaseCoordinator.kt renamed to sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/lifecycle/NavLeaseCoordinator.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.sentry.compose.navigation3
1+
package io.sentry.compose.navigation3.lifecycle
22

33
import androidx.lifecycle.Lifecycle
44
import androidx.lifecycle.LifecycleOwner
@@ -7,8 +7,8 @@ import io.sentry.ITransaction
77
import io.sentry.SpanStatus
88

99
/**
10-
* Manages a lease in order to determine which [NavScopes] instance can start nav transactions
11-
* and publish nav data to a shared [IScope].
10+
* Manages a lease in order to determine which [NavScopes] instance can start nav transactions and
11+
* publish nav data to a shared [IScope].
1212
*
1313
* `NavScopes` instances register as [candidates][Candidate] for lease ownership via
1414
* [registerCandidate].

sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/NavScopes.kt renamed to sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/lifecycle/NavScopes.kt

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.sentry.compose.navigation3
1+
package io.sentry.compose.navigation3.lifecycle
22

33
import androidx.lifecycle.Lifecycle
44
import androidx.lifecycle.Lifecycle.Event.ON_DESTROY
@@ -18,9 +18,11 @@ import io.sentry.PropagationContext
1818
import io.sentry.Scope
1919
import io.sentry.SentryLevel
2020
import io.sentry.SentryOptions
21-
import io.sentry.SpanStatus
2221
import io.sentry.TransactionContext
2322
import io.sentry.TransactionOptions
23+
import io.sentry.compose.navigation3.BackStackObserver
24+
import io.sentry.compose.navigation3.NAVIGATION_CONTEXT_KEY
25+
import io.sentry.compose.navigation3.SentryNavEffect
2426
import io.sentry.protocol.App
2527
import io.sentry.protocol.Contexts
2628

@@ -503,7 +505,9 @@ internal class NavScope(
503505
/**
504506
* The subset of [IScopes] a [BackStackObserver] uses to record navigation data.
505507
*
506-
* New operations against the shared [IScopes] must be added here.
508+
* Protects us against accidental misuse of what would otherwise be a partially-implemented
509+
* [IScopes] interface injected into [BackStackObserver]. New operations against the underlying
510+
* [IScopes] instance must be added here.
507511
*/
508512
internal interface INavScopes {
509513

@@ -523,7 +527,8 @@ internal interface INavScopes {
523527
/**
524528
* The subset of [IScope] a [BackStackObserver] uses to record navigation data.
525529
*
526-
* New operations against the shared [IScope] must be added here.
530+
* Protects us against accidental misuse of what would otherwise be a partially-implemented [IScope]
531+
* interface. New operations against the underlying [IScope] instance must be added here.
527532
*/
528533
internal interface INavScope {
529534

‎sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/BackStackObserverTest.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import io.sentry.SentryTracer
1616
import io.sentry.TransactionContext
1717
import io.sentry.TransactionOptions
1818
import io.sentry.compose.navigation3.ArgumentDropReason.Companion.ARGUMENT_DROP_REASON_KEY
19+
import io.sentry.compose.navigation3.lifecycle.DirectNavScopes
1920
import io.sentry.protocol.App
2021
import io.sentry.protocol.TransactionNameSource
2122
import org.junit.Test

‎sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/SentryNavEffectTest.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import io.sentry.SentryOptions
3030
import io.sentry.SentryTracer
3131
import io.sentry.TransactionContext
3232
import io.sentry.TransactionOptions
33+
import io.sentry.compose.navigation3.lifecycle.NavLeaseCoordinator
3334
import org.junit.Rule
3435
import org.junit.Test
3536
import org.junit.rules.TestWatcher

sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/CoordinatedBackStackObserverTest.kt renamed to sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/lifecycle/CoordinatedBackStackObserverTest.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
package io.sentry.compose.navigation3
1+
package io.sentry.compose.navigation3.lifecycle
22

33
import io.sentry.IScopes
4+
import io.sentry.compose.navigation3.BackStackObserver
5+
import io.sentry.compose.navigation3.ForwardingBackStackEntryMapper
6+
import io.sentry.compose.navigation3.SentryNavOptions
47
import org.junit.Test
58
import org.mockito.kotlin.inOrder
69
import org.mockito.kotlin.mock

sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/DirectNavScopes.kt renamed to sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/lifecycle/DirectNavScopes.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.sentry.compose.navigation3
1+
package io.sentry.compose.navigation3.lifecycle
22

33
import io.sentry.Breadcrumb
44
import io.sentry.Hint
@@ -9,6 +9,8 @@ import io.sentry.PropagationContext
99
import io.sentry.SentryOptions
1010
import io.sentry.TransactionContext
1111
import io.sentry.TransactionOptions
12+
import io.sentry.compose.navigation3.BackStackObserver
13+
import io.sentry.compose.navigation3.NAVIGATION_CONTEXT_KEY
1214
import io.sentry.protocol.App
1315
import io.sentry.protocol.Contexts
1416

sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/NavLeaseCoordinatorTest.kt renamed to sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/lifecycle/NavLeaseCoordinatorTest.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.sentry.compose.navigation3
1+
package io.sentry.compose.navigation3.lifecycle
22

33
import androidx.lifecycle.Lifecycle
44
import com.google.common.truth.Truth.assertThat
@@ -7,7 +7,9 @@ import io.sentry.Scope
77
import io.sentry.SentryOptions
88
import io.sentry.SpanStatus
99
import org.junit.Test
10+
import org.mockito.kotlin.any
1011
import org.mockito.kotlin.mock
12+
import org.mockito.kotlin.never
1113
import org.mockito.kotlin.verify
1214
import org.mockito.kotlin.verifyNoInteractions
1315
import org.mockito.kotlin.whenever
@@ -344,7 +346,7 @@ class NavLeaseCoordinatorTest {
344346

345347
assertThat(fixture.scope.transaction).isSameInstanceAs(transaction)
346348
assertThat(navLeaseCoordinator.hasLease(owner)).isTrue()
347-
verify(transaction, org.mockito.kotlin.never()).finish(org.mockito.kotlin.any())
349+
verify(transaction, never()).finish(any())
348350
}
349351

350352
@Test

0 commit comments

Comments
 (0)