Store contact’s photoUri

So much less complicated now!
This commit is contained in:
Moez Bhatti
2019-11-24 00:27:39 -05:00
parent a1fcecd79e
commit 573b01ff65
15 changed files with 36 additions and 173 deletions
@@ -234,7 +234,7 @@ class MessagesAdapter @Inject constructor(
// Bind the avatar
if (!message.isMe()) {
view.avatar.threadId = conversation?.id ?: 0
view.avatar.setContact(contactCache[message.address])
view.avatar.setContact(contactCache[message.address]?.contact)
view.avatar.setVisible(!canGroup(message, next), View.INVISIBLE)
}
@@ -51,7 +51,7 @@ class ChipsAdapter @Inject constructor() : QkAdapter<Chip>() {
val chip = getItem(position)
val view = holder.containerView
view.avatar.setContact(chip.contact, chip.address)
view.avatar.setContact(chip.contact)
view.name.text = chip.contact?.name?.takeIf { it.isNotBlank() } ?: chip.address
}
@@ -54,7 +54,7 @@ class DetailedChipView(context: Context) : RelativeLayout(context) {
}
fun setChip(chip: Chip) {
avatar.setContact(chip.contact, chip.address)
avatar.setContact(chip.contact)
name.text = chip.contact?.name?.takeIf { it.isNotBlank() } ?: chip.address
info.text = chip.address
}
@@ -55,7 +55,7 @@ class ConversationRecipientAdapter @Inject constructor() : QkRealmAdapter<Recipi
val view = holder.containerView
view.avatar.threadId = threadId
view.avatar.setContact(recipient)
view.avatar.setContact(recipient.contact)
view.name.text = recipient.contact?.name ?: recipient.address
@@ -40,6 +40,7 @@ import com.moez.QKSMS.model.PhoneNumber
import com.moez.QKSMS.repository.ConversationRepository
import com.moez.QKSMS.util.GlideApp
import com.moez.QKSMS.util.Preferences
import com.moez.QKSMS.util.tryOrNull
import javax.inject.Inject
class WidgetAdapter(intent: Intent) : RemoteViewsService.RemoteViewsFactory {
@@ -130,17 +131,11 @@ class WidgetAdapter(intent: Intent) : RemoteViewsService.RemoteViewsFactory {
}
remoteViews.setImageViewBitmap(R.id.photo, null)
contact?.numbers?.firstOrNull()?.address?.let { address ->
val futureGet = GlideApp.with(context)
.asBitmap()
.load("tel:$address")
.submit(48.dpToPx(context), 48.dpToPx(context))
try {
remoteViews.setImageViewBitmap(R.id.photo, futureGet.get())
} catch (e: Exception) {
}
}
val futureGet = GlideApp.with(context)
.asBitmap()
.load(contact?.photoUri)
.submit(48.dpToPx(context), 48.dpToPx(context))
tryOrNull(false) { remoteViews.setImageViewBitmap(R.id.photo, futureGet.get()) }
// Name
remoteViews.setTextColor(R.id.name, textPrimary)