ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-03 16:10:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

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
parent 005e5cc1a1 7e6cc4db9c
commit 503efbf4c0
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListView.kt
+1 -1
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)
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineStateProvider.kt
+1 -1
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 ->