mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-28 14:08:44 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6068 from vector-im/dependabot/gradle/vanniktechEmoji-0.12.0

Browse source 
Bump vanniktechEmoji from 0.9.0 to 0.12.0
This commit is contained in:
Adam Brown 2022-05-24 16:26:06 +01:00 committed by GitHub
commit b4b2b97eb1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dependencies.gradle
View file

@ -23,7 +23,7 @@ def mavericks = "2.6.1"
def glide = "4.13.2" def glide = "4.13.2"
def bigImageViewer = "1.8.1" def bigImageViewer = "1.8.1"
def jjwt = "0.11.5" def jjwt = "0.11.5"
def vanniktechEmoji = "0.9.0" def vanniktechEmoji = "0.12.0"
// Testing // Testing
def mockk = "1.12.4" def mockk = "1.12.4"

4
vector/src/main/java/im/vector/app/core/utils/Emoji.kt
View file

@ -16,7 +16,7 @@
package im.vector.app.core.utils package im.vector.app.core.utils
import com.vanniktech.emoji.EmojiUtils import com.vanniktech.emoji.isOnlyEmojis
/** /**
* Test if a string contains emojis. * Test if a string contains emojis.
@ -28,7 +28,7 @@ import com.vanniktech.emoji.EmojiUtils
*/ */
fun containsOnlyEmojis(str: String?): Boolean { fun containsOnlyEmojis(str: String?): Boolean {
// Now rely on vanniktech library // Now rely on vanniktech library
return EmojiUtils.isOnlyEmojis(str) return str.isOnlyEmojis()
} }
/** /**

22
vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
View file

@ -714,31 +714,31 @@ class TimelineFragment @Inject constructor(
} }
private fun createEmojiPopup(): EmojiPopup { private fun createEmojiPopup(): EmojiPopup {
return EmojiPopup return EmojiPopup(
.Builder rootView = views.rootConstraintLayout,
.fromRootView(views.rootConstraintLayout) keyboardAnimationStyle = R.style.emoji_fade_animation_style,
.setKeyboardAnimationStyle(R.style.emoji_fade_animation_style) onEmojiPopupShownListener = {
.setOnEmojiPopupShownListener {
views.composerLayout.views.composerEmojiButton.apply { views.composerLayout.views.composerEmojiButton.apply {
contentDescription = getString(R.string.a11y_close_emoji_picker) contentDescription = getString(R.string.a11y_close_emoji_picker)
setImageResource(R.drawable.ic_keyboard) setImageResource(R.drawable.ic_keyboard)
} }
} },
.setOnEmojiPopupDismissListenerLifecycleAware { onEmojiPopupDismissListener = lifecycleAwareDismissAction {
views.composerLayout.views.composerEmojiButton.apply { views.composerLayout.views.composerEmojiButton.apply {
contentDescription = getString(R.string.a11y_open_emoji_picker) contentDescription = getString(R.string.a11y_open_emoji_picker)
setImageResource(R.drawable.ic_insert_emoji) setImageResource(R.drawable.ic_insert_emoji)
} }
} },
.build(views.composerLayout.views.composerEditText) editText = views.composerLayout.views.composerEditText
)
} }
/** /**
* Ensure dismiss actions only trigger when the fragment is in the started state. * Ensure dismiss actions only trigger when the fragment is in the started state.
* EmojiPopup by default dismisses onViewDetachedFromWindow, this can cause race conditions with onDestroyView. * EmojiPopup by default dismisses onViewDetachedFromWindow, this can cause race conditions with onDestroyView.
*/ */
private fun EmojiPopup.Builder.setOnEmojiPopupDismissListenerLifecycleAware(action: () -> Unit): EmojiPopup.Builder { private fun lifecycleAwareDismissAction(action: () -> Unit): () -> Unit {
return setOnEmojiPopupDismissListener { return {
if (lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED)) { if (lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED)) {
action() action()
} }