diff --git a/qksms/src/main/java/com/moez/QKSMS/data/model/Contact.kt b/qksms/src/main/java/com/moez/QKSMS/data/model/Contact.kt index f845b9ef..d50b8d69 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/model/Contact.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/model/Contact.kt @@ -6,6 +6,7 @@ import io.realm.annotations.PrimaryKey open class Contact() : RealmObject() { @PrimaryKey var recipientId: Long = 0 + var lookupKey: String = "" var address: String = "" var name: String = "" diff --git a/qksms/src/main/java/com/moez/QKSMS/data/repository/ContactRepository.kt b/qksms/src/main/java/com/moez/QKSMS/data/repository/ContactRepository.kt index a0173ccf..828e0ae3 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/repository/ContactRepository.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/repository/ContactRepository.kt @@ -65,12 +65,13 @@ class ContactRepository @Inject constructor(val context: Context) { val contact = Contact(recipientId, recipientCursor.getString(0)) val contactUri = Uri.withAppendedPath(ContactsContract.PhoneLookup.CONTENT_FILTER_URI, Uri.encode(contact.address)) - val projection = arrayOf(BaseColumns._ID, ContactsContract.PhoneLookup.DISPLAY_NAME) + val projection = arrayOf(BaseColumns._ID, ContactsContract.PhoneLookup.DISPLAY_NAME, ContactsContract.PhoneLookup.LOOKUP_KEY) try { context.contentResolver.query(contactUri, projection, null, null, null).use { contactCursor -> if (contactCursor.moveToFirst()) { contact.inContactsTable = true contact.name = contactCursor.getString(contactCursor.getColumnIndex(ContactsContract.PhoneLookup.DISPLAY_NAME)).orEmpty() + contact.lookupKey = contactCursor.getString(contactCursor.getColumnIndex(ContactsContract.PhoneLookup.LOOKUP_KEY)).orEmpty() } } } catch (e: Exception) { diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/Navigator.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/Navigator.kt index 332e9758..454756cc 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/Navigator.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/Navigator.kt @@ -5,6 +5,7 @@ import android.arch.lifecycle.ViewModelProvider import android.content.Context import android.content.Intent import android.net.Uri +import android.provider.ContactsContract import com.moez.QKSMS.presentation.compose.ComposeActivity import com.moez.QKSMS.presentation.compose.ComposeViewModel import com.moez.QKSMS.presentation.main.MainViewModel @@ -15,6 +16,8 @@ import javax.inject.Singleton + + @Singleton class Navigator @Inject constructor(val context: Context) { diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/view/AvatarView.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/view/AvatarView.kt index cbab8d47..ac5b135c 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/view/AvatarView.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/view/AvatarView.kt @@ -1,15 +1,19 @@ package com.moez.QKSMS.presentation.view import android.content.Context +import android.net.Uri +import android.provider.ContactsContract import android.telephony.PhoneNumberUtils import android.util.AttributeSet import android.view.View import android.widget.FrameLayout +import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.R import com.moez.QKSMS.common.di.appComponent -import com.moez.QKSMS.common.util.GlideApp import com.moez.QKSMS.common.util.Colors +import com.moez.QKSMS.common.util.GlideApp import com.moez.QKSMS.data.model.Contact +import com.moez.QKSMS.presentation.Navigator import io.reactivex.disposables.CompositeDisposable import io.reactivex.rxkotlin.plusAssign import kotlinx.android.synthetic.main.avatar_view.view.* @@ -18,6 +22,7 @@ import javax.inject.Inject class AvatarView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : FrameLayout(context, attrs) { @Inject lateinit var colors: Colors + @Inject lateinit var navigator: Navigator private val disposables = CompositeDisposable() @@ -39,6 +44,14 @@ class AvatarView @JvmOverloads constructor(context: Context, attrs: AttributeSet super.onAttachedToWindow() disposables += colors.theme .subscribe { color -> background.setTint(color) } + + disposables += clicks().subscribe { + contact?.lookupKey?.takeIf { it.isNotEmpty() }?.let { key -> + val uri = Uri.withAppendedPath(ContactsContract.Contacts.CONTENT_LOOKUP_URI, key) + ContactsContract.QuickContact.showQuickContact(context, this@AvatarView, uri, + ContactsContract.QuickContact.MODE_MEDIUM, null) + } + } } override fun onDetachedFromWindow() {