diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ChatroomFeedView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ChatroomFeedView.kt index 7bc314f324..6e85ae9280 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ChatroomFeedView.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ChatroomFeedView.kt @@ -65,7 +65,7 @@ fun ChatroomFeedView(viewModel: FeedViewModel, accountViewModel: AccountViewMode state = listState ) { var previousDate: String = "" - itemsIndexed(state.feed, key = { _, item -> item.idHex }) { index, item -> + itemsIndexed(state.feed, key = { index, item -> if (index == 0) index else item.idHex }) { index, item -> ChatroomMessageCompose(item, accountViewModel = accountViewModel, navController = navController) } } diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ChatroomListFeedView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ChatroomListFeedView.kt index 85fd90c579..d829e49aa0 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ChatroomListFeedView.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ChatroomListFeedView.kt @@ -8,9 +8,11 @@ import androidx.compose.foundation.lazy.itemsIndexed import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.derivedStateOf import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.setValue import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle @@ -19,6 +21,8 @@ import com.google.accompanist.swiperefresh.SwipeRefresh import com.google.accompanist.swiperefresh.rememberSwipeRefreshState import com.vitorpamplona.amethyst.ui.note.ChatroomCompose import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel +import kotlinx.coroutines.coroutineScope +import kotlinx.coroutines.launch @Composable fun ChatroomListFeedView(viewModel: FeedViewModel, accountViewModel: AccountViewModel, navController: NavController) { @@ -28,6 +32,7 @@ fun ChatroomListFeedView(viewModel: FeedViewModel, accountViewModel: AccountView val swipeRefreshState = rememberSwipeRefreshState(isRefreshing) val listState = rememberLazyListState() + val coroutineScope = rememberCoroutineScope() LaunchedEffect(isRefreshing) { if (isRefreshing) { @@ -63,7 +68,7 @@ fun ChatroomListFeedView(viewModel: FeedViewModel, accountViewModel: AccountView ), state = listState ) { - itemsIndexed(state.feed, key = { _, item -> item.idHex }) { index, item -> + itemsIndexed(state.feed, key = { index, item -> item.idHex }) { index, item -> ChatroomCompose(item, accountViewModel = accountViewModel, navController = navController) } }