Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Merge pull request #3676 from element-hq/renovate/io.element.android-compound-android-0.x

Browse source 
Update dependency io.element.android:compound-android to v0.1.1
This commit is contained in:
Benoit Marty 2024-10-14 21:50:14 +02:00 • committed by GitHub
commit 481859da6d
3 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemReactionsLayout.kt
View file

@ -17,6 +17,7 @@ import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.IntOffset
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import io.element.android.features.messages.impl.R 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.icons.CompoundDrawables
import io.element.android.libraries.designsystem.preview.ElementPreview import io.element.android.libraries.designsystem.preview.ElementPreview
import io.element.android.libraries.designsystem.preview.PreviewsDayNight import io.element.android.libraries.designsystem.preview.PreviewsDayNight
@ -192,7 +193,7 @@ internal fun TimelineItemReactionsLayoutPreview() = ElementPreview {
) )
}, },
reactions = { reactions = {
io.element.android.features.messages.impl.timeline.aTimelineItemReactions(count = 18).reactions.forEach { aTimelineItemReactions(count = 18).reactions.forEach {
MessagesReactionButton( MessagesReactionButton(
content = MessagesReactionsButtonContent.Reaction( content = MessagesReactionsButtonContent.Reaction(
it it

14
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemReactionsView.kt
View file

@ -73,7 +73,7 @@ private fun TimelineItemReactionsView(
else -> LayoutDirection.Ltr else -> LayoutDirection.Ltr
} }
return CompositionLocalProvider(LocalLayoutDirection provides reactionsLayoutDirection) { CompositionLocalProvider(LocalLayoutDirection provides reactionsLayoutDirection) {
TimelineItemReactionsLayout( TimelineItemReactionsLayout(
modifier = modifier, modifier = modifier,
itemSpacing = 4.dp, itemSpacing = 4.dp,
@ -96,11 +96,13 @@ private fun TimelineItemReactionsView(
}, },
addMoreButton = if (userCanSendReaction) { addMoreButton = if (userCanSendReaction) {
{ {
MessagesReactionButton( CompositionLocalProvider(LocalLayoutDirection provides currentLayout) {
content = MessagesReactionsButtonContent.Icon(CompoundDrawables.ic_compound_reaction_add), MessagesReactionButton(
onClick = onMoreReactionsClick, content = MessagesReactionsButtonContent.Icon(CompoundDrawables.ic_compound_reaction_add),
onLongClick = {} onClick = onMoreReactionsClick,
) onLongClick = {}
)
}
} }
} else { } else {
null null

2
gradle/libs.versions.toml
View file

@ -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_compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" }
coil_gif = { module = "io.coil-kt:coil-gif", 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" } 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" } datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "datetime" }
serialization_json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization_json" } 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" kotlinx_collections_immutable = "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.7"