diff --git a/qksms/src/main/java/presentation/common/widget/AvatarView.kt b/qksms/src/main/java/presentation/common/widget/AvatarView.kt index 04cff991..7c2735ee 100644 --- a/qksms/src/main/java/presentation/common/widget/AvatarView.kt +++ b/qksms/src/main/java/presentation/common/widget/AvatarView.kt @@ -43,6 +43,11 @@ class AvatarView @JvmOverloads constructor(context: Context, attrs: AttributeSet @Inject lateinit var colors: Colors @Inject lateinit var navigator: Navigator + /** + * This value can be changes if we should use the theme from a particular conversation + */ + var threadId: Long = 0 + var contact: Contact? = null set(value) { field = value @@ -64,7 +69,7 @@ class AvatarView @JvmOverloads constructor(context: Context, attrs: AttributeSet super.onAttachedToWindow() if (!isInEditMode) { - colors.theme + colors.themeForConversation(threadId) .autoDisposable(scope()) .subscribe { color -> background.setTint(color) } diff --git a/qksms/src/main/java/presentation/feature/compose/MessagesAdapter.kt b/qksms/src/main/java/presentation/feature/compose/MessagesAdapter.kt index ec5bc38f..f68f0e23 100644 --- a/qksms/src/main/java/presentation/feature/compose/MessagesAdapter.kt +++ b/qksms/src/main/java/presentation/feature/compose/MessagesAdapter.kt @@ -121,6 +121,7 @@ class MessagesAdapter @Inject constructor( ?: Contact(numbers = RealmList(PhoneNumber(address = address))) // Fallback to a fake contact } + view.avatar.threadId = data?.first?.id ?: 0 view.avatar.contact = contactMap[address] } diff --git a/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoActivity.kt b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoActivity.kt index 64ea0d94..83fb3ffe 100644 --- a/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoActivity.kt +++ b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoActivity.kt @@ -79,6 +79,7 @@ class ConversationInfoActivity : QkThemedActivity(), } recipientAdapter.data = state.recipients + recipientAdapter.threadId = state.threadId notifications.setVisible(!state.blocked) diff --git a/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoState.kt b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoState.kt index 6e7ca858..b2edd0f9 100644 --- a/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoState.kt +++ b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoState.kt @@ -23,6 +23,7 @@ import data.model.Recipient data class ConversationInfoState( val recipients: List = listOf(), + val threadId: Long = 0, val archived: Boolean = false, val blocked: Boolean = false, val media: List = ArrayList(), diff --git a/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoViewModel.kt b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoViewModel.kt index d16fdea1..34f8e631 100644 --- a/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoViewModel.kt +++ b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoViewModel.kt @@ -52,6 +52,8 @@ class ConversationInfoViewModel(intent: Intent) : QkViewModel() .filter { conversation -> conversation.isLoaded } diff --git a/qksms/src/main/java/presentation/feature/conversationinfo/ConversationRecipientAdapter.kt b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationRecipientAdapter.kt index 07b2b8a0..0ee76b64 100644 --- a/qksms/src/main/java/presentation/feature/conversationinfo/ConversationRecipientAdapter.kt +++ b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationRecipientAdapter.kt @@ -41,6 +41,8 @@ class ConversationRecipientAdapter @Inject constructor( private val navigator: Navigator ) : QkAdapter() { + var threadId: Long = 0L + private val disposables = CompositeDisposable() override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { @@ -65,6 +67,7 @@ class ConversationRecipientAdapter @Inject constructor( } } + view.avatar.threadId = threadId view.avatar.contact = recipient.contact view.name.text = recipient.contact?.name ?: recipient.address