Use view tag instead of index to detect when to not display divider

Author: KevinBoulongne

Core

@@ -33,6 +33,7 @@ import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.*
+import androidx.viewbinding.ViewBinding
 import androidx.webkit.WebSettingsCompat
 import androidx.webkit.WebViewFeature
 import com.infomaniak.lib.core.utils.*
@@ -63,6 +64,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import java.util.*
 import com.google.android.material.R as RMaterial
+import com.infomaniak.lib.core.R as RCore
 
 class ThreadAdapter(
     private val shouldLoadDistantResources: Boolean,
@@ -81,7 +83,7 @@ class ThreadAdapter(
     navigateToDownloadProgressDialog: (Int, Bundle) -> Unit,
     replyToCalendarEvent: (AttendanceState, Message) -> Unit,
     promptLink: (String, ContextMenuType) -> Unit,
-) : ListAdapter<Any, ViewHolder>(MessageDiffCallback()) {
+) : ListAdapter<Any, ThreadAdapterViewHolder>(MessageDiffCallback()) {
 
     inline val items: MutableList<Any> get() = currentList
 
@@ -146,7 +148,7 @@ class ThreadAdapter(
         }
     }.getOrDefault(super.getItemViewType(position))
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ThreadAdapterViewHolder {
         val layoutInflater = LayoutInflater.from(parent.context)
         return if (viewType == R.layout.item_message) {
             MessageViewHolder(
@@ -160,7 +162,7 @@ class ThreadAdapter(
         }
     }
 
-    override fun onBindViewHolder(holder: ViewHolder, position: Int, payloads: MutableList<Any>) = runCatchingRealm {
+    override fun onBindViewHolder(holder: ThreadAdapterViewHolder, position: Int, payloads: MutableList<Any>) = runCatchingRealm {
 
         val payload = payloads.firstOrNull()
         if (payload !is NotifyType) {
@@ -189,8 +191,17 @@ class ThreadAdapter(
         }
     }.getOrDefault(Unit)
 
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+    override fun onBindViewHolder(holder: ThreadAdapterViewHolder, position: Int) {
+
         val item = items[position]
+        val previousItem = if (position > 0) items[position - 1] else null
+
+        holder.binding.root.tag = if (item is SuperCollapsedBlock || previousItem is SuperCollapsedBlock) {
+            holder.binding.context.getString(RCore.string.ignoreDivider)
+        } else {
+            null
+        }
+
         if (item is Message) {
             (holder as MessageViewHolder).bindMail(item, position)
         } else {
@@ -725,14 +736,18 @@ class ThreadAdapter(
 
     data class SuperCollapsedBlock(val messagesUids: Set<String>)
 
-    class SuperCollapsedBlockViewHolder(val binding: ItemSuperCollapsedBlockBinding) : ViewHolder(binding.root)
+    abstract class ThreadAdapterViewHolder(open val binding: ViewBinding) : ViewHolder(binding.root)
+
+    private class SuperCollapsedBlockViewHolder(
+        override val binding: ItemSuperCollapsedBlockBinding,
+    ) : ThreadAdapterViewHolder(binding)
 
-    class MessageViewHolder(
-        val binding: ItemMessageBinding,
+    private class MessageViewHolder(
+        override val binding: ItemMessageBinding,
         private val shouldLoadDistantResources: Boolean,
         onContactClicked: ((contact: Recipient) -> Unit)?,
         onAttachmentClicked: ((attachment: Attachment) -> Unit)?,
-    ) : ViewHolder(binding.root) {
+    ) : ThreadAdapterViewHolder(binding) {
 
         val fromAdapter = DetailedRecipientAdapter(onContactClicked)
         val toAdapter = DetailedRecipientAdapter(onContactClicked)

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

@@ -305,6 +305,7 @@ class ThreadFragment : Fragment() {
 
         twoPaneViewModel.currentThreadUid.distinctUntilChanged().observeNotNull(viewLifecycleOwner) { threadUid ->
 
+            resetMessagesCache()
             displayThreadView()
 
             openThread(threadUid).observe(viewLifecycleOwner) { result ->

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

@@ -88,6 +88,12 @@ class ThreadViewModel @Inject constructor(
         AccountUtils.currentMailboxId,
     ).map { it.obj }.asLiveData(ioCoroutineContext)
 
+    fun resetMessagesCache() {
+        cachedSplitBodies = mutableMapOf()
+        superCollapsedBlock = null
+        hasUserClickedTheSuperCollapsedBlock = false
+    }
+
     fun reassignThreadLive(threadUid: String) {
         threadLiveJob?.cancel()
         threadLiveJob = viewModelScope.launch(ioCoroutineContext) {
@@ -98,10 +104,6 @@ class ThreadViewModel @Inject constructor(
     fun reassignMessagesLive(threadUid: String) {
         messagesLiveJob?.cancel()
         messagesLiveJob = viewModelScope.launch(ioCoroutineContext) {
-
-            cachedSplitBodies = mutableMapOf()
-            superCollapsedBlock = null
-
             messageController.getSortedAndNotDeletedMessagesAsync(threadUid)
                 ?.map(::mapRealmMessagesResult)
                 ?.collect(messagesLive::postValue)

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

@@ -20,8 +20,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:tag="Mail">
+    android:orientation="vertical">
 
     <com.google.android.material.card.MaterialCardView
         android:id="@+id/messageHeader"

app/src/main/res/layout/item_message.xml

@@ -20,8 +20,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingVertical="@dimen/marginStandardSmall"
-    android:tag="SuperCollapsedBlock">
+    android:paddingVertical="@dimen/marginStandardSmall">
 
     <View
         android:layout_width="match_parent"