Update UI of toggling shared contact photo.

res/layout/item_selectable_contact_field.xml

@@ -9,15 +9,6 @@
     android:paddingBottom="5dp"
     android:gravity="center_vertical">
 
-    <ImageView
-        android:id="@+id/contact_field_avatar"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:layout_marginLeft="12dp"
-        android:layout_marginStart="12dp"
-        android:visibility="gone"
-        tools:src="@drawable/ic_contact_picture" />
-
     <ImageView
         android:id="@+id/contact_field_icon"
         android:layout_width="24dp"
@@ -26,6 +17,13 @@
         android:tint="@color/grey_600"
         tools:src="@drawable/ic_call_white_24dp" />
 
+    <ImageView
+        android:id="@+id/contact_field_avatar"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:visibility="gone"
+        tools:src="@drawable/ic_contact_picture" />
+
     <LinearLayout
         android:layout_width="0dp"
         android:layout_height="wrap_content"

src/org/thoughtcrime/securesms/contactshare/ContactFieldAdapter.java

@@ -99,15 +99,13 @@ class ContactFieldAdapter extends RecyclerView.Adapter<ContactFieldAdapter.Conta
       value.setMaxLines(field.maxLines);
       value.setText(field.value);
       label.setText(field.label);
+      icon.setImageResource(field.iconResId);
 
       if (field.iconUri != null) {
         avatar.setVisibility(View.VISIBLE);
-        icon.setVisibility(View.GONE);
         glideRequests.load(field.iconUri).circleCrop().into(avatar);
       } else {
-        icon.setVisibility(View.VISIBLE);
         avatar.setVisibility(View.GONE);
-        icon.setImageResource(field.iconResId);
       }
 
       if (selectable) {
@@ -211,7 +209,7 @@ class ContactFieldAdapter extends RecyclerView.Adapter<ContactFieldAdapter.Conta
 
     Field(@NonNull Avatar avatar) {
       this.value      = "";
-      this.iconResId  = 0;
+      this.iconResId  = R.drawable.baseline_account_circle_white_24;
       this.iconUri    = avatar.getAttachment() != null ? avatar.getAttachment().getDataUri() : null;
       this.maxLines   = 1;
       this.selectable = avatar;