Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-22 01:40:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add React With Any Search and update UX.

Browse Source
This commit is contained in:
Cody Henthorne
2021-06-24 15:14:34 -04:00
parent da2ee33dff
commit 2a1e5e4471
52 changed files with 1014 additions and 608 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiCategory.kt
View File

@@ -18,6 +18,7 @@ enum class EmojiCategory(val priority: Int, val key: String, @AttrRes val icon:
EMOTICONS(8, "Emoticons", R.attr.emoji_category_emoticons);
companion object {
@JvmStatic
fun forKey(key: String) = values().first { it.key == key }
}
}

2
app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiJsonParser.kt
View File

@@ -74,7 +74,7 @@ object EmojiJsonParser {
}
}
return StaticEmojiPageModel(category.icon, pageList, uriFactory(pageName, format))
return StaticEmojiPageModel(category, pageList, uriFactory(pageName, format))
}
private fun mergeToDisplayPages(dataPages: List<EmojiPageModel>): List<EmojiPageModel> {

2
app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiSource.kt
View File

@@ -152,7 +152,7 @@ data class EmojiMetrics(val rawHeight: Int, val rawWidth: Int, val perRow: Int)
private fun getAssetsUri(name: String, format: String): Uri = Uri.parse("file:///android_asset/emoji/$name.$format")
private val PAGE_EMOTICONS: EmojiPageModel = StaticEmojiPageModel(
EmojiCategory.EMOTICONS.icon,
EmojiCategory.EMOTICONS,
arrayOf(
":-)", ";-)", "(-:", ":->", ":-D", "\\o/",
":-P", "B-)", ":-$", ":-*", "O:-)", "=-O",