mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-03 16:10:00 +00:00
Fix rendering of Room item in ForwardMessagesView
This commit is contained in:
committed by
Benoit Marty
parent
713223bbed
commit
31c7c29836
+5
-6
@@ -21,13 +21,13 @@ import androidx.compose.foundation.clickable
|
|||||||
import androidx.compose.foundation.layout.Arrangement
|
import androidx.compose.foundation.layout.Arrangement
|
||||||
import androidx.compose.foundation.layout.Column
|
import androidx.compose.foundation.layout.Column
|
||||||
import androidx.compose.foundation.layout.ExperimentalLayoutApi
|
import androidx.compose.foundation.layout.ExperimentalLayoutApi
|
||||||
import androidx.compose.foundation.layout.IntrinsicSize
|
|
||||||
import androidx.compose.foundation.layout.PaddingValues
|
import androidx.compose.foundation.layout.PaddingValues
|
||||||
import androidx.compose.foundation.layout.Row
|
import androidx.compose.foundation.layout.Row
|
||||||
import androidx.compose.foundation.layout.Spacer
|
import androidx.compose.foundation.layout.Spacer
|
||||||
import androidx.compose.foundation.layout.consumeWindowInsets
|
import androidx.compose.foundation.layout.consumeWindowInsets
|
||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
import androidx.compose.foundation.layout.height
|
import androidx.compose.foundation.layout.height
|
||||||
|
import androidx.compose.foundation.layout.heightIn
|
||||||
import androidx.compose.foundation.layout.padding
|
import androidx.compose.foundation.layout.padding
|
||||||
import androidx.compose.foundation.lazy.LazyColumn
|
import androidx.compose.foundation.lazy.LazyColumn
|
||||||
import androidx.compose.foundation.lazy.LazyRow
|
import androidx.compose.foundation.lazy.LazyRow
|
||||||
@@ -228,8 +228,8 @@ internal fun RoomSummaryView(
|
|||||||
modifier = modifier
|
modifier = modifier
|
||||||
.clickable { onSelection(summary) }
|
.clickable { onSelection(summary) }
|
||||||
.fillMaxWidth()
|
.fillMaxWidth()
|
||||||
.padding(horizontal = 16.dp)
|
.padding(start = 16.dp, end = 4.dp)
|
||||||
.height(IntrinsicSize.Min),
|
.heightIn(56.dp),
|
||||||
verticalAlignment = Alignment.CenterVertically
|
verticalAlignment = Alignment.CenterVertically
|
||||||
) {
|
) {
|
||||||
val roomAlias = summary.canonicalAlias ?: summary.roomId.value
|
val roomAlias = summary.canonicalAlias ?: summary.roomId.value
|
||||||
@@ -238,13 +238,12 @@ internal fun RoomSummaryView(
|
|||||||
id = roomAlias,
|
id = roomAlias,
|
||||||
name = summary.name,
|
name = summary.name,
|
||||||
url = summary.avatarURLString,
|
url = summary.avatarURLString,
|
||||||
size = AvatarSize.RoomListItem,
|
size = AvatarSize.ForwardRoomListItem,
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
Column(
|
Column(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.padding(start = 12.dp, end = 4.dp, top = 8.dp, bottom = 8.dp)
|
.padding(start = 12.dp, end = 4.dp, top = 4.dp, bottom = 4.dp)
|
||||||
.alignByBaseline()
|
|
||||||
.weight(1f)
|
.weight(1f)
|
||||||
) {
|
) {
|
||||||
// Name
|
// Name
|
||||||
|
|||||||
+2
@@ -25,6 +25,8 @@ enum class AvatarSize(val dp: Dp) {
|
|||||||
RoomHeader(96.dp),
|
RoomHeader(96.dp),
|
||||||
RoomListItem(52.dp),
|
RoomListItem(52.dp),
|
||||||
|
|
||||||
|
ForwardRoomListItem(36.dp),
|
||||||
|
|
||||||
UserHeader(96.dp),
|
UserHeader(96.dp),
|
||||||
UserListItem(36.dp),
|
UserListItem(36.dp),
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user