Simplify code to ellipsize or not tags in subject

Author: tevincent

app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt

@@ -260,7 +260,6 @@ class ThreadListAdapter @Inject constructor(
             ellipsizeConfiguration = SubjectFormatter.EllipsizeConfiguration(
                 maxWidth = context.resources.getDimension(R.dimen.folderNameTagMaxSize).toInt(),
                 truncateAt = TruncateAt.END,
-                tagTextPaint = SubjectFormatter.getTagsPaint(context),
             ),
         )
     }

app/src/main/java/com/infomaniak/mail/ui/main/thread/SubjectFormatter.kt

@@ -22,7 +22,7 @@ import android.content.res.Resources
 import android.graphics.Paint
 import android.text.StaticLayout
 import android.text.TextPaint
-import android.text.TextUtils.*
+import android.text.TextUtils.TruncateAt
 import androidx.annotation.ColorRes
 import androidx.core.content.res.ResourcesCompat
 import com.infomaniak.mail.MatomoMail.trackExternalEvent
@@ -34,7 +34,6 @@ import com.infomaniak.mail.utils.extensions.formatSubject
 import com.infomaniak.mail.utils.extensions.postfixWithTag
 import javax.inject.Inject
 import javax.inject.Singleton
-import com.infomaniak.lib.core.R as RCore
 
 @Singleton
 class SubjectFormatter @Inject constructor(private val context: Context) {
@@ -87,14 +86,14 @@ class SubjectFormatter @Inject constructor(private val context: Context) {
         val folderName = getFolderName(thread)
         if (folderName.isEmpty()) return previousContent
 
-        val ellipsizeTag = getEllipsizeConfiguration(previousContent, folderName)
+        val ellipsizeTag = getEllipsizeConfiguration(folderName)
         return postFixWithFolder(previousContent, folderName, ellipsizeTag)
     }
 
     private fun postFixWithFolder(
         previousContent: CharSequence,
         folderName: String,
-        ellipsizeConfiguration: EllipsizeConfiguration,
+        ellipsizeConfiguration: EllipsizeConfiguration?,
     ) = context.postfixWithTag(
         previousContent,
         folderName,
@@ -104,33 +103,16 @@ class SubjectFormatter @Inject constructor(private val context: Context) {
 
     private fun getFolderName(thread: Thread) = if (thread.messages.size > 1) "" else thread.folderName
 
-    private fun getEllipsizeConfiguration(previousContent: CharSequence, tag: String): EllipsizeConfiguration {
+    private fun getEllipsizeConfiguration(tag: String): EllipsizeConfiguration? {
         val paddingsInPixels = (context.resources.getDimension(R.dimen.threadHorizontalMargin) * 2).toInt()
         val width = Resources.getSystem().displayMetrics.widthPixels - paddingsInPixels
-        val tagsTextPaint = getTagsPaint(context)
-
-        val layoutBeforeAddingTag = StaticLayout.Builder.obtain(
-            previousContent,
-            0,
-            previousContent.length,
-            tagsTextPaint,
-            width,
-        ).build()
-
-        // Colors are not taken into account here. We only call postfixWithTag to compute the layout size
-        val stringAfterAddingTag = context.postfixWithTag(
-            previousContent,
-            tag,
-            TagColor(RCore.color.black, RCore.color.black),
-        )
 
-        val layoutAfterAddingTag =
-            StaticLayout.Builder.obtain(stringAfterAddingTag, 0, stringAfterAddingTag.length, tagsTextPaint, width).build()
+        val tagTextPaint = getTagsPaint(context)
+        val layoutWithTag = StaticLayout.Builder.obtain(tag, 0, tag.length, tagTextPaint, width).build()
 
-        val positionLastChar = layoutBeforeAddingTag.getPrimaryHorizontal(previousContent.length).toInt()
-        val isLinesCountDifferent = layoutAfterAddingTag.lineCount != layoutBeforeAddingTag.lineCount
-        val maxWidth = if (isLinesCountDifferent) width else width - positionLastChar
-        return EllipsizeConfiguration(maxWidth, TruncateAt.MIDDLE, isLinesCountDifferent, tagsTextPaint)
+        return layoutWithTag.takeIf { it.lineCount > 1 }?.let {
+            EllipsizeConfiguration(width, TruncateAt.MIDDLE, withNewLine = true)
+        }
     }
 
     data class SubjectData(
@@ -144,7 +126,6 @@ class SubjectFormatter @Inject constructor(private val context: Context) {
         val maxWidth: Int,
         val truncateAt: TruncateAt = TruncateAt.MIDDLE,
         val withNewLine: Boolean = false,
-        val tagTextPaint: TextPaint,
     )
 
     data class TagColor(@ColorRes val backgroundColorRes: Int, @ColorRes val textColorRes: Int)

app/src/main/java/com/infomaniak/mail/utils/extensions/Extensions.kt

@@ -28,7 +28,10 @@ import android.content.res.Configuration
 import android.content.res.TypedArray
 import android.net.Uri
 import android.os.Build
-import android.text.*
+import android.text.Html
+import android.text.Spannable
+import android.text.Spanned
+import android.text.TextUtils
 import android.text.style.ClickableSpan
 import android.util.Patterns
 import android.view.View
@@ -82,8 +85,9 @@ import com.infomaniak.mail.ui.main.folder.HeaderItemDecoration
 import com.infomaniak.mail.ui.main.folder.ThreadListAdapter
 import com.infomaniak.mail.ui.main.thread.MessageWebViewClient
 import com.infomaniak.mail.ui.main.thread.RoundedBackgroundSpan
-import com.infomaniak.mail.ui.main.thread.SubjectFormatter.*
 import com.infomaniak.mail.ui.main.thread.SubjectFormatter.Companion.getTagsPaint
+import com.infomaniak.mail.ui.main.thread.SubjectFormatter.EllipsizeConfiguration
+import com.infomaniak.mail.ui.main.thread.SubjectFormatter.TagColor
 import com.infomaniak.mail.ui.main.thread.ThreadFragment.HeaderState
 import com.infomaniak.mail.utils.*
 import com.infomaniak.mail.utils.Utils
@@ -515,20 +519,17 @@ fun Context.postfixWithTag(
     onClicked: (() -> Unit)? = null,
 ): Spannable {
 
-    fun getEllipsizedTag(): String {
-        return if (ellipsizeConfiguration != null) {
-            val textPaint = getTagsPaint(this)
-            with(ellipsizeConfiguration) {
-                val tagNameLayout = StaticLayout.Builder.obtain(tag, 0, tag.length, textPaint, maxWidth)
-                    .setEllipsizedWidth(maxWidth)
-                    .setEllipsize(truncateAt)
-                    .setMaxLines(1)
-                    .build()
-                if (withNewLine) "$TAG_SEPARATOR\n${tagNameLayout.text}" else "$TAG_SEPARATOR${tagNameLayout.text}"
-            }
-        } else {
-            "$TAG_SEPARATOR$tag"
-        }
+    fun getEllipsizedTag(): CharSequence {
+        val baseTag = "$TAG_SEPARATOR$tag"
+        return ellipsizeConfiguration?.let {
+            val modifiedTag = if (ellipsizeConfiguration.withNewLine) "\n$baseTag" else baseTag
+            TextUtils.ellipsize(
+                modifiedTag,
+                getTagsPaint(this),
+                ellipsizeConfiguration.maxWidth.toFloat(),
+                ellipsizeConfiguration.truncateAt
+            )
+        } ?: baseTag
     }
 
     val ellipsizedTag = getEllipsizedTag()