mirror of
https://github.com/nextcloud/talk-android
synced 2025-08-03 18:15:40 +01:00
add constants
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
This commit is contained in:
parent
5a4d09da5c
commit
eb0e205090
@ -249,25 +249,33 @@ class MessageActionsDialog(
|
|||||||
isPermitted(hasChatPermission) &&
|
isPermitted(hasChatPermission) &&
|
||||||
isReactableMessageType(message)
|
isReactableMessageType(message)
|
||||||
) {
|
) {
|
||||||
val recentEmojiManager = RecentEmojiManager(context, 8)
|
val recentEmojiManager = RecentEmojiManager(context, MAX_RECENTS)
|
||||||
val recentEmojis = recentEmojiManager.getRecentEmojis()
|
val recentEmojis = recentEmojiManager.getRecentEmojis()
|
||||||
val searchEmojiManager = SearchEmojiManager()
|
val searchEmojiManager = SearchEmojiManager()
|
||||||
|
|
||||||
val initialSearchKeywords = listOf("thumbsup", "thumbsdown", "heart", "joy", "confused", "cry","pray",
|
val initialSearchKeywords = listOf(
|
||||||
"fire")
|
"thumbsup",
|
||||||
|
"thumbsdown",
|
||||||
|
"heart",
|
||||||
|
"joy",
|
||||||
|
"confused",
|
||||||
|
"cry",
|
||||||
|
"pray",
|
||||||
|
"fire"
|
||||||
|
)
|
||||||
val initialEmojisFromSearch = mutableSetOf<Emoji>()
|
val initialEmojisFromSearch = mutableSetOf<Emoji>()
|
||||||
|
|
||||||
initialSearchKeywords.forEach { keyword ->
|
initialSearchKeywords.forEach { keyword ->
|
||||||
val searchResults = searchEmojiManager.search(keyword)
|
val searchResults = searchEmojiManager.search(keyword)
|
||||||
if (searchResults.isNotEmpty()) {
|
if (searchResults.isNotEmpty()) {
|
||||||
initialEmojisFromSearch.add(searchResults[0].component1())
|
initialEmojisFromSearch.add(searchResults[ZERO_INDEX].component1())
|
||||||
recentEmojiManager.addEmoji(searchResults[0].component1())
|
recentEmojiManager.addEmoji(searchResults[ZERO_INDEX].component1())
|
||||||
}
|
}
|
||||||
if (initialEmojisFromSearch.size >= 8) {
|
if (initialEmojisFromSearch.size >= MAX_RECENTS) {
|
||||||
return@forEach
|
return@forEach
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
val combinedEmojis = (recentEmojis + initialEmojisFromSearch).toList().distinct().take(8)
|
val combinedEmojis = (recentEmojis + initialEmojisFromSearch).toList().distinct().take(MAX_RECENTS)
|
||||||
|
|
||||||
val emojiSearchKeywords = mapOf(
|
val emojiSearchKeywords = mapOf(
|
||||||
"👍" to "thumbsup",
|
"👍" to "thumbsup",
|
||||||
@ -301,13 +309,11 @@ class MessageActionsDialog(
|
|||||||
val keyword = emojiSearchKeywords[emoji] ?: ""
|
val keyword = emojiSearchKeywords[emoji] ?: ""
|
||||||
val result = SearchEmojiManager().search(keyword)
|
val result = SearchEmojiManager().search(keyword)
|
||||||
if (result.isNotEmpty()) {
|
if (result.isNotEmpty()) {
|
||||||
recentEmojiManager.addEmoji(result[0].component1())
|
recentEmojiManager.addEmoji(result[ZERO_INDEX].component1())
|
||||||
recentEmojiManager.persist()
|
recentEmojiManager.persist()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
textView.visibility = View.VISIBLE
|
textView.visibility = View.VISIBLE
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
textView.visibility = View.GONE
|
textView.visibility = View.GONE
|
||||||
}
|
}
|
||||||
@ -512,7 +518,6 @@ class MessageActionsDialog(
|
|||||||
.subscribeOn(Schedulers.io())
|
.subscribeOn(Schedulers.io())
|
||||||
?.observeOn(AndroidSchedulers.mainThread())
|
?.observeOn(AndroidSchedulers.mainThread())
|
||||||
?.subscribe(ReactionDeletedObserver())
|
?.subscribe(ReactionDeletedObserver())
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
reactionsRepository.addReaction(currentConversation!!.token!!, message, emoji)
|
reactionsRepository.addReaction(currentConversation!!.token!!, message, emoji)
|
||||||
.subscribeOn(Schedulers.io())
|
.subscribeOn(Schedulers.io())
|
||||||
@ -574,5 +579,7 @@ class MessageActionsDialog(
|
|||||||
private const val DELAY: Long = 200
|
private const val DELAY: Long = 200
|
||||||
private const val AGE_THRESHOLD_FOR_EDIT_MESSAGE: Long = 86400000
|
private const val AGE_THRESHOLD_FOR_EDIT_MESSAGE: Long = 86400000
|
||||||
private const val ACTOR_BOTS = "bots"
|
private const val ACTOR_BOTS = "bots"
|
||||||
|
private const val ZERO_INDEX = 0
|
||||||
|
private const val MAX_RECENTS = 8
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user