From 21af8381b0c0603a0e7f4c75ec61c93e2ff86c9a Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Mon, 21 Feb 2022 12:09:17 +0100
Subject: [PATCH] hide secondary text for normal users

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../java/com/nextcloud/talk/adapters/items/UserItem.java    | 6 ++++--
 .../res/layout/rv_item_conversation_info_participant.xml    | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java
index 2dcd8c7af..3525fc6bb 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java
+++ b/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java
@@ -20,6 +20,7 @@
 
 package com.nextcloud.talk.adapters.items;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.Resources;
 import android.text.TextUtils;
@@ -116,6 +117,7 @@ public class UserItem extends AbstractFlexibleItem<UserItem.UserItemViewHolder>
         return new UserItemViewHolder(view, adapter);
     }
 
+    @SuppressLint("SetTextI18n")
     @Override
     public void bindViewHolder(FlexibleAdapter adapter, UserItemViewHolder holder, int position, List payloads) {
 
@@ -277,8 +279,8 @@ public class UserItem extends AbstractFlexibleItem<UserItem.UserItemViewHolder>
                         break;
                 }
 
-                if (!holder.contactMentionId.getText().equals(userType)) {
-                    holder.contactMentionId.setText(userType);
+                if (!userType.equals(NextcloudTalkApplication.Companion.getSharedApplication().getString(R.string.nc_user))) {
+                    holder.contactMentionId.setText("(" + userType + ")");
                 }
             }
         }
diff --git a/app/src/main/res/layout/rv_item_conversation_info_participant.xml b/app/src/main/res/layout/rv_item_conversation_info_participant.xml
index 0319cde88..15e4ee6f1 100644
--- a/app/src/main/res/layout/rv_item_conversation_info_participant.xml
+++ b/app/src/main/res/layout/rv_item_conversation_info_participant.xml
@@ -39,7 +39,7 @@
 
     <com.vanniktech.emoji.EmojiEditText
         android:id="@+id/conversation_info_participant_emoji"
-        android:layout_width="28dp"
+        android:layout_width="22dp"
         android:layout_height="wrap_content"
         android:background="@color/transparent"
         android:cursorVisible="false"
@@ -82,7 +82,7 @@
         android:singleLine="true"
         android:textAlignment="viewStart"
         android:textAppearance="?android:attr/textAppearanceListItem"
-        android:textColor="@color/conversation_item_header"
+        android:textColor="?android:attr/textColorSecondary"
         app:layout_constraintStart_toEndOf="@+id/conversation_info_participant_emoji"
         app:layout_constraintTop_toBottomOf="@+id/name_text"
         tools:text="gone shopping" />