From 1ed758c2451fd1415e2b21746315babe238ad212 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Wed, 27 Sep 2017 21:16:22 -0400 Subject: [PATCH] Bind avatars inside of conversation --- .../java/com/moez/QKSMS/data/model/Message.kt | 1 + .../data/repository/ContactRepository.kt | 9 +++++ .../com/moez/QKSMS/data/sync/SyncManager.kt | 1 + .../moez/QKSMS/ui/messages/MessageAdapter.kt | 36 ++++++++++++------- 4 files changed, 35 insertions(+), 12 deletions(-) diff --git a/qksms/src/main/java/com/moez/QKSMS/data/model/Message.kt b/qksms/src/main/java/com/moez/QKSMS/data/model/Message.kt index 7629fa5e..20906fe7 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/model/Message.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/model/Message.kt @@ -8,6 +8,7 @@ open class Message : RealmObject() { @PrimaryKey var id: Long = 0 var threadId: Long = 0 + var address: String = "" var boxId: Int = 0 var type: String = "" var body: 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 82dca94b..631aa940 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 @@ -68,6 +68,15 @@ class ContactRepository(val context: Context) { return Contact() } + fun getContactFromCache(address: String): Contact? { + val realm = Realm.getDefaultInstance() + val contact = realm.where(Contact::class.java) + .equalTo("address", address) + .findFirst() + realm.close() + return contact + } + // TODO cache the photos fun getAvatar(uriString: String): Maybe { return Maybe.just(uriString) diff --git a/qksms/src/main/java/com/moez/QKSMS/data/sync/SyncManager.kt b/qksms/src/main/java/com/moez/QKSMS/data/sync/SyncManager.kt index 2090ef04..204d8f28 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/sync/SyncManager.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/sync/SyncManager.kt @@ -81,6 +81,7 @@ class SyncManager(val context: Context, private val contactsRepo: ContactReposit when (type) { "sms" -> { threadId = cursor.getLong(columnsMap.smsThreadId) + address = cursor.getString(columnsMap.smsAddress) boxId = cursor.getInt(columnsMap.smsType) date = cursor.getLong(columnsMap.mmsDate) dateSent = cursor.getLong(columnsMap.mmsDateSent) diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageAdapter.kt index d9c495fa..96c57d1b 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageAdapter.kt @@ -6,8 +6,8 @@ import android.view.View import android.view.ViewGroup import com.moez.QKSMS.R import com.moez.QKSMS.dagger.AppComponentManager -import com.moez.QKSMS.data.model.Contact import com.moez.QKSMS.data.model.Message +import com.moez.QKSMS.data.repository.ContactRepository import com.moez.QKSMS.util.DateFormatter import com.moez.QKSMS.util.ThemeManager import com.moez.QKSMS.util.extensions.dpToPx @@ -22,15 +22,16 @@ import javax.inject.Inject class MessageAdapter(data: OrderedRealmCollection?) : RealmRecyclerViewAdapter(data, true) { companion object { + private val VIEWTYPE_ME = -1 private val TIMESTAMP_THRESHOLD = 60 - - private val VIEWTYPE_IN = 0 - private val VIEWTYPE_OUT = 1 } @Inject lateinit var context: Context @Inject lateinit var themeManager: ThemeManager @Inject lateinit var dateFormatter: DateFormatter + @Inject lateinit var contactRepo: ContactRepository + + private val people = ArrayList() init { AppComponentManager.appComponent.inject(this) @@ -40,19 +41,24 @@ class MessageAdapter(data: OrderedRealmCollection?) : RealmRecyclerView val layoutRes: Int val bubbleColor: Int when (viewType) { - VIEWTYPE_IN -> { - layoutRes = R.layout.message_list_item_in - bubbleColor = themeManager.bubbleColor - } - else -> { + VIEWTYPE_ME -> { layoutRes = R.layout.message_list_item_out bubbleColor = themeManager.color } + else -> { + layoutRes = R.layout.message_list_item_in + bubbleColor = themeManager.bubbleColor + } } - val layoutInflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater + val layoutInflater = LayoutInflater.from(context) val viewHolder = MessageViewHolder(layoutInflater.inflate(layoutRes, parent, false)) viewHolder.body.setBackgroundTint(bubbleColor) + + if (viewType != VIEWTYPE_ME) { + viewHolder.avatar?.contact = contactRepo.getContactFromCache(people[viewType]) + } + return viewHolder } @@ -73,7 +79,6 @@ class MessageAdapter(data: OrderedRealmCollection?) : RealmRecyclerView else -> null } - viewHolder.avatar?.apply { contact = Contact() } viewHolder.body.text = message.body viewHolder.timestamp.text = dateFormatter.getMessageTimestamp(message.date) } @@ -122,6 +127,13 @@ class MessageAdapter(data: OrderedRealmCollection?) : RealmRecyclerView override fun getItemViewType(position: Int): Int { val message = getItem(position)!! - return if (message.isMe()) VIEWTYPE_OUT else VIEWTYPE_IN + if (message.isMe()) { + return VIEWTYPE_ME + } + + if (!people.contains(message.address)) { + people.add(message.address) + } + return people.indexOf(message.address) } } \ No newline at end of file