gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-18 18:25:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

add more emojis

Browse Source 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
This commit is contained in:
sowjanyakch 2025-05-07 17:06:05 +02:00
parent 26002a33a2
commit 245280615c
No known key found for this signature in database
GPG Key ID: F7AA2A8B65B50220
3 changed files with 43 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt
View File

@ -249,11 +249,12 @@ class MessageActionsDialog(
isPermitted(hasChatPermission) &&
isReactableMessageType(message)
) {
val recentEmojiManager = RecentEmojiManager(context, 6)
val recentEmojiManager = RecentEmojiManager(context, 8)
val recentEmojis = recentEmojiManager.getRecentEmojis()
val searchEmojiManager = SearchEmojiManager()
val initialSearchKeywords = listOf("thumbsup", "thumbsdown", "heart", "joy", "confused", "cry")
val initialSearchKeywords = listOf("thumbsup", "thumbsdown", "heart", "joy", "confused", "cry","pray",
"fire")
val initialEmojisFromSearch = mutableSetOf<Emoji>()
initialSearchKeywords.forEach { keyword ->
@ -261,11 +262,11 @@ class MessageActionsDialog(
if (searchResults.isNotEmpty()) {
initialEmojisFromSearch.add(searchResults[0].component1())
}
if (initialEmojisFromSearch.size >= 6) {
if (initialEmojisFromSearch.size >= 8) {
return@forEach
}
}
val combinedEmojis = (recentEmojis + initialEmojisFromSearch).toList().distinct().take(6)
val combinedEmojis = (recentEmojis + initialEmojisFromSearch).toList().distinct().take(8)
val emojiSearchKeywords = mapOf(
"👍" to "thumbsup",
@ -273,7 +274,9 @@ class MessageActionsDialog(
"❤️" to "heart",
"😂" to "joy",
"😕" to "confused",
"😢" to "cry"
"😢" to "cry",
"🙏" to "pray",
"🔥" to "fire"
)
val emojiTextViews = listOf(
@ -282,7 +285,9 @@ class MessageActionsDialog(
dialogMessageActionsBinding.emojiHeart,
dialogMessageActionsBinding.emojiLaugh,
dialogMessageActionsBinding.emojiConfused,
dialogMessageActionsBinding.emojiCry
dialogMessageActionsBinding.emojiCry,
dialogMessageActionsBinding.emojiPray,
dialogMessageActionsBinding.emojiFire
)
emojiTextViews.forEachIndexed { index, textView ->

31
app/src/main/res/layout/dialog_message_actions.xml
View File

@ -17,9 +17,15 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<HorizontalScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fillViewport="true"
android:scrollbars="none">
<LinearLayout
android:id="@+id/emojiBar"
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/standard_quarter_margin"
android:layout_marginTop="@dimen/standard_half_margin"
@ -94,6 +100,28 @@
android:text="@string/emoji_sad"
android:textSize="20sp" />
<com.vanniktech.emoji.EmojiTextView
android:id="@+id/emojiPray"
android:layout_width="@dimen/reaction_bottom_sheet_layout_size"
android:layout_height="@dimen/reaction_bottom_sheet_layout_size"
android:layout_marginLeft="@dimen/standard_quarter_margin"
android:layout_marginRight="@dimen/standard_quarter_margin"
android:cursorVisible="false"
android:gravity="center"
android:text="@string/emoji_pray"
android:textSize="20sp" />
<com.vanniktech.emoji.EmojiTextView
android:id="@+id/emojiFire"
android:layout_width="@dimen/reaction_bottom_sheet_layout_size"
android:layout_height="@dimen/reaction_bottom_sheet_layout_size"
android:layout_marginLeft="@dimen/standard_quarter_margin"
android:layout_marginRight="@dimen/standard_half_margin"
android:cursorVisible="false"
android:gravity="center"
android:text="@string/emoji_fire"
android:textSize="20sp" />
<com.vanniktech.emoji.EmojiEditText
android:id="@+id/emojiMore"
android:layout_width="0dp"
@ -106,6 +134,7 @@
android:paddingStart="@dimen/zero"
android:paddingEnd="@dimen/standard_padding" />
</LinearLayout>
</HorizontalScrollView>
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"

2
app/src/main/res/values/strings.xml
View File

@ -378,6 +378,8 @@ How to translate with transifex:
<string name="emoji_heart" translatable="false">❤️</string>
<string name="emoji_confused" translatable="false">😯</string>
<string name="emoji_sad" translatable="false">😢</string>
<string name="emoji_pray" translatable="false">🙏</string>
<string name="emoji_fire" translatable="false">🔥</string>
<string name="emoji_more" translatable="false">More emojis</string>
<string name="dontClear">Don\'t clear</string>
<string name="today">Today</string>