forked from upstream-mirrors/quik
Update contact list stype to show indices
This commit is contained in:
@@ -20,10 +20,12 @@ package com.moez.QKSMS.feature.compose
|
||||
|
||||
import android.view.LayoutInflater
|
||||
import android.view.ViewGroup
|
||||
import androidx.core.view.isVisible
|
||||
import androidx.recyclerview.widget.RecyclerView
|
||||
import com.moez.QKSMS.R
|
||||
import com.moez.QKSMS.common.base.QkAdapter
|
||||
import com.moez.QKSMS.common.base.QkViewHolder
|
||||
import com.moez.QKSMS.common.util.extensions.forwardTouches
|
||||
import com.moez.QKSMS.common.util.extensions.setVisible
|
||||
import com.moez.QKSMS.model.Contact
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
@@ -42,32 +44,34 @@ class ContactAdapter @Inject constructor() : QkAdapter<Contact>() {
|
||||
val view = layoutInflater.inflate(R.layout.contact_list_item, parent, false)
|
||||
|
||||
view.addresses.setRecycledViewPool(numbersViewPool)
|
||||
view.addresses.adapter = PhoneNumberAdapter()
|
||||
view.addresses.forwardTouches(view)
|
||||
|
||||
return QkViewHolder(view).apply {
|
||||
view.primary.setOnClickListener {
|
||||
view.setOnClickListener {
|
||||
val contact = getItem(adapterPosition)
|
||||
contactSelected.onNext(copyContact(contact, 0))
|
||||
}
|
||||
|
||||
view.addresses.adapter = PhoneNumberAdapter { contact, index ->
|
||||
contactSelected.onNext(copyContact(contact, index + 1))
|
||||
contactSelected.onNext(contact)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
|
||||
val prevContact = if (position > 0) getItem(position - 1) else null
|
||||
val contact = getItem(position)
|
||||
val view = holder.containerView
|
||||
|
||||
view.index.text = if (contact.name[0].isLetter()) contact.name[0].toString() else "#"
|
||||
view.index.isVisible = prevContact == null ||
|
||||
(contact.name[0].isLetter() && contact.name[0] != prevContact.name[0]) ||
|
||||
(!contact.name[0].isLetter() && prevContact.name[0].isLetter())
|
||||
|
||||
view.avatar.setContact(contact)
|
||||
view.name.text = contact.name
|
||||
view.name.setVisible(view.name.text.isNotEmpty())
|
||||
view.address.text = contact.numbers.firstOrNull()?.address ?: ""
|
||||
view.type.text = contact.numbers.firstOrNull()?.type ?: ""
|
||||
|
||||
val adapter = view.addresses.adapter as PhoneNumberAdapter
|
||||
adapter.contact = contact
|
||||
adapter.data = contact.numbers.drop(Math.min(contact.numbers.size, 1))
|
||||
adapter.data = contact.numbers
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -80,8 +84,4 @@ class ContactAdapter @Inject constructor() : QkAdapter<Contact>() {
|
||||
numbers.add(contact.numbers[numberIndex])
|
||||
}
|
||||
|
||||
override fun areItemsTheSame(old: Contact, new: Contact): Boolean {
|
||||
return old.lookupKey == new.lookupKey
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -25,11 +25,9 @@ import com.moez.QKSMS.common.base.QkAdapter
|
||||
import com.moez.QKSMS.common.base.QkViewHolder
|
||||
import com.moez.QKSMS.model.Contact
|
||||
import com.moez.QKSMS.model.PhoneNumber
|
||||
import kotlinx.android.synthetic.main.contact_list_item.view.*
|
||||
import kotlinx.android.synthetic.main.contact_number_list_item.view.*
|
||||
|
||||
class PhoneNumberAdapter(
|
||||
private val numberClicked: (Contact, Int) -> Unit
|
||||
) : QkAdapter<PhoneNumber>() {
|
||||
class PhoneNumberAdapter : QkAdapter<PhoneNumber>() {
|
||||
|
||||
lateinit var contact: Contact
|
||||
|
||||
@@ -43,10 +41,6 @@ class PhoneNumberAdapter(
|
||||
val number = getItem(position)
|
||||
val view = holder.containerView
|
||||
|
||||
// Setting this in onCreateViewHolder causes a crash sometimes. [contact] returns the
|
||||
// contact from a different row, I'm not sure why
|
||||
view.setOnClickListener { numberClicked(contact, position) }
|
||||
|
||||
view.address.text = number.address
|
||||
view.type.text = number.type
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user