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

Fix swipe to reply positioning in CIV2.

Browse Source
This commit is contained in:
Alex Hart
2023-09-20 11:48:01 -04:00
parent 05b5078aa9
commit 12db8b5ee1
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemLayout.kt
View File

@@ -35,7 +35,11 @@ class V2ConversationItemLayout @JvmOverloads constructor(
onMeasureListeners.forEach { it.onPreMeasure() } onMeasureListeners.forEach { it.onPreMeasure() }
super.onMeasure(widthMeasureSpec, heightMeasureSpec) super.onMeasure(widthMeasureSpec, heightMeasureSpec)
val remeasure = onMeasureListeners.map { it.onPostMeasure() }.any { it } var remeasure = false
onMeasureListeners.forEach {
remeasure = it.onPostMeasure() || remeasure
}
if (remeasure) { if (remeasure) {
super.onMeasure(widthMeasureSpec, heightMeasureSpec) super.onMeasure(widthMeasureSpec, heightMeasureSpec)
} }

10
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder.kt
View File

@@ -112,17 +112,17 @@ open class V2ConversationItemTextOnlyViewHolder<Model : MappingModel<Model>>(
override fun onPreMeasure() = Unit override fun onPreMeasure() = Unit
override fun onPostMeasure(): Boolean { override fun onPostMeasure(): Boolean {
val wrapperHeight = binding.bodyWrapper.measuredHeight
val yTranslation = (wrapperHeight - 38.dp) / 2f
binding.reply.translationY = -yTranslation
return false return false
} }
} }
init { init {
binding.root.addOnMeasureListener(footerDelegate) binding.root.addOnMeasureListener(footerDelegate)
binding.root.addOnMeasureListener(replyDelegate) binding.bodyWrapper.addOnLayoutChangeListener { _, _, top, _, bottom, _, _, _, _ ->
val wrapperHeight = bottom - top
val yTranslation = (wrapperHeight - 38.dp) / 2f
binding.reply.translationY = -yTranslation
}
binding.root.onDispatchTouchEventListener = dispatchTouchEventListener binding.root.onDispatchTouchEventListener = dispatchTouchEventListener