From 090fc096573604ec9f9fc9fa2ea642814e214c5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Asiel=20D=C3=ADaz=20Ben=C3=ADtez?= <adbenitez@nauta.cu>
Date: Sat, 30 Oct 2021 08:08:56 -0400
Subject: [PATCH] show verified-checkmark in memberlist in group creation
 (#2101)

---
 res/layout/selected_recipient_list_item.xml   | 61 ++++++++++---------
 .../util/SelectedRecipientsAdapter.java       |  1 +
 2 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/res/layout/selected_recipient_list_item.xml b/res/layout/selected_recipient_list_item.xml
index 9c6e4f360..427b7dc8b 100644
--- a/res/layout/selected_recipient_list_item.xml
+++ b/res/layout/selected_recipient_list_item.xml
@@ -18,36 +18,39 @@
             tools:src="@color/blue_600"
             android:contentDescription="@null" />
 
-    <org.thoughtcrime.securesms.components.emoji.EmojiTextView
-        android:id="@+id/name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toRightOf="@+id/contact_photo_image"
-        android:layout_toEndOf="@+id/contact_photo_image"
-        android:layout_toLeftOf="@+id/delete"
-        android:layout_toStartOf="@+id/delete"
-        android:layout_marginLeft="16dp"
-        android:layout_marginStart="16dp"
-        android:drawablePadding="5dp"
-        android:ellipsize="marquee"
-        android:singleLine="true"
-        android:fontFamily="sans-serif"
-        android:textSize="16sp" />
+    <LinearLayout android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:layout_toRightOf="@+id/contact_photo_image"
+                  android:layout_toEndOf="@+id/contact_photo_image"
+                  android:layout_toLeftOf="@+id/delete"
+                  android:layout_toStartOf="@+id/delete"
+                  android:layout_marginLeft="16dp"
+                  android:layout_marginStart="16dp"
+                  android:paddingRight="16dp"
+                  android:paddingEnd="16dp"
+                  android:orientation="vertical">
 
-    <TextView
-        android:id="@+id/phone"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/name"
-        android:layout_alignStart="@+id/name"
-        android:layout_below="@id/name"
-        android:layout_toLeftOf="@+id/delete"
-        android:layout_toStartOf="@+id/delete"
-        android:singleLine="true"
-        android:ellipsize="marquee"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textSize="14sp"
-        android:fontFamily="sans-serif-light" />
+        <org.thoughtcrime.securesms.components.emoji.EmojiTextView
+            android:id="@+id/name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawablePadding="5dp"
+            android:ellipsize="marquee"
+            android:singleLine="true"
+            android:fontFamily="sans-serif"
+            android:textSize="16sp" />
+
+        <TextView
+            android:id="@+id/phone"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:ellipsize="marquee"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textSize="14sp"
+            android:fontFamily="sans-serif-light" />
+
+    </LinearLayout>
 
     <ImageButton
         android:id="@+id/delete"
diff --git a/src/org/thoughtcrime/securesms/util/SelectedRecipientsAdapter.java b/src/org/thoughtcrime/securesms/util/SelectedRecipientsAdapter.java
index 7b1259005..e9b70f965 100644
--- a/src/org/thoughtcrime/securesms/util/SelectedRecipientsAdapter.java
+++ b/src/org/thoughtcrime/securesms/util/SelectedRecipientsAdapter.java
@@ -126,6 +126,7 @@ public class SelectedRecipientsAdapter extends BaseAdapter {
 
     avatar.setAvatar(glideRequests, p, false);
     name.setText(dcContact.getDisplayName());
+    name.setCompoundDrawablesWithIntrinsicBounds(0, 0, dcContact.isVerified()? R.drawable.ic_verified : 0, 0);
     phone.setText(dcContact.getAddr());
     delete.setVisibility(modifiable ? View.VISIBLE : View.GONE);
     delete.setColorFilter(DynamicTheme.isDarkTheme(context)? Color.WHITE : Color.BLACK);