Eliminate need for explicitly creating ViewHolder

This commit is contained in:
Moez Bhatti
2017-10-05 01:02:46 -04:00
parent 9948b76faf
commit f5212cad43
8 changed files with 75 additions and 91 deletions
@@ -0,0 +1,6 @@
package com.moez.QKSMS.presentation.base
import android.support.v7.widget.RecyclerView
import android.view.View
class QkViewHolder(view: View) : RecyclerView.ViewHolder(view)
@@ -4,20 +4,22 @@ import android.content.Context
import android.content.Intent import android.content.Intent
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.ViewGroup import android.view.ViewGroup
import com.jakewharton.rxbinding2.view.RxView
import com.moez.QKSMS.R import com.moez.QKSMS.R
import com.moez.QKSMS.common.di.AppComponentManager import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.data.model.Message
import com.moez.QKSMS.data.repository.MessageRepository
import com.moez.QKSMS.presentation.messages.MessageListActivity
import com.moez.QKSMS.common.util.DateFormatter import com.moez.QKSMS.common.util.DateFormatter
import com.moez.QKSMS.common.util.ThemeManager import com.moez.QKSMS.common.util.ThemeManager
import com.moez.QKSMS.common.util.extensions.getColorCompat import com.moez.QKSMS.data.model.Message
import com.moez.QKSMS.data.repository.MessageRepository
import com.moez.QKSMS.presentation.base.QkViewHolder
import com.moez.QKSMS.presentation.messages.MessageListActivity
import io.realm.OrderedRealmCollection import io.realm.OrderedRealmCollection
import io.realm.RealmList import io.realm.RealmList
import io.realm.RealmRecyclerViewAdapter import io.realm.RealmRecyclerViewAdapter
import kotlinx.android.synthetic.main.conversation_list_item.view.*
import javax.inject.Inject import javax.inject.Inject
class ConversationAdapter(data: OrderedRealmCollection<Message>?) : RealmRecyclerViewAdapter<Message, ConversationViewHolder>(data, true) { class ConversationAdapter(data: OrderedRealmCollection<Message>?) : RealmRecyclerViewAdapter<Message, QkViewHolder>(data, true) {
@Inject lateinit var context: Context @Inject lateinit var context: Context
@Inject lateinit var messageRepo: MessageRepository @Inject lateinit var messageRepo: MessageRepository
@@ -28,41 +30,36 @@ class ConversationAdapter(data: OrderedRealmCollection<Message>?) : RealmRecycle
AppComponentManager.appComponent.inject(this) AppComponentManager.appComponent.inject(this)
} }
override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): ConversationViewHolder { override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): QkViewHolder {
val layoutRes = when(viewType) { val layoutRes = when (viewType) {
0 -> R.layout.conversation_list_item 0 -> R.layout.conversation_list_item
else -> R.layout.conversation_list_item_unread else -> R.layout.conversation_list_item_unread
} }
val layoutInflater = LayoutInflater.from(context) val layoutInflater = LayoutInflater.from(context)
val viewHolder = ConversationViewHolder(layoutInflater.inflate(layoutRes, parent, false)) val view = layoutInflater.inflate(layoutRes, parent, false)
if (viewType == 1) viewHolder.date.setTextColor(themeManager.color) if (viewType == 1) {
view.date.setTextColor(themeManager.color)
return viewHolder
}
override fun onBindViewHolder(viewHolder: ConversationViewHolder, position: Int) {
val message = getItem(position)!!
val conversation = messageRepo.getConversation(message.threadId)
viewHolder.itemView.setOnClickListener {
context.startActivity(Intent(context, MessageListActivity::class.java)
.putExtra("threadId", message.threadId))
} }
val dateColor = if (message.read) context.getColorCompat(R.color.textTertiary) else themeManager.color return QkViewHolder(view)
val snippetColor = context.getColorCompat(if (message.read) R.color.textTertiary else R.color.textPrimary) }
viewHolder.avatar.contacts = conversation?.contacts ?: RealmList() override fun onBindViewHolder(viewHolder: QkViewHolder, position: Int) {
viewHolder.title.text = conversation?.getTitle() val message = getItem(position)!!
val conversation = messageRepo.getConversation(message.threadId)
val view = viewHolder.itemView
viewHolder.date.text = dateFormatter.getConversationTimestamp(message.date) RxView.clicks(view)
viewHolder.date.setTextColor(dateColor) .map { Intent(context, MessageListActivity::class.java) }
.doOnNext { intent -> intent.putExtra("threadId", message.threadId) }
.subscribe { intent -> context.startActivity(intent) }
viewHolder.snippet.text = message.body view.avatars.contacts = conversation?.contacts ?: RealmList()
viewHolder.snippet.setTextColor(snippetColor) view.title.text = conversation?.getTitle()
viewHolder.snippet.maxLines = if (message.read) 1 else 3 view.date.text = dateFormatter.getConversationTimestamp(message.date)
view.snippet.text = message.body
} }
override fun getItemViewType(position: Int): Int { override fun getItemViewType(position: Int): Int {
@@ -1,16 +0,0 @@
package com.moez.QKSMS.presentation.conversations
import android.support.v7.widget.RecyclerView
import android.view.View
import android.widget.TextView
import com.moez.QKSMS.R
import com.moez.QKSMS.presentation.view.GroupAvatarView
class ConversationViewHolder(view: View) : RecyclerView.ViewHolder(view) {
val avatar: GroupAvatarView = view.findViewById(R.id.avatars)
val title: TextView = view.findViewById(R.id.title)
val date: TextView = view.findViewById(R.id.date)
val snippet: TextView = view.findViewById(R.id.snippet)
}
@@ -4,6 +4,7 @@ import android.content.Context
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import com.jakewharton.rxbinding2.view.RxView
import com.moez.QKSMS.R import com.moez.QKSMS.R
import com.moez.QKSMS.common.di.AppComponentManager import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.common.util.DateFormatter import com.moez.QKSMS.common.util.DateFormatter
@@ -13,13 +14,15 @@ import com.moez.QKSMS.common.util.extensions.setBackgroundTint
import com.moez.QKSMS.common.util.extensions.setPadding import com.moez.QKSMS.common.util.extensions.setPadding
import com.moez.QKSMS.data.model.Message import com.moez.QKSMS.data.model.Message
import com.moez.QKSMS.data.repository.ContactRepository import com.moez.QKSMS.data.repository.ContactRepository
import com.moez.QKSMS.presentation.base.QkViewHolder
import io.realm.OrderedRealmCollection import io.realm.OrderedRealmCollection
import io.realm.RealmRecyclerViewAdapter import io.realm.RealmRecyclerViewAdapter
import kotlinx.android.synthetic.main.message_list_item_in.view.*
import timber.log.Timber import timber.log.Timber
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
import javax.inject.Inject import javax.inject.Inject
class MessageAdapter(data: OrderedRealmCollection<Message>?) : RealmRecyclerViewAdapter<Message, MessageViewHolder>(data, true) { class MessageAdapter(data: OrderedRealmCollection<Message>?) : RealmRecyclerViewAdapter<Message, QkViewHolder>(data, true) {
companion object { companion object {
private val VIEWTYPE_ME = -1 private val VIEWTYPE_ME = -1
@@ -37,7 +40,7 @@ class MessageAdapter(data: OrderedRealmCollection<Message>?) : RealmRecyclerView
AppComponentManager.appComponent.inject(this) AppComponentManager.appComponent.inject(this)
} }
override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): MessageViewHolder { override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): QkViewHolder {
val layoutRes: Int val layoutRes: Int
val bubbleColor: Int val bubbleColor: Int
when (viewType) { when (viewType) {
@@ -52,69 +55,72 @@ class MessageAdapter(data: OrderedRealmCollection<Message>?) : RealmRecyclerView
} }
val layoutInflater = LayoutInflater.from(context) val layoutInflater = LayoutInflater.from(context)
val viewHolder = MessageViewHolder(layoutInflater.inflate(layoutRes, parent, false)) val view = layoutInflater.inflate(layoutRes, parent, false)
viewHolder.body.setBackgroundTint(bubbleColor)
view.body.setBackgroundTint(bubbleColor)
if (viewType != VIEWTYPE_ME) { if (viewType != VIEWTYPE_ME) {
viewHolder.avatar?.contact = contactRepo.getContactFromCache(people[viewType]) view.avatar?.contact = contactRepo.getContactFromCache(people[viewType])
} }
return viewHolder return QkViewHolder(view)
} }
override fun onBindViewHolder(viewHolder: MessageViewHolder, position: Int) { override fun onBindViewHolder(viewHolder: QkViewHolder, position: Int) {
val message = getItem(position)!! val message = getItem(position)!!
val view = viewHolder.itemView
viewHolder.itemView.setOnClickListener { Timber.v(message.toString()) } RxView.clicks(view).subscribe { Timber.v(message.toString()) }
bindGrouping(view, position)
bindGrouping(viewHolder, position) view.status?.visibility = when {
viewHolder.status?.visibility = when {
message.isSending() || message.isFailedMessage() -> View.VISIBLE message.isSending() || message.isFailedMessage() -> View.VISIBLE
else -> View.GONE else -> View.GONE
} }
viewHolder.status?.text = when {
view.status?.text = when {
message.isSending() -> "Sending..." message.isSending() -> "Sending..."
message.isFailedMessage() -> "Failed to send. Tap to try again" message.isFailedMessage() -> "Failed to send. Tap to try again"
else -> null else -> null
} }
viewHolder.body.text = message.body view.body.text = message.body
viewHolder.timestamp.text = dateFormatter.getMessageTimestamp(message.date) view.timestamp.text = dateFormatter.getMessageTimestamp(message.date)
} }
private fun bindGrouping(viewHolder: MessageViewHolder, position: Int) { private fun bindGrouping(view: View, position: Int) {
val message = getItem(position)!! val message = getItem(position)!!
val previous = if (position == 0) null else getItem(position - 1) val previous = if (position == 0) null else getItem(position - 1)
val next = if (position == itemCount - 1) null else getItem(position + 1) val next = if (position == itemCount - 1) null else getItem(position + 1)
val diff = TimeUnit.MILLISECONDS.toMinutes(message.date - (previous?.date ?: 0)) val diff = TimeUnit.MILLISECONDS.toMinutes(message.date - (previous?.date ?: 0))
viewHolder.timestamp.visibility = if (diff < TIMESTAMP_THRESHOLD) View.GONE else View.VISIBLE
val sent = message.isMe() val sent = message.isMe()
val canGroupWithPrevious = canGroup(message, previous) val canGroupWithPrevious = canGroup(message, previous)
val canGroupWithNext = canGroup(message, next) val canGroupWithNext = canGroup(message, next)
view.timestamp.visibility = if (diff < TIMESTAMP_THRESHOLD) View.GONE else View.VISIBLE
when { when {
!canGroupWithPrevious && canGroupWithNext -> { !canGroupWithPrevious && canGroupWithNext -> {
viewHolder.itemView.setPadding(bottom = 2.dpToPx(context)) view.setPadding(bottom = 2.dpToPx(context))
viewHolder.body.setBackgroundResource(if (sent) R.drawable.message_out_first else R.drawable.message_in_first) view.body.setBackgroundResource(if (sent) R.drawable.message_out_first else R.drawable.message_in_first)
viewHolder.avatar?.visibility = View.INVISIBLE view.avatar?.visibility = View.INVISIBLE
} }
canGroupWithPrevious && canGroupWithNext -> { canGroupWithPrevious && canGroupWithNext -> {
viewHolder.itemView.setPadding(bottom = 2.dpToPx(context)) view.setPadding(bottom = 2.dpToPx(context))
viewHolder.body.setBackgroundResource(if (sent) R.drawable.message_out_middle else R.drawable.message_in_middle) view.body.setBackgroundResource(if (sent) R.drawable.message_out_middle else R.drawable.message_in_middle)
viewHolder.avatar?.visibility = View.INVISIBLE view.avatar?.visibility = View.INVISIBLE
} }
canGroupWithPrevious && !canGroupWithNext -> { canGroupWithPrevious && !canGroupWithNext -> {
viewHolder.itemView.setPadding(bottom = 16.dpToPx(context)) view.setPadding(bottom = 16.dpToPx(context))
viewHolder.body.setBackgroundResource(if (sent) R.drawable.message_out_last else R.drawable.message_in_last) view.body.setBackgroundResource(if (sent) R.drawable.message_out_last else R.drawable.message_in_last)
viewHolder.avatar?.visibility = View.VISIBLE view.avatar?.visibility = View.VISIBLE
} }
else -> { else -> {
viewHolder.itemView.setPadding(bottom = 16.dpToPx(context)) view.setPadding(bottom = 16.dpToPx(context))
viewHolder.body.setBackgroundResource(R.drawable.message_only) view.body.setBackgroundResource(R.drawable.message_only)
viewHolder.avatar?.visibility = View.VISIBLE view.avatar?.visibility = View.VISIBLE
} }
} }
} }
@@ -1,17 +0,0 @@
package com.moez.QKSMS.presentation.messages
import android.support.v7.widget.RecyclerView
import android.view.View
import android.widget.TextView
import com.moez.QKSMS.R
import com.moez.QKSMS.presentation.view.AvatarView
class MessageViewHolder(view: View) : RecyclerView.ViewHolder(view) {
val timestamp: TextView = view.findViewById(R.id.timestamp)
val message: View = view.findViewById(R.id.message)
val status: TextView? = view.findViewById(R.id.status)
val avatar: AvatarView? = view.findViewById(R.id.avatar)
val body: TextView = view.findViewById(R.id.body)
}
@@ -50,10 +50,11 @@
android:id="@+id/snippet" android:id="@+id/snippet"
style="@style/TextSecondary" style="@style/TextSecondary"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:ellipsize="end"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_marginTop="2dp" android:layout_marginTop="2dp"
android:ellipsize="end"
android:maxLines="1"
tools:text="Hey! How's it going?" /> tools:text="Hey! How's it going?" />
</LinearLayout> </LinearLayout>
@@ -57,6 +57,7 @@
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_marginTop="2dp" android:layout_marginTop="2dp"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="3"
android:textColor="@color/textPrimary" android:textColor="@color/textPrimary"
android:textStyle="bold" android:textStyle="bold"
tools:text="Hey! How's it going?" /> tools:text="Hey! How's it going?" />
@@ -54,6 +54,12 @@
android:paddingTop="8dp" android:paddingTop="8dp"
tools:text="Hey! How's it going?" /> tools:text="Hey! How's it going?" />
<TextView
android:id="@+id/status"
android:layout_width="0dp"
android:layout_height="0dp"
android:visibility="gone" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>