From ff0e463cfa2e087f9f087814394092a0a3dff8e0 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 21 Sep 2017 13:44:00 -0400 Subject: [PATCH] Clean up MessageAdapter --- .../moez/QKSMS/ui/messages/MessageAdapter.kt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) 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 0ce28733..8e74db4d 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 @@ -19,6 +19,8 @@ class MessageAdapter(context: Context, data: OrderedRealmCollection?) : RealmRecyclerViewAdapter(context, data, true) { companion object { + private val TIMESTAMP_THRESHOLD = 60 + private val VIEWTYPE_IN = 0 private val VIEWTYPE_OUT = 1 } @@ -51,14 +53,14 @@ class MessageAdapter(context: Context, data: OrderedRealmCollection?) : } private fun bindGrouping(viewHolder: MessageViewHolder, 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 sent = message.isMe() - val diff = TimeUnit.MILLISECONDS.toMinutes(message.dateSent - (previous?.dateSent ?: 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 canGroupWithPrevious = canGroup(message, previous) val canGroupWithNext = canGroup(message, next) @@ -80,14 +82,12 @@ class MessageAdapter(context: Context, data: OrderedRealmCollection?) : viewHolder.avatar?.apply { visibility = View.VISIBLE } } } - - viewHolder.timestamp.visibility = if (diff >= 60) View.VISIBLE else View.GONE } - private fun canGroup(first: Message, second: Message?): Boolean { - if (second == null) return false - val diff = TimeUnit.MILLISECONDS.toMinutes(Math.abs(first.dateSent - second.dateSent)) - return first.isMe() == second.isMe() && diff < 60 + private fun canGroup(message: Message, other: Message?): Boolean { + if (other == null) return false + val diff = TimeUnit.MILLISECONDS.toMinutes(Math.abs(message.date - other.date)) + return message.isMe() == other.isMe() && diff < TIMESTAMP_THRESHOLD } override fun getItemViewType(position: Int): Int {