Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ private fun MainContent(
animatedVisibilityScope: AnimatedVisibilityScope
) {
with(sharedTransitionScope) {
Box(modifier = Modifier.fillMaxSize()) {
Box(modifier = modifier.fillMaxSize()) {
Row(
modifier = Modifier
.padding(8.dp)
Expand Down Expand Up @@ -209,7 +209,7 @@ private fun DetailsContent(
animatedVisibilityScope: AnimatedVisibilityScope
) {
with(sharedTransitionScope) {
Box(modifier = Modifier.fillMaxSize()) {
Box(modifier = modifier.fillMaxSize()) {
Column(
modifier = Modifier
.padding(top = 200.dp, start = 16.dp, end = 16.dp)
Expand Down Expand Up @@ -574,7 +574,7 @@ fun PlaceholderSizeAnimated_Demo() {
.sharedBounds(
rememberSharedContentState(key = "image-${snack.name}"),
animatedVisibilityScope = this@composable,
placeHolderSize = SharedTransitionScope.PlaceHolderSize.animatedSize
placeholderSize = SharedTransitionScope.PlaceholderSize.AnimatedSize
)
.clickable {
navController.navigate("details/$index")
Expand Down Expand Up @@ -624,7 +624,7 @@ fun PlaceholderSizeAnimated_Demo() {
.sharedBounds(
rememberSharedContentState(key = "image-${snack.name}"),
animatedVisibilityScope = this@composable,
placeHolderSize = SharedTransitionScope.PlaceHolderSize.animatedSize
placeholderSize = SharedTransitionScope.PlaceholderSize.AnimatedSize
)
.clip(RoundedCornerShape(8.dp))
.fillMaxWidth()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ private fun MainContent(
animatedVisibilityScope = animatedVisibilityScope,
enter = fadeIn(),
exit = fadeOut(),
resizeMode = SharedTransitionScope.ResizeMode.ScaleToBounds()
resizeMode = SharedTransitionScope.ResizeMode.scaleToBounds()
)
// [START_EXCLUDE]
.border(1.dp, Color.Gray.copy(alpha = 0.5f), RoundedCornerShape(8.dp))
Expand Down Expand Up @@ -154,7 +154,7 @@ private fun DetailsContent(
animatedVisibilityScope = animatedVisibilityScope,
enter = fadeIn(),
exit = fadeOut(),
resizeMode = SharedTransitionScope.ResizeMode.ScaleToBounds()
resizeMode = SharedTransitionScope.ResizeMode.scaleToBounds()
)
// [START_EXCLUDE]
.border(1.dp, Color.Gray.copy(alpha = 0.5f), RoundedCornerShape(8.dp))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ private fun SharedElementTypicalUseText() {
animatedVisibilityScope = this,
enter = fadeIn(),
exit = fadeOut(),
resizeMode = SharedTransitionScope.ResizeMode.ScaleToBounds()
resizeMode = SharedTransitionScope.ResizeMode.scaleToBounds()
)
)
// [END android_compose_shared_element_text_tip]
Expand Down
76 changes: 38 additions & 38 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
[versions]
accompanist = "0.36.0"
activityKtx = "1.11.0"
activityKtx = "1.12.1"
android-googleid = "1.1.1"
androidGradlePlugin = "8.13.0"
androidx-activity-compose = "1.11.0"
androidGradlePlugin = "8.13.1"
androidx-activity-compose = "1.12.1"
androidx-appcompat = "1.7.0"
androidx-compose-bom = "2025.11.01"
androidx-compose-bom = "2025.12.00"
androidx-compose-ui-test = "1.7.0-alpha08"
androidx-compose-ui-test-junit4-accessibility = "1.10.0-beta01"
androidx-compose-ui-test-junit4-accessibility = "1.11.0-alpha01"
androidx-constraintlayout = "2.2.1"
androidx-constraintlayout-compose = "1.1.1"
androidx-coordinator-layout = "1.3.0"
Expand All @@ -17,18 +17,18 @@ androidx-credentials-play-services-auth = "1.6.0-beta03"
androidx-emoji2-views = "1.6.0"
androidx-fragment = "1.8.9"
androidx-glance-appwidget = "1.1.1"
androidx-lifecycle-compose = "2.9.4"
androidx-lifecycle-runtime-compose = "2.9.4"
androidx-navigation = "2.9.5"
androidx-navigation3 = "1.0.0-beta01"
androidx-lifecycle-compose = "2.10.0"
androidx-lifecycle-runtime-compose = "2.10.0"
androidx-navigation = "2.9.6"
androidx-navigation3 = "1.1.0-alpha01"
androidx-paging = "3.3.6"
androidx-startup-runtime = "1.2.0"
androidx-test = "1.7.0"
androidx-test-espresso = "3.7.0"
androidx-test-junit = "1.3.0"
androidx-window = "1.5.0"
androidx-window-core = "1.5.0"
androidx-window-java = "1.5.0"
androidx-window = "1.5.1"
androidx-window-core = "1.5.1"
androidx-window-java = "1.5.1"
androidx-xr-arcore = "1.0.0-alpha09"
androidx-xr-compose = "1.0.0-alpha09"
androidx-xr-scenecore = "1.0.0-alpha10"
Expand All @@ -38,59 +38,59 @@ arcorePlayServices = "1.0.0-alpha09"
coil = "2.7.0"
# @keep
compileSdk = "36"
compose-latest = "1.9.5"
composeUiTooling = "1.5.5"
compose-latest = "1.10.0"
composeUiTooling = "1.5.6"
coreSplashscreen = "1.2.0"
coroutines = "1.10.2"
dataStore = "1.1.7"
datastoreCore = "1.1.7"
datastorePreferencesRxjava2 = "1.1.7"
datastorePreferencesRxjava3 = "1.1.7"
firebase-bom = "34.4.0"
dataStore = "1.2.0"
datastoreCore = "1.2.0"
datastorePreferencesRxjava2 = "1.2.0"
datastorePreferencesRxjava3 = "1.2.0"
firebase-bom = "34.6.0"
glide = "1.0.0-beta08"
google-ar-core = "1.51.0"
google-maps = "19.2.0"
gradle-versions = "0.53.0"
guava = "33.5.0-jre"
guava-android = "33.5.0-jre"
hilt = "2.57.2"
horologist = "0.8.2-alpha"
horologist = "0.8.3-alpha"
junit = "4.13.2"
kotlin = "2.2.21"
kotlinCoroutinesOkhttp = "1.0"
kotlinxCoroutinesGuava = "1.10.2"
kotlinxSerializationJson = "1.9.0"
ksp = "2.3.0"
ksp = "2.3.3"
ktlint = "1.5.0"
lifecycleService = "2.9.4"
maps-compose = "6.12.1"
material = "1.14.0-alpha06"
lifecycleService = "2.10.0"
maps-compose = "6.12.2"
material = "1.14.0-alpha07"
material3-adaptive = "1.2.0"
material3-adaptive-navigation-suite = "1.4.0"
media3 = "1.8.0"
media3Ui = "1.8.0"
# @keep
minSdk = "36"
okHttp = "5.2.1"
okHttp = "5.3.2"
playServicesWearable = "19.0.0"
protobuf = "4.32.1"
protobuf = "4.33.1"
protoc = "0.9.5"
protolayout = "1.3.0"
reactive-streams = "1.0.4"
recyclerview = "1.4.0"
robolectric = "4.16"
roborazzi = "1.52.0"
spotless = "8.0.0"
spotless = "8.1.0"
targetSdk = "36"
tiles = "1.5.0"
tracing = "1.3.0"
validatorPush = "1.0.0-alpha08"
version-catalog-update = "1.0.1"
watchfaceComplicationsDataSourceKtx = "1.2.1"
wear = "1.3.0"
wearComposeFoundation = "1.5.5"
wearComposeMaterial = "1.5.5"
wearComposeMaterial3 = "1.5.5"
wearComposeFoundation = "1.5.6"
wearComposeMaterial = "1.5.6"
wearComposeMaterial3 = "1.5.6"
wearInput = "1.2.0"
wearOngoing = "1.1.0"
wearToolingPreview = "1.0.0"
Expand Down Expand Up @@ -139,10 +139,10 @@ androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx
androidx-core-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "coreSplashscreen" }
androidx-credentials = { module = "androidx.credentials:credentials", version.ref = "androidx-credentials" }
androidx-credentials-play-services-auth = { module = "androidx.credentials:credentials-play-services-auth", version.ref = "androidx-credentials-play-services-auth" }
androidx-datastore = { group = "androidx.datastore", name = "datastore", version.ref = "dataStore" }
androidx-datastore = { module = "androidx.datastore:datastore", version.ref = "dataStore" }
androidx-datastore-core = { module = "androidx.datastore:datastore-core", version.ref = "datastoreCore" }
androidx-datastore-preferences = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "dataStore" }
androidx-datastore-preferences-core = { group = "androidx.datastore", name = "datastore-preferences-core", version.ref = "dataStore" }
androidx-datastore-preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "dataStore" }
androidx-datastore-preferences-core = { module = "androidx.datastore:datastore-preferences-core", version.ref = "dataStore" }
androidx-datastore-preferences-rxjava2 = { module = "androidx.datastore:datastore-preferences-rxjava2", version.ref = "datastorePreferencesRxjava2" }
androidx-datastore-preferences-rxjava3 = { module = "androidx.datastore:datastore-preferences-rxjava3", version.ref = "datastorePreferencesRxjava3" }
androidx-emoji2-views = { module = "androidx.emoji2:emoji2-views", version.ref = "androidx-emoji2-views" }
Expand Down Expand Up @@ -206,7 +206,7 @@ firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "fir
glide-compose = { module = "com.github.bumptech.glide:compose", version.ref = "glide" }
google-android-material = { module = "com.google.android.material:material", version.ref = "material" }
google-ar-core = { module = "com.google.ar:core", version.ref = "google-ar-core" }
google-protobuf-kotlin-lite = { group = "com.google.protobuf", name = "protobuf-kotlin-lite", version.ref = "protobuf" }
google-protobuf-kotlin-lite = { module = "com.google.protobuf:protobuf-kotlin-lite", version.ref = "protobuf" }
googlemaps-compose = { module = "com.google.maps.android:maps-compose", version.ref = "maps-compose" }
googlemaps-maps = { module = "com.google.android.gms:play-services-maps", version.ref = "google-maps" }
guava = { module = "com.google.guava:guava", version.ref = "guava" }
Expand All @@ -216,10 +216,6 @@ hilt-compiler = { module = "com.google.dagger:hilt-android-compiler", version.re
horologist-compose-layout = { module = "com.google.android.horologist:horologist-compose-layout", version.ref = "horologist" }
horologist-compose-material = { module = "com.google.android.horologist:horologist-compose-material", version.ref = "horologist" }
horologist-roboscreenshots = { module = "com.google.android.horologist:horologist-roboscreenshots", version.ref = "horologist" }
robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" }
roborazzi = { group = "io.github.takahirom.roborazzi", name = "roborazzi", version.ref = "roborazzi" }
roborazzi-compose = { group = "io.github.takahirom.roborazzi", name = "roborazzi-compose", version.ref = "roborazzi" }
roborazzi-rule = { group = "io.github.takahirom.roborazzi", name = "roborazzi-junit-rule", version.ref = "roborazzi" }
jetbrains-kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
junit = { module = "junit:junit", version.ref = "junit" }
kotlin-coroutines-okhttp = { module = "ru.gildor.coroutines:kotlin-coroutines-okhttp", version.ref = "kotlinCoroutinesOkhttp" }
Expand All @@ -232,6 +228,10 @@ kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serializa
okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okHttp" }
play-services-wearable = { module = "com.google.android.gms:play-services-wearable", version.ref = "playServicesWearable" }
reactive-streams = { module = "org.reactivestreams:reactive-streams", version.ref = "reactive-streams" }
robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" }
roborazzi = { module = "io.github.takahirom.roborazzi:roborazzi", version.ref = "roborazzi" }
roborazzi-compose = { module = "io.github.takahirom.roborazzi:roborazzi-compose", version.ref = "roborazzi" }
roborazzi-rule = { module = "io.github.takahirom.roborazzi:roborazzi-junit-rule", version.ref = "roborazzi" }
validator-push = { module = "com.google.android.wearable.watchface.validator:validator-push", version.ref = "validatorPush" }
wear-compose-material = { module = "androidx.wear.compose:compose-material", version.ref = "wearComposeMaterial" }
wear-compose-material3 = { module = "androidx.wear.compose:compose-material3", version.ref = "wearComposeMaterial3" }
Expand Down