chores(PR): Apply suggestions

Author: FabianDevel

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

@@ -165,7 +165,7 @@ class ThreadAdapter(
         val item = items[position]
 
         holder.binding.root.tag = if (item is SuperCollapsedBlock || (item is Message && item.shouldHideDivider)) {
-            holder.binding.context.getString(R.string.ignoreDivider)
+            IGNORE_DIVIDER_TAG
         } else {
             null
         }
@@ -631,9 +631,7 @@ class ThreadAdapter(
                     newItem is SuperCollapsedBlock &&
                             newItem.messagesUids.count() == oldItem.messagesUids.count()
                 }
-                else -> {
-                    false
-                }
+                else -> false
             }
         }
 
@@ -771,6 +769,8 @@ class ThreadAdapter(
 
     companion object {
 
+        const val IGNORE_DIVIDER_TAG = "ignoreDividerTag"
+
         private val contextMenuTypeForHitTestResultType = mapOf(
             HitTestResult.PHONE_TYPE to ContextMenuType.PHONE,
             HitTestResult.EMAIL_TYPE to ContextMenuType.EMAIL,

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

@@ -318,9 +318,7 @@ class ThreadFragment : Fragment() {
         addItemDecoration(
             DividerItemDecorator(
                 divider = InsetDrawable(dividerDrawable(context), 0),
-                shouldIgnoreView = { view ->
-                    view.tag == context.getString(R.string.ignoreDivider)
-                },
+                shouldIgnoreView = { view -> view.tag == ThreadAdapter.IGNORE_DIVIDER_TAG },
             ),
         )
         recycledViewPool.setMaxRecycledViews(0, 0)
@@ -396,7 +394,8 @@ class ThreadFragment : Fragment() {
             }
 
             threadAdapter.submitList(items)
-            fetchMessagesHeavyData(messagesToFetch)
+            if (messagesToFetch.isNotEmpty()) fetchMessagesHeavyData(messagesToFetch)
+
             fetchCalendarEvents(items)
         }
     }

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

@@ -50,6 +50,9 @@ import kotlinx.coroutines.flow.map
 import javax.inject.Inject
 import kotlin.collections.set
 
+typealias ThreadAdapterItems = List<Any>
+typealias MessagesWithoutHeavyData = List<Message>
+
 @HiltViewModel
 class ThreadViewModel @Inject constructor(
     application: Application,
@@ -78,7 +81,7 @@ class ThreadViewModel @Inject constructor(
     val failedMessagesUids = SingleLiveEvent<List<String>>()
 
     val threadLive = MutableLiveData<Thread?>()
-    val messagesLive = MutableLiveData<Pair<List<Any>, List<Message>>>()
+    val messagesLive = MutableLiveData<Pair<ThreadAdapterItems, MessagesWithoutHeavyData>>()
 
     private var cachedSplitBodies = mutableMapOf<String, SplitBody>()
     private var superCollapsedBlock: MutableSet<String>? = null
@@ -110,21 +113,21 @@ class ThreadViewModel @Inject constructor(
             messageController.getSortedAndNotDeletedMessagesAsync(threadUid)
                 ?.map(::mapRealmMessagesResult)
                 ?.collect(messagesLive::postValue)
-                }
         }
+    }
 
-    private suspend fun mapRealmMessagesResult(results: ResultsChange<Message>): Pair<List<Any>, List<Message>> {
+    private suspend fun mapRealmMessagesResult(results: ResultsChange<Message>): Pair<ThreadAdapterItems, MessagesWithoutHeavyData> {
+
+        val messagesCount = results.list.count()
+        val items = mutableListOf<Any>()
+        val messagesToFetch = mutableListOf<Message>()
 
         val shouldDisplaySuperCollapsedBlock =
-            results.list.count() >= SUPER_COLLAPSE_BLOCK_MESSAGES_LIMIT && !hasUserClickedTheSuperCollapsedBlock
+            messagesCount >= SUPER_COLLAPSE_BLOCK_MESSAGES_LIMIT && !hasUserClickedTheSuperCollapsedBlock
         val shouldCreateSuperCollapsedBlock = (shouldDisplaySuperCollapsedBlock && superCollapsedBlock == null).also {
             if (it) superCollapsedBlock = mutableSetOf()
         }
 
-        val messagesCount = results.list.count()
-        val items = mutableListOf<Any>()
-        val messagesToFetch = mutableListOf<Message>()
-
         suspend fun addMessage(message: Message) {
             splitBody(message).let {
                 items += it
@@ -176,15 +179,11 @@ class ThreadViewModel @Inject constructor(
         }
 
         suspend fun mapFullList() {
-            results.list.map { addMessage(it) }
+            results.list.forEach { addMessage(it) }
         }
 
         if (shouldDisplaySuperCollapsedBlock) {
-            if (shouldCreateSuperCollapsedBlock) {
-                mapListWithNewSuperCollapsedBlock()
-            } else {
-                mapListWithExistingSuperCollapsedBlock()
-            }
+            if (shouldCreateSuperCollapsedBlock) mapListWithNewSuperCollapsedBlock() else mapListWithExistingSuperCollapsedBlock()
         } else {
             mapFullList()
         }

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

@@ -19,8 +19,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingVertical="@dimen/marginStandardSmall">
+    android:layout_height="wrap_content">
 
     <View
         android:layout_width="match_parent"

app/src/main/res/values/strings.xml

@@ -21,7 +21,6 @@
     <string name="notification_channel_id_draft_service" translatable="false">draft_service_channel_id</string>
     <string name="notification_channel_id_general" translatable="false">general_channel_id</string>
     <string name="notification_channel_id_sync_messages_service" translatable="false">sync_messages_service_channel_id</string>
-    <string name="ignoreDivider" translatable="false">IGNORE_DIVIDER</string>
 
     <string name="accentColorBlueTitle">Blue</string>
     <string name="accentColorPinkTitle">Pink</string>