Skip to content

Commit fe9c912

Browse files
committed
Fix Navigation 3 scene metadata key checks
1 parent c2b9777 commit fe9c912

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

  • compose/snippets/src/main/java/com/example/compose/snippets/navigation3/scenes

compose/snippets/src/main/java/com/example/compose/snippets/navigation3/scenes/ScenesSnippets.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import androidx.navigation3.runtime.NavBackStack
2828
import androidx.navigation3.runtime.NavEntry
2929
import androidx.navigation3.runtime.NavKey
3030
import androidx.navigation3.runtime.NavMetadataKey
31-
import androidx.navigation3.runtime.contains
3231
import androidx.navigation3.runtime.entryProvider
3332
import androidx.navigation3.runtime.metadata
3433
import androidx.navigation3.runtime.rememberNavBackStack
@@ -124,8 +123,11 @@ class ListDetailSceneStrategy<T : Any>(val windowSizeClass: WindowSizeClass) : S
124123
}
125124

126125
val detailEntry =
127-
entries.lastOrNull()?.takeIf { it.metadata.contains(DetailKey) } ?: return null
128-
val listEntry = entries.findLast { it.metadata.contains(ListKey) } ?: return null
126+
entries.lastOrNull()?.takeIf {
127+
it.metadata.containsKey(DetailKey.toString())
128+
} ?: return null
129+
val listEntry =
130+
entries.findLast { it.metadata.containsKey(ListKey.toString()) } ?: return null
129131

130132
// We use the list's contentKey to uniquely identify the scene.
131133
// This allows the detail panes to be displayed instantly through recomposition, rather than

0 commit comments

Comments
 (0)