From 9c98e4d270a70e26b6442f2c581f8ce0351d8db1 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 21 Sep 2017 13:34:33 -0400 Subject: [PATCH] Group messages by time, don't show avatars for outgoing messages --- .../moez/QKSMS/ui/messages/MessageAdapter.kt | 61 +++++++------- .../QKSMS/ui/messages/MessageViewHolder.kt | 2 +- .../java/com/moez/QKSMS/ui/view/AvatarView.kt | 10 +-- .../main/res/layout/message_list_item_in.xml | 79 ++++++++++--------- .../main/res/layout/message_list_item_out.xml | 76 +++++++++--------- 5 files changed, 116 insertions(+), 112 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 7634b011..0ce28733 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 @@ -12,6 +12,7 @@ import com.moez.QKSMS.util.DateFormatter import io.realm.OrderedRealmCollection import io.realm.RealmRecyclerViewAdapter import timber.log.Timber +import java.util.concurrent.TimeUnit import javax.inject.Inject class MessageAdapter(context: Context, data: OrderedRealmCollection?) : @@ -41,14 +42,14 @@ class MessageAdapter(context: Context, data: OrderedRealmCollection?) : val message = getItem(position)!! viewHolder.itemView.setOnClickListener { Timber.v(message.toString()) } - + bindGrouping(viewHolder, position) - viewHolder.avatar.contact = Contact() + viewHolder.avatar?.apply { contact = Contact() } viewHolder.body.text = message.body viewHolder.timestamp.text = dateFormatter.getMessageTimestamp(message.date) } - + private fun bindGrouping(viewHolder: MessageViewHolder, position: Int) { val message = getItem(position)!! @@ -56,41 +57,37 @@ class MessageAdapter(context: Context, data: OrderedRealmCollection?) : val next = if (position == itemCount - 1) null else getItem(position + 1) val sent = message.isMe() - if (previous != null && next != null) { // Mid message - if (previous.isMe() == sent && sent == next.isMe()) { // Mid in group + val diff = TimeUnit.MILLISECONDS.toMinutes(message.dateSent - (previous?.dateSent ?: 0)) + + val canGroupWithPrevious = canGroup(message, previous) + val canGroupWithNext = canGroup(message, next) + + when { + !canGroupWithPrevious && canGroupWithNext -> { + viewHolder.body.setBackgroundResource(if (sent) R.drawable.message_out_first else R.drawable.message_in_first) + viewHolder.avatar?.apply { visibility = View.INVISIBLE } + } + canGroupWithPrevious && canGroupWithNext -> { viewHolder.body.setBackgroundResource(if (sent) R.drawable.message_out_middle else R.drawable.message_in_middle) - viewHolder.avatar.visibility = View.INVISIBLE - } else if (previous.isMe() == sent && sent != next.isMe()) { // Last in group + viewHolder.avatar?.apply { visibility = View.INVISIBLE } + } + canGroupWithPrevious && !canGroupWithNext -> { viewHolder.body.setBackgroundResource(if (sent) R.drawable.message_out_last else R.drawable.message_in_last) - viewHolder.avatar.visibility = View.VISIBLE - } else if (previous.isMe() != sent && sent == next.isMe()) { // First in group - viewHolder.body.setBackgroundResource(if (sent) R.drawable.message_out_first else R.drawable.message_in_first) - viewHolder.avatar.visibility = View.INVISIBLE - } else { // Only in group - viewHolder.body.setBackgroundResource(R.drawable.message_only) - viewHolder.avatar.visibility = View.VISIBLE + viewHolder.avatar?.apply { visibility = View.VISIBLE } } - } else if (previous != null && next == null) { // Last message - if (previous.isMe() == sent) { // Last in group - viewHolder.body.setBackgroundResource(if (sent) R.drawable.message_out_last else R.drawable.message_in_last) - viewHolder.avatar.visibility = View.VISIBLE - } else { // Only in group + else -> { viewHolder.body.setBackgroundResource(R.drawable.message_only) - viewHolder.avatar.visibility = View.VISIBLE + viewHolder.avatar?.apply { visibility = View.VISIBLE } } - } else if (previous == null && next != null) { // First message - if (sent == next.isMe()) { // First in group - viewHolder.body.setBackgroundResource(if (sent) R.drawable.message_out_first else R.drawable.message_in_first) - viewHolder.avatar.visibility = View.INVISIBLE - } else { // Only in group - viewHolder.body.setBackgroundResource(R.drawable.message_only) - viewHolder.avatar.visibility = View.VISIBLE - } - } else { // Only message - viewHolder.body.setBackgroundResource(R.drawable.message_only) - viewHolder.avatar.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 } override fun getItemViewType(position: Int): Int { diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageViewHolder.kt b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageViewHolder.kt index 27f1c877..903c5c2c 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageViewHolder.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageViewHolder.kt @@ -8,7 +8,7 @@ import com.moez.QKSMS.ui.view.AvatarView class MessageViewHolder(view: View) : RecyclerView.ViewHolder(view) { - val avatar: AvatarView = view.findViewById(R.id.avatar) + val avatar: AvatarView? = view.findViewById(R.id.avatar) val body: TextView = view.findViewById(R.id.body) val timestamp: TextView = view.findViewById(R.id.timestamp) diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/view/AvatarView.kt b/qksms/src/main/java/com/moez/QKSMS/ui/view/AvatarView.kt index 5fab550d..31d945c5 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/view/AvatarView.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/view/AvatarView.kt @@ -20,16 +20,16 @@ class AvatarView(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : Fr constructor(context: Context) : this(context, null, 0) init { - if (!isInEditMode) { - View.inflate(context, R.layout.avatar_view, this) - } + View.inflate(context, R.layout.avatar_view, this) } override fun onFinishInflate() { super.onFinishInflate() - updateView() - setBackgroundResource(R.drawable.message_only) + + if (!isInEditMode) { + updateView() + } } private fun updateView() { diff --git a/qksms/src/main/res/layout/message_list_item_in.xml b/qksms/src/main/res/layout/message_list_item_in.xml index 2d1e10cd..0e8db990 100644 --- a/qksms/src/main/res/layout/message_list_item_in.xml +++ b/qksms/src/main/res/layout/message_list_item_in.xml @@ -3,49 +3,56 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:gravity="start|bottom" - android:orientation="horizontal" - android:paddingBottom="2dp" - android:paddingEnd="60dp" - android:paddingStart="12dp" - android:paddingTop="2dp"> + android:orientation="vertical"> - + + android:layout_marginBottom="2dp" + android:gravity="start|bottom" + android:orientation="horizontal" + android:paddingEnd="60dp" + android:paddingStart="12dp"> - + - + android:layout_weight="1" + android:orientation="vertical"> + + + + diff --git a/qksms/src/main/res/layout/message_list_item_out.xml b/qksms/src/main/res/layout/message_list_item_out.xml index a3a7cc8a..a17f7e08 100644 --- a/qksms/src/main/res/layout/message_list_item_out.xml +++ b/qksms/src/main/res/layout/message_list_item_out.xml @@ -3,51 +3,51 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:gravity="end|bottom" - android:orientation="horizontal" - android:paddingBottom="2dp" - android:paddingEnd="12dp" - android:paddingStart="60dp" - android:paddingTop="2dp"> + android:orientation="vertical"> + + + android:layout_marginBottom="2dp" + android:gravity="end|bottom" + android:paddingEnd="12dp" + android:paddingStart="60dp"> - + android:layout_weight="1" + android:orientation="vertical"> - + + + - - \ No newline at end of file