From b34eb0808843a45342797b0abc247f086dc78fb6 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Tue, 3 Oct 2017 13:56:01 -0700
Subject: [PATCH] Fix look of default group photo in conversation preferences
 view

Fixes #7022
// FREEBIE
---
 res/drawable/ic_group_large.xml                        |  7 +++++++
 res/drawable/ic_person_large.xml                       |  4 ++++
 res/layout/recipient_preference_activity.xml           |  1 -
 res/layout/webrtc_call_screen.xml                      |  3 +--
 .../contacts/avatars/ContactPhotoFactory.java          |  2 +-
 .../contacts/avatars/GeneratedContactPhoto.java        |  2 +-
 .../contacts/avatars/ResourceContactPhoto.java         | 10 ++++++++--
 7 files changed, 22 insertions(+), 7 deletions(-)
 create mode 100644 res/drawable/ic_group_large.xml
 create mode 100644 res/drawable/ic_person_large.xml

diff --git a/res/drawable/ic_group_large.xml b/res/drawable/ic_group_large.xml
new file mode 100644
index 0000000000..d11f0bde26
--- /dev/null
+++ b/res/drawable/ic_group_large.xml
@@ -0,0 +1,7 @@
+<vector android:height="480dp"
+        android:width="480dp"
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0"
+        xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@color/gray20" android:pathData="M16,11c1.66,0 2.99,-1.34 2.99,-3S17.66,5 16,5c-1.66,0 -3,1.34 -3,3s1.34,3 3,3zM8,11c1.66,0 2.99,-1.34 2.99,-3S9.66,5 8,5C6.34,5 5,6.34 5,8s1.34,3 3,3zM8,13c-2.33,0 -7,1.17 -7,3.5L1,19h14v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5zM16,13c-0.29,0 -0.62,0.02 -0.97,0.05 1.16,0.84 1.97,1.97 1.97,3.45L17,19h6v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5z"/>
+</vector>
diff --git a/res/drawable/ic_person_large.xml b/res/drawable/ic_person_large.xml
new file mode 100644
index 0000000000..39cf6fdcfc
--- /dev/null
+++ b/res/drawable/ic_person_large.xml
@@ -0,0 +1,4 @@
+<vector android:height="480dp" android:viewportHeight="24.0"
+    android:viewportWidth="24.0" android:width="480dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@color/gray20" android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
+</vector>
diff --git a/res/layout/recipient_preference_activity.xml b/res/layout/recipient_preference_activity.xml
index 5a5337147d..44758c48c6 100644
--- a/res/layout/recipient_preference_activity.xml
+++ b/res/layout/recipient_preference_activity.xml
@@ -26,7 +26,6 @@
                        android:layout_width="match_parent"
                        android:layout_height="match_parent"
                        android:scaleType="centerCrop"
-                       android:background="@color/black"
                        android:transitionName="avatar"
                        app:layout_collapseMode="parallax"
                        app:layout_collapseParallaxMultiplier="0.7"/>
diff --git a/res/layout/webrtc_call_screen.xml b/res/layout/webrtc_call_screen.xml
index d12911e475..52d8993a99 100644
--- a/res/layout/webrtc_call_screen.xml
+++ b/res/layout/webrtc_call_screen.xml
@@ -43,11 +43,10 @@
             <ImageView android:id="@+id/photo"
                        android:layout_width="match_parent"
                        android:layout_height="match_parent"
-                       android:background="@android:color/black"
                        android:scaleType="centerCrop"
                        android:visibility="visible"
                        android:clickable="true"
-                       tools:src="@drawable/ic_contact_picture_large"
+                       tools:src="@drawable/ic_person_large"
                     />
 
             <LinearLayout android:id="@+id/untrusted_layout"
diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/ContactPhotoFactory.java b/src/org/thoughtcrime/securesms/contacts/avatars/ContactPhotoFactory.java
index 620a0ed84f..095883c8ab 100644
--- a/src/org/thoughtcrime/securesms/contacts/avatars/ContactPhotoFactory.java
+++ b/src/org/thoughtcrime/securesms/contacts/avatars/ContactPhotoFactory.java
@@ -39,7 +39,7 @@ public class ContactPhotoFactory {
   }
 
   public static ContactPhoto getDefaultGroupPhoto() {
-    return new ResourceContactPhoto(R.drawable.ic_group_white_24dp);
+    return new ResourceContactPhoto(R.drawable.ic_group_white_24dp, R.drawable.ic_group_large);
   }
 
   public static ContactPhoto getContactPhoto(@NonNull Context context, @Nullable Uri uri, @NonNull Address address, @Nullable String name) {
diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/GeneratedContactPhoto.java b/src/org/thoughtcrime/securesms/contacts/avatars/GeneratedContactPhoto.java
index f8b9b43026..a4f48fdde6 100644
--- a/src/org/thoughtcrime/securesms/contacts/avatars/GeneratedContactPhoto.java
+++ b/src/org/thoughtcrime/securesms/contacts/avatars/GeneratedContactPhoto.java
@@ -48,7 +48,7 @@ public class GeneratedContactPhoto implements ContactPhoto {
 
   @Override
   public Drawable asCallCard(Context context) {
-    return ContextCompat.getDrawable(context, R.drawable.ic_contact_picture_large);
+    return ContextCompat.getDrawable(context, R.drawable.ic_person_large);
   }
 
   @Override
diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/ResourceContactPhoto.java b/src/org/thoughtcrime/securesms/contacts/avatars/ResourceContactPhoto.java
index 71b49c42e8..5ac9c6e451 100644
--- a/src/org/thoughtcrime/securesms/contacts/avatars/ResourceContactPhoto.java
+++ b/src/org/thoughtcrime/securesms/contacts/avatars/ResourceContactPhoto.java
@@ -16,9 +16,15 @@ import com.makeramen.roundedimageview.RoundedDrawable;
 public class ResourceContactPhoto implements ContactPhoto {
 
   private final int resourceId;
+  private final int callCardResourceId;
 
   ResourceContactPhoto(@DrawableRes int resourceId) {
-    this.resourceId = resourceId;
+    this(resourceId, resourceId);
+  }
+
+  ResourceContactPhoto(@DrawableRes int resourceId, @DrawableRes int callCardResourceId) {
+    this.resourceId         = resourceId;
+    this.callCardResourceId = callCardResourceId;
   }
 
   @Override
@@ -42,7 +48,7 @@ public class ResourceContactPhoto implements ContactPhoto {
 
   @Override
   public Drawable asCallCard(Context context) {
-    return context.getResources().getDrawable(resourceId);
+    return context.getResources().getDrawable(callCardResourceId);
   }
 
   @Override