From 56284bb81250aa42af337b853722b2afb2eec3da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Thu, 18 Jan 2024 13:37:02 -0500
Subject: [PATCH] conversation: use conversation color in searchAdapter
Change-Id: I2c2fbda43949be76e26e946b1019cbe97e9a1b79
---
.../app/src/main/java/cx/ring/adapters/ConversationAdapter.kt | 2 ++
.../app/src/main/java/cx/ring/fragments/ConversationFragment.kt | 1 +
2 files changed, 3 insertions(+)
diff --git a/jami-android/app/src/main/java/cx/ring/adapters/ConversationAdapter.kt b/jami-android/app/src/main/java/cx/ring/adapters/ConversationAdapter.kt
index a76eb9b16..9e61c4d7d 100644
--- a/jami-android/app/src/main/java/cx/ring/adapters/ConversationAdapter.kt
+++ b/jami-android/app/src/main/java/cx/ring/adapters/ConversationAdapter.kt
@@ -626,6 +626,8 @@ class ConversationAdapter(
notifyDataSetChanged()
}
+ fun getPrimaryColor() = convColor
+
fun setComposingStatus(composingStatus: ComposingStatus) {
val composing = composingStatus == ComposingStatus.Active
if (isComposing != composing) {
diff --git a/jami-android/app/src/main/java/cx/ring/fragments/ConversationFragment.kt b/jami-android/app/src/main/java/cx/ring/fragments/ConversationFragment.kt
index a1e4e9e4f..2f4173a66 100644
--- a/jami-android/app/src/main/java/cx/ring/fragments/ConversationFragment.kt
+++ b/jami-android/app/src/main/java/cx/ring/fragments/ConversationFragment.kt
@@ -853,6 +853,7 @@ class ConversationFragment : BaseSupportFragment<ConversationPresenter, Conversa
override fun onMenuItemActionExpand(item: MenuItem): Boolean {
val binding = binding ?: return false
mSearchAdapter = ConversationAdapter(this@ConversationFragment, presenter, true)
+ mSearchAdapter?.setPrimaryColor(mAdapter!!.getPrimaryColor())
presenter.startSearch()
currentBottomView?.isVisible = false
binding.histList.adapter = mSearchAdapter
--
GitLab