🤖 Sync main to latest (#259)

compose-devrel-github-bot · simona-anomis · IanGClifton · web-flow · commit 77e9ab130226 · 2024-05-07T16:54:06.000+01:00
* 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 <35065668+simona-anomis@users.noreply.github.com> Co-authored-by: Ian G. Clifton <1033551+IanGClifton@users.noreply.github.com> Co-authored-by: Alex Vanyo <vanyo@google.com> Co-authored-by: compose-devrel-github-bot <compose-devrel-github-bot@users.noreply.github.com>
diff --git a/compose/snippets/src/main/java/com/example/compose/snippets/SnippetsActivity.kt b/compose/snippets/src/main/java/com/example/compose/snippets/SnippetsActivity.kt
@@ -78,7 +78,7 @@ class SnippetsActivity : ComponentActivity() {
                                         )
                                     }
                                     Destination.ShapesExamples -> ApplyPolygonAsClipImage()
-                                    Destination.SharedElementExamples ->PlaceholderSizeAnimated_Demo()
+                                    Destination.SharedElementExamples -> PlaceholderSizeAnimated_Demo()
                                 }
                             }
                         }
diff --git a/compose/snippets/src/main/java/com/example/compose/snippets/animations/sharedelement/BasicSharedElementSnippets.kt b/compose/snippets/src/main/java/com/example/compose/snippets/animations/sharedelement/BasicSharedElementSnippets.kt
@@ -39,7 +39,6 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.compositionLocalOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -422,17 +421,19 @@ private object UniqueKeySnippet {
         SharedTransitionLayout {
             AnimatedVisibility(visible = true) {
                 // [END_EXCLUDE]
-                Box(modifier = Modifier
-                    .sharedElement(
-                        rememberSharedContentState(
-                            key = SnackSharedElementKey(
-                                snackId = 1,
-                                origin = "latest",
-                                type = SnackSharedElementType.Image
-                            )
-                        ),
-                        animatedVisibilityScope = this@AnimatedVisibility
-                    ))
+                Box(
+                    modifier = Modifier
+                        .sharedElement(
+                            rememberSharedContentState(
+                                key = SnackSharedElementKey(
+                                    snackId = 1,
+                                    origin = "latest",
+                                    type = SnackSharedElementType.Image
+                                )
+                            ),
+                            animatedVisibilityScope = this@AnimatedVisibility
+                        )
+                )
                 // [START_EXCLUDE]
             }
         }
diff --git a/compose/snippets/src/main/java/com/example/compose/snippets/animations/sharedelement/CustomizeSharedElementsSnippets.kt b/compose/snippets/src/main/java/com/example/compose/snippets/animations/sharedelement/CustomizeSharedElementsSnippets.kt
@@ -30,9 +30,7 @@ import androidx.compose.animation.SharedTransitionScope
 import androidx.compose.animation.core.ArcMode
 import androidx.compose.animation.core.ExperimentalAnimationSpecApi
 import androidx.compose.animation.core.FastOutSlowInEasing
-import androidx.compose.animation.core.Spring
 import androidx.compose.animation.core.keyframes
-import androidx.compose.animation.core.spring
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
@@ -266,10 +264,10 @@ private fun DetailsContent(
                 // [END android_compose_shared_element_text_bounds_transform]
                 Text(
                     "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur sit amet lobortis velit. " +
-                            "Lorem ipsum dolor sit amet, consectetur adipiscing elit." +
-                            " Curabitur sagittis, lectus posuere imperdiet facilisis, nibh massa " +
-                            "molestie est, quis dapibus orci ligula non magna. Pellentesque rhoncus " +
-                            "hendrerit massa quis ultricies. Curabitur congue ullamcorper leo, at maximus",
+                        "Lorem ipsum dolor sit amet, consectetur adipiscing elit." +
+                        " Curabitur sagittis, lectus posuere imperdiet facilisis, nibh massa " +
+                        "molestie est, quis dapibus orci ligula non magna. Pellentesque rhoncus " +
+                        "hendrerit massa quis ultricies. Curabitur congue ullamcorper leo, at maximus",
                     modifier = Modifier.skipToLookaheadSize()
                 )
             }
@@ -326,7 +324,7 @@ private fun SharedElement_Clipping() {
                             rememberSharedContentState(key = "title"),
                             animatedVisibilityScope = this@AnimatedContent,
 
-                            )
+                        )
                     )
                 }
             } else {
@@ -364,10 +362,10 @@ private fun SharedElement_Clipping() {
                     )
                     Text(
                         "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur sit amet lobortis velit. " +
-                                "Lorem ipsum dolor sit amet, consectetur adipiscing elit." +
-                                " Curabitur sagittis, lectus posuere imperdiet facilisis, nibh massa " +
-                                "molestie est, quis dapibus orci ligula non magna. Pellentesque rhoncus " +
-                                "hendrerit massa quis ultricies. Curabitur congue ullamcorper leo, at maximus"
+                            "Lorem ipsum dolor sit amet, consectetur adipiscing elit." +
+                            " Curabitur sagittis, lectus posuere imperdiet facilisis, nibh massa " +
+                            "molestie est, quis dapibus orci ligula non magna. Pellentesque rhoncus " +
+                            "hendrerit massa quis ultricies. Curabitur congue ullamcorper leo, at maximus"
                     )
                 }
             }
@@ -377,7 +375,6 @@ private fun SharedElement_Clipping() {
 
 @Composable
 private fun JetsnackBottomBar(modifier: Modifier) {
-
 }
 
 @Composable
@@ -402,7 +399,6 @@ private fun EnterExitJetsnack() {
             // [END android_compose_shared_element_enter_exit]
         }
     }
-
 }
 
 @Preview
