From 84e2fcad54423ccaf4ff37c5f3ca08a187902936 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Thu, 5 Jul 2018 10:05:54 -0700
Subject: [PATCH] Update UI of toggling shared contact photo.

---
 .../baseline_account_circle_white_24.png        | Bin 0 -> 477 bytes
 .../baseline_account_circle_white_24.png        | Bin 0 -> 303 bytes
 .../baseline_account_circle_white_24.png        | Bin 0 -> 571 bytes
 .../baseline_account_circle_white_24.png        | Bin 0 -> 832 bytes
 .../baseline_account_circle_white_24.png        | Bin 0 -> 1118 bytes
 res/layout/item_selectable_contact_field.xml    |  16 +++++++---------
 .../contactshare/ContactFieldAdapter.java       |   6 ++----
 7 files changed, 9 insertions(+), 13 deletions(-)
 create mode 100755 res/drawable-hdpi/baseline_account_circle_white_24.png
 create mode 100755 res/drawable-mdpi/baseline_account_circle_white_24.png
 create mode 100755 res/drawable-xhdpi/baseline_account_circle_white_24.png
 create mode 100755 res/drawable-xxhdpi/baseline_account_circle_white_24.png
 create mode 100755 res/drawable-xxxhdpi/baseline_account_circle_white_24.png

