mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-24 18:35:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

Move list of Quick Emoji to Emoji Data Source

Browse source
This commit is contained in:
Benoit Marty 2020-01-02 10:42:01 +01:00
parent 9ecceafb96
commit 448552d287
4 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
View file

@ -43,6 +43,7 @@ import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformatio
import im.vector.riotx.features.html.EventHtmlRenderer import im.vector.riotx.features.html.EventHtmlRenderer
import im.vector.riotx.features.html.VectorHtmlCompressor import im.vector.riotx.features.html.VectorHtmlCompressor
import im.vector.riotx.features.settings.VectorPreferences import im.vector.riotx.features.settings.VectorPreferences
import im.vector.riotx.features.reactions.data.EmojiDataSource
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.* import java.util.*
@ -101,9 +102,6 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted
} }
companion object : MvRxViewModelFactory<MessageActionsViewModel, MessageActionState> { companion object : MvRxViewModelFactory<MessageActionsViewModel, MessageActionState> {
val quickEmojis = listOf("👍", "👎", "😄", "🎉", "😕", "❤️", "🚀", "👀")
@JvmStatic @JvmStatic
override fun create(viewModelContext: ViewModelContext, state: MessageActionState): MessageActionsViewModel? { override fun create(viewModelContext: ViewModelContext, state: MessageActionState): MessageActionsViewModel? {
val fragment: MessageActionsBottomSheet = (viewModelContext as FragmentViewModelContext).fragment() val fragment: MessageActionsBottomSheet = (viewModelContext as FragmentViewModelContext).fragment()
@ -161,7 +159,7 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted
RxRoom(room) RxRoom(room)
.liveAnnotationSummary(eventId) .liveAnnotationSummary(eventId)
.map { annotations -> .map { annotations ->
quickEmojis.map { emoji -> EmojiDataSource.quickEmojis.map { emoji ->
ToggleState(emoji, annotations.getOrNull()?.reactionsSummary?.firstOrNull { it.key == emoji }?.addedByMe ?: false) ToggleState(emoji, annotations.getOrNull()?.reactionsSummary?.firstOrNull { it.key == emoji }?.addedByMe ?: false)
} }
} }

31
vector/src/main/java/im/vector/riotx/features/reactions/data/EmojiDataSource.kt
View file

@ -34,6 +34,8 @@ class EmojiDataSource @Inject constructor(
} }
?: EmojiData(emptyList(), emptyMap(), emptyMap()) ?: EmojiData(emptyList(), emptyMap(), emptyMap())
private val quickReactions = mutableListOf<EmojiItem>()
fun filterWith(query: String): List<EmojiItem> { fun filterWith(query: String): List<EmojiItem> {
val words = query.split("\\s".toRegex()) val words = query.split("\\s".toRegex())
@ -56,15 +58,24 @@ class EmojiDataSource @Inject constructor(
} }
fun getQuickReactions(): List<EmojiItem> { fun getQuickReactions(): List<EmojiItem> {
return listOf( if (quickReactions.isEmpty()) {
"+1", // 👍 listOf(
"-1", // 👎 "+1", // 👍
"grinning", // 😄 "-1", // 👎
"tada", // 🎉 "grinning", // 😄
"confused", // 😕 "tada", // 🎉
"heart", // ❤️ "confused", // 😕
"rocket", // 🚀 "heart", // ❤️
"eyes" // 👀 "rocket", // 🚀
).mapNotNull { rawData.emojis[it] } "eyes" // 👀
)
.mapNotNullTo(quickReactions) { rawData.emojis[it] }
}
return quickReactions
}
companion object {
val quickEmojis = listOf("👍", "👎", "😄", "🎉", "😕", "❤️", "🚀", "👀")
} }
} }

2
vector/src/main/res/layout/item_autocomplete_emoji.xml
View file

@ -53,4 +53,4 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

2
vector/src/main/res/values/strings_riotX.xml
View file

@ -18,6 +18,6 @@
<string name="devices_current_device">Current device</string> <string name="devices_current_device">Current device</string>
<string name="devices_other_devices">Other devices</string> <string name="devices_other_devices">Other devices</string>
<string name="autocomplete_limited_results">Limited results, please type more letters…</string> <string name="autocomplete_limited_results">Showing only the first results, type more letters…</string>
</resources> </resources>