From a7cc47d259021833ec63deb8ec3c03d10f15a493 Mon Sep 17 00:00:00 2001 From: Moxie Marlinspike Date: Thu, 19 Jul 2012 19:23:49 -0700 Subject: [PATCH] Update conversation item style. 1) Don't print sender/recipient name in message body. 2) Do the split conversation icon view. 3) Adjust font sizes and colors. --- res/drawable-hdpi/divet_left.png | Bin 0 -> 1239 bytes res/drawable-hdpi/divet_right.png | Bin 0 -> 1195 bytes res/drawable-mdpi/divet_left.png | Bin 0 -> 1109 bytes res/drawable-mdpi/divet_right.png | Bin 0 -> 1169 bytes res/drawable-xhdpi/divet_left.png | Bin 0 -> 1268 bytes res/drawable-xhdpi/divet_right.png | Bin 0 -> 1267 bytes res/layout/conversation_fragment.xml | 11 +- res/layout/conversation_item.xml | 159 ---------- res/layout/conversation_item_received.xml | 147 +++++++++ res/layout/conversation_item_sent.xml | 151 +++++++++ res/xml/preferences.xml | 145 ++++----- .../ApplicationPreferencesActivity.java | 131 ++++---- .../securesms/ConversationAdapter.java | 33 +- .../securesms/ConversationItem.java | 287 ++++++++---------- .../securesms/components/ImageDivet.java | 118 +++++++ 15 files changed, 705 insertions(+), 477 deletions(-) create mode 100644 res/drawable-hdpi/divet_left.png create mode 100644 res/drawable-hdpi/divet_right.png create mode 100644 res/drawable-mdpi/divet_left.png create mode 100644 res/drawable-mdpi/divet_right.png create mode 100644 res/drawable-xhdpi/divet_left.png create mode 100644 res/drawable-xhdpi/divet_right.png delete mode 100644 res/layout/conversation_item.xml create mode 100644 res/layout/conversation_item_received.xml create mode 100644 res/layout/conversation_item_sent.xml create mode 100644 src/org/thoughtcrime/securesms/components/ImageDivet.java diff --git a/res/drawable-hdpi/divet_left.png b/res/drawable-hdpi/divet_left.png new file mode 100644 index 0000000000000000000000000000000000000000..100d320d5158f72baca3295571c374f66ca0a2d5 GIT binary patch literal 1239 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 literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/divet_right.png b/res/drawable-mdpi/divet_right.png new file mode 100644 index 0000000000000000000000000000000000000000..4deca81d1933f152fd807f7fc33e24cbecdcc87b GIT binary patch literal 1169 zcmbVMe`wTJ9FKLi+D)y0DhOE$Q_;J;WR6W_8%*}kUfR35LGh0TlJ~yv zeLtV??;OeZ>|EWxp`D_r)!Ht#K-LxH?N}LpwCK@R()jc@;dA zW)__4*YmW3d`QQmAYy_9pc7n_i**Ttu#M&c2Ux(f93SBXDaK0x(2a*7)_iMFDyX@J zEh43v3dWwqvejxeT8%}KUuHQ`6hjW4j}VPWFzRBX7IA~lCW8tC)3-frBbN>tjR7=* z(+u%+Aq2GT>vP zpa@NlrLYRgH=mU=GM5oJF3X8Akjo}OE~lufn2U=|tmX#Ta81~>YZJQ-toUB6r1;Rl z$S)x@-0XmS1z{9akVh-UIISC|?S^t#o`q;t=-Y>&mGhB9&*xXNm#`1S|Hhq6Dv4Yo zqlg(Ho0Pj^Oap8EpPaG888&Q=e>F?(sNqyMNkytwVb_@}z#a)w_MZZSLsPmXE07K`2dZ`S5M{lhCp~ J>IL~g{U6bLf}#Kb literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/divet_left.png b/res/drawable-xhdpi/divet_left.png new file mode 100644 index 0000000000000000000000000000000000000000..46e4e02fb36dd8f7af4c53647d4c27d5c78cf42b GIT binary patch literal 1268 zcmbVMZEVzJ9IsA6mQ4rogNy;SEMpq4ecF5Jwd`E(u6J;R8@F5MHWL!N_PMRO^<{0x zb@L7JWzhtMY-*4fWfBO8Q%Ow3DGW6n@?jV?l8|hRUlv6Yf-%8FO?hLr9@HJl_38G8GJ^nZ*-}kMHFVr# zl)8-pCqf`k7edg?bb66kw@ZmaDWhD;q-YXQn&!nduWdV7_>UV)YTM$V38^f!jR8wW z^~h}~gHi5oZ^%YnVCXCYbvTIx=yBrQY3=kv>}OV|h8 zf8!2^rX>)B5wE=0$Dq-d%YyHM;3RI3iwq?%Pu%`p5xsx?$_o(jHZj{P(f*b``+u&3@D|K;rY zH(Ph!dZFg@$hdo`K1J?pIP)d=>>>TsiK@3JKX?1(J^ejh4a0$pYl}C{f%Plik}JNr zJ9C|$dgi6b{ZzF~)XuehCtmxlSpEK$j`ym3w^nEBE(KdZe6ra8*fEtkd0z1!ty=%h z(fp1pf#sFH#v?aB(k~WY*;X8DJoehhn}5Ie+18H7XMdh~cV&J3!Ht*gPmcr-T{``J zZt`mM@E_;SBp$eP`>It_@pb;`-E018Z+|^habYHQc$m4o_CoVhbDzxqSqZSSn^rvh T#>9?{_a90nT7>b~6TANgtR}G6 literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/divet_right.png b/res/drawable-xhdpi/divet_right.png new file mode 100644 index 0000000000000000000000000000000000000000..f495096cea042e5bc0a0e710da74e46d56387501 GIT binary patch literal 1267 zcmeAS@N?(olHy`uVBq!ia0vp^JV30#!3HGNq-U-IQj#UE5hcO-X(i=}MX3yqDfvmM z3ZA)%>8U}fi7AzZCsS=07?{&CLn2Bde0{8v^Ko2Tt~skz|cV7z)0WFNY~KZ%Gk)tz(4^Clz_GsrKDK}xwt{?0`hE?GD=Dctn~HE z%ggo3jrH=2()A53EiFN27#ZmTRp=I1=9MH?=;jqG!%T2VElw`VEGWs$&r<-In3$Ab zT4JjNbScCOxdpzyaD(%Tp#cR9GX09g0)0b01O41wkiWpHi%Wu15zfG>x;Uh=AXPso zwK%`DC>aHCFybnZQU%%yG$2F3nBNEAe!(RRYTBrDUd985mg@ z7#fLwm{}MaS{gYSI2sx_IT;ukTbetY!_2^@*Tulnz{JJS(#g=#+|ba~(9+nz z&DG4n&CS`x#nR2x5~kNPuec;JFF6%vZzj-Qs9p=adaay`QWHz^i$e1Ab6_bTAS1sd zzc?emK*2fKRKYhfIWrH$2SpFWw=StgnPsUdZbkXI3gGay%EV&7fhDTHEi9bP+{_%E zEgj8WEu2h@m7sc4$O$ujpkwqwi32IIz=VJ)5X6KheIN&(c~bL$Ii?7hHLfS`o5H}r zsO;(D7*cU-O33Z3Lk=P~H=A5PNe3M~?qu)&A@J{lYwj2Aw(k$VnD24I_Sv>`(-b;Y z(u_8|NxYeuer{gzk-|AkuSMNZO_Wem(9LiP4ZZbwkFiH^+X9`_Lbtc2-zY!iaNXl_ zh;iLJmSzQxbpcy*~GwW|m-fEFLF@fv{B=p zy^{(nB(+~AZ^<-UtF5)xAWKhv#U+Q=TwNbp3cUZC_>_sot1Eg=n)Ysai_Q77PnEAO zdd3iGseC6u_Bc=Dal_4vj`;+NNX`A~>$@-NJL~URTJ}7TU$00!^CEBEYzAfqj+U~R T7R`l|LB)`#tDnm{r-UW|Z(Fpu literal 0 HcmV?d00001 diff --git a/res/layout/conversation_fragment.xml b/res/layout/conversation_fragment.xml index ef5379fd4a..55d83977b9 100644 --- a/res/layout/conversation_fragment.xml +++ b/res/layout/conversation_fragment.xml @@ -1,19 +1,20 @@ diff --git a/res/layout/conversation_item.xml b/res/layout/conversation_item.xml deleted file mode 100644 index be7aaa4f36..0000000000 --- a/res/layout/conversation_item.xml +++ /dev/null @@ -1,159 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -