@@ -50,12 +50,12 @@ interface SceneExample<T : Any> {
50
50
51
51
// [START android_compose_navigation3_scenes_2]
52
52
data class SinglePaneScene <T : Any >(
53
- override val key : T ,
53
+ override val key : Any ,
54
54
val entry : NavEntry <T >,
55
55
override val previousEntries : List <NavEntry <T >>,
56
56
) : Scene<T> {
57
57
override val entries: List <NavEntry <T >> = listOf (entry)
58
- override val content: @Composable () -> Unit = { entry.content.invoke(entry.key ) }
58
+ override val content: @Composable () -> Unit = { entry.Content ( ) }
59
59
}
60
60
61
61
/* *
@@ -66,7 +66,7 @@ public class SinglePaneSceneStrategy<T : Any> : SceneStrategy<T> {
66
66
@Composable
67
67
override fun calculateScene (entries : List <NavEntry <T >>, onBack : (Int ) -> Unit ): Scene <T > =
68
68
SinglePaneScene (
69
- key = entries.last().key ,
69
+ key = entries.last().contentKey ,
70
70
entry = entries.last(),
71
71
previousEntries = entries.dropLast(1 )
72
72
)
@@ -88,10 +88,10 @@ class TwoPaneScene<T : Any>(
88
88
override val content: @Composable (() -> Unit ) = {
89
89
Row (modifier = Modifier .fillMaxSize()) {
90
90
Column (modifier = Modifier .weight(0.5f )) {
91
- firstEntry.content.invoke(firstEntry.key )
91
+ firstEntry.Content ( )
92
92
}
93
93
Column (modifier = Modifier .weight(0.5f )) {
94
- secondEntry.content.invoke(secondEntry.key )
94
+ secondEntry.Content ( )
95
95
}
96
96
}
97
97
}
@@ -138,7 +138,7 @@ class TwoPaneSceneStrategy<T : Any> : SceneStrategy<T> {
138
138
val secondEntry = lastTwoEntries.last()
139
139
140
140
// The scene key must uniquely represent the state of the scene.
141
- val sceneKey = Pair (firstEntry.key , secondEntry.key )
141
+ val sceneKey = Pair (firstEntry.contentKey , secondEntry.contentKey )
142
142
143
143
TwoPaneScene (
144
144
key = sceneKey,
0 commit comments