Merge branch 'develop' into feature/fga/update_create_room_flow
This commit is contained in:
commit
6de12b19f4
2 changed files with 7 additions and 2 deletions
|
|
@ -325,7 +325,12 @@ private fun TimelineItemEventRowContent(
|
|||
MessageEventBubble(
|
||||
modifier = Modifier
|
||||
.constrainAs(message) {
|
||||
top.linkTo(sender.bottom, margin = NEGATIVE_MARGIN_FOR_BUBBLE)
|
||||
val topMargin = if (bubbleState.cutTopStart) {
|
||||
NEGATIVE_MARGIN_FOR_BUBBLE
|
||||
} else {
|
||||
0.dp
|
||||
}
|
||||
top.linkTo(sender.bottom, margin = topMargin)
|
||||
if (event.isMine) {
|
||||
end.linkTo(parent.end, margin = 16.dp)
|
||||
} else {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue