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 c67915be..bc3fd9b6 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 @@ -10,6 +10,7 @@ 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.ThemeManager import com.moez.QKSMS.util.extensions.getColorCompat import io.realm.OrderedRealmCollection import io.realm.RealmList @@ -21,14 +22,24 @@ class ConversationAdapter(data: OrderedRealmCollection?) : RealmRecycle @Inject lateinit var context: Context @Inject lateinit var messageRepo: MessageRepository @Inject lateinit var dateFormatter: DateFormatter + @Inject lateinit var themeManager: ThemeManager init { AppComponentManager.appComponent.inject(this) } override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): ConversationViewHolder { - val layoutInflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater - return ConversationViewHolder(layoutInflater.inflate(R.layout.conversation_list_item, parent, false)) + 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)) + + if (viewType == 1) viewHolder.date.setTextColor(themeManager.color) + + return viewHolder } override fun onBindViewHolder(viewHolder: ConversationViewHolder, position: Int) { @@ -40,14 +51,21 @@ class ConversationAdapter(data: OrderedRealmCollection?) : RealmRecycle .putExtra("threadId", message.threadId)) } - val textColor = context.getColorCompat(if (message.read) R.color.textTertiary else R.color.textPrimary) + 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) viewHolder.avatar.contacts = conversation?.contacts ?: RealmList() viewHolder.title.text = conversation?.getTitle() + viewHolder.date.text = dateFormatter.getMessageTimestamp(message.date) - viewHolder.date.setTextColor(textColor) + viewHolder.date.setTextColor(dateColor) + viewHolder.snippet.text = message.body - viewHolder.snippet.setTextColor(textColor) + viewHolder.snippet.setTextColor(snippetColor) viewHolder.snippet.maxLines = if (message.read) 1 else 3 } + + override fun getItemViewType(position: Int): Int { + return if (getItem(position)!!.read) 0 else 1 + } } \ No newline at end of file diff --git a/qksms/src/main/res/layout/conversation_list_item_unread.xml b/qksms/src/main/res/layout/conversation_list_item_unread.xml new file mode 100644 index 00000000..9cc46998 --- /dev/null +++ b/qksms/src/main/res/layout/conversation_list_item_unread.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file