Browse Source

Use provided modifier

feature/bma/flipper
Benoit Marty 2 years ago
parent
commit
5026f459d0
  1. 7
      features/messages/src/main/java/io/element/android/x/features/messages/MessagesScreen.kt
  2. 2
      features/messages/src/main/java/io/element/android/x/features/messages/components/MessagesTimelineItemImageView.kt
  3. 4
      features/roomlist/src/main/java/io/element/android/x/features/roomlist/components/RoomSummaryRow.kt

7
features/messages/src/main/java/io/element/android/x/features/messages/MessagesScreen.kt

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

2
features/messages/src/main/java/io/element/android/x/features/messages/components/MessagesTimelineItemImageView.kt

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

4
features/roomlist/src/main/java/io/element/android/x/features/roomlist/components/RoomSummaryRow.kt

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

Loading…
Cancel
Save