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

Fix bubbles jumping around when entering selection mode.

Browse Source
This commit is contained in:
Cody Henthorne
2023-07-18 15:26:46 -04:00
committed by Nicholas
parent 67d4f666ce
commit 4910050891
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,6 +61,9 @@ open class InsetAwareConstraintLayout @JvmOverloads constructor(
private var overridingKeyboard: Boolean = false private var overridingKeyboard: Boolean = false
private var previousKeyboardHeight: Int = 0 private var previousKeyboardHeight: Int = 0
val isKeyboardShowing: Boolean
get() = previousKeyboardHeight > 0
init { init {
ViewCompat.setOnApplyWindowInsetsListener(this) { _, windowInsetsCompat -> ViewCompat.setOnApplyWindowInsetsListener(this) { _, windowInsetsCompat ->
applyInsets(windowInsets = windowInsetsCompat.getInsets(windowTypes), keyboardInsets = windowInsetsCompat.getInsets(keyboardType)) applyInsets(windowInsets = windowInsetsCompat.getInsets(windowTypes), keyboardInsets = windowInsetsCompat.getInsets(keyboardType))

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

@@ -1868,18 +1868,21 @@ class ConversationFragment :
val additionalScrollOffset = 54.dp val additionalScrollOffset = 54.dp
if (isVisible) { if (isVisible) {
ViewUtil.animateIn(bottomActionBar, bottomActionBar.enterAnimation) ViewUtil.animateIn(bottomActionBar, bottomActionBar.enterAnimation)
container.hideInput()
inputPanel.setHideForSelection(true) inputPanel.setHideForSelection(true)
animationsAllowed = false
bottomActionBar.viewTreeObserver.addOnPreDrawListener(object : ViewTreeObserver.OnPreDrawListener { bottomActionBar.viewTreeObserver.addOnPreDrawListener(object : ViewTreeObserver.OnPreDrawListener {
override fun onPreDraw(): Boolean { override fun onPreDraw(): Boolean {
if (bottomActionBar.height == 0 && bottomActionBar.visible) { if (bottomActionBar.height == 0 && bottomActionBar.visible) {
return false return false
} }
bottomActionBar.viewTreeObserver.removeOnPreDrawListener(this) bottomActionBar.viewTreeObserver.removeOnPreDrawListener(this)
val bottomPadding = bottomActionBar.height + 18.dp
val bottomPadding = bottomActionBar.height + ((bottomActionBar.layoutParams as? ViewGroup.MarginLayoutParams)?.bottomMargin ?: 18.dp)
ViewUtil.setPaddingBottom(binding.conversationItemRecycler, bottomPadding) ViewUtil.setPaddingBottom(binding.conversationItemRecycler, bottomPadding)
binding.conversationItemRecycler.scrollBy(0, -(bottomPadding - additionalScrollOffset)) binding.conversationItemRecycler.scrollBy(0, -(bottomPadding - additionalScrollOffset))
animationsAllowed = true
return false return false
} }
}) })
@@ -2638,7 +2641,7 @@ class ConversationFragment :
val snapshot = ConversationItemSelection.snapshotView(target, binding.conversationItemRecycler, messageRecord, videoBitmap) val snapshot = ConversationItemSelection.snapshotView(target, binding.conversationItemRecycler, messageRecord, videoBitmap)
val focusedView = if (container.isInputShowing) null else itemView.rootView.findFocus() val focusedView = if (container.isInputShowing || !container.isKeyboardShowing) null else itemView.rootView.findFocus()
val bodyBubble = target.bubbleView val bodyBubble = target.bubbleView
val selectedConversationModel = SelectedConversationModel( val selectedConversationModel = SelectedConversationModel(
snapshot, snapshot,