Merge pull request #1683 from Infomaniak/clean-code

Clean code before SuperCollapsedBlock feature

Author: KevinBoulongne

app/src/main/assets/icon_print_email.svg

@@ -69,14 +69,14 @@ object ApiRoutes {
     //endregion
 
     //region Calendar
-    fun calendarEvent(resource: String): String {
-        return "${resource(resource)}?format=render"
-    }
-
     fun infomaniakCalendarEventReply(calendarEventId: Int): String {
         return "${pim()}/event/$calendarEventId/reply"
     }
 
+    fun calendarEvent(resource: String): String {
+        return "${resource(resource)}?format=render"
+    }
+
     fun icsCalendarEventReply(resource: String): String {
         return "${resource(resource)}/reply"
     }

app/src/main/java/com/infomaniak/mail/data/api/ApiRoutes.kt

@@ -33,8 +33,6 @@ import io.realm.kotlin.notifications.ResultsChange
 import io.realm.kotlin.query.RealmQuery
 import io.realm.kotlin.query.RealmSingleQuery
 import io.realm.kotlin.query.Sort
-import io.sentry.Sentry
-import io.sentry.SentryLevel
 import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 

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

@@ -204,14 +204,16 @@ class Message : RealmObject {
         latestCalendarEventResponse: CalendarEventResponse?,
         messageIds: RealmSet<String>? = null,
     ) {
+
         this.date = date
         this._isFullyDownloaded = isFullyDownloaded
         this.isTrashed = isTrashed
         draftLocalUuid?.let { this.draftLocalUuid = it }
         this.isFromSearch = isFromSearch
         this.messageIds = messageIds ?: computeMessageIds()
-        shortUid = uid.toShortUid()
         this.latestCalendarEventResponse = latestCalendarEventResponse
+
+        shortUid = uid.toShortUid()
     }
 
     fun keepHeavyData(message: Message) {

app/src/main/java/com/infomaniak/mail/data/models/message/Message.kt

@@ -118,6 +118,31 @@ class ThreadListAdapter @Inject constructor(
         this.recyclerView = recyclerView
     }
 
+    override fun getItemViewType(position: Int): Int = runCatchingRealm {
+        val item = dataSet[position]
+        return when {
+            item is String -> DisplayType.DATE_SEPARATOR.layout
+            item is FolderRole -> DisplayType.FLUSH_FOLDER_BUTTON.layout
+            item is Unit -> DisplayType.LOAD_MORE_BUTTON.layout
+            displaySeeAllButton -> DisplayType.SEE_ALL_BUTTON.layout
+            else -> DisplayType.THREAD.layout
+        }
+    }.getOrDefault(super.getItemViewType(position))
+
+    override fun getItemId(position: Int): Long = runCatchingRealm {
+        return when (val item = dataSet[position]) {
+            is Thread -> item.uid.hashCode().toLong()
+            is String -> item.hashCode().toLong()
+            else -> super.getItemId(position)
+        }
+    }.getOrDefault(super.getItemId(position))
+
+    fun getItemPosition(threadUid: String): Int? {
+        return dataSet
+            .indexOfFirst { it is Thread && it.uid == threadUid }
+            .takeIf { position -> position != -1 }
+    }
+
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ThreadListViewHolder {
         val layoutInflater = LayoutInflater.from(parent.context)
         val binding = when (viewType) {
@@ -132,13 +157,17 @@ class ThreadListAdapter @Inject constructor(
     }
 
     override fun onBindViewHolder(holder: ThreadListViewHolder, position: Int, payloads: MutableList<Any>) = runCatchingRealm {
+
         val payload = payloads.firstOrNull()
+        if (payload !is NotificationType) {
+            super.onBindViewHolder(holder, position, payloads)
+            return@runCatchingRealm
+        }
+
         if (payload == NotificationType.SELECTED_STATE && holder.itemViewType == DisplayType.THREAD.layout) {
             val binding = holder.binding as CardviewThreadItemBinding
             val thread = dataSet[position] as Thread
             binding.updateSelectedUi(thread)
-        } else {
-            super.onBindViewHolder(holder, position, payloads)
         }
     }.getOrDefault(Unit)
 
@@ -152,31 +181,6 @@ class ThreadListAdapter @Inject constructor(
         }
     }
 
-    override fun getItemViewType(position: Int): Int = runCatchingRealm {
-        val item = dataSet[position]
-        return when {
-            item is String -> DisplayType.DATE_SEPARATOR.layout
-            item is FolderRole -> DisplayType.FLUSH_FOLDER_BUTTON.layout
-            item is Unit -> DisplayType.LOAD_MORE_BUTTON.layout
-            displaySeeAllButton -> DisplayType.SEE_ALL_BUTTON.layout
-            else -> DisplayType.THREAD.layout
-        }
-    }.getOrDefault(super.getItemViewType(position))
-
-    override fun getItemId(position: Int): Long = runCatchingRealm {
-        return when (val item = dataSet[position]) {
-            is Thread -> item.uid.hashCode().toLong()
-            is String -> item.hashCode().toLong()
-            else -> super.getItemId(position)
-        }
-    }.getOrDefault(super.getItemId(position))
-
-    fun getItemPosition(threadUid: String): Int? {
-        return dataSet
-            .indexOfFirst { it is Thread && it.uid == threadUid }
-            .takeIf { position -> position != -1 }
-    }
-
     private fun CardviewThreadItemBinding.displayThread(thread: Thread, position: Int) {
 
         refreshCachedSelectedPosition(thread.uid, position) // If item changed position, update cached position.

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

@@ -86,7 +86,9 @@ abstract class TwoPaneFragment : Fragment() {
     }
 
     private fun setupSlidingPane() = with(slidingPaneLayout) {
+
         lockMode = SlidingPaneLayout.LOCK_MODE_LOCKED
+
         addPanelSlideListener(object : SlidingPaneLayout.PanelSlideListener {
             override fun onPanelOpened(panel: View) = Unit
             override fun onPanelClosed(panel: View) = Unit

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

@@ -29,7 +29,7 @@ import androidx.navigation.fragment.navArgs
 import com.infomaniak.lib.core.utils.safeBinding
 import com.infomaniak.mail.R
 import com.infomaniak.mail.data.LocalSettings
-import com.infomaniak.mail.data.LocalSettings.*
+import com.infomaniak.mail.data.LocalSettings.AccentColor
 import com.infomaniak.mail.databinding.FragmentPermissionsOnboardingBinding
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject

app/src/main/java/com/infomaniak/mail/ui/main/onboarding/PermissionsOnboardingFragment.kt

@@ -45,7 +45,6 @@ class PrintMailFragment : Fragment() {
     private val printMailViewModel: PrintMailViewModel by viewModels()
     private val threadAdapter inline get() = binding.messagesList.adapter as ThreadAdapter
 
-
     @Inject
     lateinit var localSettings: LocalSettings