Skip to content

Commit 77e9ab1

Browse files
compose-devrel-github-botsimona-anomisIanGCliftonalexvanyo
authored
🤖 Sync main to latest (#259)
* Update libs.versions.toml (#251) * Updated ListDetailPaneScaffold use to alpha12 (#255) This eliminates storing state outside and directly uses the navigator as the source of truth. This also gets rid of the Modifier for AnimatedPane as it's no longer a required argument. * Added NavigationSuiteScaffold snippets (#261) * Added NavigationSuiteScaffold snippets * Apply Spotless * 🤖 Update Dependencies (#262) * Added snippets for SupportingPaneScaffold (#260) * Added snippets for SupportingPaneScaffold * Apply Spotless * Update compose/snippets/src/main/java/com/example/compose/snippets/adaptivelayouts/SampleSupportingPaneScaffold.kt * Migrate to material3-adaptive WindowSizeClass method (#264) * Migrate to material3-adaptive WindowSizeClass method * Update comments to be single line * Apply Spotless --------- Co-authored-by: Simona <[email protected]> Co-authored-by: Ian G. Clifton <[email protected]> Co-authored-by: Alex Vanyo <[email protected]> Co-authored-by: compose-devrel-github-bot <[email protected]>
1 parent d918044 commit 77e9ab1

File tree

5 files changed

+24
-31
lines changed

5 files changed

+24
-31
lines changed

compose/snippets/src/main/java/com/example/compose/snippets/SnippetsActivity.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ class SnippetsActivity : ComponentActivity() {
7878
)
7979
}
8080
Destination.ShapesExamples -> ApplyPolygonAsClipImage()
81-
Destination.SharedElementExamples ->PlaceholderSizeAnimated_Demo()
81+
Destination.SharedElementExamples -> PlaceholderSizeAnimated_Demo()
8282
}
8383
}
8484
}

compose/snippets/src/main/java/com/example/compose/snippets/animations/sharedelement/BasicSharedElementSnippets.kt

