mittwerk
/
element-x-android
mirror of https://github.com/element-hq/element-x-android.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

knock : display alias in knocked room item list

pull/3725/head
ganfra 1 week ago
parent
18914cad80
commit
bc4a9a4ad0
2 changed files with 82 additions and 68 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 145
      features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt
  2. 5
      features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/model/RoomListRoomSummaryProvider.kt

145
features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt
Unescape View File

@ -12,6 +12,7 @@ import androidx.compose.foundation.combinedClickable
import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Arrangement.Absolute.spacedBy 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.Column
import androidx.compose.foundation.layout.ColumnScope import androidx.compose.foundation.layout.ColumnScope
import androidx.compose.foundation.layout.IntrinsicSize import androidx.compose.foundation.layout.IntrinsicSize
@ -73,78 +74,86 @@ internal fun RoomSummaryRow(
eventSink: (RoomListEvents) -> Unit, eventSink: (RoomListEvents) -> Unit,
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
) { ) {
when (room.displayType) { Box(modifier = modifier) {
RoomSummaryDisplayType.PLACEHOLDER -> { when (room.displayType) {
RoomSummaryPlaceholderRow(modifier = modifier) RoomSummaryDisplayType.PLACEHOLDER -> {
} RoomSummaryPlaceholderRow()
RoomSummaryDisplayType.INVITE -> { }
RoomSummaryScaffoldRow( RoomSummaryDisplayType.INVITE -> {
room = room, RoomSummaryScaffoldRow(
onClick = onClick, room = room,
onLongClick = { onClick = onClick,
Timber.d("Long click on invite room") onLongClick = {
}, Timber.d("Long click on invite room")
modifier = modifier
) {
InviteNameAndIndicatorRow(name = room.name)
InviteSubtitle(isDm = room.isDm, inviteSender = room.inviteSender, canonicalAlias = room.canonicalAlias)
if (!room.isDm && room.inviteSender != null) {
Spacer(modifier = Modifier.height(4.dp))
InviteSenderView(
modifier = Modifier.fillMaxWidth(),
inviteSender = room.inviteSender,
)
}
Spacer(modifier = Modifier.height(12.dp))
InviteButtonsRow(
onAcceptClick = {
eventSink(RoomListEvents.AcceptInvite(room))
}, },
onDeclineClick = { ) {
eventSink(RoomListEvents.DeclineInvite(room)) InviteNameAndIndicatorRow(name = room.name)
InviteSubtitle(isDm = room.isDm, inviteSender = room.inviteSender, canonicalAlias = room.canonicalAlias)
if (!room.isDm && room.inviteSender != null) {
Spacer(modifier = Modifier.height(4.dp))
InviteSenderView(
modifier = Modifier.fillMaxWidth(),
inviteSender = room.inviteSender,
)
} }
) Spacer(modifier = Modifier.height(12.dp))
InviteButtonsRow(
onAcceptClick = {
eventSink(RoomListEvents.AcceptInvite(room))
},
onDeclineClick = {
eventSink(RoomListEvents.DeclineInvite(room))
}
)
}
} }
} RoomSummaryDisplayType.ROOM -> {
RoomSummaryDisplayType.ROOM -> { RoomSummaryScaffoldRow(
RoomSummaryScaffoldRow( room = room,
room = room, onClick = onClick,
onClick = onClick, onLongClick = {
onLongClick = { eventSink(RoomListEvents.ShowContextMenu(room))
eventSink(RoomListEvents.ShowContextMenu(room)) },
}, ) {
modifier = modifier NameAndTimestampRow(
) { name = room.name,
NameAndTimestampRow( timestamp = room.timestamp,
name = room.name, isHighlighted = room.isHighlighted
timestamp = room.timestamp, )
isHighlighted = room.isHighlighted LastMessageAndIndicatorRow(room = room)
) }
LastMessageAndIndicatorRow(room = room)
} }
} RoomSummaryDisplayType.KNOCKED -> {
RoomSummaryDisplayType.KNOCKED -> { RoomSummaryScaffoldRow(
RoomSummaryScaffoldRow( room = room,
room = room, onClick = onClick,
onClick = onClick, onLongClick = {
onLongClick = { Timber.d("Long click on knocked room")
Timber.d("Long click on knocked room") },
}, ) {
modifier = modifier NameAndTimestampRow(
) { name = room.name,
NameAndTimestampRow( timestamp = null,
name = room.name, isHighlighted = room.isHighlighted
timestamp = room.timestamp, )
isHighlighted = room.isHighlighted if (room.canonicalAlias != null) {
) Text(
Text( text = room.canonicalAlias.value,
text = stringResource(id = R.string.screen_join_room_knock_sent_title), maxLines = 1,
maxLines = 1, overflow = TextOverflow.Ellipsis,
overflow = TextOverflow.Ellipsis, style = ElementTheme.typography.fontBodyMdRegular,
style = ElementTheme.typography.fontBodyMdRegular, color = ElementTheme.colors.textSecondary,
color = ElementTheme.colors.textSecondary, )
modifier = modifier, 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,
)
}
} }
} }
} }

5
features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/model/RoomListRoomSummaryProvider.kt
Unescape View File

@ -105,6 +105,11 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
aRoomListRoomSummary( aRoomListRoomSummary(
name = "A knocked room", name = "A knocked room",
displayType = RoomSummaryDisplayType.KNOCKED, displayType = RoomSummaryDisplayType.KNOCKED,
),
aRoomListRoomSummary(
name = "A knocked room with alias",
canonicalAlias = RoomAlias("#knockable:matrix.org"),
displayType = RoomSummaryDisplayType.KNOCKED,
) )
), ),
).flatten() ).flatten()

Write Preview
Loading…
Cancel
Save