forked from upstream-mirrors/quik
Load contact avatars in conversation list
This commit is contained in:
@@ -6,6 +6,7 @@ import com.moez.QKSMS.ui.conversations.ConversationListViewModel
|
||||
import com.moez.QKSMS.ui.messages.MessageAdapter
|
||||
import com.moez.QKSMS.ui.messages.MessageListActivity
|
||||
import com.moez.QKSMS.ui.messages.MessageListViewModel
|
||||
import com.moez.QKSMS.ui.view.AvatarView
|
||||
import com.moez.QKSMS.util.NotificationManager
|
||||
import dagger.Component
|
||||
import javax.inject.Singleton
|
||||
@@ -14,20 +15,22 @@ import javax.inject.Singleton
|
||||
@Component(modules = arrayOf(AppModule::class))
|
||||
interface AppComponent {
|
||||
|
||||
fun inject(receiver: SmsReceiver)
|
||||
fun inject(receiver: MessageSentReceiver)
|
||||
fun inject(receiver: MarkSeenReceiver)
|
||||
fun inject(receiver: MarkReadReceiver)
|
||||
fun inject(receiver: RemoteMessagingReceiver)
|
||||
|
||||
fun inject(activity: MessageListActivity)
|
||||
|
||||
fun inject(viewModel: ConversationListViewModel)
|
||||
fun inject(viewModel: MessageListViewModel)
|
||||
|
||||
fun inject(adapter: MessageAdapter)
|
||||
fun inject(adapter: ConversationAdapter)
|
||||
|
||||
fun inject(manager: NotificationManager)
|
||||
|
||||
fun inject(receiver: SmsReceiver)
|
||||
fun inject(receiver: MessageSentReceiver)
|
||||
fun inject(receiver: MarkSeenReceiver)
|
||||
fun inject(receiver: MarkReadReceiver)
|
||||
fun inject(receiver: RemoteMessagingReceiver)
|
||||
|
||||
fun inject(view: AvatarView)
|
||||
|
||||
fun inject(viewModel: ConversationListViewModel)
|
||||
fun inject(viewModel: MessageListViewModel)
|
||||
|
||||
}
|
||||
@@ -8,6 +8,7 @@ open class Contact() : RealmObject() {
|
||||
@PrimaryKey var recipientId: Long = 0
|
||||
var address: String = ""
|
||||
var name: String = ""
|
||||
var photoUri: String = ""
|
||||
|
||||
constructor(id: Long, address: String) : this() {
|
||||
this.recipientId = id
|
||||
|
||||
@@ -1,12 +1,16 @@
|
||||
package com.moez.QKSMS.data.repository
|
||||
|
||||
import android.content.ContentUris
|
||||
import android.content.Context
|
||||
import android.database.Cursor
|
||||
import android.graphics.Bitmap
|
||||
import android.graphics.BitmapFactory
|
||||
import android.net.Uri
|
||||
import android.provider.BaseColumns
|
||||
import android.provider.ContactsContract
|
||||
import com.moez.QKSMS.data.model.Contact
|
||||
import io.reactivex.Maybe
|
||||
import io.reactivex.android.schedulers.AndroidSchedulers
|
||||
import io.reactivex.schedulers.Schedulers
|
||||
import io.realm.Realm
|
||||
|
||||
|
||||
@@ -36,7 +40,7 @@ class ContactRepository(val context: Context) {
|
||||
// If it's not found, then load from the Contacts ContentProvider instead
|
||||
var contact: Contact? = null
|
||||
|
||||
val recipientCursor = context.contentResolver.query(ContentUris.withAppendedId(URI, recipientId), null, null, null, null)
|
||||
val recipientCursor = context.contentResolver.query(Uri.withAppendedPath(URI, recipientId.toString()), null, null, null, null)
|
||||
if (recipientCursor.moveToFirst()) {
|
||||
contact = Contact(recipientId, recipientCursor.getString(0))
|
||||
}
|
||||
@@ -45,9 +49,10 @@ class ContactRepository(val context: Context) {
|
||||
val contactUri = Uri.withAppendedPath(ContactsContract.PhoneLookup.CONTENT_FILTER_URI, Uri.encode(contact?.address))
|
||||
var contactCursor: Cursor? = null
|
||||
try {
|
||||
contactCursor = context.contentResolver.query(contactUri, arrayOf(BaseColumns._ID, ContactsContract.PhoneLookup.DISPLAY_NAME), null, null, null)
|
||||
contactCursor = context.contentResolver.query(contactUri, arrayOf(BaseColumns._ID, ContactsContract.PhoneLookup.DISPLAY_NAME, ContactsContract.Data.PHOTO_THUMBNAIL_URI), null, null, null)
|
||||
if (contactCursor.moveToFirst()) {
|
||||
contact?.name = contactCursor.getString(contactCursor.getColumnIndex(ContactsContract.Data.DISPLAY_NAME))
|
||||
contact?.photoUri = contactCursor.getString(contactCursor.getColumnIndex(ContactsContract.Data.PHOTO_THUMBNAIL_URI))
|
||||
}
|
||||
} catch (ignored: Exception) {
|
||||
} finally {
|
||||
@@ -63,4 +68,19 @@ class ContactRepository(val context: Context) {
|
||||
return Contact()
|
||||
}
|
||||
|
||||
// TODO cache the photos
|
||||
fun getAvatar(uriString: String): Maybe<Bitmap> {
|
||||
return Maybe.just(uriString)
|
||||
.subscribeOn(Schedulers.io())
|
||||
.filter { string -> string.isNotEmpty() }
|
||||
.map { string -> Uri.parse(string) }
|
||||
.map { uri -> context.contentResolver.openAssetFileDescriptor(uri, "r") }
|
||||
.map { assetFileDescriptor ->
|
||||
val bitmap = BitmapFactory.decodeFileDescriptor(assetFileDescriptor.fileDescriptor, null, null)
|
||||
assetFileDescriptor.close()
|
||||
bitmap
|
||||
}
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
}
|
||||
|
||||
}
|
||||
@@ -6,9 +6,14 @@ import android.util.AttributeSet
|
||||
import android.view.View
|
||||
import android.widget.FrameLayout
|
||||
import com.moez.QKSMS.R
|
||||
import com.moez.QKSMS.dagger.AppComponentManager
|
||||
import com.moez.QKSMS.data.model.Contact
|
||||
import com.moez.QKSMS.data.repository.ContactRepository
|
||||
import com.moez.QKSMS.util.extensions.getColorCompat
|
||||
import io.reactivex.disposables.Disposable
|
||||
import kotlinx.android.synthetic.main.avatar_view.view.*
|
||||
import javax.inject.Inject
|
||||
|
||||
|
||||
class AvatarView(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : FrameLayout(context, attrs, defStyleAttr) {
|
||||
|
||||
@@ -18,10 +23,15 @@ class AvatarView(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : Fr
|
||||
updateView()
|
||||
}
|
||||
|
||||
@Inject lateinit var contactRepo: ContactRepository
|
||||
|
||||
private var avatarRequest: Disposable? = null
|
||||
|
||||
constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0)
|
||||
constructor(context: Context) : this(context, null, 0)
|
||||
|
||||
init {
|
||||
AppComponentManager.appComponent.inject(this)
|
||||
View.inflate(context, R.layout.avatar_view, this)
|
||||
}
|
||||
|
||||
@@ -36,7 +46,13 @@ class AvatarView(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : Fr
|
||||
}
|
||||
|
||||
private fun updateView() {
|
||||
initial.text = if (contact?.name?.length ?: 0 > 0) contact?.name?.substring(0, 1) else "?"
|
||||
}
|
||||
avatarRequest?.dispose()
|
||||
photo.setImageDrawable(null)
|
||||
initial.text = "?"
|
||||
|
||||
contact?.let { contact ->
|
||||
avatarRequest = contactRepo.getAvatar(contact.photoUri).subscribe({ photo.setImageBitmap(it) }, {})
|
||||
initial.text = if (contact.name.isNotEmpty()) contact.name.substring(0, 1) else "?"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -7,12 +7,6 @@
|
||||
tools:background="@color/list_separator"
|
||||
tools:parentTag="com.moez.QKSMS.ui.view.AvatarView">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/photo"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:scaleType="centerCrop" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/initial"
|
||||
style="@style/TextPrimary"
|
||||
@@ -22,4 +16,10 @@
|
||||
android:textAllCaps="true"
|
||||
tools:text="M" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/photo"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:scaleType="centerCrop" />
|
||||
|
||||
</merge>
|
||||
Reference in New Issue
Block a user