Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-20 02:58:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix keyboard animation when going back from emoji-search.

Browse Source
This commit is contained in:
Alex Hart
2025-12-01 16:18:05 -04:00
committed by jeffrey-signal
parent 559a665831
commit 188f1c52a9
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/thoughtcrime/securesms/components/InsetAwareConstraintLayout.kt
View File

@@ -231,6 +231,7 @@ open class InsetAwareConstraintLayout @JvmOverloads constructor(
interface KeyboardStateListener { interface KeyboardStateListener {
fun onKeyboardShown() fun onKeyboardShown()
fun onKeyboardHidden() fun onKeyboardHidden()
fun onKeyboardAnimationEnded() = Unit
} }
interface WindowInsetsListener { interface WindowInsetsListener {
@@ -288,6 +289,10 @@ open class InsetAwareConstraintLayout @JvmOverloads constructor(
} }
override fun onEnd(animation: WindowInsetsAnimationCompat) { override fun onEnd(animation: WindowInsetsAnimationCompat) {
keyboardStateListeners.forEach {
it.onKeyboardAnimationEnded()
}
if (overridingKeyboard) { if (overridingKeyboard) {
return return
} }

8
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
View File

@@ -4718,12 +4718,16 @@ class ConversationFragment :
} }
override fun onKeyboardHidden() { override fun onKeyboardHidden() {
closeEmojiSearch()
if (searchMenuItem?.isActionViewExpanded == true && searchMenuItem?.actionView?.hasFocus() == true) { if (searchMenuItem?.isActionViewExpanded == true && searchMenuItem?.actionView?.hasFocus() == true) {
searchMenuItem?.actionView?.clearFocus() searchMenuItem?.actionView?.clearFocus()
} }
} }
override fun onKeyboardAnimationEnded() {
if (!container.isKeyboardShowing) {
closeEmojiSearch()
}
}
} }
//endregion //endregion