From 63250b33a8fbdac7758714635f87e24d475a12c8 Mon Sep 17 00:00:00 2001 From: Moxie Marlinspike Date: Mon, 16 Jul 2012 20:20:13 -0700 Subject: [PATCH] Switch to QuickContactBadge. --- res/drawable-hdpi/ic_contact_picture.png | Bin 0 -> 5929 bytes res/drawable-mdpi/ic_contact_picture.png | Bin 0 -> 4733 bytes res/drawable-xhdpi/ic_contact_picture.png | Bin 0 -> 7422 bytes res/drawable/ic_contact_picture.png | Bin 1482 -> 0 bytes res/layout/conversation_header_view.xml | 43 +++++++----------- res/layout/main.xml | 18 +++----- .../securesms/ConversationHeaderView.java | 37 ++++++--------- 7 files changed, 39 insertions(+), 59 deletions(-) create mode 100644 res/drawable-hdpi/ic_contact_picture.png create mode 100644 res/drawable-mdpi/ic_contact_picture.png create mode 100644 res/drawable-xhdpi/ic_contact_picture.png delete mode 100644 res/drawable/ic_contact_picture.png diff --git a/res/drawable-hdpi/ic_contact_picture.png b/res/drawable-hdpi/ic_contact_picture.png new file mode 100644 index 0000000000000000000000000000000000000000..2eef7b53cec872f476b806e21b81951a6347128a GIT binary patch literal 5929 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 A_y7O^ literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/ic_contact_picture.png b/res/drawable-mdpi/ic_contact_picture.png new file mode 100644 index 0000000000000000000000000000000000000000..6c7cb61d6035c50faa571cd5ec9857a1109b7bca GIT binary patch literal 4733 zcmZ8jcQo8lxBY3+qePh?y66msFiIF*5J3bXx*&Qd!C=%8z4sb5dT$Xudd=uHdheaj z_ugOc{ju*}>z=#MI`^)9);%F=s`7+*RCoXY5GpFjs6Vpge}RMkxU%4{hX4ScxTUnT znx%;e0JzVjX?)hy*rE`>SU82f35LhMu~R3#sfJ-KF+@V|Gw$$w~pNf>;+*kG_@`SEQu17Pds zpA%A2zHpM@+XNIEoLyz$`k)z{RjoZn7g7ECiH7p?ue+iI3))btn9xm$cOE(ax7VIai4Zsuvlq02ixB}j*VX~By)WXPj z19c06_uIDi( z{T0R~=*7RODuha&HTj+yGfjO(4{2ju!ld>SWrzeP&@*!}a zVh@vgnYT%QhS23ROaID=g}O*&6HKX#(6P?LsqG9<<5Dfs3Jt5aFx7RFY` zOvpf`w;9f2x_eD4g{G5trJl0j_u@H{c!*vRUqP;*9`M_6SUyONhW$R)Jv3HbvM`e- zH#J)?pFq94&`MLIh*~g~Bb(<({JSrOHWS4YXxqXnY38aYnX;o}7R45E)p9c)Gtx7h z&@@{ax4fWnmeaUXrE8;WSx>qE#%H;-zfxTn&dqzjVZ2rv(Y@% zt9h<@QP^JCr4garQij~t-ICkn8J*9c%@h5RUq+e9IzC(KrfMgXk#mrj@#B~5L+pJy zTEAhuZ>J&hx26B*`j`9PKQG0(V@p^Sd;wV$K<2(o*$CU3+CoqTZ3TZeqxc3Bzoc3> zch%3kPjt31cbXO|`v39LC}KxJCY@6(^S3?Q77rmCjXGv8$xvI0R_j#&zh?@xiPn{6De zsjRQ9MQVT7V%2ij^6o0{uIvd-yUcjix>XLBm(}tPXAs zY~7E4P_|3EcMLouI11Aj*oRi6!czZ2Yec;qT^-^@UqOkQ66={8ckLTG%$z#v^X8DH zG9Tzr~rDuciXnB>HFRzUKT&Dl#d2xlJ02bXwf5DXj`fdbwaAn2e!{3 zr)2Jb-6f9r&q+NdJqSHNdggo39eXdE957vote?bhbbss?T}56!xum#py|KI;JS#r_ zx@-3@V`XvaHPsSXIrEY-Js+6OUSsJ+E3H9q*+#^WYf_7~t2{9i8-D@EregW~aFk$j<#Q`t(;-bUZ=C5#l+*p1?{FOvx*NZ&MV9gKac)hZeBKCR(N=y)DBTA z*ekIq)r&8F^Io`pgYQgX$|c;O=8|Q&JSt;sti1BOGr~_z>boIVNJcf2rDpFl+h-D# z9wD{CfnBsKjz@--@{S(IYN7Id>#@t4!xNzsB)D(YSv-;`5^F{GY&&^k<^-GU5^@nX2N+|9Db1aL+VaXwov5^~+Ume6Hh|!b{42W0|Fwv)i8( zr;&ET^9p)lk?xreDf?0}xpIcYKDj&jr4Q3))EjG^u-_`m^XhL-*wYW^daJw8+U_p9 z9O@f~#z|C?{Zq-{OvBep%H#LWBwz6?-WlEpit{pD?QykSb!Ohis=r=)`z{EVXqWk& z{IbQ?d#8$mOUDo|McF?+>PA~@b~LSpx8}yu$ASC&8)wVS)I;HcTws(I@&{&fDuj$89Q z`;3QI0;;ro-m~eAtIrhEw3C}%+rm0kRdT3Tu9wJ7`d>Met9SohZL4a2Y3}~G_tyOa z1_?HFTYr0pXq%SnizIa{VMh?@Q~jHvi>AMFDcvn9sXwAS?6o~Er!PVl7bQrYbMM$L zELMqryxtY=hHA})L3nLxZ4_;`Y`%Zl6Op)a|C;i3wt~*aXU?bnQ07c=Fvcw3A|LOq zO6t&SaaTE4^MBTT)A#2AdqhKB=}prl3!`2Vo3~x~_mo2}o^I)_n+`{vEOl>sc%69b z^c-5p=GG=$c3JZ?!d*n&UKzMF%y3$p@NY_A#mu0jpe_d@?xgX@LTc6u*5WhH| z7sYk+JP6%?I^SP^aqK;GcZAJJM@mQWTK%i$k@khd;BfrwS7*?R^xc!a9Z%A$e^S57 zAFf_kJ{&n@9q}-oaO3;q;rR+lu3uwfx#) zsSG+*Q&r{LXBdemw=5(17Gr(0?~w?WI0HvgH3@`{dFP0I;PMWu!DM76x^7oTx;I zZ7n-fX)rK^I&+oVc&Be47Nd;m)JyT$n@CZWAV1tGJ*PeYu#%{CbnE6jNlSC*ZyAk~ z+=WsGzr3*k1hGA%*nLJoGszs7U@gIpk2p$H+&xiyM3MXxl0byi>*eM^pgeyF@lvb6|TW_Bee{&S$&Jw^u4iYVcY7nSj`uhKY4KP;2YtEN+jH*!WTYIGS8;O>(4);EmbC0}0C<8bv`)y*c2n6W4H zuQ^^VFB=KdT(=IN!ub}E(u}^&rxURse`@87PEkU6C#`BUIqq(+PL7VEwi$5H0|kc} zyG7(zvNTT9R5uh(hcy%w>SkSNSaJNcZ(>;?A2DEWXvOa)cFvT?#c0K2kVt&Qh$+9K z4pBuQSq|Fs7Rj9Pt!5ri4myc%zT3|${XCO#E8?p)ti(1pHuBWBCPy`{E{}44 zSSkRrM8=<)^+*oho{w;?hO(% zDZnr$gEkih>&wH-dP$s142fX``Pd480>s4zXnLY{E?YBL=l+qw(vRHJd-mD+lMn6J zq))@23~cy_4Vz$qr)}%1rgz_u6c_caTR_vsEEVhMdLaz^`=t8^2WxnNM$G!m`Z_G?%JK!gT?vzQ4%bcP7Y=meW6gykvq*!xU+tlCPz@#hxawQKP!74d##}~!Reae zfojSH@x(v<&sL{DXpa#j>)q(cjQ!vlpvRX8kw33?n% z-^NY&6l$)F4sV>Kq)^k^a_xuhRi|1IH%jAhC-mDbwstwPk>NeotzMWrlDW|&m-CK` zV!D5Nclhkg1*GE9tQ)GRh6CH&+A3T;@VUPgIggGt=c}FFGp{-li&#)M3d3c9+%U@& zEFUh;&Qc>Hv)RaM%Rgz{Zqe!}WgS`7Y+pRwAFuH)_?%=HS(yjp_!)vhVRB5e?}&{{ zWJbO+3nOyGWh$w8C-DN%Th{c;P^CNZN_k!#I-tPEHfzwEag8J9Pg4~i-jE1f=1IaW ze6=gH35h52`4z+`Au3v|RlM6bdf`89{evyk2-H~m+15}G^_Zr35)S}(hx)zfDMam5 zO0=-&*0C?0ZUSyE9_QX+`&+ta)VJLn0dtu_&nX;MtO;}>2i7kyNo zB6IVzRvOIT_QHBx6t}2T<(G;u-ch*uN%N=$c&##wSC$x43S_JlkS?3;bk$77Cx;-O zF}*oS|u3&ey}QrIk{)1-jxD@I0sH$C(g~^Qslvrml)jKOn>j-!^RHr0Vg4 zuU8WOn6YTt)AT?FXJ}Og-ma;${;%fd=7xr46vTkl7}o4m zqE&p%0CIS^HFE0iSo4fE?5J`zRPLl{{|2_UJTPXAMj^KAs~c*b}0vc6_Wib`ayh;SG*!??oTR0!AX z&u{TB$=#gGIvB(*5@()wpi?{UGf(|;Mr8~NFD)|ITh`?!Q%uKTGaZQA`Qv?h3bbs_ zFBjCF1?ZA+2N_+`RmdVjTuGjvKK`pL&a&FhrbfyZx5@iI0vkJ1OLLF^FW`sr3H+~s@mmznqX1BpRh21)8T$PPCXou9 literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/ic_contact_picture.png b/res/drawable-xhdpi/ic_contact_picture.png new file mode 100644 index 0000000000000000000000000000000000000000..1a2bfde385b770deff8237c256c118c81effe5b5 GIT binary patch literal 7422 zcmZ8mWmFtNvmGR1u^=I^xFkxvI(@p&)$aQdBM!8ZT$B{02m&EE)k-wamtk1%3yD@r4gV3)@4pY5d<1 z6F9byjC_pK|#Y*wc4FyA$$`1u9oXmn5cKHJtSi3(vJw){0Afv7g+X@4K-5hH0I?scz z64Agv41f*`$dBlr7X@;0fe%h^KD+=vU;u}?&cBcWdI0!JK}v)JwL${;O=CZ!0Im~s zaAcs4L4^rfI0q1ZJ3tTyjJ*OhlX3_mfC>YEVc=)zH>8SGz##VbP&{C80zlIl2~ALN z!GJ+FE~W|+=o)B`k&-wCKpaR6k?}D12@M_U5fuP9tul$&ij7x&VMkrlO|GNc;GV_9 zEmo>D7lJikm$CV zc~WYs^?N)_+n^%-tJ_R;UnKpj>Mca?>TJM$c-)HttQQn`YXO+mAFAS=1irq-4R=ia zL~*vt`f%YUAA$QWV#}yVDN;(Vy8+)4V`MNkoDM@KkswL>IWEk%`Vc3%*%~mI_IY_N z`cQJI_~*9jUo?*U5@3HB5a)&iKyFi?$t{S1toc|1G5|`17lfH` zp7s}vga8<)(hDw&03mR|i#aImA1J@OALUT6Qm8+VCLk&uBp)Nj${eJogi2q5S10=B zFj%`VM3M)Y#Q}Mw^Ti+J*)>7|s2&))1HrI2AQQp;&?&AN%4GyirkM$)?UXR1_K}9* z`*l-?Nn_AR#P=(kd{p+2r&a6M%cZ!b;Ehg`V5Ju97tF;Wmh=%5$^s7v&lgfy1uy*8 znIgp&%^AD3z-R;wOJR;80ESMR>LBwUCPlInxB?}E`dx@{n=yFP`v_Xm=)=m8@PDk1=mq(ez61^zC zCT>ccPi&w1Dz3NRq>5`k5<$rRE)k3zbc;zgFk_=H7?MM90_g2#f` z!h61SJ8`$XkV*Q>giF~w!#fF2%11%50K=X&c6_jG@5^4FUgBQC-uG|gEPF4FdO6+< zVGnt3^KKh&^S?<9FT>E6$gL91)6Ub{Y8=2+D=sc7uHQ$V_L|0+&MDSVlbR~DGP4r+ z=(pfhYgM~xZJ&$z9HVln%)<&U;-RS5hsv z(>&6zdaVjC>MZI}`61r|i`duRliXz;UoKe8dw`*5;# znoV=hpJn%{?smFvlOmabzuqdvjI*56&Z(9KdtW)eRfDT*%~;IDwzaptF1#*YUW5?J zV}6d1ApA(k%_5ViGw3{+o;X{o^!{CmYKc`z$xLBwb#1q2fy*f82Is8hgyqM{<2i^; zv#pa2iOro2Z(T>-i#nD%wnO>DjU%pkmj&-Sx2n+!Sgr3`);eVIcl+<*b#AHmQooIB zH;4Cz_MRp+(9y&C1nSSf~ zleZL6F0Mg2`=&5UE8F>j0fTlur0g

