Skip to content

🤖 Sync main to latest #259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
May 7, 2024
Merged

🤖 Sync main to latest #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
568344b
Update libs.versions.toml (#251)
simona-anomis Apr 18, 2024
57ebb93
Updated ListDetailPaneScaffold use to alpha12 (#255)
IanGClifton May 1, 2024
edb4c21
Added NavigationSuiteScaffold snippets (#261)
IanGClifton May 2, 2024
cf682eb
🤖 Update Dependencies (#262)
compose-devrel-github-bot May 3, 2024
ef29bb6
Added snippets for SupportingPaneScaffold (#260)
IanGClifton May 6, 2024
30f5ef7
Migrate to material3-adaptive WindowSizeClass method (#264)
alexvanyo May 6, 2024
7bf3175
Merge remote-tracking branch 'origin/main' into latest
compose-devrel-github-bot May 6, 2024
2dd77e1
Apply Spotless
compose-devrel-github-bot May 6, 2024
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
2 changes: 1 addition & 1 deletion compose/snippets/src/main/java/com/example/compose/snippets/SnippetsActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ class SnippetsActivity : ComponentActivity() {
)
}
Destination.ShapesExamples -> ApplyPolygonAsClipImage()
Destination.SharedElementExamples ->PlaceholderSizeAnimated_Demo()
Destination.SharedElementExamples -> PlaceholderSizeAnimated_Demo()
}
}
}
Expand Down
25 changes: 13 additions & 12 deletions .../java/com/example/compose/snippets/animations/sharedelement/BasicSharedElementSnippets.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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]
}
}
Expand Down
22 changes: 9 additions & 13 deletions .../com/example/compose/snippets/animations/sharedelement/CustomizeSharedElementsSnippets.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()
)
}
Expand Down Expand Up @@ -326,7 +324,7 @@ private fun SharedElement_Clipping() {
rememberSharedContentState(key = "title"),
animatedVisibilityScope = this@AnimatedContent,

)
)
)
}
} else {
Expand Down Expand Up @@ -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"
)
}
}
Expand All @@ -377,7 +375,6 @@ private fun SharedElement_Clipping() {

@Composable
private fun JetsnackBottomBar(modifier: Modifier) {

}

@Composable
Expand All @@ -402,7 +399,6 @@ private fun EnterExitJetsnack() {
// [END android_compose_shared_element_enter_exit]
}
}

}

@Preview
Expand Down
1 change: 0 additions & 1 deletion ...m/example/compose/snippets/animations/sharedelement/SharedElementCommonUseCaseSnippets.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions ...example/compose/snippets/animations/sharedelement/SharedElementsWithNavigationSnippets.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -139,7 +137,6 @@ private fun DetailsScreen(
)
}
}

}

@Composable
Expand Down Expand Up @@ -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]
Loading