SES-4614 : Read More Indicator Appears Erroneously (#1548)

* Modify ellipsis for short texts for 25th line

* Default limit to 5

Author: jbsession

app/src/main/java/org/session/libsession/utilities/ViewUtils.kt

@@ -15,6 +15,7 @@ import android.view.ViewGroup
 import android.widget.TextView
 import androidx.annotation.AttrRes
 import androidx.annotation.ColorInt
+import kotlin.math.ceil
 
 @ColorInt
 fun Context.getColorFromAttr(
@@ -59,7 +60,7 @@ fun TextView.needsCollapsing(
         .setHyphenationFrequency(hyphenationFrequency)
         .setAlignment(alignment)
         .setTextDirection(direction)
-        .setMaxLines(maxLines)                                   // cap at maxLines
+        .setMaxLines(maxLines)       // cap at maxLines
         .setEllipsize(ellipsize)     // compute ellipsis
 
     builder.setJustificationMode(justificationMode)
@@ -74,4 +75,28 @@ fun TextView.needsCollapsing(
     // Exactly maxLines: truncated if last line is ellipsized or characters were cut
     val last = (maxLines - 1).coerceAtMost(layout.lineCount - 1)
     return layout.getEllipsisCount(last) > 0 || layout.getLineEnd(last) < textForLayout.length
+}
+
+fun TextView.applyCollapsedEllipsisMinWidth(
+    widthCapPx: Int,
+    maxCharsBeforeEllipsis: Int = 5, // will truncate after this many characters for short texts
+    sampleGlyph: Char = '0'
+) {
+    if (widthCapPx <= 0) return
+
+    val ellipsis = '\u2026'
+
+    val paint = paint
+    val sample = sampleGlyph.toString().repeat(maxCharsBeforeEllipsis)
+    val minContent =
+        ceil(paint.measureText(sample) + paint.measureText(ellipsis.toString())).toInt()
+    val neededTotal = minContent + paddingLeft + paddingRight
+    val applied = neededTotal.coerceAtMost(widthCapPx)
+    if (applied > 0 && minWidth != applied) {
+        minWidth = applied
+    }
+}
+
+fun TextView.clearCollapsedMinWidth() {
+    if (minWidth != 0) minWidth = 0
 }

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt

@@ -31,6 +31,8 @@ import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import org.session.libsession.messaging.sending_receiving.attachments.AttachmentState
 import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAttachment
 import org.session.libsession.utilities.ThemeUtil
+import org.session.libsession.utilities.applyCollapsedEllipsisMinWidth
+import org.session.libsession.utilities.clearCollapsedMinWidth
 import org.session.libsession.utilities.getColorFromAttr
 import org.session.libsession.utilities.modifyLayoutParams
 import org.session.libsession.utilities.needsCollapsing
@@ -361,6 +363,7 @@ class VisibleMessageContentView : ConstraintLayout {
                     availableWidthPx = binding.bodyTextView.maxWidth,
                     maxLines = MAX_COLLAPSED_LINE_COUNT)
             ){
+                binding.bodyTextView.applyCollapsedEllipsisMinWidth( binding.bodyTextView.maxWidth)
                 // show the "Read mode" button
                 binding.readMore.setTextColor(color)
                 binding.readMore.isVisible = true
@@ -371,12 +374,14 @@ class VisibleMessageContentView : ConstraintLayout {
                     binding.readMore.getGlobalVisibleRect(r)
                     if (r.contains(event.rawX.roundToInt(), event.rawY.roundToInt())) {
                         binding.bodyTextView.maxLines = Int.MAX_VALUE
+                        binding.bodyTextView.clearCollapsedMinWidth()
                         binding.readMore.isVisible = false
                         onTextExpanded?.invoke(message.messageId) // Notify that text was expanded
                     }
                 }
                 onContentClick.add(readMoreClickHandler)
             } else {
+                binding.bodyTextView.clearCollapsedMinWidth()
                 binding.readMore.isVisible = false
             }
         }