Browse Source

Add enum `Suggestion` instead of reusing `TimelineRoom`

pull/3058/head
Benoit Marty 3 months ago committed by Benoit Marty
parent
commit
a9f23c06b0
  1. 12
      features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/mentions/MentionSuggestionsPickerView.kt
  2. 2
      libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarSize.kt

12
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/mentions/MentionSuggestionsPickerView.kt

@ -93,14 +93,14 @@ private fun RoomMemberSuggestionItemView( @@ -93,14 +93,14 @@ private fun RoomMemberSuggestionItemView(
modifier: Modifier = Modifier,
) {
Row(modifier = modifier.clickable { onSelectSuggestion(memberSuggestion) }, horizontalArrangement = Arrangement.spacedBy(16.dp)) {
val avatarSize = AvatarSize.TimelineRoom
val avatarData = when (memberSuggestion) {
is ResolvedMentionSuggestion.AtRoom -> roomAvatar?.copy(size = avatarSize) ?: AvatarData(roomId, roomName, null, avatarSize)
is ResolvedMentionSuggestion.AtRoom -> roomAvatar?.copy(size = AvatarSize.Suggestion)
?: AvatarData(roomId, roomName, null, AvatarSize.Suggestion)
is ResolvedMentionSuggestion.Member -> AvatarData(
memberSuggestion.roomMember.userId.value,
memberSuggestion.roomMember.displayName,
memberSuggestion.roomMember.avatarUrl,
avatarSize,
id = memberSuggestion.roomMember.userId.value,
name = memberSuggestion.roomMember.displayName,
url = memberSuggestion.roomMember.avatarUrl,
size = AvatarSize.Suggestion,
)
}
val title = when (memberSuggestion) {

2
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarSize.kt

@ -57,4 +57,6 @@ enum class AvatarSize(val dp: Dp) { @@ -57,4 +57,6 @@ enum class AvatarSize(val dp: Dp) {
RoomDirectoryItem(36.dp),
EditProfileDetails(96.dp),
Suggestion(32.dp),
}

Loading…
Cancel
Save