From 48e2f5e4c1ea71ba9264210a2bd7a5c1e0cd2c3e Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 26 Sep 2017 02:10:11 -0400 Subject: [PATCH] Add timestamps to conversations --- .../ui/conversations/ConversationAdapter.kt | 9 +++++- .../conversations/ConversationViewHolder.kt | 1 + .../res/layout/conversation_list_item.xml | 30 ++++++++++++++----- qksms/src/main/res/values/styles.xml | 5 ++++ 4 files changed, 37 insertions(+), 8 deletions(-) diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationAdapter.kt index 882c71f3..c67915be 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationAdapter.kt @@ -9,6 +9,7 @@ import com.moez.QKSMS.dagger.AppComponentManager import com.moez.QKSMS.data.model.Message import com.moez.QKSMS.data.repository.MessageRepository import com.moez.QKSMS.ui.messages.MessageListActivity +import com.moez.QKSMS.util.DateFormatter import com.moez.QKSMS.util.extensions.getColorCompat import io.realm.OrderedRealmCollection import io.realm.RealmList @@ -19,6 +20,7 @@ class ConversationAdapter(data: OrderedRealmCollection?) : RealmRecycle @Inject lateinit var context: Context @Inject lateinit var messageRepo: MessageRepository + @Inject lateinit var dateFormatter: DateFormatter init { AppComponentManager.appComponent.inject(this) @@ -38,9 +40,14 @@ class ConversationAdapter(data: OrderedRealmCollection?) : RealmRecycle .putExtra("threadId", message.threadId)) } + val textColor = context.getColorCompat(if (message.read) R.color.textTertiary else R.color.textPrimary) + viewHolder.avatar.contacts = conversation?.contacts ?: RealmList() viewHolder.title.text = conversation?.getTitle() + viewHolder.date.text = dateFormatter.getMessageTimestamp(message.date) + viewHolder.date.setTextColor(textColor) viewHolder.snippet.text = message.body - viewHolder.snippet.setTextColor(context.getColorCompat(if (message.read) R.color.textTertiary else R.color.textPrimary)) + viewHolder.snippet.setTextColor(textColor) + viewHolder.snippet.maxLines = if (message.read) 1 else 3 } } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationViewHolder.kt b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationViewHolder.kt index e6b01ab6..b79dcb92 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationViewHolder.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationViewHolder.kt @@ -10,6 +10,7 @@ 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) } diff --git a/qksms/src/main/res/layout/conversation_list_item.xml b/qksms/src/main/res/layout/conversation_list_item.xml index c28fa84a..3b042c10 100644 --- a/qksms/src/main/res/layout/conversation_list_item.xml +++ b/qksms/src/main/res/layout/conversation_list_item.xml @@ -23,18 +23,34 @@ android:layout_weight="1" android:orientation="vertical"> - + + + + + + + 14sp + +