Colour code conversations by account

Stephen Paul Weber created 2 years ago

When multi-account

Change summary

src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java      |  8 
src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java | 12 
src/main/res/layout/account_row.xml                                      |  8 
src/main/res/layout/conversation_list_row.xml                            |  6 
4 files changed, 24 insertions(+), 10 deletions(-)

Detailed changes

src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java

@@ -6,6 +6,7 @@ import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 
 import androidx.annotation.NonNull;
+import androidx.core.graphics.ColorUtils;
 import androidx.databinding.DataBindingUtil;
 
 import java.util.List;
@@ -17,6 +18,7 @@ import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.ui.XmppActivity;
 import eu.siacs.conversations.ui.util.AvatarWorkerTask;
 import eu.siacs.conversations.ui.util.StyledAttributes;
+import eu.siacs.conversations.utils.UIHelper;
 
 public class AccountAdapter extends ArrayAdapter<Account> {
 
@@ -79,6 +81,12 @@ public class AccountAdapter extends ArrayAdapter<Account> {
                 ((OnTglAccountState) activity).onClickTglAccountState(account, b);
             }
         });
+        if (activity.xmppConnectionService != null && activity.xmppConnectionService.getAccounts().size() > 1) {
+            viewHolder.binding.frame.setBackgroundColor(ColorUtils.setAlphaComponent(
+                UIHelper.getColorForName(account.getJid().asBareJid().toString()),
+                activity.isDarkTheme() ? 20 : 10
+            ));
+        }
         return view;
     }
 

src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java

@@ -8,6 +8,7 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
+import androidx.core.graphics.ColorUtils;
 import androidx.databinding.DataBindingUtil;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -68,12 +69,11 @@ public class ConversationAdapter
             viewHolder.binding.conversationName.setText(name);
         }
 
-        if (conversation == ConversationFragment.getConversation(activity)) {
-            viewHolder.binding.frame.setBackgroundColor(
-                    StyledAttributes.getColor(activity, R.attr.color_background_tertiary));
-        } else {
-            viewHolder.binding.frame.setBackgroundColor(
-                    StyledAttributes.getColor(activity, R.attr.color_background_primary));
+        if (activity.xmppConnectionService != null && activity.xmppConnectionService.getAccounts().size() > 1) {
+            viewHolder.binding.frame.setBackgroundColor(ColorUtils.setAlphaComponent(
+                UIHelper.getColorForName(conversation.getAccount().getJid().asBareJid().toString()),
+                activity.isDarkTheme() ? 20 : 10
+            ));
         }
 
         Message message = conversation.getLatestMessage();

src/main/res/layout/account_row.xml

@@ -2,10 +2,15 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <FrameLayout
+        android:background="?selectableItemBackground"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content">
+
     <RelativeLayout
+        android:id="@+id/frame"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?selectableItemBackground"
         android:paddingLeft="8dp"
         android:paddingBottom="8dp"
         android:paddingTop="8dp">
@@ -56,4 +61,5 @@
             android:focusable="false" />
 
     </RelativeLayout>
+    </FrameLayout>
 </layout>

src/main/res/layout/conversation_list_row.xml

@@ -4,13 +4,13 @@
     <FrameLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:descendantFocusability="blocksDescendants">
+        android:descendantFocusability="blocksDescendants"
+        android:background="?attr/color_background_primary">
 
         <FrameLayout
             android:id="@+id/frame"
             android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:background="?attr/color_background_primary">
+            android:layout_height="wrap_content">
 
             <RelativeLayout
                 android:layout_width="fill_parent"