Skip to content

Commit 27f7311

Browse files
committed
chore: update dependencies
androidx-annotation => 1.10.0 androidx-credentaisl => 1.6.0 navigation3 => 1.1.0 firebase-bom => 34.12.0 libphonenumber => 9.0.28 robolectric => 4.16.1 mixpanel => 8.5.0 Signed-off-by: Brandon McAnsh <git@bmcreations.dev>
1 parent f372281 commit 27f7311

5 files changed

Lines changed: 33 additions & 30 deletions

File tree

apps/flipcash/app/src/main/kotlin/com/flipcash/app/internal/ui/App.kt

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -159,13 +159,16 @@ internal fun App(
159159
),
160160
rememberNavBlockingOverlayEntryDecorator(),
161161
),
162-
sceneStrategy = ModalBottomSheetSceneStrategy<NavKey>(
163-
codeNavigator.resultStore
164-
) {
165-
codeNavigator.backStack.getOrNull(
166-
codeNavigator.backStack.lastIndex - 1
167-
)
168-
} then SinglePaneSceneStrategy(),
162+
sceneStrategies = listOf(
163+
ModalBottomSheetSceneStrategy(
164+
codeNavigator.resultStore
165+
) {
166+
codeNavigator.backStack.getOrNull(
167+
codeNavigator.backStack.lastIndex - 1
168+
)
169+
},
170+
SinglePaneSceneStrategy(),
171+
),
169172
transitionSpec = {
170173
val shouldCrossfade =
171174
initialState.key == AppRoute.Loading.toString() ||

apps/flipcash/app/src/main/kotlin/com/flipcash/app/internal/ui/navigation/AppScreenContent.kt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,12 @@ private fun SheetContent(
195195
decorators = listOf(
196196
rememberNavMessagingEntryDecorator(navigator.backStack, barManager)
197197
),
198-
sceneStrategy = ModalBottomSheetSceneStrategy<NavKey>(navigator.resultStore) {
199-
navigator.backStack.getOrNull(navigator.backStack.lastIndex - 1)
200-
} then SinglePaneSceneStrategy(),
198+
sceneStrategies = listOf(
199+
ModalBottomSheetSceneStrategy(navigator.resultStore) {
200+
navigator.backStack.getOrNull(navigator.backStack.lastIndex - 1)
201+
},
202+
SinglePaneSceneStrategy(),
203+
),
201204
transitionSpec = {
202205
if (targetState is OverlayScene<*> || initialState is OverlayScene<*>) {
203206
EnterTransition.None togetherWith ExitTransition.None

gradle/libs.versions.toml

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,22 @@ google-services = "4.4.4"
1212

1313
androidx-appcompat = "1.7.1"
1414
androidx-activity = "1.13.0"
15-
androidx-annotation = "1.9.1"
15+
androidx-annotation = "1.10.0"
1616
androidx-biometrics = "1.4.0-alpha06"
1717
androidx-camerax = "1.6.0"
18-
androidx-credentials = "1.5.0"
18+
androidx-credentials = "1.6.0"
1919
androidx-core = "1.18.0"
2020
androidx-datastore = "1.2.1"
2121
androidx-exif = "1.4.2"
2222
androidx-lifecycle = "2.10.0"
2323
androidx-navigation = "2.9.7"
24-
navigation3 = "1.0.1"
24+
navigation3 = "1.1.0"
2525
navigation3-lifecycle = "2.10.0"
2626
androidx-browser = "1.10.0"
2727
androidx-paging = "3.4.2"
2828
androidx-room = "2.8.4"
2929
androidx-work = "2.11.2"
3030
androidx-webkit = "1.15.0"
31-
androidx-ui = "1.10.6"
3231

3332
sqlcipher = "4.5.4"
3433

@@ -50,8 +49,7 @@ rxandroid = "3.0.2"
5049
kin-sdk = "2.1.2"
5150
grpc-android = "1.79.0"
5251
slf4j = "1.7.36"
53-
firebase-bom = "34.11.0"
54-
crashlytics-gradle = "3.0.6"
52+
firebase-bom = "34.12.0"
5553
play-service-ml-barcode = "18.3.1"
5654
google-play-billing = "8.3.0"
5755
google-play-updates = "2.1.0"
@@ -62,8 +60,8 @@ grpc-kotlin = "1.5.0"
6260
protobuf = "4.34.0"
6361
protobuf-plugin = "0.9.6"
6462

65-
lib-phone-number-port = "9.0.27"
66-
lib-phone-number-google = "9.0.27"
63+
lib-phone-number-port = "9.0.28"
64+
lib-phone-number-google = "9.0.28"
6765
zxing = "3.5.4"
6866

6967
androidx-test-runner = "1.7.0"
@@ -73,18 +71,17 @@ espresso = "3.7.0"
7371
mockito-kotlin = "6.3.0"
7472
mockk = "1.14.9"
7573
turbine = "1.2.1"
76-
robolectric = "4.16"
74+
robolectric = "4.16.1"
7775
slf4j-simple = "2.0.17"
7876
androidxUiJUnit = "1.10.6"
79-
mixpanel = "8.4.0"
77+
mixpanel = "8.5.0"
8078

8179
timber = "5.0.1"
8280
voyager = "1.1.0-beta03"
8381

8482
sodium-bindings = "0.9.5"
8583
desugaring = "2.1.5"
8684
event-bus = "0.1.0"
87-
solana-mwa = "2.1.0"
8885

8986
bugsnag = "6.26.0"
9087
bugsnag-agp = "8.2.0"
@@ -140,7 +137,6 @@ androidx-room-testing = { module = "androidx.room:room-testing", version.ref = "
140137
androidx-work = { module = "androidx.work:work-runtime", version.ref = "androidx-work" }
141138
androidx-work-testing = { module = "androidx.work:work-testing", version.ref = "androidx-work" }
142139
androidx-datastore = { module = "androidx.datastore:datastore-preferences", version.ref = "androidx-datastore" }
143-
androidx-ui-tooling = { module = "androidx.compose.ui:ui-tooling-android", version.ref = "androidx-ui" }
144140
androidx-webkit = { module = "androidx.webkit:webkit", version.ref = "androidx-webkit" }
145141

146142
sqlcipher = { module = "net.zetetic:android-database-sqlcipher", version.ref = "sqlcipher" }
@@ -224,15 +220,14 @@ retrofit-converter-serialization = { module = "com.squareup.retrofit2:converter-
224220
# Firebase
225221
firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "firebase-bom" }
226222
firebase-analytics = { module = "com.google.firebase:firebase-analytics" }
227-
firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics" }
228223
firebase-messaging = { module = "com.google.firebase:firebase-messaging" }
229224
firebase-installations = { module = "com.google.firebase:firebase-installations" }
230225
firebase-perf = { module = "com.google.firebase:firebase-perf" }
231226

232227
# Google Play Services
233228
play-integrity = { module = "com.google.android.play:integrity", version = "1.6.0" }
234229
play-service-ml-barcode = { module = "com.google.android.gms:play-services-mlkit-barcode-scanning", version.ref = "play-service-ml-barcode" }
235-
play-services-wallet = { module = "com.google.android.gms:play-services-wallet", version = "19.5.0" }
230+
play-services-wallet = { module = "com.google.android.gms:play-services-wallet", version = "20.0.0" }
236231

237232
# Google Play Billing
238233
google-play-billing-runtime = { module = "com.android.billingclient:billing", version.ref = "google-play-billing" }
@@ -273,7 +268,6 @@ haze-materials = { module = "dev.chrisbanes.haze:haze-materials", version.ref =
273268
rinku = { module = "dev.theolm:rinku", version.ref = "rinku" }
274269
rinku-compose = { module = "dev.theolm:rinku-compose-ext", version.ref = "rinku" }
275270
event-bus = { module = "io.github.hoc081098:channel-event-bus", version.ref = "event-bus" }
276-
solana-mwa = { module = "com.solanamobile:mobile-wallet-adapter-clientlib-ktx", version.ref = "solana-mwa" }
277271

278272
# Testing
279273
androidx-test-runner = { module = "androidx.test:runner", version.ref = "androidx-test-runner" }
@@ -328,7 +322,6 @@ kotlin-ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
328322
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
329323
hilt = { id = "dagger.hilt.android.plugin", version.ref = "hilt" }
330324
google-services = { id = "com.google.gms.google-services", version.ref = "google-services" }
331-
firebase-crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "crashlytics-gradle" }
332325
firebase-perf = { id = "com.google.firebase.firebase-perf", version.ref = "firebase-perf-plugin" }
333326
bugsnag-android = { id = "com.bugsnag.android.gradle", version.ref = "bugsnag-agp" }
334327
bugsnag-gradle = { id = "com.bugsnag.gradle", version.ref = "bugsnag-gradle-plugin" }

ui/navigation/src/main/kotlin/com/getcode/navigation/AppNavHost.kt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import androidx.compose.animation.AnimatedContentTransitionScope
88
import androidx.compose.animation.ContentTransform
99
import androidx.compose.animation.EnterTransition
1010
import androidx.compose.animation.ExitTransition
11+
import androidx.compose.animation.SharedTransitionScope
1112
import androidx.compose.animation.core.tween
1213
import androidx.compose.animation.fadeIn
1314
import androidx.compose.animation.fadeOut
@@ -28,6 +29,7 @@ import androidx.navigation3.scene.Scene
2829
import androidx.navigation3.scene.SceneStrategy
2930
import androidx.navigation3.scene.SinglePaneSceneStrategy
3031
import androidx.navigation3.ui.NavDisplay
32+
import com.getcode.animation.LocalSharedTransitionScope
3133
import com.getcode.navigation.core.CodeNavigator
3234
import com.getcode.navigation.decorators.rememberNavResultScopeEntryDecorator
3335
import com.getcode.navigation.results.NavResultStateRegistry
@@ -39,7 +41,8 @@ import com.getcode.theme.CodeTheme
3941
fun AppNavHost(
4042
navigator: CodeNavigator,
4143
resultStateRegistry: NavResultStateRegistry = rememberNavResultStateRegistry(),
42-
sceneStrategy: SceneStrategy<NavKey> = SinglePaneSceneStrategy(),
44+
sceneStrategies: List<SceneStrategy<NavKey>> = listOf(SinglePaneSceneStrategy()),
45+
sharedTransitionScope: SharedTransitionScope = LocalSharedTransitionScope.current,
4346
transitionSpec: AnimatedContentTransitionScope<Scene<NavKey>>.() -> ContentTransform = {
4447
if (targetState is OverlayScene<*> || initialState is OverlayScene<*>) {
4548
EnterTransition.None togetherWith ExitTransition.None
@@ -64,7 +67,8 @@ fun AppNavHost(
6467
navigator.backStack.removeAt(navigator.backStack.lastIndex)
6568
}
6669
},
67-
sceneStrategy = sceneStrategy,
70+
sceneStrategies = sceneStrategies,
71+
sharedTransitionScope = sharedTransitionScope,
6872
transitionSpec = transitionSpec,
6973
popTransitionSpec = popTransitionSpec,
7074
predictivePopTransitionSpec = predictivePopTransitionSpec,

ui/navigation/src/main/kotlin/com/getcode/navigation/flow/FlowHost.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ fun <S : FlowStep, R : Parcelable> FlowHost(
113113
onExit: (FlowExitReason<R>) -> Unit,
114114
entryProvider: (NavKey) -> NavEntry<NavKey>,
115115
decorators: List<NavEntryDecorator<NavKey>> = emptyList(),
116-
sceneStrategy: SceneStrategy<NavKey> = SinglePaneSceneStrategy(),
116+
sceneStrategies: List<SceneStrategy<NavKey>> = listOf(SinglePaneSceneStrategy()),
117117
transitionSpec: AnimatedContentTransitionScope<Scene<NavKey>>.() -> ContentTransform =
118118
DefaultFlowTransitionSpec,
119119
popTransitionSpec: AnimatedContentTransitionScope<Scene<NavKey>>.() -> ContentTransform =
@@ -189,7 +189,7 @@ fun <S : FlowStep, R : Parcelable> FlowHost(
189189
AppNavHost(
190190
navigator = innerNavigator,
191191
resultStateRegistry = resultStateRegistry,
192-
sceneStrategy = sceneStrategy,
192+
sceneStrategies = sceneStrategies,
193193
transitionSpec = transitionSpec,
194194
popTransitionSpec = popTransitionSpec,
195195
onBack = { innerNavigator.navigateBack() },

0 commit comments

Comments
 (0)