Group messages by time, don't show avatars for outgoing messages

This commit is contained in:
Moez Bhatti
2017-09-21 13:34:33 -04:00
parent f7d86aec24
commit 9c98e4d270
5 changed files with 116 additions and 112 deletions
@@ -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<Message>?) :
@@ -41,14 +42,14 @@ class MessageAdapter(context: Context, data: OrderedRealmCollection<Message>?) :
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<Message>?) :
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 {
@@ -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)
@@ -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() {
@@ -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">
<com.moez.QKSMS.ui.view.AvatarView
android:id="@+id/avatar"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_marginEnd="12dp" />
<TextView
android:id="@+id/timestamp"
style="@style/TextSecondary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:layout_marginTop="24dp"
android:gravity="center"
tools:text="Tue at 11:39pm" />
<LinearLayout
android:layout_width="0dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
android:layout_marginBottom="2dp"
android:gravity="start|bottom"
android:orientation="horizontal"
android:paddingEnd="60dp"
android:paddingStart="12dp">
<TextView
android:id="@+id/body"
style="@style/TextPrimary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start"
android:background="@drawable/message_only"
android:backgroundTint="@android:color/white"
android:gravity="start|center_vertical"
android:minHeight="36dp"
android:paddingBottom="8dp"
android:paddingEnd="12dp"
android:paddingStart="12dp"
android:paddingTop="8dp"
tools:text="Hey! How's it going?" />
<com.moez.QKSMS.ui.view.AvatarView
android:id="@+id/avatar"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_marginEnd="12dp" />
<TextView
android:id="@+id/timestamp"
style="@style/TextSecondary"
android:layout_width="match_parent"
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="start"
android:visibility="gone"
tools:text="2:50pm" />
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:id="@+id/body"
style="@style/TextPrimary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start"
android:background="@drawable/message_only"
android:backgroundTint="@android:color/white"
android:gravity="start|center_vertical"
android:minHeight="36dp"
android:paddingBottom="8dp"
android:paddingEnd="12dp"
android:paddingStart="12dp"
android:paddingTop="8dp"
tools:text="Hey! How's it going?" />
</LinearLayout>
</LinearLayout>
@@ -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">
<TextView
android:id="@+id/timestamp"
style="@style/TextSecondary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:layout_marginTop="24dp"
android:gravity="center"
tools:text="Tue at 11:39pm" />
<LinearLayout
android:layout_width="0dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
android:layout_marginBottom="2dp"
android:gravity="end|bottom"
android:paddingEnd="12dp"
android:paddingStart="60dp">
<TextView
android:id="@+id/body"
style="@style/TextPrimary"
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textColor="@color/textPrimaryLight"
android:layout_gravity="end"
android:background="@drawable/message_only"
android:backgroundTint="@color/colorPrimary"
android:gravity="start|center_vertical"
android:minHeight="36dp"
android:paddingBottom="8dp"
android:paddingEnd="12dp"
android:paddingStart="12dp"
android:paddingTop="8dp"
tools:text="Hey! How's it going?" />
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:id="@+id/timestamp"
style="@style/TextSecondary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="end"
android:visibility="gone"
tools:text="2:50pm" />
<TextView
android:id="@+id/body"
style="@style/TextPrimary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:background="@drawable/message_only"
android:backgroundTint="@color/colorPrimary"
android:gravity="start|center_vertical"
android:minHeight="36dp"
android:paddingBottom="8dp"
android:paddingEnd="12dp"
android:paddingStart="12dp"
android:paddingTop="8dp"
android:textColor="@color/textPrimaryLight"
tools:text="Hey! How's it going?" />
</LinearLayout>
</LinearLayout>
<com.moez.QKSMS.ui.view.AvatarView
android:id="@+id/avatar"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_marginStart="12dp" />
</LinearLayout>