mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-03-15 18:59:12 +03:00
Code Issues Projects Releases Packages Wiki Activity

Image message footer: also show outside if more than 1/4 area covered

Browse source 
Also, prefer footer on the side if possible.

Change-Id: I66b23de5d673317f4bc810190535c3028c541d8b
This commit is contained in:
SpiritCroc 2021-05-28 15:33:16 +02:00
parent 6b7564f9f4
commit b28ca929a3
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
View file

@ -68,7 +68,7 @@ abstract class MessageImageVideoItem : AbsMessageItem<MessageImageVideoItem.Hold
// Image size change -> different footer space situation possible
val footerMeasures = getFooterMeasures(holder)
forceAllowFooterOverlay = shouldAllowFooterOverlay(footerMeasures, width, height)
val newShowFooterBellow = shouldShowFooterBellow(footerMeasures, width)
val newShowFooterBellow = shouldShowFooterBellow(footerMeasures, width, height)
if (lastAllowedFooterOverlay != forceAllowFooterOverlay || newShowFooterBellow != lastShowFooterBellow) {
showFooterBellow = newShowFooterBellow
updateMessageBubble(holder.imageView.context, holder)
@ -144,14 +144,18 @@ abstract class MessageImageVideoItem : AbsMessageItem<MessageImageVideoItem.Hold
private fun shouldAllowFooterOverlay(footerMeasures: Array<Int>, imageWidth: Int, imageHeight: Int): Boolean {
val footerWidth = footerMeasures[0]
val footerHeight = footerMeasures[1]
return imageWidth > 1.5*footerWidth && imageHeight > 1.5*footerHeight
// We need enough space in both directions to remain within the image bounds.
// Furthermore, we do not want to hide a too big area, so check the total covered area as well.
return imageWidth > 1.5*footerWidth && imageHeight > 1.5*footerHeight && (imageWidth * imageHeight > 4 * footerWidth * footerHeight)
}
private fun shouldShowFooterBellow(footerMeasures: Array<Int>, imageWidth: Int): Boolean {
private fun shouldShowFooterBellow(footerMeasures: Array<Int>, imageWidth: Int, imageHeight: Int): Boolean {
// Only show footer bellow if the width is not the limiting factor (or it will get cut).
// Otherwise, we can not be sure in this place that we'll have enough space on the side
// Also, prefer footer on the side if possible (i.e. enough height available)
val footerWidth = footerMeasures[0]
return imageWidth > 1.5*footerWidth
val footerHeight = footerMeasures[1]
return imageWidth > 1.5*footerWidth && imageHeight < 1.5*footerHeight
}
override fun allowFooterOverlay(holder: Holder): Boolean {