Sorting the contacts

Signed-off-by: Mario Danic <mario@lovelyhq.com>

app/src/main/java/com/nextcloud/talk/adapters/items/GenericTextHeaderItem.kt

@@ -80,7 +80,7 @@ class GenericTextHeaderItem(val model: String) : AbstractHeaderItem<GenericTextH
     ) : FlexibleViewHolder(view, adapter, true) {
 
         @JvmField
-        @BindView(R.id.title_text_view)
+        @BindView(R.id.titleTextView)
         var titleTextView: TextView? = null
 
         init {

app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactPresenter.kt

@@ -1,6 +1,7 @@
 package com.nextcloud.talk.newarch.features.contactsflow
 
 import android.content.Context
+import android.util.Log
 import android.view.ViewGroup
 import androidx.core.view.isVisible
 import coil.api.load
@@ -14,27 +15,34 @@ import com.nextcloud.talk.utils.ApiUtils
 import com.otaliastudios.elements.Element
 import com.otaliastudios.elements.Page
 import com.otaliastudios.elements.Presenter
+import com.otaliastudios.elements.extensions.HeaderSource
 import kotlinx.android.synthetic.main.rv_item_contact.view.*
+import kotlinx.android.synthetic.main.rv_item_title_header.view.*
 import org.koin.core.KoinComponent
 import org.koin.core.inject
 
-open class ContactPresenter(context: Context, onElementClick: ((Page, Holder, Element<Participant>) -> Unit)?) : Presenter<Participant>(context, onElementClick), KoinComponent {
+open class ContactPresenter<T : Any>(context: Context, onElementClick: ((Page, Holder, Element<T>) -> Unit)?) : Presenter<T>(context, onElementClick), KoinComponent {
     private val globalService: GlobalService by inject()
 
     override val elementTypes: Collection<Int>
-        get() = listOf(0)
+        get() = listOf(ParticipantElementType.PARTICIPANT.ordinal, ParticipantElementType.PARTICIPANT_HEADER.ordinal)
 
     override fun onCreate(parent: ViewGroup, elementType: Int): Holder {
-        return Holder(getLayoutInflater().inflate(R.layout.rv_item_contact, parent, false))
+        return if (elementType == ParticipantElementType.PARTICIPANT.ordinal) {
+            Holder(getLayoutInflater().inflate(R.layout.rv_item_contact, parent, false))
+        } else {
+            Holder(getLayoutInflater().inflate(R.layout.rv_item_title_header, parent, false))
+        }
     }
 
-    override fun onBind(page: Page, holder: Holder, element: Element<Participant>, payloads: List<Any>) {
+    override fun onBind(page: Page, holder: Holder, element: Element<T>, payloads: List<Any>) {
         super.onBind(page, holder, element, payloads)
 
-        val participant = element.data
+        if (element.type == ParticipantElementType.PARTICIPANT.ordinal) {
+            val participant = element.data as Participant?
             val user = globalService.currentUserLiveData.value
 
-        holder.itemView.checkedImageView.isVisible = element.data?.selected == true
+            holder.itemView.checkedImageView.isVisible = participant?.selected == true
 
             if (!payloads.contains(ElementPayload.SELECTION_TOGGLE)) {
                 participant?.displayName?.let {
@@ -68,5 +76,8 @@ open class ContactPresenter(context: Context, onElementClick: ((Page, Holder, El
                     }
                 }
             }
+        } else {
+            holder.itemView.titleTextView.text = (element.data as HeaderSource.Data<*, *>).header.toString()
+        }
     }
 }

app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactsViewModel.kt

@@ -1,6 +1,7 @@
 package com.nextcloud.talk.newarch.features.contactsflow
 
 import android.app.Application
+import android.os.Build
 import android.util.Log
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
@@ -12,6 +13,8 @@ import com.nextcloud.talk.newarch.domain.usecases.base.UseCaseResponse
 import com.nextcloud.talk.newarch.features.conversationslist.ConversationsListView
 import com.nextcloud.talk.newarch.services.GlobalService
 import org.koin.core.parameter.parametersOf
+import java.util.*
+import kotlin.Comparator
 
 class ContactsViewModel constructor(
         application: Application,
@@ -26,11 +29,19 @@ class ContactsViewModel constructor(
         getContactsUseCase.invoke(viewModelScope, parametersOf(globalService.currentUserLiveData.value, searchQuery.value, conversationToken), object :
                 UseCaseResponse<List<Participant>> {
             override suspend fun onSuccess(result: List<Participant>) {
-                val sortPriority = mapOf("users" to 3, "groups" to 2, "emails" to 1, "circles" to 0)
+                val sortPriority = mapOf("users" to 0, "groups" to 1, "emails" to 2, "circles" to 3)
-                contactsLiveData.postValue(result.sortedWith(Comparator { o1, o2 ->
+                val typeComparator = Comparator<Participant> { o1, o2 ->
                     sortPriority[o2.source]?.let { sortPriority[o1.source]?.compareTo(it) }
                     0
+                }
+
+                val sortedList = result.sortedWith(compareBy({
+                    sortPriority[it.source]
+                }, {
+                    it.displayName.toLowerCase(Locale.getDefault())
                 }))
+
+                contactsLiveData.postValue(sortedList)
             }
 
             override suspend fun onError(errorModel: ErrorModel?) {

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

@@ -25,7 +25,7 @@
     android:orientation="vertical">
 
     <TextView
-        android:id="@+id/title_text_view"
+        android:id="@+id/titleTextView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"