@ -12,6 +12,7 @@ import androidx.compose.foundation.combinedClickable
@@ -12,6 +12,7 @@ import androidx.compose.foundation.combinedClickable
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Arrangement.Absolute.spacedBy
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.ColumnScope
import androidx.compose.foundation.layout.IntrinsicSize
@ -73,9 +74,10 @@ internal fun RoomSummaryRow(
@@ -73,9 +74,10 @@ internal fun RoomSummaryRow(
eventSink : ( RoomListEvents ) -> Unit ,
modifier : Modifier = Modifier ,
) {
Box ( modifier = modifier ) {
when ( room . displayType ) {
RoomSummaryDisplayType . PLACEHOLDER -> {
RoomSummaryPlaceholderRow ( modifier = modifier )
RoomSummaryPlaceholderRow ( )
}
RoomSummaryDisplayType . INVITE -> {
RoomSummaryScaffoldRow (
@ -84,7 +86,6 @@ internal fun RoomSummaryRow(
@@ -84,7 +86,6 @@ internal fun RoomSummaryRow(
onLongClick = {
Timber . d ( " Long click on invite room " )
} ,
modifier = modifier
) {
InviteNameAndIndicatorRow ( name = room . name )
InviteSubtitle ( isDm = room . isDm , inviteSender = room . inviteSender , canonicalAlias = room . canonicalAlias )
@ -113,7 +114,6 @@ internal fun RoomSummaryRow(
@@ -113,7 +114,6 @@ internal fun RoomSummaryRow(
onLongClick = {
eventSink ( RoomListEvents . ShowContextMenu ( room ) )
} ,
modifier = modifier
) {
NameAndTimestampRow (
name = room . name ,
@ -130,25 +130,34 @@ internal fun RoomSummaryRow(
@@ -130,25 +130,34 @@ internal fun RoomSummaryRow(
onLongClick = {
Timber . d ( " Long click on knocked room " )
} ,
modifier = modifier
) {
NameAndTimestampRow (
name = room . name ,
timestamp = room . timestamp ,
timestamp = null ,
isHighlighted = room . isHighlighted
)
if ( room . canonicalAlias != null ) {
Text (
text = room . canonicalAlias . value ,
maxLines = 1 ,
overflow = TextOverflow . Ellipsis ,
style = ElementTheme . typography . fontBodyMdRegular ,
color = ElementTheme . colors . textSecondary ,
)
Spacer ( modifier = Modifier . height ( 4. dp ) )
}
Text (
text = stringResource ( id = R . string . screen _join _room _knock _sent _title ) ,
maxLines = 1 ,
overflow = TextOverflow . Ellipsis ,
style = ElementTheme . typography . fontBodyMdRegular ,
color = ElementTheme . colors . textSecondary ,
modifier = modifier ,
)
}
}
}
}
}
@OptIn ( ExperimentalFoundationApi :: class )
@Composable