From ae57e872dc90fb4adf89d3c1f0972f8df427ad0d Mon Sep 17 00:00:00 2001 From: Dessalines Date: Fri, 31 Jan 2025 22:12:41 -0500 Subject: [PATCH] Fixing rank order. (#244) - Fixes #238 --- .../favlistanddetails/FavListDetailPane.kt | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/dessalines/rankmyfavs/ui/components/favlist/favlistanddetails/FavListDetailPane.kt b/app/src/main/java/com/dessalines/rankmyfavs/ui/components/favlist/favlistanddetails/FavListDetailPane.kt index cde8c06..3f2a94f 100644 --- a/app/src/main/java/com/dessalines/rankmyfavs/ui/components/favlist/favlistanddetails/FavListDetailPane.kt +++ b/app/src/main/java/com/dessalines/rankmyfavs/ui/components/favlist/favlistanddetails/FavListDetailPane.kt @@ -10,7 +10,7 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.imePadding import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn -import androidx.compose.foundation.lazy.itemsIndexed +import androidx.compose.foundation.lazy.items import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.foundation.rememberBasicTooltipState import androidx.compose.foundation.shape.CircleShape @@ -372,8 +372,8 @@ fun FavListDetailPane( // FavListDetails(favList) // } - itemsIndexed( - key = { _, item -> item.id }, + items( + key = { item -> item.id }, items = favListItems.orEmpty().filter { it.name.contains( @@ -381,10 +381,12 @@ fun FavListDetailPane( ignoreCase = true, ) }, - ) { index, favListItem -> + ) { favListItem -> + val rankNum = favListItems.orEmpty().indexOf(favListItem) + 1 + FavListItemRow( favListItem = favListItem, - index = index + 1, + rankNum = rankNum, onClick = { onItemDetailsClick(favListItem.id) }, @@ -446,12 +448,12 @@ fun FavListDetailsPreview() { @Composable fun FavListItemRow( favListItem: FavListItem, - index: Int, + rankNum: Int, onClick: () -> Unit, ) { // Only show the rank if its above the min confidence bound val rank = - if (calculateConfidence(favListItem.glickoDeviation) >= MIN_CONFIDENCE_BOUND) index.toString() else "?" + if (calculateConfidence(favListItem.glickoDeviation) >= MIN_CONFIDENCE_BOUND) rankNum.toString() else "?" ListItem( headlineContent = { Text(favListItem.name) @@ -474,7 +476,7 @@ fun FavListItemRow( fun FavListItemRowPreview() { FavListItemRow( favListItem = sampleFavListItem, - index = 23, + rankNum = 23, onClick = {}, ) }