ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-04 01:19:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add enum Suggestion instead of reusing TimelineRoom

Browse Source
This commit is contained in:
Benoit Marty
2024-06-20 15:00:09 +02:00
committed by Benoit Marty
parent 97add3941c
commit a9f23c06b0
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/mentions/MentionSuggestionsPickerView.kt
+6 -6
View File
@@ -93,14 +93,14 @@ private fun RoomMemberSuggestionItemView(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
) { ) {
Row(modifier = modifier.clickable { onSelectSuggestion(memberSuggestion) }, horizontalArrangement = Arrangement.spacedBy(16.dp)) { Row(modifier = modifier.clickable { onSelectSuggestion(memberSuggestion) }, horizontalArrangement = Arrangement.spacedBy(16.dp)) {
val avatarSize = AvatarSize.TimelineRoom
val avatarData = when (memberSuggestion) { 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( is ResolvedMentionSuggestion.Member -> AvatarData(
memberSuggestion.roomMember.userId.value, id = memberSuggestion.roomMember.userId.value,
memberSuggestion.roomMember.displayName, name = memberSuggestion.roomMember.displayName,
memberSuggestion.roomMember.avatarUrl, url = memberSuggestion.roomMember.avatarUrl,
avatarSize, size = AvatarSize.Suggestion,
) )
} }
val title = when (memberSuggestion) { val title = when (memberSuggestion) {
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarSize.kt
+2
View File
@@ -57,4 +57,6 @@ enum class AvatarSize(val dp: Dp) {
RoomDirectoryItem(36.dp), RoomDirectoryItem(36.dp),
EditProfileDetails(96.dp), EditProfileDetails(96.dp),
Suggestion(32.dp),
} }