Skip to content

Commit 3432b15

Browse files
committed
Merge branch 'predictive-back-seekable' of https://github.com/android/snippets into predictive-back-seekable
2 parents f420997 + 2751e7b commit 3432b15

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

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

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ import androidx.navigation.navArgument
9191
import com.example.compose.snippets.R
9292
import com.example.compose.snippets.ui.theme.LavenderLight
9393
import com.example.compose.snippets.ui.theme.RoseLight
94-
import kotlinx.coroutines.launch
9594
import kotlin.coroutines.cancellation.CancellationException
95+
import kotlinx.coroutines.launch
9696

9797
@Preview
9898
@Composable
@@ -272,10 +272,10 @@ private fun DetailsContent(
272272
// [END android_compose_shared_element_text_bounds_transform]
273273
Text(
274274
"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur sit amet lobortis velit. " +
275-
"Lorem ipsum dolor sit amet, consectetur adipiscing elit." +
276-
" Curabitur sagittis, lectus posuere imperdiet facilisis, nibh massa " +
277-
"molestie est, quis dapibus orci ligula non magna. Pellentesque rhoncus " +
278-
"hendrerit massa quis ultricies. Curabitur congue ullamcorper leo, at maximus",
275+
"Lorem ipsum dolor sit amet, consectetur adipiscing elit." +
276+
" Curabitur sagittis, lectus posuere imperdiet facilisis, nibh massa " +
277+
"molestie est, quis dapibus orci ligula non magna. Pellentesque rhoncus " +
278+
"hendrerit massa quis ultricies. Curabitur congue ullamcorper leo, at maximus",
279279
modifier = Modifier.skipToLookaheadSize()
280280
)
281281
}
@@ -332,7 +332,7 @@ private fun SharedElement_Clipping() {
332332
rememberSharedContentState(key = "title"),
333333
animatedVisibilityScope = this@AnimatedContent,
334334

335-
)
335+
)
336336
)
337337
}
338338
} else {
@@ -370,10 +370,10 @@ private fun SharedElement_Clipping() {
370370
)
371371
Text(
372372
"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur sit amet lobortis velit. " +
373-
"Lorem ipsum dolor sit amet, consectetur adipiscing elit." +
374-
" Curabitur sagittis, lectus posuere imperdiet facilisis, nibh massa " +
375-
"molestie est, quis dapibus orci ligula non magna. Pellentesque rhoncus " +
376-
"hendrerit massa quis ultricies. Curabitur congue ullamcorper leo, at maximus"
373+
"Lorem ipsum dolor sit amet, consectetur adipiscing elit." +
374+
" Curabitur sagittis, lectus posuere imperdiet facilisis, nibh massa " +
375+
"molestie est, quis dapibus orci ligula non magna. Pellentesque rhoncus " +
376+
"hendrerit massa quis ultricies. Curabitur congue ullamcorper leo, at maximus"
377377
)
378378
}
379379
}
@@ -685,7 +685,8 @@ fun CustomPredictiveBackHandle() {
685685
seekableTransitionState.seekTo(it, Screen.Details(lastNavigatedIndex))
686686
}
687687
}
688-
})
688+
}
689+
)
689690
SharedTransitionLayout(modifier = Modifier.weight(1f)) {
690691
transition.AnimatedContent { targetState ->
691692
when (targetState) {

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ import androidx.compose.ui.res.painterResource
4646
import androidx.compose.ui.tooling.preview.Preview
4747
import androidx.compose.ui.unit.dp
4848
import androidx.compose.ui.unit.sp
49-
import androidx.navigation.NavHostController
5049
import androidx.navigation.NavType
5150
import androidx.navigation.compose.NavHost
5251
import androidx.navigation.compose.composable
@@ -77,7 +76,7 @@ fun SharedElement_PredictiveBack() {
7776
HomeScreen(
7877
this@SharedTransitionLayout,
7978
this@composable,
80-
{ navController.navigate("details/$it") }
79+
{ navController.navigate("details/$it") }
8180
)
8281
}
8382
composable(

0 commit comments

Comments
 (0)