Create a container for icons

wip Reorganize subject formatting methods

Code review

Author: tevincent

app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/ThreadController.kt

@@ -46,6 +46,7 @@ import okhttp3.OkHttpClient
 import javax.inject.Inject
 
 class ThreadController @Inject constructor(
+    private val context: Context,
     private val mailboxContentRealm: RealmDatabase.MailboxContent,
     @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
 ) {
@@ -81,7 +82,6 @@ class ThreadController @Inject constructor(
      * @return A list of search threads. The search only returns messages from spam or trash if we explicitly selected those folders
      */
     suspend fun initAndGetSearchFolderThreads(
-        context: Context,
         remoteThreads: List<Thread>,
         folderRole: FolderRole?,
     ): List<Thread> = withContext(ioDispatcher) {
@@ -115,12 +115,14 @@ class ThreadController @Inject constructor(
             val searchFolder = FolderController.getOrCreateSearchFolder(realm = this)
             remoteThreads.map { remoteThread ->
                 ensureActive()
+                val firstMessageFolderId = remoteThread.messages.single().folderId
                 if (remoteThread.messages.size == 1) {
-                    val folderId = remoteThread.messages.first().folderId
-                    getFolder(folderId, this@writeBlocking)?.let { folder -> remoteThread.folderName = folder.getLocalizedName(context) }
+                    getFolder(firstMessageFolderId, this@writeBlocking)?.let { folder ->
+                        remoteThread.folderName = folder.getLocalizedName(context)
+                    }
                 }
                 remoteThread.isFromSearch = true
-                remoteThread.folderId = remoteThread.messages.first().folderId
+                remoteThread.folderId = firstMessageFolderId
 
                 keepOldMessagesAndAddToSearchFolder(remoteThread, searchFolder)
 

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

@@ -21,6 +21,7 @@ import android.content.Context
 import android.content.res.ColorStateList
 import android.graphics.Canvas
 import android.os.Build
+import android.text.TextUtils
 import android.view.HapticFeedbackConstants
 import android.view.LayoutInflater
 import android.view.View
@@ -53,7 +54,7 @@ import com.infomaniak.mail.data.models.correspondent.Recipient
 import com.infomaniak.mail.data.models.thread.Thread
 import com.infomaniak.mail.databinding.*
 import com.infomaniak.mail.ui.main.folder.ThreadListAdapter.ThreadListViewHolder
-import com.infomaniak.mail.ui.main.thread.SubjectFormatter.getFolderName
+import com.infomaniak.mail.ui.main.thread.SubjectFormatter
 import com.infomaniak.mail.utils.RealmChangesBinding
 import com.infomaniak.mail.utils.Utils.runCatchingRealm
 import com.infomaniak.mail.utils.extensions.*
@@ -87,7 +88,6 @@ class ThreadListAdapter @Inject constructor(
     private var swipingIsAuthorized: Boolean = true
     private var displaySeeAllButton = false // TODO: Manage this for intelligent mailbox
     private var isLoadMoreDisplayed = false
-    private var isFolderNameVisible: Boolean = false
 
     var onThreadClicked: ((thread: Thread) -> Unit)? = null
     var onFlushClicked: ((dialogTitle: String) -> Unit)? = null
@@ -96,6 +96,7 @@ class ThreadListAdapter @Inject constructor(
     private var folderRole: FolderRole? = null
     private var onSwipeFinished: (() -> Unit)? = null
     private var multiSelection: MultiSelectionListener<Thread>? = null
+    private var isFolderNameVisible: Boolean = false
 
     //region Tablet mode
     private var openedThreadPosition: Int? = null
@@ -189,10 +190,18 @@ class ThreadListAdapter @Inject constructor(
     private fun shouldDisplayFolderName(folderName: String) = isFolderNameVisible && folderName.isNotEmpty()
 
     private fun CardviewThreadItemBinding.displayThread(thread: Thread, position: Int) {
-        val folderName = getFolderName(thread)
-        if (shouldDisplayFolderName(folderName)) {
+        if (shouldDisplayFolderName(thread.folderName)) {
             folderNameView.isVisible = true
-            folderNameView.text = folderName
+            folderNameView.text = context.postfixWithTag(
+                tag = thread.folderName,
+                tagColor = TagColor(R.color.folderNameBackground, R.color.folderNameTextColor),
+                ellipsizeConfiguration = SubjectFormatter.EllipsizeConfiguration(
+                    maxWidth = context.resources.getDimension(R.dimen.subjectTagMaxSize).toInt(),
+                    truncateAt = TextUtils.TruncateAt.END
+                ),
+            )
+        } else {
+            folderNameView.isVisible = false
         }
 
         refreshCachedSelectedPosition(thread.uid, position) // If item changed position, update cached position.

app/src/main/java/com/infomaniak/mail/ui/main/search/SearchViewModel.kt

@@ -209,12 +209,8 @@ class SearchViewModel @Inject constructor(
 
         suspend fun ApiResponse<ThreadResult>.initSearchFolderThreads() {
             runCatching {
-                data?.threads?.let {
-                    threadController.initAndGetSearchFolderThreads(
-                        context,
-                        remoteThreads = it,
-                        folderRole = folder?.role
-                    )
+                data?.threads?.let { threads ->
+                    threadController.initAndGetSearchFolderThreads(remoteThreads = threads, folderRole = folder?.role)
                 }
             }.getOrElse { exception ->
                 exception.printStackTrace()

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

@@ -17,13 +17,17 @@
  */
 package com.infomaniak.mail.ui.main.thread
 
+import android.content.Context
 import android.graphics.Canvas
 import android.graphics.Paint
 import android.graphics.Paint.FontMetricsInt
 import android.graphics.RectF
 import android.graphics.Typeface
+import android.text.TextPaint
 import android.text.style.LineHeightSpan
 import android.text.style.ReplacementSpan
+import androidx.core.content.res.ResourcesCompat
+import com.infomaniak.mail.R
 
 /**
  * A span to create a rounded background on a text.
@@ -36,6 +40,7 @@ class RoundedBackgroundSpan(
     private val textColor: Int,
     private val textTypeface: Typeface,
     private val fontSize: Float,
+    private val cornerRadius: Float = CORNER_RADIUS
 ) : ReplacementSpan(), LineHeightSpan {
 
     override fun getSize(paint: Paint, text: CharSequence?, start: Int, end: Int, fm: FontMetricsInt?): Int {
@@ -65,7 +70,7 @@ class RoundedBackgroundSpan(
         )
 
         paint.color = backgroundColor
-        canvas.drawRoundRect(rect, CORNER_RADIUS, CORNER_RADIUS, paint)
+        canvas.drawRoundRect(rect, cornerRadius, cornerRadius, paint)
 
         paint.setGivenTextStyle()
         canvas.drawText(
@@ -98,5 +103,11 @@ class RoundedBackgroundSpan(
         private const val PADDING = 16
         private const val VERTICAL_OFFSET = 4
         private const val CORNER_RADIUS = 10f
+
+        fun getTagsPaint(context: Context) = TextPaint(Paint.ANTI_ALIAS_FLAG).apply {
+            color = ResourcesCompat.getColor(context.resources, R.color.folderNameTextColor, null)
+            textSize = context.resources.getDimension(R.dimen.externalTagTextSize)
+            typeface = ResourcesCompat.getFont(context, R.font.tag_font)
+        }
     }
 }