diff --git a/qksms/src/main/java/data/mapper/CursorToContact.kt b/qksms/src/main/java/data/mapper/CursorToContact.kt index 0d87a5ae..e32a74f3 100644 --- a/qksms/src/main/java/data/mapper/CursorToContact.kt +++ b/qksms/src/main/java/data/mapper/CursorToContact.kt @@ -18,30 +18,32 @@ */ package data.mapper +import android.content.Context import android.database.Cursor -import android.provider.ContactsContract +import android.provider.ContactsContract.CommonDataKinds.Phone.* import data.model.Contact import data.model.PhoneNumber import javax.inject.Inject -class CursorToContact @Inject constructor() : Mapper { +class CursorToContact @Inject constructor(private val context: Context) : Mapper { companion object { - val URI = ContactsContract.CommonDataKinds.Phone.CONTENT_URI - val PROJECTION = arrayOf( - ContactsContract.CommonDataKinds.Phone.LOOKUP_KEY, - ContactsContract.CommonDataKinds.Phone.NUMBER, - ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME) + val URI = CONTENT_URI + val PROJECTION = arrayOf(LOOKUP_KEY, NUMBER, TYPE, DISPLAY_NAME) - val LOOKUP_KEY = 0 - val NUMBER = 1 - val DISPLAY_NAME = 2 + val COLUMN_LOOKUP_KEY = 0 + val COLUMN_NUMBER = 1 + val COLUMN_TYPE = 2 + val COLUMN_DISPLAY_NAME = 3 } override fun map(from: Cursor) = Contact().apply { - lookupKey = from.getString(LOOKUP_KEY) - name = from.getString(DISPLAY_NAME) - numbers.add(PhoneNumber().apply { address = from.getString(NUMBER) }) + lookupKey = from.getString(COLUMN_LOOKUP_KEY) + name = from.getString(COLUMN_DISPLAY_NAME) + numbers.add(PhoneNumber().apply { + address = from.getString(COLUMN_NUMBER) + type = context.getString(getTypeLabelResource(from.getInt(COLUMN_TYPE))) + }) lastUpdate = System.currentTimeMillis() } diff --git a/qksms/src/main/java/data/model/PhoneNumber.kt b/qksms/src/main/java/data/model/PhoneNumber.kt index 53a5d9f0..739d1660 100644 --- a/qksms/src/main/java/data/model/PhoneNumber.kt +++ b/qksms/src/main/java/data/model/PhoneNumber.kt @@ -23,6 +23,6 @@ import io.realm.RealmObject open class PhoneNumber : RealmObject() { var address: String = "" - var label: String = "" + var type: String = "" } \ No newline at end of file diff --git a/qksms/src/main/java/interactor/ContactSync.kt b/qksms/src/main/java/interactor/ContactSync.kt index 236c6c72..6dcfab11 100644 --- a/qksms/src/main/java/interactor/ContactSync.kt +++ b/qksms/src/main/java/interactor/ContactSync.kt @@ -44,11 +44,11 @@ open class ContactSync @Inject constructor( .groupBy { contact -> contact.lookupKey } .flatMap { group -> group.toList().toFlowable() } .map { contacts -> - val numbers = contacts.map { it.numbers }.flatten() - val contact = contacts.first() - contact.numbers.clear() - contact.numbers.addAll(numbers) - contact + val allNumbers = contacts.map { it.numbers }.flatten() + contacts.first().apply { + numbers.clear() + numbers.addAll(allNumbers) + } } .toList().toFlowable() .doOnNext { contacts -> diff --git a/qksms/src/main/java/presentation/feature/compose/ContactAdapter.kt b/qksms/src/main/java/presentation/feature/compose/ContactAdapter.kt index dd0e083d..b217f411 100644 --- a/qksms/src/main/java/presentation/feature/compose/ContactAdapter.kt +++ b/qksms/src/main/java/presentation/feature/compose/ContactAdapter.kt @@ -20,15 +20,16 @@ package presentation.feature.compose import android.content.Context import android.view.LayoutInflater +import android.view.View import android.view.ViewGroup import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.R import data.model.Contact -import presentation.common.base.QkAdapter -import presentation.common.base.QkViewHolder import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.contact_list_item.view.* +import presentation.common.base.QkAdapter +import presentation.common.base.QkViewHolder import javax.inject.Inject class ContactAdapter @Inject constructor(private val context: Context) : QkAdapter() { @@ -46,11 +47,34 @@ class ContactAdapter @Inject constructor(private val context: Context) : QkAdapt val contact = getItem(position) val view = holder.itemView - view.clicks().subscribe { contactSelected.onNext(contact) } + view.primary.clicks().subscribe { contactSelected.onNext(copyContact(contact, 0)) } view.avatar.contact = contact view.name.text = contact.name - view.address.text = contact.numbers.map { it.address }.toString() + view.address.text = contact.numbers.first()?.address ?: "" + view.type.text = contact.numbers.first()?.type ?: "" + + view.addresses.removeAllViews() + contact.numbers.forEachIndexed { index, number -> + if (index != 0) { + val numberView = View.inflate(context, R.layout.contact_number_list_item, null) + numberView.clicks().subscribe { contactSelected.onNext(copyContact(contact, index)) } + numberView.address.text = number.address + numberView.type.text = number.type + view.addresses.addView(numberView) + } + } + + } + + /** + * Creates a copy of the contact with only one phone number, so that the chips + * view can still display the name/photo, and not get confused about which phone number to use + */ + private fun copyContact(contact: Contact, numberIndex: Int) = Contact().apply { + lookupKey = contact.lookupKey + name = contact.name + numbers.add(contact.numbers[numberIndex]) } override fun areItemsTheSame(old: Contact, new: Contact): Boolean { diff --git a/qksms/src/main/res/layout/contact_list_item.xml b/qksms/src/main/res/layout/contact_list_item.xml index fb4257cd..b4c0ee09 100644 --- a/qksms/src/main/res/layout/contact_list_item.xml +++ b/qksms/src/main/res/layout/contact_list_item.xml @@ -18,41 +18,76 @@ ~ along with QKSMS. If not, see . --> - - + android:orientation="vertical"> + android:background="@drawable/ripple" + android:gravity="center_vertical" + android:paddingBottom="8dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:paddingTop="8dp"> - + - + android:orientation="vertical"> + + + + + + + + + + + + + + \ No newline at end of file diff --git a/qksms/src/main/res/layout/contact_number_list_item.xml b/qksms/src/main/res/layout/contact_number_list_item.xml new file mode 100644 index 00000000..b5aeae35 --- /dev/null +++ b/qksms/src/main/res/layout/contact_number_list_item.xml @@ -0,0 +1,50 @@ + + + + + + + + + \ No newline at end of file