diff --git a/res/drawable-hdpi/baseline_account_circle_white_24.png b/res/drawable-hdpi/baseline_account_circle_white_24.png
new file mode 100755
index 0000000000000000000000000000000000000000..b1ff90f71f4e046dd5a4d49295fdeb223328ff3e
GIT binary patch
literal 477
zcmV<30V4j1P)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0004`Nkl<ZcmdVc
zC3GD?5J1r>g_+5f{fQ|v$+9nbS@ex5b6wfHGBa0|DPW3We&I~c&hAH*YnO3G#t$-B
z#}!`kgLYc^$ty0go-~OE#hjrPpH|LLEU{oRyJ^N!&Fp5fC?E29Kr9}RFJVmQE3x{@
zbn&BzTC5u!<RCY&YAF?qbY9^4%~Bc0QhwulOQyJ}!P+EB*o?K`?WU48TyMp}TU>2a
z$yl7hIwLAv>#QhJXvI1$4o+jWlA;yX;PXx#yu)XWRyc{@MiIqE{7z|=+o)KNU)|P@
zJ`i?|!yM)YVIQ=k7Lw7d9W{}RChh1W$@r)p-NkC<JUf_6rt~9|dF<dktyp)%$KSwK
zGQ@*ij?)u9{xvB0N}(8vdHe}o$P`*ot0W56m?z?WMJpu=RtBForTUHVpV?w4X7OLY
z5lZaGrfR8{0II1))%d>JH>hs*l4;M3eRQK<kS-Qw{6xWjj<JwwWKqUSc5#bt6x32A
ze$3!=vf*eL`8*~TPsx|aNMSdvMAFJ`QY03XMoc0~B_5=YNo(4M)0%ap$+*!6vWYLK
TV!1)$00000NkvXXu0mjfmsZ;5

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/baseline_account_circle_white_24.png b/res/drawable-mdpi/baseline_account_circle_white_24.png
new file mode 100755
index 0000000000000000000000000000000000000000..5971fc54c75ae9a1f710dc1cd55778c4f6eb5a1e
GIT binary patch
literal 303
zcmV+~0nq-5P)<h;3K|Lk000e1NJLTq000;O000;W1ONa4N`Cco0002?Nkl<ZcmciB
zEoeef6ae76Er`7+_AQQKkBZe~vDX#Drb8I^o@F5R^<Fm6HBB-*2<qbdwy+CN-yJjg
z#lyL9?)eGlrlezRW@lq=tfLhEre)>WN-LxpNXrcVOCPGJcor!<(U6HAW7LBv)5xcn
ztwmH~Tt&oMIYhehsxhuAuNxv$QuXS~n}*23p^=)Jkwc3R**nEPM7B<`O_h{+apxlZ
zaO>WyELGA3uv8C6)GYy%Vq0%Qg6m>iOFls_B<O*)Qff6uu0oD0qvC2D4(Uz%_tTf!
z-U0nk<Vm#iVeSi%8HO~?<N-BLInj-cSv=A6`Ub9t0=zfMFBJd)002ovPDHLkV1fho
BhDQJZ

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/baseline_account_circle_white_24.png b/res/drawable-xhdpi/baseline_account_circle_white_24.png
new file mode 100755
index 0000000000000000000000000000000000000000..e0d8d3b5e4c16fa463afa2151f12c2701be3c597
GIT binary patch
literal 571
zcmV-B0>u4^P)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+00064Nkl<ZcmZM<
z8ekLvSgmI$y`m@#!#lQZvzsP%nJK56E@-1FHtINOV!KKi+g2Id`u&E3v-Uo7?wxg?
z`a33_nZ$OUQsxOem`LX&s_w>W9^vzdRdkc;qCU$>5t3p#^(8)vc|ufAD306r?ZmY`
z@;GS06{_P3EhUV)T)>iIEj{Hoda{-jmh;q;5Vm7^&Oj$Mkmp#og{q%~CC_k`98Mm~
zWbvapU$AU8)0?q;p@sOc7TXXrJs8_MvC*0|wx(vjDYi6i#KH=E8k_mX_^hzvHF*b#
zOcA`Lrj8H8Z%bg2wV^sb2fu<Yz)%YK&DISZq$<zp@1*<loT?nq4cx^Rx+-jUbOY~5
z(mUNifh6U10~wN((G7ecEX_?$a)xh&e9#Tt#;3qZ<};Qq)cBvR%}C~RoD@E{qi)l;
zEb;#vsK<EjVmYY8vyBOvMqLS@CR2?|a+VGb$CaW;BBDr5)-bCl&#7#N#K1HvdqGVr
zw4BPiOAPc-*R@6)XD&-621=c^YaQju{7heoh`xMLPo{+yPVfc2B?5Z!(th;A-<GeG
zNB|{#HNGu=?83E&cHV3|_TbtrA=KkMuAi)D9Ce&j9mcVdRN(7qqa|0+zHo#^EMgT$
zc|Zp33cn^qr{+8TJ0O&Ip=i|!yann6(xw}`2q+@MFeJbz001Mjplio<Vl@B&002ov
JPDHLkV1fo51m6Gv

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/baseline_account_circle_white_24.png b/res/drawable-xxhdpi/baseline_account_circle_white_24.png
new file mode 100755
index 0000000000000000000000000000000000000000..68c73c98a6923a86bf6bfa6f209238e9375c9bf2
GIT binary patch
literal 832
zcmV-G1Hb%<P)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0009ANkl<ZcmeF$
zL%2{~6oBFN+kdug+qP?xCRwv=+s&VBO|xzDn%VB^YZ%VmckP4RJ3hu<k}uT{Km0&$
zdNGIPZ096Vyy6AXoMJ1>nM*Hn%cnybW)XtsI<qMu9~ZySmD9L!if;TY9|zrtz>5gF
zNznM8&G@mI|0OsyAO^o;Xb{x1Sw>Kn`F>7h;sQZBPbTq>9E1|I5ORt){KExw2N_CL
z(vzO54B-&E^ZX<3@iRNoT&KEYzv^5^v%|yM#7s07$z=HME~1$!?$8QN9NENxY{a2y
zBlgJ5Lp1f2l}q!0%wmh>Xm*Q&U1*kz9crK(APNSct0^`(j;@p_D2eW<=xBtEbfO>~
zHX4bB9oYC!6#R#co!Vh?l7fwrqM!seQj}zuk=W^P|4}PON?JIAojsypH+GJQ8Gn+9
zC1qi(hpj~Z6cd_aO$i<G*lQ{#jKGacWR+Bql}orWLQGhSJ0Yp2A0fE2R7^OE!jPa<
zAp;qx%1{nrPhYQz;B$x&6YlXj+!GU0_#BeOgakf^1To<OpTh$&AqFp!xydO`5l=E+
z#E1!pU0lQ|=F*xnWaH;|N~f%pp$&65<>KNFi3v-vafhj77X`VP%6)7s@e?{i>B;Y6
zi9hH`grCsSn6%ua3qO0PfV*;&v^4gXerzVactm<OyG}opXtq{-Vv~J>rl+ux{4GB5
z9})T&<Unpxa2hB9U=U6zYPX1;I2D!vPz0x4qM<QPeIx+%u`d+04?BU1;u94~&{8u4
zYT|U4QsM)7xUDxEj97-#11kCG<woGN%x}Z$InBfa$`OgvBQlFUnj2#LSblREIEIpd
zUXAIPMd~8yB$mj}F;X|nOIvscCZ}nxzjo&EN@)wb!#`ZXESyC&C!IL(FYQ^vQ?+sK
z9ytg>6Uz=(Fo%guWD+a6ND^rYA&0-=%lVHteEIz2spb41)BrCQzhY_d)sHw8bR!xs
zqUrYW#^l{OgBz#m&M)$DQJUF=pn0=fpoIj(eyIiJU=)mkQ2+q-2k&-kWzOsX0000<
KMNUMnLSTZiV1PFO

literal 0
HcmV?d00001

diff --git a/res/drawable-xxxhdpi/baseline_account_circle_white_24.png b/res/drawable-xxxhdpi/baseline_account_circle_white_24.png
new file mode 100755
index 0000000000000000000000000000000000000000..268736d3ec54f282f7dd86442f105332bd885700
GIT binary patch
literal 1118
zcmV-k1flzhP)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@000CfNkl<ZcmeI(
zLzv}S5Ww+j-?sbNwrz7Ywmq|X+&$a2Z5yknvDvmUM)Uvd$xSLbxt;mG{IZT!r%siG
zLZMJ7WDW-~fGc^JkD1FFn&@F0%@i}2k9n9Y8NhxLL}W06=cvYsDxPN;nGzHn#S?5s
zYa>r_wDd2M7|u_4@e?CRlKwz0*VBv%jod)4#1e5#pdFK1nMj<(28S~jKg{KD@gD=&
zf?u{UK>S2Jx8b+jeS4IM@CmW-DG@P`Lgo`I^T`vl*q16|sf>Na9Co1wopzq(QVu4A
zOb+65o}~kw8g@1J@RXoY&9wjjT}fsdwP+MmWaiafjK+sVqHOCuG!`3pop}_Ehr|XC
zpz)}9!}(}@LY#vz<RdgL6!$2g73b<m69-764(D1Z5Vv>*jWOa7W6*e6+~I6ADv4Kw
zBo%0!BYGq%ck+NJ@E{uHB#9O?(78wyxDcHg`s?3-&Vi!9f#_6{C>o4MD@zo}LTj98
zP>fcFG7Y0utl9io=xHAzy)(rrUPkXiQQ!iU6#oO#*@oWzqQL#=Z6#ftU?6T(iUJk5
zF;JY~5!@Li4lxRM9uX&4j*dQ<tH+(?VvjuB`^Zr^{R!^ni5<?vi-%NEkluObV<6p-
z@<Vj=F%b{pRW;MMGpJ8tI<<K9kl5i%OlaphF6Uq}wP_U_Uy2=;5oF864pjtMmDr(!
zAnOo2^buseVuwzGtW)gJMv%3M9V!X3%GiBI`>5et9_2=E;U#{e2@{t2{Ua;kNoH{=
zhmgFTfzsg&=V?lC?+dZR!?@AO8;oREafDr&!2-WRiCO4u;uS`bBWfJVW2{GKrrDfX
z7tc~C9+1iu8gT9cu|q!2baO8|ivgr@7rh3vPb|e=4abQ=98U@MmWl=KYrKYC#W2$O
z2s;m(NvkxmoA`iaW}8W?q_Y)keVisfVJ|jeZ5!$03@>8s74Z?bW9>z8iZiixhR^kP
zX7)@mR`Pr<WV2FiYJy{e_=pKu8LypUs<(WVjufA8gk@g5fke?^7FMdr5g(9EHCASc
z7D=qZ$^tTcsQq1ll{F-a9;ae$HfdrIY0SpjDdG+<W9=t)G5GEI9&0aqDfVc=S_c=3
z0US&v)>`$&9-7g?V?@LgMzN7-&iA|Esg#pET>BrC1y6cJSVVNaJi|Vs#6CPt578|m
zBHoctF?M=+i&KabM>vr;>BUYl`C<mUQiBuCyubkRqi*S1iuGleu`YbA<{hqQCL_3*
zvwvI8WhO7Nnm(MVV!s``^tf<GF8=<6h<}|Mx8b+jh!a0Cn9YG|fY9Sm-&#-(4V!>e
z5#$X4Ys1nbiIL34i`k4MN%|K@^Aww0wIUuNK|v-Xcvja88tiu5PyTAh?WCDv=J5%S
ka3upcK#U26LZMLTXB}+0Iok}-=Kufz07*qoM6N<$f^9PcCIA2c

literal 0
HcmV?d00001

diff --git a/res/layout/item_selectable_contact_field.xml b/res/layout/item_selectable_contact_field.xml
index b2aa6b3442..8074933c2a 100644
--- a/res/layout/item_selectable_contact_field.xml
+++ b/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"
diff --git a/src/org/thoughtcrime/securesms/contactshare/ContactFieldAdapter.java b/src/org/thoughtcrime/securesms/contactshare/ContactFieldAdapter.java
index 748de7d947..2888117455 100644
--- a/src/org/thoughtcrime/securesms/contactshare/ContactFieldAdapter.java
+++ b/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;