filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[bubble merge] Keep footered time out of code blocks 

Change-Id: I185016a1f014cb774afa0bb28bd8020f2ec2f410
This commit is contained in:
SpiritCroc 2022-02-20 14:50:34 +01:00
parent 3189093879
commit 4f4381a325
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
vector/src/main/java/im/vector/app/core/ui/views/FooteredTextView.kt
View File

@ -4,9 +4,14 @@ import android.content.Context
import android.graphics.Canvas
import android.graphics.Rect
import android.text.Layout
import android.text.Spannable
import android.text.Spanned
import android.util.AttributeSet
import androidx.appcompat.widget.AppCompatTextView
import androidx.core.text.getSpans
import androidx.core.text.toSpanned
import im.vector.app.R
import im.vector.app.features.html.HtmlCodeSpan
import kotlin.math.ceil
import kotlin.math.max
@ -90,8 +95,19 @@ class FooteredTextView @JvmOverloads constructor(
(maxLineWidth + resources.getDimensionPixelSize(R.dimen.sc_footer_rtl_mismatch_extra_padding))
) + footerWidth
// If the last line is a multi-line code block, we have never space in the last line (as the black background always uses full width)
val forceNewlineFooter = if (text is Spannable || text is Spanned) {
val span = text.toSpanned()
// If not found, -1+1 = 0
val lastLineStart = span.lastIndexOf("\n") + 1
val lastLineCodeSpans = span.getSpans<HtmlCodeSpan>(lastLineStart)
lastLineCodeSpans.any { it.isBlock }
} else {
false
}
// Is there space for a horizontal footer?
if (widthWithHorizontalFooter <= widthLimit) {
if (widthWithHorizontalFooter <= widthLimit && !forceNewlineFooter) {
// Reserve extra horizontal footer space if necessary
if (widthWithHorizontalFooter > newWidth) {
newWidth = ceil(widthWithHorizontalFooter).toInt()