Skip to content

Commit b686f10

Browse files
committed
Instead of replacing suggested emojis, concatenate recent ones removing duplicates
1 parent bf72739 commit b686f10

File tree

1 file changed

+6
-6
lines changed
  • features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist

1 file changed

+6
-6
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ import io.element.android.libraries.matrix.ui.messages.sender.SenderNameMode
9898
import io.element.android.libraries.ui.strings.CommonStrings
9999
import kotlinx.collections.immutable.ImmutableList
100100
import kotlinx.collections.immutable.persistentListOf
101+
import kotlinx.collections.immutable.toImmutableList
101102

102103
@OptIn(ExperimentalMaterial3Api::class)
103104
@Composable
@@ -344,6 +345,7 @@ private fun MessageSummary(
344345
}
345346

346347
private val emojiRippleRadius = 24.dp
348+
private val suggestedEmojis = persistentListOf("👍️", "👎️", "🔥", "❤️", "👏")
347349

348350
@Composable
349351
private fun EmojiReactionsRow(
@@ -358,12 +360,10 @@ private fun EmojiReactionsRow(
358360
) {
359361
val backgroundColor = ElementTheme.colors.bgCanvasDefault
360362

361-
val emojis = remember(recentEmojis.isEmpty()) {
362-
if (recentEmojis.isEmpty()) {
363-
persistentListOf("👍️", "👎️", "🔥", "❤️", "👏")
364-
} else {
365-
recentEmojis.take(50)
366-
}
363+
val emojis = remember(recentEmojis) {
364+
(suggestedEmojis + recentEmojis.filter { it !in suggestedEmojis })
365+
.take(100)
366+
.toImmutableList()
367367
}
368368

369369
LazyRow(

0 commit comments

Comments
 (0)