From cb121835f59b8d58d98786e3d86fa4808a5c5e72 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Thu, 13 Feb 2025 19:01:30 -0500 Subject: [PATCH] Stops using vico's forEach custom function (it's going to be deleted in the next version) --- .../ui/screen/loggedIn/chatrooms/ChatroomHeaderCompose.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chatrooms/ChatroomHeaderCompose.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chatrooms/ChatroomHeaderCompose.kt index 7f8914674..1e6edaaa7 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chatrooms/ChatroomHeaderCompose.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chatrooms/ChatroomHeaderCompose.kt @@ -56,7 +56,6 @@ import androidx.compose.ui.unit.sp import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.distinctUntilChanged import androidx.lifecycle.map -import com.patrykandpatrick.vico.core.extension.forEachIndexedExtended import com.vitorpamplona.amethyst.R import com.vitorpamplona.amethyst.model.Channel import com.vitorpamplona.amethyst.model.FeatureSetType @@ -86,6 +85,7 @@ import com.vitorpamplona.quartz.nip17Dm.base.ChatroomKeyable import com.vitorpamplona.quartz.nip28PublicChat.admin.ChannelCreateEvent import com.vitorpamplona.quartz.nip28PublicChat.admin.ChannelMetadataEvent import com.vitorpamplona.quartz.nip37Drafts.DraftEvent +import kotlin.math.min @Composable fun ChatroomHeaderCompose( @@ -372,12 +372,12 @@ fun DisplayUserSetAsSubject( } } else { Row { - userList.take(4).forEachIndexedExtended { index, isFirst, isLast, value -> + userList.take(4).forEachIndexed { index, value -> LoadUser(baseUserHex = value, accountViewModel) { it?.let { ShortUsernameDisplay(baseUser = it, fontWeight = fontWeight, accountViewModel = accountViewModel) } } - if (!isLast) { + if (min(userList.size, 4) - 1 != index) { Text( text = ", ", fontWeight = fontWeight,