From 8abb1dd2366dec5f415c1e127f0106a0836afad8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 17:38:16 +0100 Subject: [PATCH] Update dependency androidx.constraintlayout:constraintlayout-compose to v1.1.0 (#3770) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update dependency androidx.constraintlayout:constraintlayout-compose to v1.1.0 * Fix negative margin usage --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jorge Martín --- .../impl/timeline/components/TimelineItemEventRow.kt | 7 ++++++- gradle/libs.versions.toml | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt index 04757737dc..2f0165cd7b 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt @@ -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 { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8ed0925333..f431a76e9b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -18,7 +18,7 @@ core = "1.13.1" # Stick to 1.0.0 for now, and ensure that this scenario cannot be reproduced when upgrading the version. datastore = "1.0.0" constraintlayout = "2.1.4" -constraintlayout_compose = "1.0.1" +constraintlayout_compose = "1.1.0" lifecycle = "2.8.6" activity = "1.9.3" media3 = "1.4.1"