Use provided modifier

This commit is contained in:
Benoit Marty 2022-11-23 18:04:15 +01:00
parent 4ddf216bee
commit f17f4f55d7
3 changed files with 6 additions and 7 deletions

View file

@ -275,7 +275,7 @@ fun MessageEventRow(
Pair(Alignment.CenterStart, Start) Pair(Alignment.CenterStart, Start)
} }
Box( Box(
modifier = Modifier modifier = modifier
.fillMaxWidth() .fillMaxWidth()
.wrapContentHeight(), .wrapContentHeight(),
contentAlignment = parentAlignment contentAlignment = parentAlignment
@ -331,7 +331,6 @@ fun MessageEventRow(
.zIndex(1f) .zIndex(1f)
.offset(x = if (messageEvent.isMine) 0.dp else 20.dp, y = -(16.dp)) .offset(x = if (messageEvent.isMine) 0.dp else 20.dp, y = -(16.dp))
) )
} }
if (messageEvent.isMine) { if (messageEvent.isMine) {
Spacer(modifier = Modifier.width(16.dp)) Spacer(modifier = Modifier.width(16.dp))
@ -339,9 +338,9 @@ fun MessageEventRow(
} }
} }
if (messageEvent.groupPosition.isNew()) { if (messageEvent.groupPosition.isNew()) {
Spacer(modifier = Modifier.height(8.dp)) Spacer(modifier = modifier.height(8.dp))
} else { } else {
Spacer(modifier = Modifier.height(2.dp)) Spacer(modifier = modifier.height(2.dp))
} }
} }

View file

@ -32,7 +32,7 @@ fun MessagesTimelineItemImageView(
0.7f 0.7f
} }
Box( Box(
modifier = Modifier modifier = modifier
.fillMaxWidth(widthPercent) .fillMaxWidth(widthPercent)
.aspectRatio(content.aspectRatio), .aspectRatio(content.aspectRatio),
contentAlignment = Alignment.Center, contentAlignment = Alignment.Center,

View file

@ -41,9 +41,9 @@ internal fun RoomSummaryRow(
) { ) {
val clickModifier = if (room.isPlaceholder) { val clickModifier = if (room.isPlaceholder) {
Modifier modifier
} else { } else {
Modifier.clickable( modifier.clickable(
onClick = { onClick(room) }, onClick = { onClick(room) },
indication = rememberRipple(), indication = rememberRipple(),
interactionSource = remember { MutableInteractionSource() } interactionSource = remember { MutableInteractionSource() }