pk`%~4S}0noPqo6T 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 a2_N{_IsP|+#tXr#5hf#{C|)jV;Qv2JieUr* literal 0 HcmV?d00001 diff --git a/res/drawable/ic_contact_picture.png b/res/drawable/ic_contact_picture.png deleted file mode 100644 index 1ea44c675e626dc85b71d3482d72f02c066ee0b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1482 zcmV;*1vUDKP)f0v&( zHa0kpMx)tm_Pdx>ooqIEpxf{2Vu!-J>7MW)+ea}Gf|IXQvc zvx_)8J3Bo+jStv)u8WI{+7qH4VV*~z&kuVyu7@OFqnfFVsUkK#r4Ek zpTS1Gc>x>Ppvo=pbUMVdr}N`BssLBAzrP=GK0EF0?TzEn(UD;H`+Zbh;8V1Ng9C~@ z{y^Rfahw2bG>lxTT9%Q%4Sl7s-QM2Db^CFzMu((fG-tGcsC1BjE|<#)TOp=PA+}`= z5UWuv9v>g2E+SW)bg5(z;j#FcLd_M#4Llx?ZD2_#pFSksb=BV99-UwUQB9BO>U;ub zQ^d@~Gj%wzImvw7Ce2JGT-1TZVGueq2z{d2PH0`_)GeiDV0fb((qplT1Xx=AM436I ztHn#kHZ4nGHbfs!vt`OqDH=Z`)H11A)RxhQqp{>0s{Su9<76Kad$G0hcaz20?x$iA z#5Tb5YgE@bVbNP7nOQLH?CkjbgKI9Qw3(JsW;D~kKDlb9%*@Qr=cRo$*^6%_qKhdMPgL_xt1V*!ibou}IbUe?KhDQZ75FqtQtGiDR9E1W{QEYPDLm zJ*3Y(zhqC?rqd~qf+~BowpA(>8M%69U#Qql1yyv2qiYg`8*P{R^unQ-{l7PIHNu}l z>r^8uC7eKl8a(c@%ZwTcB((EtB>n_gV~0eaIi~HHudgpjQEXm~YLK1Y zQeB{ReJZ3HCC$8aE0FqW*V6eFsJJwh?p2@Jm4vqQB}L(MJ%$;F8l@217>+`X>_X~t ze%xx5!kpyk=}B_cQ;jI3nOcWL!`$oj(p94rm}OLgrKLvEGZUroNGcM&|$x>l37?{nxySp23Okc5VMeElA*w#{KL{Y(}8;S-o`L1?LX04N-JWPdgnq;0;Fh}&8+$pE&Io8S$KdzlUdbcq%`Ru zyF|Z*IiJsK|AsFs%o-vr<;|eZ#H06Ay?XI8cPjW)FmueR;SICw9j7|KQ kRa3fDDj6|0`A>iW0A&UD1kcK*4*&oF07*qoM6N<$f=4Iaj{pDw diff --git a/res/layout/conversation_header_view.xml b/res/layout/conversation_header_view.xml index eb854fdc7d..198b4e6cb1 100644 --- a/res/layout/conversation_header_view.xml +++ b/res/layout/conversation_header_view.xml @@ -2,7 +2,7 @@ - - - - - - - - - + - + + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_alignParentTop="true" + android:visibility="gone" /> - - + + - \ No newline at end of file diff --git a/res/layout/main.xml b/res/layout/main.xml index df834cf537..fe2e862934 100644 --- a/res/layout/main.xml +++ b/res/layout/main.xml @@ -29,17 +29,13 @@ /> + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:drawSelectorOnTop="false" + android:scrollbarStyle="insideOverlay" + android:fadingEdgeLength="16dip" + android:layout_alignParentTop="true" + android:layout_above="@id/search_text" /> selectedThreads; - private Recipients recipients; - private long threadId; - private boolean first; - private TextView subjectView; - private TextView fromView; - private TextView dateView; - private View unreadIndicator; - private View keyIndicator; - private CheckBox checkbox; - private ImageView contactPhoto; + private Recipients recipients; + private long threadId; + private boolean first; + private TextView subjectView; + private TextView fromView; + private TextView dateView; + private View unreadIndicator; + private View keyIndicator; + private CheckBox checkbox; + private QuickContactBadge contactPhoto; public ConversationHeaderView(Context context, boolean first) { this(context, (Set)null); this.first = true; contactPhoto.setVisibility(View.GONE); - this.setBackgroundColor(Color.TRANSPARENT); } public ConversationHeaderView(Context context, Set selectedThreads) { @@ -80,7 +77,7 @@ public class ConversationHeaderView extends RelativeLayout { this.dateView = (TextView)findViewById(R.id.date); this.unreadIndicator = findViewById(R.id.unread_indicator); this.keyIndicator = findViewById(R.id.key_indicator); - this.contactPhoto = (ImageView)findViewById(R.id.contact_photo); + this.contactPhoto = (QuickContactBadge)findViewById(R.id.contact_photo); this.checkbox = (CheckBox)findViewById(R.id.checkbox); intializeListeners(); @@ -117,13 +114,9 @@ public class ConversationHeaderView extends RelativeLayout { if (batchMode) checkbox.setVisibility(View.VISIBLE); else checkbox.setVisibility(View.GONE); - if (!PreferenceManager.getDefaultSharedPreferences(context).getBoolean(ApplicationPreferencesActivity.CONVERSATION_ICONS_LIST_PREF, ApplicationPreferencesActivity.showIcon())) { - contactPhoto.setVisibility(View.GONE); - } else { - contactPhoto.setImageBitmap(message.getRecipients().getPrimaryRecipient().getContactPhoto()); - contactPhoto.setBackgroundResource(R.drawable.light_border_background); - contactPhoto.setVisibility(View.VISIBLE); - } + contactPhoto.setImageBitmap(this.recipients.getPrimaryRecipient().getContactPhoto()); + contactPhoto.assignContactFromPhone(this.recipients.getPrimaryRecipient().getNumber(), true); + contactPhoto.setVisibility(View.VISIBLE); } }