From 5c10827fce5e03631bde0a8c47ac7c6df4283930 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 15:49:48 +0000 Subject: [PATCH 1/4] Update dependency io.element.android:compound-android to v0.1.1 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 182f773524..ae51c0788a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -158,7 +158,7 @@ coil = { module = "io.coil-kt:coil", version.ref = "coil" } coil_compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" } coil_gif = { module = "io.coil-kt:coil-gif", version.ref = "coil" } coil_test = { module = "io.coil-kt:coil-test", version.ref = "coil" } -compound = { module = "io.element.android:compound-android", version = "0.1.0" } +compound = { module = "io.element.android:compound-android", version = "0.1.1" } datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "datetime" } serialization_json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization_json" } kotlinx_collections_immutable = "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.7" From 76e8e8ffaec510280647d5cd112881ad8b04fd5a Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 14 Oct 2024 20:58:51 +0200 Subject: [PATCH 2/4] Remove useless `return` --- .../impl/timeline/components/TimelineItemReactionsView.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemReactionsView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemReactionsView.kt index 47e7cd74a6..92809c904e 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemReactionsView.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemReactionsView.kt @@ -73,7 +73,7 @@ private fun TimelineItemReactionsView( else -> LayoutDirection.Ltr } - return CompositionLocalProvider(LocalLayoutDirection provides reactionsLayoutDirection) { + CompositionLocalProvider(LocalLayoutDirection provides reactionsLayoutDirection) { TimelineItemReactionsLayout( modifier = modifier, itemSpacing = 4.dp, From a7328c705ca046e9cd1de1a4643bfe7f3afecdb1 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 14 Oct 2024 21:02:39 +0200 Subject: [PATCH 3/4] Fix regression due to icon now supports RTL. --- .../timeline/components/TimelineItemReactionsView.kt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemReactionsView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemReactionsView.kt index 92809c904e..66e916fec1 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemReactionsView.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemReactionsView.kt @@ -96,11 +96,13 @@ private fun TimelineItemReactionsView( }, addMoreButton = if (userCanSendReaction) { { - MessagesReactionButton( - content = MessagesReactionsButtonContent.Icon(CompoundDrawables.ic_compound_reaction_add), - onClick = onMoreReactionsClick, - onLongClick = {} - ) + CompositionLocalProvider(LocalLayoutDirection provides currentLayout) { + MessagesReactionButton( + content = MessagesReactionsButtonContent.Icon(CompoundDrawables.ic_compound_reaction_add), + onClick = onMoreReactionsClick, + onLongClick = {} + ) + } } } else { null From 3b426705f7fa97f61bd35eaf933cd6ef51df79f2 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 14 Oct 2024 21:11:39 +0200 Subject: [PATCH 4/4] Import fun --- .../impl/timeline/components/TimelineItemReactionsLayout.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemReactionsLayout.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemReactionsLayout.kt index ce9f9c2e78..9eee592050 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemReactionsLayout.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemReactionsLayout.kt @@ -17,6 +17,7 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.dp import io.element.android.features.messages.impl.R +import io.element.android.features.messages.impl.timeline.aTimelineItemReactions import io.element.android.libraries.designsystem.icons.CompoundDrawables import io.element.android.libraries.designsystem.preview.ElementPreview import io.element.android.libraries.designsystem.preview.PreviewsDayNight @@ -192,7 +193,7 @@ internal fun TimelineItemReactionsLayoutPreview() = ElementPreview { ) }, reactions = { - io.element.android.features.messages.impl.timeline.aTimelineItemReactions(count = 18).reactions.forEach { + aTimelineItemReactions(count = 18).reactions.forEach { MessagesReactionButton( content = MessagesReactionsButtonContent.Reaction( it