diff --git a/compose/snippets/src/main/java/com/example/compose/snippets/animations/sharedelement/SharedElementCommonUseCaseSnippets.kt b/compose/snippets/src/main/java/com/example/compose/snippets/animations/sharedelement/SharedElementCommonUseCaseSnippets.kt
@@ -20,7 +20,6 @@ package com.example.compose.snippets.animations.sharedelement
 
 import androidx.annotation.DrawableRes
 import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.ExitTransition
 import androidx.compose.animation.ExperimentalSharedTransitionApi
 import androidx.compose.animation.SharedTransitionLayout
 import androidx.compose.animation.fadeIn
diff --git a/compose/snippets/src/main/java/com/example/compose/snippets/animations/sharedelement/SharedElementsWithNavigationSnippets.kt b/compose/snippets/src/main/java/com/example/compose/snippets/animations/sharedelement/SharedElementsWithNavigationSnippets.kt
@@ -23,8 +23,6 @@ import androidx.compose.animation.AnimatedContentScope
 import androidx.compose.animation.ExperimentalSharedTransitionApi
 import androidx.compose.animation.SharedTransitionLayout
 import androidx.compose.animation.SharedTransitionScope
-import androidx.compose.animation.core.TweenSpec
-import androidx.compose.animation.core.tween
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
@@ -139,7 +137,6 @@ private fun DetailsScreen(
             )
         }
     }
-
 }
 
 @Composable
@@ -194,4 +191,4 @@ data class Snack(
     val description: String,
     @DrawableRes val image: Int
 )
-// [END android_compose_shared_element_predictive_back]
+// [END android_compose_shared_element_predictive_back]

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ class SnippetsActivity : ComponentActivity() {`
`78`	`78`	`)`
`79`	`79`	`}`
`80`	`80`	`Destination.ShapesExamples -> ApplyPolygonAsClipImage()`
`81`		`- Destination.SharedElementExamples ->PlaceholderSizeAnimated_Demo()`
	`81`	`+ Destination.SharedElementExamples -> PlaceholderSizeAnimated_Demo()`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,9 +30,7 @@ import androidx.compose.animation.SharedTransitionScope`
`30`	`30`	`import androidx.compose.animation.core.ArcMode`
`31`	`31`	`import androidx.compose.animation.core.ExperimentalAnimationSpecApi`
`32`	`32`	`import androidx.compose.animation.core.FastOutSlowInEasing`
`33`		`-import androidx.compose.animation.core.Spring`
`34`	`33`	`import androidx.compose.animation.core.keyframes`
`35`		`-import androidx.compose.animation.core.spring`
`36`	`34`	`import androidx.compose.animation.core.tween`
`37`	`35`	`import androidx.compose.animation.fadeIn`
`38`	`36`	`import androidx.compose.animation.fadeOut`
`@@ -266,10 +264,10 @@ private fun DetailsContent(`
`266`	`264`	`// [END android_compose_shared_element_text_bounds_transform]`
`267`	`265`	`Text(`
`268`	`266`	`"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",`
`273`	`271`	`modifier = Modifier.skipToLookaheadSize()`
`274`	`272`	`)`
`275`	`273`	`}`
`@@ -326,7 +324,7 @@ private fun SharedElement_Clipping() {`
`326`	`324`	`rememberSharedContentState(key = "title"),`
`327`	`325`	`animatedVisibilityScope = this@AnimatedContent,`
`328`	`326`
`329`		`- )`
	`327`	`+ )`
`330`	`328`	`)`
`331`	`329`	`}`
`332`	`330`	`} else {`
`@@ -364,10 +362,10 @@ private fun SharedElement_Clipping() {`
`364`	`362`	`)`
`365`	`363`	`Text(`
`366`	`364`	`"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"`
`371`	`369`	`)`
`372`	`370`	`}`
`373`	`371`	`}`
`@@ -377,7 +375,6 @@ private fun SharedElement_Clipping() {`
`377`	`375`
`378`	`376`	`@Composable`
`379`	`377`	`private fun JetsnackBottomBar(modifier: Modifier) {`
`380`		`-`
`381`	`378`	`}`
`382`	`379`
`383`	`380`	`@Composable`
`@@ -402,7 +399,6 @@ private fun EnterExitJetsnack() {`
`402`	`399`	`// [END android_compose_shared_element_enter_exit]`
`403`	`400`	`}`
`404`	`401`	`}`
`405`		`-`
`406`	`402`	`}`
`407`	`403`
`408`	`404`	`@Preview`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,6 @@ import androidx.compose.animation.AnimatedContentScope`
`23`	`23`	`import androidx.compose.animation.ExperimentalSharedTransitionApi`
`24`	`24`	`import androidx.compose.animation.SharedTransitionLayout`
`25`	`25`	`import androidx.compose.animation.SharedTransitionScope`
`26`		`-import androidx.compose.animation.core.TweenSpec`
`27`		`-import androidx.compose.animation.core.tween`
`28`	`26`	`import androidx.compose.foundation.Image`
`29`	`27`	`import androidx.compose.foundation.clickable`
`30`	`28`	`import androidx.compose.foundation.layout.Arrangement`
`@@ -139,7 +137,6 @@ private fun DetailsScreen(`
`139`	`137`	`)`
`140`	`138`	`}`
`141`	`139`	`}`
`142`		`-`
`143`	`140`	`}`
`144`	`141`
`145`	`142`	`@Composable`
`@@ -194,4 +191,4 @@ data class Snack(`
`194`	`191`	`val description: String,`
`195`	`192`	`@DrawableRes val image: Int`
`196`	`193`	`)`
`197`		`-// [END android_compose_shared_element_predictive_back]`
	`194`	`+// [END android_compose_shared_element_predictive_back]`