Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Fix compilation issue after rebase

Browse source
This commit is contained in:
Benoit Marty 2023-06-26 17:27:51 +02:00 • committed by Benoit Marty
parent 0f27c6c5cd
commit c7ec8bc9e9
3 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesView.kt
View file

@ -48,6 +48,7 @@ import io.element.android.libraries.designsystem.ElementTextStyles
import io.element.android.libraries.designsystem.components.ProgressDialog import io.element.android.libraries.designsystem.components.ProgressDialog
import io.element.android.libraries.designsystem.components.avatar.Avatar import io.element.android.libraries.designsystem.components.avatar.Avatar
import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.libraries.designsystem.components.avatar.AvatarData
import io.element.android.libraries.designsystem.components.avatar.AvatarSize
import io.element.android.libraries.designsystem.components.button.BackButton import io.element.android.libraries.designsystem.components.button.BackButton
import io.element.android.libraries.designsystem.components.dialogs.ErrorDialog import io.element.android.libraries.designsystem.components.dialogs.ErrorDialog
import io.element.android.libraries.designsystem.components.dialogs.ErrorDialogDefaults import io.element.android.libraries.designsystem.components.dialogs.ErrorDialogDefaults
@ -233,7 +234,12 @@ internal fun RoomSummaryView(
) { ) {
val roomAlias = summary.canonicalAlias ?: summary.roomId.value val roomAlias = summary.canonicalAlias ?: summary.roomId.value
Avatar( Avatar(
avatarData = AvatarData(id = roomAlias, name = summary.name, url = summary.avatarURLString), avatarData = AvatarData(
id = roomAlias,
name = summary.name,
url = summary.avatarURLString,
size = AvatarSize.RoomListItem,
),
) )
Column( Column(
modifier = Modifier modifier = Modifier

1
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarSize.kt
View file

@ -29,6 +29,7 @@ enum class AvatarSize(val dp: Dp) {
UserListItem(36.dp), UserListItem(36.dp),
SelectedUser(56.dp), SelectedUser(56.dp),
SelectedRoom(56.dp),
TimelineRoom(32.dp), TimelineRoom(32.dp),
TimelineSender(32.dp), TimelineSender(32.dp),

12
libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedRoom.kt
View file

@ -47,7 +47,6 @@ import io.element.android.libraries.designsystem.theme.components.Surface
import io.element.android.libraries.designsystem.theme.components.Text import io.element.android.libraries.designsystem.theme.components.Text
import io.element.android.libraries.matrix.api.core.RoomId import io.element.android.libraries.matrix.api.core.RoomId
import io.element.android.libraries.matrix.api.room.RoomSummaryDetails import io.element.android.libraries.matrix.api.room.RoomSummaryDetails
import io.element.android.libraries.matrix.api.user.MatrixUser
import io.element.android.libraries.ui.strings.CommonStrings import io.element.android.libraries.ui.strings.CommonStrings
@Composable @Composable
@ -56,13 +55,14 @@ fun SelectedRoom(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
onRoomRemoved: (RoomSummaryDetails) -> Unit = {}, onRoomRemoved: (RoomSummaryDetails) -> Unit = {},
) { ) {
Box(modifier = modifier Box(
.width(56.dp) modifier = modifier
.width(56.dp)
) { ) {
Column( Column(
horizontalAlignment = Alignment.CenterHorizontally, horizontalAlignment = Alignment.CenterHorizontally,
) { ) {
Avatar(AvatarData(roomSummary.roomId.value, roomSummary.name, roomSummary.avatarURLString, AvatarSize.Custom(56.dp))) Avatar(AvatarData(roomSummary.roomId.value, roomSummary.name, roomSummary.avatarURLString, AvatarSize.SelectedRoom))
Text( Text(
text = roomSummary.name, text = roomSummary.name,
overflow = TextOverflow.Ellipsis, overflow = TextOverflow.Ellipsis,
@ -102,8 +102,8 @@ internal fun SelectedRoomDarkPreview() = ElementPreviewDark { ContentToPreview()
@Composable @Composable
private fun ContentToPreview() { private fun ContentToPreview() {
SelectedRoom(roomSummary = SelectedRoom(
RoomSummaryDetails( roomSummary = RoomSummaryDetails(
roomId = RoomId("!room:domain"), roomId = RoomId("!room:domain"),
name = "roomName", name = "roomName",
canonicalAlias = null, canonicalAlias = null,