diff --git a/qksms/build.gradle b/qksms/build.gradle index 006ebef2..48066138 100644 --- a/qksms/build.gradle +++ b/qksms/build.gradle @@ -40,6 +40,7 @@ dependencies { compile 'com.android.support.constraint:constraint-layout:1.0.2' compile 'com.android.support:design:26.1.0' compile 'com.bugsnag:bugsnag-android:3.9.0' + compile 'com.github.bumptech.glide:glide:4.3.0' compile "com.google.dagger:dagger:2.11" compile 'com.jakewharton.rxbinding2:rxbinding-kotlin:2.0.0' compile 'com.jakewharton.timber:timber:4.5.1' 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 378c0c59..f40cb5a6 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 @@ -1,16 +1,11 @@ package com.moez.QKSMS.data.repository import android.content.Context -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.Flowable -import io.reactivex.Maybe -import io.reactivex.android.schedulers.AndroidSchedulers -import io.reactivex.schedulers.Schedulers import io.realm.Realm import javax.inject.Inject import javax.inject.Singleton @@ -70,19 +65,4 @@ class ContactRepository @Inject constructor(val context: Context) { return contact } - // TODO cache the photos - fun getAvatar(uriString: String): Maybe { - 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()) - } - } \ No newline at end of file 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 d6cafc81..6f8976ab 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 @@ -5,15 +5,12 @@ import android.content.res.ColorStateList import android.util.AttributeSet import android.view.View import android.widget.FrameLayout +import com.bumptech.glide.Glide import com.moez.QKSMS.R import com.moez.QKSMS.common.di.AppComponentManager -import com.moez.QKSMS.data.model.Contact -import com.moez.QKSMS.data.repository.ContactRepository import com.moez.QKSMS.common.util.extensions.getColorCompat -import io.reactivex.disposables.Disposable +import com.moez.QKSMS.data.model.Contact import kotlinx.android.synthetic.main.avatar_view.view.* -import javax.inject.Inject - class AvatarView(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : FrameLayout(context, attrs, defStyleAttr) { @@ -23,9 +20,6 @@ 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) @@ -47,12 +41,11 @@ class AvatarView(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : Fr } private fun updateView() { - avatarRequest?.dispose() photo.setImageDrawable(null) initial.text = "?" contact?.let { contact -> - avatarRequest = contactRepo.getAvatar(contact.photoUri).subscribe({ photo.setImageBitmap(it) }, {}) + Glide.with(photo).load(contact.photoUri).into(photo) initial.text = if (contact.name.isNotEmpty()) contact.name.substring(0, 1) else "?" } }