+13-12
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ import androidx.compose.foundation.shape.CircleShape
3939
import androidx.compose.foundation.shape.RoundedCornerShape
4040
import androidx.compose.material3.Text
4141
import androidx.compose.runtime.Composable
42-
import androidx.compose.runtime.compositionLocalOf
4342
import androidx.compose.runtime.getValue
4443
import androidx.compose.runtime.mutableStateOf
4544
import androidx.compose.runtime.remember
@@ -422,17 +421,19 @@ private object UniqueKeySnippet {
422421
SharedTransitionLayout {
423422
AnimatedVisibility(visible = true) {
424423
// [END_EXCLUDE]
425-
Box(modifier = Modifier
426-
.sharedElement(
427-
rememberSharedContentState(
428-
key = SnackSharedElementKey(
429-
snackId = 1,
430-
origin = "latest",
431-
type = SnackSharedElementType.Image
432-
)
433-
),
434-
animatedVisibilityScope = this@AnimatedVisibility
435-
))
424+
Box(
425+
modifier = Modifier
426+
.sharedElement(
427+
rememberSharedContentState(
428+
key = SnackSharedElementKey(
429+
snackId = 1,
430+
origin = "latest",
431+
type = SnackSharedElementType.Image
432+
)
433+
),
434+
animatedVisibilityScope = this@AnimatedVisibility
435+
)
436+
)
436437
// [START_EXCLUDE]
437438
}
438439
}

compose/snippets/src/main/java/com/example/compose/snippets/animations/sharedelement/CustomizeSharedElementsSnippets.kt

+9-13
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@ import androidx.compose.animation.SharedTransitionScope
3030
import androidx.compose.animation.core.ArcMode
3131
import androidx.compose.animation.core.ExperimentalAnimationSpecApi
3232
import androidx.compose.animation.core.FastOutSlowInEasing
33-
import androidx.compose.animation.core.Spring
3433
import androidx.compose.animation.core.keyframes
35-
import androidx.compose.animation.core.spring
3634
import androidx.compose.animation.core.tween
3735
import androidx.compose.animation.fadeIn
3836
import androidx.compose.animation.fadeOut
@@ -266,10 +264,10 @@ private fun DetailsContent(
266264
// [END android_compose_shared_element_text_bounds_transform]
267265
Text(
268266
"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur sit amet lobortis velit. " +
269-
"Lorem ipsum dolor sit amet, consectetur adipiscing elit." +
270-
" Curabitur sagittis, lectus posuere imperdiet facilisis, nibh massa " +
271-
"molestie est, quis dapibus orci ligula non magna. Pellentesque rhoncus " +
272-
"hendrerit massa quis ultricies. Curabitur congue ullamcorper leo, at maximus",
267+
"Lorem ipsum dolor sit amet, consectetur adipiscing elit." +
268+
" Curabitur sagittis, lectus posuere imperdiet facilisis, nibh massa " +
269+
"molestie est, quis dapibus orci ligula non magna. Pellentesque rhoncus " +
270+
"hendrerit massa quis ultricies. Curabitur congue ullamcorper leo, at maximus",
273271
modifier = Modifier.skipToLookaheadSize()
274272
)
275273
}
@@ -326,7 +324,7 @@ private fun SharedElement_Clipping() {
326324
rememberSharedContentState(key = "title"),
327325
animatedVisibilityScope = this@AnimatedContent,
328326

329-
)
327+
)
330328
)
331329
}
332330
} else {
@@ -364,10 +362,10 @@ private fun SharedElement_Clipping() {
364362
)
365363
Text(
366364
"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur sit amet lobortis velit. " +
367-
"Lorem ipsum dolor sit amet, consectetur adipiscing elit." +
368-
" Curabitur sagittis, lectus posuere imperdiet facilisis, nibh massa " +
369-
"molestie est, quis dapibus orci ligula non magna. Pellentesque rhoncus " +
370-
"hendrerit massa quis ultricies. Curabitur congue ullamcorper leo, at maximus"
365+
"Lorem ipsum dolor sit amet, consectetur adipiscing elit." +
366+
" Curabitur sagittis, lectus posuere imperdiet facilisis, nibh massa " +
367+
"molestie est, quis dapibus orci ligula non magna. Pellentesque rhoncus " +
368+
"hendrerit massa quis ultricies. Curabitur congue ullamcorper leo, at maximus"
371369
)
372370
}
373371
}
@@ -377,7 +375,6 @@ private fun SharedElement_Clipping() {
377375

378376
@Composable
379377
private fun JetsnackBottomBar(modifier: Modifier) {
380-
381378
}
382379

383380
@Composable
@@ -402,7 +399,6 @@ private fun EnterExitJetsnack() {
402399
// [END android_compose_shared_element_enter_exit]
403400
}
404401
}
405-
406402
}
407403

408404
@Preview

compose/snippets/src/main/java/com/example/compose/snippets/animations/sharedelement/SharedElementCommonUseCaseSnippets.kt

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ package com.example.compose.snippets.animations.sharedelement
2020

2121
import androidx.annotation.DrawableRes
2222
import androidx.compose.animation.AnimatedVisibility
23-
import androidx.compose.animation.ExitTransition
2423
import androidx.compose.animation.ExperimentalSharedTransitionApi
2524
import androidx.compose.animation.SharedTransitionLayout
2625
import androidx.compose.animation.fadeIn

compose/snippets/src/main/java/com/example/compose/snippets/animations/sharedelement/SharedElementsWithNavigationSnippets.kt

+1-4
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ import androidx.compose.animation.AnimatedContentScope
2323
import androidx.compose.animation.ExperimentalSharedTransitionApi
2424
import androidx.compose.animation.SharedTransitionLayout
2525
import androidx.compose.animation.SharedTransitionScope
26-
import androidx.compose.animation.core.TweenSpec
27-
import androidx.compose.animation.core.tween
2826
import androidx.compose.foundation.Image
2927
import androidx.compose.foundation.clickable
3028
import androidx.compose.foundation.layout.Arrangement
@@ -139,7 +137,6 @@ private fun DetailsScreen(
139137
)
140138
}
141139
}
142-
143140
}
144141

145142
@Composable
@@ -194,4 +191,4 @@ data class Snack(
194191
val description: String,
195192
@DrawableRes val image: Int
196193
)
197-
// [END android_compose_shared_element_predictive_back]
194+
// [END android_compose_shared_element_predictive_back]

0 commit comments

Comments
 (0)