Skip to content

fix: use composite key for CardInfo in HelpScreen grid #244

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
codebutler merged 1 commit into from
Feb 22, 2026
+6 −4
Merged

fix: use composite key for CardInfo in HelpScreen grid #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions app/src/commonMain/kotlin/com/codebutler/farebot/shared/ui/screen/HelpScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,14 +280,14 @@ fun ExploreContent(
.padding(horizontal = 12.dp, vertical = 8.dp),
)
}
items(cards, key = { it.nameRes.key }) { card ->
items(cards, key = { it.uniqueKey }) { card ->
CardImageTile(
card = card,
cardName = cardNames[card.nameRes.key] ?: "",
isSupported = card.cardType in supportedCardTypes,
isKeysRequired = card.keysRequired && card.keyBundle !in loadedKeyBundles,
onTap = {
selectedCardKey = card.nameRes.key
selectedCardKey = card.uniqueKey
},
)
}
Expand Down Expand Up @@ -337,7 +337,7 @@ fun ExploreContent(
// Bottom sheet for selected card details
val selectedCard =
selectedCardKey?.let { key ->
supportedCards.find { it.nameRes.key == key }
supportedCards.find { it.uniqueKey == key }
}
if (selectedCard != null) {
ModalBottomSheet(
Expand Down
4 changes: 3 additions & 1 deletion transit/src/commonMain/kotlin/com/codebutler/farebot/transit/CardInfo.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,6 @@ data class CardInfo(
/** Brand color as 0xRRGGBB (no alpha). Null if unknown — UI will use a theme-appropriate fallback. */
val brandColor: Int?,
val credits: List<String> = emptyList(),
)
) {
val uniqueKey: String get() = "${nameRes.key}:${cardType.name}"
}