mirror of
https://github.com/nextcloud/talk-android
synced 2025-07-19 18:55:05 +01:00
add more emojis
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
This commit is contained in:
parent
26002a33a2
commit
245280615c
@ -249,11 +249,12 @@ class MessageActionsDialog(
|
|||||||
isPermitted(hasChatPermission) &&
|
isPermitted(hasChatPermission) &&
|
||||||
isReactableMessageType(message)
|
isReactableMessageType(message)
|
||||||
) {
|
) {
|
||||||
val recentEmojiManager = RecentEmojiManager(context, 6)
|
val recentEmojiManager = RecentEmojiManager(context, 8)
|
||||||
val recentEmojis = recentEmojiManager.getRecentEmojis()
|
val recentEmojis = recentEmojiManager.getRecentEmojis()
|
||||||
val searchEmojiManager = SearchEmojiManager()
|
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>()
|
val initialEmojisFromSearch = mutableSetOf<Emoji>()
|
||||||
|
|
||||||
initialSearchKeywords.forEach { keyword ->
|
initialSearchKeywords.forEach { keyword ->
|
||||||
@ -261,11 +262,11 @@ class MessageActionsDialog(
|
|||||||
if (searchResults.isNotEmpty()) {
|
if (searchResults.isNotEmpty()) {
|
||||||
initialEmojisFromSearch.add(searchResults[0].component1())
|
initialEmojisFromSearch.add(searchResults[0].component1())
|
||||||
}
|
}
|
||||||
if (initialEmojisFromSearch.size >= 6) {
|
if (initialEmojisFromSearch.size >= 8) {
|
||||||
return@forEach
|
return@forEach
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
val combinedEmojis = (recentEmojis + initialEmojisFromSearch).toList().distinct().take(6)
|
val combinedEmojis = (recentEmojis + initialEmojisFromSearch).toList().distinct().take(8)
|
||||||
|
|
||||||
val emojiSearchKeywords = mapOf(
|
val emojiSearchKeywords = mapOf(
|
||||||
"👍" to "thumbsup",
|
"👍" to "thumbsup",
|
||||||
@ -273,7 +274,9 @@ class MessageActionsDialog(
|
|||||||
"❤️" to "heart",
|
"❤️" to "heart",
|
||||||
"😂" to "joy",
|
"😂" to "joy",
|
||||||
"😕" to "confused",
|
"😕" to "confused",
|
||||||
"😢" to "cry"
|
"😢" to "cry",
|
||||||
|
"🙏" to "pray",
|
||||||
|
"🔥" to "fire"
|
||||||
)
|
)
|
||||||
|
|
||||||
val emojiTextViews = listOf(
|
val emojiTextViews = listOf(
|
||||||
@ -282,7 +285,9 @@ class MessageActionsDialog(
|
|||||||
dialogMessageActionsBinding.emojiHeart,
|
dialogMessageActionsBinding.emojiHeart,
|
||||||
dialogMessageActionsBinding.emojiLaugh,
|
dialogMessageActionsBinding.emojiLaugh,
|
||||||
dialogMessageActionsBinding.emojiConfused,
|
dialogMessageActionsBinding.emojiConfused,
|
||||||
dialogMessageActionsBinding.emojiCry
|
dialogMessageActionsBinding.emojiCry,
|
||||||
|
dialogMessageActionsBinding.emojiPray,
|
||||||
|
dialogMessageActionsBinding.emojiFire
|
||||||
)
|
)
|
||||||
|
|
||||||
emojiTextViews.forEachIndexed { index, textView ->
|
emojiTextViews.forEachIndexed { index, textView ->
|
||||||
|
@ -17,9 +17,15 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
|
|
||||||
|
<HorizontalScrollView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:fillViewport="true"
|
||||||
|
android:scrollbars="none">
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/emojiBar"
|
android:id="@+id/emojiBar"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="@dimen/standard_quarter_margin"
|
android:layout_marginStart="@dimen/standard_quarter_margin"
|
||||||
android:layout_marginTop="@dimen/standard_half_margin"
|
android:layout_marginTop="@dimen/standard_half_margin"
|
||||||
@ -94,6 +100,28 @@
|
|||||||
android:text="@string/emoji_sad"
|
android:text="@string/emoji_sad"
|
||||||
android:textSize="20sp" />
|
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
|
<com.vanniktech.emoji.EmojiEditText
|
||||||
android:id="@+id/emojiMore"
|
android:id="@+id/emojiMore"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
@ -106,6 +134,7 @@
|
|||||||
android:paddingStart="@dimen/zero"
|
android:paddingStart="@dimen/zero"
|
||||||
android:paddingEnd="@dimen/standard_padding" />
|
android:paddingEnd="@dimen/standard_padding" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
</HorizontalScrollView>
|
||||||
|
|
||||||
<androidx.core.widget.NestedScrollView
|
<androidx.core.widget.NestedScrollView
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
@ -378,6 +378,8 @@ How to translate with transifex:
|
|||||||
<string name="emoji_heart" translatable="false">❤️</string>
|
<string name="emoji_heart" translatable="false">❤️</string>
|
||||||
<string name="emoji_confused" translatable="false">😯</string>
|
<string name="emoji_confused" translatable="false">😯</string>
|
||||||
<string name="emoji_sad" 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="emoji_more" translatable="false">More emojis</string>
|
||||||
<string name="dontClear">Don\'t clear</string>
|
<string name="dontClear">Don\'t clear</string>
|
||||||
<string name="today">Today</string>
|
<string name="today">Today</string>
|
||||||
|
Loading…
Reference in New Issue
Block a user