forked from upstream-mirrors/quik
Eliminate need for explicitly creating ViewHolder
This commit is contained in:
@@ -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)
|
||||
+26
-29
@@ -4,20 +4,22 @@ import android.content.Context
|
||||
import android.content.Intent
|
||||
import android.view.LayoutInflater
|
||||
import android.view.ViewGroup
|
||||
import com.jakewharton.rxbinding2.view.RxView
|
||||
import com.moez.QKSMS.R
|
||||
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.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.RealmList
|
||||
import io.realm.RealmRecyclerViewAdapter
|
||||
import kotlinx.android.synthetic.main.conversation_list_item.view.*
|
||||
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 messageRepo: MessageRepository
|
||||
@@ -28,41 +30,36 @@ class ConversationAdapter(data: OrderedRealmCollection<Message>?) : RealmRecycle
|
||||
AppComponentManager.appComponent.inject(this)
|
||||
}
|
||||
|
||||
override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): ConversationViewHolder {
|
||||
val layoutRes = when(viewType) {
|
||||
override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): QkViewHolder {
|
||||
val layoutRes = when (viewType) {
|
||||
0 -> R.layout.conversation_list_item
|
||||
else -> R.layout.conversation_list_item_unread
|
||||
}
|
||||
|
||||
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)
|
||||
|
||||
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))
|
||||
if (viewType == 1) {
|
||||
view.date.setTextColor(themeManager.color)
|
||||
}
|
||||
|
||||
val dateColor = if (message.read) context.getColorCompat(R.color.textTertiary) else themeManager.color
|
||||
val snippetColor = context.getColorCompat(if (message.read) R.color.textTertiary else R.color.textPrimary)
|
||||
return QkViewHolder(view)
|
||||
}
|
||||
|
||||
viewHolder.avatar.contacts = conversation?.contacts ?: RealmList()
|
||||
viewHolder.title.text = conversation?.getTitle()
|
||||
override fun onBindViewHolder(viewHolder: QkViewHolder, position: Int) {
|
||||
val message = getItem(position)!!
|
||||
val conversation = messageRepo.getConversation(message.threadId)
|
||||
val view = viewHolder.itemView
|
||||
|
||||
viewHolder.date.text = dateFormatter.getConversationTimestamp(message.date)
|
||||
viewHolder.date.setTextColor(dateColor)
|
||||
RxView.clicks(view)
|
||||
.map { Intent(context, MessageListActivity::class.java) }
|
||||
.doOnNext { intent -> intent.putExtra("threadId", message.threadId) }
|
||||
.subscribe { intent -> context.startActivity(intent) }
|
||||
|
||||
viewHolder.snippet.text = message.body
|
||||
viewHolder.snippet.setTextColor(snippetColor)
|
||||
viewHolder.snippet.maxLines = if (message.read) 1 else 3
|
||||
view.avatars.contacts = conversation?.contacts ?: RealmList()
|
||||
view.title.text = conversation?.getTitle()
|
||||
view.date.text = dateFormatter.getConversationTimestamp(message.date)
|
||||
view.snippet.text = message.body
|
||||
}
|
||||
|
||||
override fun getItemViewType(position: Int): Int {
|
||||
|
||||
-16
@@ -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.View
|
||||
import android.view.ViewGroup
|
||||
import com.jakewharton.rxbinding2.view.RxView
|
||||
import com.moez.QKSMS.R
|
||||
import com.moez.QKSMS.common.di.AppComponentManager
|
||||
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.data.model.Message
|
||||
import com.moez.QKSMS.data.repository.ContactRepository
|
||||
import com.moez.QKSMS.presentation.base.QkViewHolder
|
||||
import io.realm.OrderedRealmCollection
|
||||
import io.realm.RealmRecyclerViewAdapter
|
||||
import kotlinx.android.synthetic.main.message_list_item_in.view.*
|
||||
import timber.log.Timber
|
||||
import java.util.concurrent.TimeUnit
|
||||
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 {
|
||||
private val VIEWTYPE_ME = -1
|
||||
@@ -37,7 +40,7 @@ class MessageAdapter(data: OrderedRealmCollection<Message>?) : RealmRecyclerView
|
||||
AppComponentManager.appComponent.inject(this)
|
||||
}
|
||||
|
||||
override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): MessageViewHolder {
|
||||
override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): QkViewHolder {
|
||||
val layoutRes: Int
|
||||
val bubbleColor: Int
|
||||
when (viewType) {
|
||||
@@ -52,69 +55,72 @@ class MessageAdapter(data: OrderedRealmCollection<Message>?) : RealmRecyclerView
|
||||
}
|
||||
|
||||
val layoutInflater = LayoutInflater.from(context)
|
||||
val viewHolder = MessageViewHolder(layoutInflater.inflate(layoutRes, parent, false))
|
||||
viewHolder.body.setBackgroundTint(bubbleColor)
|
||||
val view = layoutInflater.inflate(layoutRes, parent, false)
|
||||
|
||||
view.body.setBackgroundTint(bubbleColor)
|
||||
|
||||
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 view = viewHolder.itemView
|
||||
|
||||
viewHolder.itemView.setOnClickListener { Timber.v(message.toString()) }
|
||||
RxView.clicks(view).subscribe { Timber.v(message.toString()) }
|
||||
bindGrouping(view, position)
|
||||
|
||||
bindGrouping(viewHolder, position)
|
||||
|
||||
viewHolder.status?.visibility = when {
|
||||
view.status?.visibility = when {
|
||||
message.isSending() || message.isFailedMessage() -> View.VISIBLE
|
||||
else -> View.GONE
|
||||
}
|
||||
viewHolder.status?.text = when {
|
||||
|
||||
view.status?.text = when {
|
||||
message.isSending() -> "Sending..."
|
||||
message.isFailedMessage() -> "Failed to send. Tap to try again"
|
||||
else -> null
|
||||
}
|
||||
|
||||
viewHolder.body.text = message.body
|
||||
viewHolder.timestamp.text = dateFormatter.getMessageTimestamp(message.date)
|
||||
view.body.text = message.body
|
||||
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 previous = if (position == 0) 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))
|
||||
viewHolder.timestamp.visibility = if (diff < TIMESTAMP_THRESHOLD) View.GONE else View.VISIBLE
|
||||
|
||||
val sent = message.isMe()
|
||||
val canGroupWithPrevious = canGroup(message, previous)
|
||||
val canGroupWithNext = canGroup(message, next)
|
||||
|
||||
view.timestamp.visibility = if (diff < TIMESTAMP_THRESHOLD) View.GONE else View.VISIBLE
|
||||
|
||||
when {
|
||||
!canGroupWithPrevious && canGroupWithNext -> {
|
||||
viewHolder.itemView.setPadding(bottom = 2.dpToPx(context))
|
||||
viewHolder.body.setBackgroundResource(if (sent) R.drawable.message_out_first else R.drawable.message_in_first)
|
||||
viewHolder.avatar?.visibility = View.INVISIBLE
|
||||
view.setPadding(bottom = 2.dpToPx(context))
|
||||
view.body.setBackgroundResource(if (sent) R.drawable.message_out_first else R.drawable.message_in_first)
|
||||
view.avatar?.visibility = View.INVISIBLE
|
||||
}
|
||||
canGroupWithPrevious && canGroupWithNext -> {
|
||||
viewHolder.itemView.setPadding(bottom = 2.dpToPx(context))
|
||||
viewHolder.body.setBackgroundResource(if (sent) R.drawable.message_out_middle else R.drawable.message_in_middle)
|
||||
viewHolder.avatar?.visibility = View.INVISIBLE
|
||||
view.setPadding(bottom = 2.dpToPx(context))
|
||||
view.body.setBackgroundResource(if (sent) R.drawable.message_out_middle else R.drawable.message_in_middle)
|
||||
view.avatar?.visibility = View.INVISIBLE
|
||||
}
|
||||
canGroupWithPrevious && !canGroupWithNext -> {
|
||||
viewHolder.itemView.setPadding(bottom = 16.dpToPx(context))
|
||||
viewHolder.body.setBackgroundResource(if (sent) R.drawable.message_out_last else R.drawable.message_in_last)
|
||||
viewHolder.avatar?.visibility = View.VISIBLE
|
||||
view.setPadding(bottom = 16.dpToPx(context))
|
||||
view.body.setBackgroundResource(if (sent) R.drawable.message_out_last else R.drawable.message_in_last)
|
||||
view.avatar?.visibility = View.VISIBLE
|
||||
}
|
||||
else -> {
|
||||
viewHolder.itemView.setPadding(bottom = 16.dpToPx(context))
|
||||
viewHolder.body.setBackgroundResource(R.drawable.message_only)
|
||||
viewHolder.avatar?.visibility = View.VISIBLE
|
||||
view.setPadding(bottom = 16.dpToPx(context))
|
||||
view.body.setBackgroundResource(R.drawable.message_only)
|
||||
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)
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user