From 69868917ba0300f8c5338d3f8d161bc6102d2173 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 23 Jun 2023 10:40:13 +0200 Subject: [PATCH] Iterate on Room placeholder --- .../impl/components/RoomSummaryRow.kt | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt index 1e0102e1c9..11d55c1867 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt +++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt @@ -63,7 +63,6 @@ import io.element.android.libraries.designsystem.theme.roomListUnreadIndicator internal val minHeight = 84.dp -@OptIn(ExperimentalFoundationApi::class) @Composable internal fun RoomSummaryRow( room: RoomListRoomSummary, @@ -72,9 +71,27 @@ internal fun RoomSummaryRow( modifier: Modifier = Modifier, ) { if (room.isPlaceholder) { - RoomSummaryPlaceholderRow(modifier) - return + RoomSummaryPlaceholderRow( + modifier = modifier, + ) + } else { + RoomSummaryRealRow( + room = room, + onClick = onClick, + onLongClick = onLongClick, + modifier = modifier + ) } +} + +@OptIn(ExperimentalFoundationApi::class) +@Composable +internal fun RoomSummaryRealRow( + room: RoomListRoomSummary, + onClick: (RoomListRoomSummary) -> Unit, + onLongClick: (RoomListRoomSummary) -> Unit, + modifier: Modifier = Modifier, +) { val clickModifier = Modifier.combinedClickable( onClick = { onClick(room) }, onLongClick = { onLongClick(room) },