From d0c05dfc0c84f78e3b7454e7e7b0af42648783df Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Wed, 24 May 2023 12:59:28 -0500
Subject: [PATCH] Fix selection display with account colours

---
 .../siacs/conversations/ui/adapter/ListItemAdapter.java  | 9 ++++++---
 src/main/res/layout/contact.xml                          | 7 ++++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java
index fabf8570c75129e4bd861530cf996430c0cd7ccf..1f5b08a7943c458b36c8d6b27e8d8b4d434af52d 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java
@@ -56,20 +56,23 @@ public class ListItemAdapter extends ArrayAdapter<ListItem> {
 		LayoutInflater inflater = activity.getLayoutInflater();
 		ListItem item = getItem(position);
 		ViewHolder viewHolder;
+		View innerView;
 		if (view == null) {
 			ContactBinding binding = DataBindingUtil.inflate(inflater,R.layout.contact,parent,false);
 			viewHolder = ViewHolder.get(binding);
 			view = binding.getRoot();
+			innerView = binding.inner;
 		} else {
 			viewHolder = (ViewHolder) view.getTag();
+			innerView = view;
 		}
 
 		if (activity.xmppConnectionService != null && activity.xmppConnectionService.getAccounts().size() > 1) {
-			view.setBackgroundColor(item.getAccount().getColor(activity.isDarkTheme()));
-		} else {
-			view.setBackground(StyledAttributes.getDrawable(view.getContext(),R.attr.list_item_background));
+			innerView.setBackgroundColor(item.getAccount().getColor(activity.isDarkTheme()));
 		}
 
+		view.setBackground(StyledAttributes.getDrawable(view.getContext(),R.attr.list_item_background));
+
 		List<ListItem.Tag> tags = item.getTags(activity);
 		if (tags.size() == 0 || !this.showDynamicTags) {
 			viewHolder.tags.setVisibility(View.GONE);
diff --git a/src/main/res/layout/contact.xml b/src/main/res/layout/contact.xml
index 7c8bfbd82dfcb1ff823ea955becb8babeba707ac..daaea7f26c0b6278bb60258dfa956bb9cf6f6d72 100644
--- a/src/main/res/layout/contact.xml
+++ b/src/main/res/layout/contact.xml
@@ -2,10 +2,14 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?selectableItemBackground">
     <RelativeLayout
+        android:id="@+id/inner"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?selectableItemBackground"
         android:padding="@dimen/list_padding">
 
         <com.google.android.material.imageview.ShapeableImageView
@@ -56,4 +60,5 @@
         </LinearLayout>
 
     </RelativeLayout>
+    </FrameLayout>
 </layout>