Per-contact colours

Closes #1120
This commit is contained in:
Moez Bhatti
2019-12-15 20:46:33 -05:00
parent 5d62912508
commit 76e0f775d6
35 changed files with 315 additions and 153 deletions
@@ -150,6 +150,10 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
.doOnNext { attach.setBackgroundTint(it.theme) }
.doOnNext { attach.setTint(it.textPrimary) }
.doOnNext { messageAdapter.theme = it }
.autoDisposable(scope())
.subscribe()
allThemes
.autoDisposable(scope())
.subscribe { messageList.scrapViews() }
@@ -177,7 +181,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
return
}
threadId.onNext(state.selectedConversation)
threadId.onNext(state.threadId)
title = when {
state.selectedMessages > 0 -> getString(R.string.compose_title_selected, state.selectedMessages)
@@ -28,7 +28,7 @@ import io.realm.RealmResults
data class ComposeState(
val hasError: Boolean = false,
val editingMode: Boolean = false,
val selectedConversation: Long = 0,
val threadId: Long = 0,
val selectedChips: List<Chip> = ArrayList(),
val sendAsGroup: Boolean = true,
val conversationtitle: String = "",
@@ -27,6 +27,7 @@ import com.moez.QKSMS.common.Navigator
import com.moez.QKSMS.common.base.QkViewModel
import com.moez.QKSMS.common.util.BillingManager
import com.moez.QKSMS.common.util.ClipboardUtils
import com.moez.QKSMS.common.util.Colors
import com.moez.QKSMS.common.util.MessageDetailsFormatter
import com.moez.QKSMS.common.util.extensions.makeToast
import com.moez.QKSMS.compat.SubscriptionManagerCompat
@@ -77,6 +78,7 @@ class ComposeViewModel @Inject constructor(
@Named("addresses") private val addresses: List<String>,
@Named("text") private val sharedText: String,
@Named("attachments") private val sharedAttachments: Attachments,
private val colors: Colors,
private val contactRepo: ContactRepository,
private val context: Context,
private val activeConversationManager: ActiveConversationManager,
@@ -97,7 +99,7 @@ class ComposeViewModel @Inject constructor(
private val subscriptionManager: SubscriptionManagerCompat
) : QkViewModel<ComposeView, ComposeState>(ComposeState(
editingMode = threadId == 0L && addresses.isEmpty(),
selectedConversation = threadId,
threadId = threadId,
query = query)
) {
@@ -171,13 +173,13 @@ class ComposeViewModel @Inject constructor(
.takeUntil(state.filter { state -> !state.editingMode })
.subscribe(selectedChips::onNext)
// When the conversation changes, mark read, and update the threadId and the messages for the adapter
// When the conversation changes, mark read, and update the recipientId and the messages for the adapter
disposables += conversation
.distinctUntilChanged { conversation -> conversation.id }
.observeOn(AndroidSchedulers.mainThread())
.map { conversation ->
val messages = messageRepo.getMessages(conversation.id)
newState { copy(selectedConversation = conversation.id, messages = Pair(conversation, messages)) }
newState { copy(threadId = conversation.id, messages = Pair(conversation, messages)) }
messages
}
.switchMap { messages -> messages.asObservable() }
@@ -98,9 +98,6 @@ class MessagesAdapter @Inject constructor(
field = value
contactCache.clear()
// Update the theme
theme = colors.theme(value?.first?.id ?: 0)
updateData(value?.second)
}
@@ -145,9 +142,6 @@ class MessagesAdapter @Inject constructor(
view.findViewById<ProgressBar>(R.id.cancel).setTint(theme.theme)
} else {
view = layoutInflater.inflate(R.layout.message_list_item_in, parent, false)
view.avatar.threadId = conversation?.id ?: 0
view.body.setTextColor(theme.textPrimary)
view.body.setBackgroundTint(theme.theme)
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
@@ -187,6 +181,11 @@ class MessagesAdapter @Inject constructor(
val next = if (position == itemCount - 1) null else getItem(position + 1)
val view = viewHolder.containerView
val theme = when (message.isOutgoingMessage()) {
true -> colors.theme()
false -> colors.theme(contactCache[message.address]?.id ?: 0)
}
// Update the selected state
view.isActivated = isSelected(message.id) || highlight == message.id
@@ -231,11 +230,14 @@ class MessagesAdapter @Inject constructor(
val media = message.parts.filter { !it.isSmil() && !it.isText() }
view.setPadding(bottom = if (canGroup(message, next)) 0 else 16.dpToPx(context))
// Bind the avatar
// Bind the avatar and bubble colour
if (!message.isMe()) {
view.avatar.threadId = conversation?.id ?: 0
view.avatar.recipientId = contactCache[message.address]?.id ?: 0
view.avatar.setContact(contactCache[message.address]?.contact)
view.avatar.setVisible(!canGroup(message, next), View.INVISIBLE)
view.body.setTextColor(theme.textPrimary)
view.body.setBackgroundTint(theme.theme)
}
// Bind the body text
@@ -87,7 +87,7 @@ class ComposeItemAdapter @Inject constructor(private val colors: Colors) : QkAda
view.icon.isVisible = false
view.avatar.contacts = listOf(Recipient(contact = contact))
view.avatar.recipients = listOf(Recipient(contact = contact))
view.title.text = contact.numbers.joinToString { it.address }
@@ -102,7 +102,7 @@ class ComposeItemAdapter @Inject constructor(private val colors: Colors) : QkAda
view.icon.isVisible = prev !is ComposeItem.Recent
view.icon.setImageResource(R.drawable.ic_history_black_24dp)
view.avatar.contacts = conversation.recipients
view.avatar.recipients = conversation.recipients
view.title.text = conversation.getTitle()
@@ -123,7 +123,7 @@ class ComposeItemAdapter @Inject constructor(private val colors: Colors) : QkAda
view.icon.isVisible = prev !is ComposeItem.Starred
view.icon.setImageResource(R.drawable.ic_star_black_24dp)
view.avatar.contacts = listOf(Recipient(contact = contact))
view.avatar.recipients = listOf(Recipient(contact = contact))
view.title.text = contact.name
@@ -139,7 +139,7 @@ class ComposeItemAdapter @Inject constructor(private val colors: Colors) : QkAda
view.icon.isVisible = prev !is ComposeItem.Group
view.icon.setImageResource(R.drawable.ic_people_black_24dp)
view.avatar.contacts = group.contacts.map { contact -> Recipient(contact = contact) }
view.avatar.recipients = group.contacts.map { contact -> Recipient(contact = contact) }
view.title.text = group.title
@@ -158,7 +158,7 @@ class ComposeItemAdapter @Inject constructor(private val colors: Colors) : QkAda
view.icon.isVisible = false
view.avatar.contacts = listOf(Recipient(contact = contact))
view.avatar.recipients = listOf(Recipient(contact = contact))
view.title.text = contact.name