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

Merge pull request #1625 from vector-im/langleyd/fix_emoji_shortcut_values

Browse source 
Fix emoji shortcut values
This commit is contained in:
David Langley 2023-10-23 16:49:56 +01:00 • committed by GitHub
commit da345f9afa
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListView.kt
View file

@ -348,7 +348,7 @@ private fun EmojiReactionsRow(
) { ) {
// TODO use most recently used emojis here when available from the Rust SDK // TODO use most recently used emojis here when available from the Rust SDK
val defaultEmojis = sequenceOf( val defaultEmojis = sequenceOf(
"👍", "👎", "🔥", "❤️", "👏" "👍️", "👎️", "🔥", "❤️", "👏"
) )
for (emoji in defaultEmojis) { for (emoji in defaultEmojis) {
val isHighlighted = highlightedEmojis.contains(emoji) val isHighlighted = highlightedEmojis.contains(emoji)

2
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineStateProvider.kt
View file

@ -139,7 +139,7 @@ fun aTimelineItemReactions(
count: Int = 1, count: Int = 1,
isHighlighted: Boolean = false, isHighlighted: Boolean = false,
): TimelineItemReactions { ): TimelineItemReactions {
val emojis = arrayOf("👍", "😀️", "😁️", "😆️", "😅️", "🤣️", "🥰️", "😇️", "😊️", "😉️", "🙃️", "🙂️", "😍️", "🤗️", "🤭️") val emojis = arrayOf("👍️", "😀️", "😁️", "😆️", "😅️", "🤣️", "🥰️", "😇️", "😊️", "😉️", "🙃️", "🙂️", "😍️", "🤗️", "🤭️")
return TimelineItemReactions( return TimelineItemReactions(
reactions = buildList { reactions = buildList {
repeat(count) { index -> repeat(count) { index ->