From db9656c70cbd65ea9cc84728bfbebf68c0678423 Mon Sep 17 00:00:00 2001 From: Moxie Marlinspike Date: Mon, 29 Jun 2015 08:49:32 -0700 Subject: [PATCH] Update conversation style. 1) No more blue/green for outgoing messages. Just lock or no lock. 2) Use 9-patches instead of shapes for better bubble performance. 3) Use tinting rather than different colored assets. 4) Change outgoing status indicators so that they don't change width of the bubble as they update. 5) Switch to using ..., check, double-check for pending, sent, delivered rather than using bubble tone to indicate pending. // FREEBIE --- AndroidManifest.xml | 2 +- build.gradle | 1 + .../ic_done_all_grey600_18dp.png | Bin 0 -> 343 bytes res/drawable-hdpi/ic_done_grey600_18dp.png | Bin 0 -> 269 bytes res/drawable-hdpi/received_bubble.9.png | Bin 0 -> 305 bytes res/drawable-hdpi/sent_bubble.9.png | Bin 0 -> 297 bytes .../ic_done_all_grey600_18dp.png | Bin 0 -> 283 bytes res/drawable-mdpi/ic_done_grey600_18dp.png | Bin 0 -> 230 bytes res/drawable-mdpi/received_bubble.9.png | Bin 0 -> 250 bytes res/drawable-mdpi/sent_bubble.9.png | Bin 0 -> 240 bytes .../ic_done_all_grey600_18dp.png | Bin 0 -> 388 bytes res/drawable-xhdpi/ic_done_grey600_18dp.png | Bin 0 -> 326 bytes res/drawable-xhdpi/received_bubble.9.png | Bin 0 -> 423 bytes res/drawable-xhdpi/sent_bubble.9.png | Bin 0 -> 418 bytes .../ic_done_all_grey600_18dp.png | Bin 0 -> 494 bytes res/drawable-xxhdpi/ic_done_grey600_18dp.png | Bin 0 -> 407 bytes res/drawable-xxhdpi/received_bubble.9.png | Bin 0 -> 577 bytes res/drawable-xxhdpi/sent_bubble.9.png | Bin 0 -> 584 bytes .../ic_done_all_grey600_18dp.png | Bin 0 -> 584 bytes res/drawable-xxxhdpi/ic_done_grey600_18dp.png | Bin 0 -> 451 bytes ...rsation_item_sent_indicator_text_shape.xml | 4 +- ...on_item_sent_indicator_text_shape_dark.xml | 2 +- res/drawable/triangle_tick_incoming_dark.xml | 13 -- res/drawable/triangle_tick_incoming_light.xml | 13 -- ...iangle_tick_outgoing_pending_push_dark.xml | 13 -- ...angle_tick_outgoing_pending_push_light.xml | 13 -- ...riangle_tick_outgoing_pending_sms_dark.xml | 13 -- ...iangle_tick_outgoing_pending_sms_light.xml | 13 -- .../triangle_tick_outgoing_sent_push_dark.xml | 13 -- ...triangle_tick_outgoing_sent_push_light.xml | 13 -- .../triangle_tick_outgoing_sent_sms_dark.xml | 13 -- .../triangle_tick_outgoing_sent_sms_light.xml | 13 -- res/layout/conversation_activity.xml | 3 +- res/layout/conversation_bubble_incoming.xml | 121 ----------- res/layout/conversation_bubble_outgoing.xml | 139 ------------ res/layout/conversation_item_activity.xml | 2 +- res/layout/conversation_item_pending.xml | 17 ++ res/layout/conversation_item_pending_v11.xml | 20 ++ res/layout/conversation_item_received.xml | 143 ++++++++++++- res/layout/conversation_item_sent.xml | 142 ++++++++++++- res/values/attrs.xml | 22 +- res/values/colors.xml | 15 +- res/values/themes.xml | 46 +--- .../securesms/ConversationItem.java | 199 ++++++++++++------ .../securesms/components/BubbleContainer.java | 168 --------------- .../components/IncomingBubbleContainer.java | 87 -------- .../components/OutgoingBubbleContainer.java | 105 --------- .../securesms/components/ThumbnailView.java | 13 +- .../database/model/SmsMessageRecord.java | 2 +- 49 files changed, 475 insertions(+), 908 deletions(-) create mode 100644 res/drawable-hdpi/ic_done_all_grey600_18dp.png create mode 100644 res/drawable-hdpi/ic_done_grey600_18dp.png create mode 100644 res/drawable-hdpi/received_bubble.9.png create mode 100644 res/drawable-hdpi/sent_bubble.9.png create mode 100644 res/drawable-mdpi/ic_done_all_grey600_18dp.png create mode 100644 res/drawable-mdpi/ic_done_grey600_18dp.png create mode 100644 res/drawable-mdpi/received_bubble.9.png create mode 100644 res/drawable-mdpi/sent_bubble.9.png create mode 100644 res/drawable-xhdpi/ic_done_all_grey600_18dp.png create mode 100644 res/drawable-xhdpi/ic_done_grey600_18dp.png create mode 100644 res/drawable-xhdpi/received_bubble.9.png create mode 100644 res/drawable-xhdpi/sent_bubble.9.png create mode 100644 res/drawable-xxhdpi/ic_done_all_grey600_18dp.png create mode 100644 res/drawable-xxhdpi/ic_done_grey600_18dp.png create mode 100644 res/drawable-xxhdpi/received_bubble.9.png create mode 100644 res/drawable-xxhdpi/sent_bubble.9.png create mode 100644 res/drawable-xxxhdpi/ic_done_all_grey600_18dp.png create mode 100644 res/drawable-xxxhdpi/ic_done_grey600_18dp.png delete mode 100644 res/drawable/triangle_tick_incoming_dark.xml delete mode 100644 res/drawable/triangle_tick_incoming_light.xml delete mode 100644 res/drawable/triangle_tick_outgoing_pending_push_dark.xml delete mode 100644 res/drawable/triangle_tick_outgoing_pending_push_light.xml delete mode 100644 res/drawable/triangle_tick_outgoing_pending_sms_dark.xml delete mode 100644 res/drawable/triangle_tick_outgoing_pending_sms_light.xml delete mode 100644 res/drawable/triangle_tick_outgoing_sent_push_dark.xml delete mode 100644 res/drawable/triangle_tick_outgoing_sent_push_light.xml delete mode 100644 res/drawable/triangle_tick_outgoing_sent_sms_dark.xml delete mode 100644 res/drawable/triangle_tick_outgoing_sent_sms_light.xml delete mode 100644 res/layout/conversation_bubble_incoming.xml delete mode 100644 res/layout/conversation_bubble_outgoing.xml create mode 100644 res/layout/conversation_item_pending.xml create mode 100644 res/layout/conversation_item_pending_v11.xml delete mode 100644 src/org/thoughtcrime/securesms/components/BubbleContainer.java delete mode 100644 src/org/thoughtcrime/securesms/components/IncomingBubbleContainer.java delete mode 100644 src/org/thoughtcrime/securesms/components/OutgoingBubbleContainer.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index c12e89e812..a6eac279b6 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -5,7 +5,7 @@ android:versionCode="131" android:versionName="2.20.0"> - + Y$HV7x7n}H(rbNl}gG(fWWD0nKVlu^@ zf1CW;x`g$qac|jujsB+!XKi+U+;Et~Q9@|ZjWlJKjKYU*=NFhN7PBNCJJu$!(7(ZG z!!f~DqktR_eM=9A>A_4<0VR`kc5GPuU3K$=%WabwU4Tyc7+5ytT&_bxk^7e#^CAd=d#Wzp$P!|5PXFI literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/ic_done_grey600_18dp.png b/res/drawable-hdpi/ic_done_grey600_18dp.png new file mode 100644 index 0000000000000000000000000000000000000000..395454d91d7086919b820026f59673d9859e7bce GIT binary patch literal 269 zcmeAS@N?(olHy`uVBq!ia0vp^(jd&i0wmS%+S~(D3dtTpz6=aiY77hwEes65fIIEGl9etTsjXM=%2>%$u!Z5s+EH1s|&$@<#=NU!fPpV+OVS{WuP;<-<+%HO%$ z9K6Cj(Ej%!o>)8MHE*_5p4pHTxuW<6@5vj?o)HX7BL#l0nYd`Os82+dq*dg}o})${ z7fLa_@VBb$okuSs8=3<}Uilg?57?3C`}O~%H!>Td+64>hJDY$GV(@hJ Kb6Mw<&;$T6c3}7b literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/received_bubble.9.png b/res/drawable-hdpi/received_bubble.9.png new file mode 100644 index 0000000000000000000000000000000000000000..fb716dcbac28999272d00fe316a6d753fefa37ac GIT binary patch literal 305 zcmeAS@N?(olHy`uVBq!ia0vp^`ao>N!3HGH8zg1cHA(Ely8JE1uA#VLW9}aQn%ke*K z6_2ZsoeCAuuL-HJOBOJ$6IPw~difh;E1TTeISX?J^bSfMVS zb-yu({(g&tjh4TSTJ}A+=9?ZKRu{wY>8k%dol35r2xE0gU>GoXy85}Sb4q9e0JM*K A{Qv*} literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/sent_bubble.9.png b/res/drawable-hdpi/sent_bubble.9.png new file mode 100644 index 0000000000000000000000000000000000000000..e5c0b542f8acae66d5f26ed46926840d6bdf5c10 GIT binary patch literal 297 zcmeAS@N?(olHy`uVBq!ia0vp^`ao>N!3HGHIy0^7J3TEupEpOh+%0wu*q7%f}NAS;ebP*eOgn(3%lQDHvU0-@9$byJNw$sR}WXW za!+8WRygbzci;|t-NCpr`+a+gUHhX?3rqZdAkX$OyTAUNW%CDPgAURCU*^0$^RVAR z->ru4jMp0DWgl)&>RuvQ!`72@biLLTb+r%b3*@!y0yi4)^x0SV^*;MxX|OhM68q8o ztas{7kJ>Ljdi`#Gi+Ehc!&U_G-`eI7xBi|FhoWs=_L;W&Ge5Yz>_cq)oE=P_%0K$W pJ)-5DzCV(j9JcOm$rY)S(x+!}_cpydw-D%e22WQ%mvv4FO#uCkfYJZ} literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/ic_done_all_grey600_18dp.png b/res/drawable-mdpi/ic_done_all_grey600_18dp.png new file mode 100644 index 0000000000000000000000000000000000000000..080b29b54383eb0af6036e211eb14a932176559d GIT binary patch literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+0wn(&ce?|m6p}rHd>I(3)EF2VS{N990fib~ zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9;eUJonf*W>XMsm#F#`j)FbFd;%$g$s z6rAko;uxZFK3OAGfk%?9U1{N^e?fc-XG3lUYPEZx+>WnUyMz4KScPVKzY8q+Zjn!gE>6-FR_bR(p8S^fo2}<8D$uC{rcVvY6{scrN90+D) ZsCaQ;dTH4DWkBaKc)I$ztaD0e0s#BI(3)EF2VS{N990fib~ zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9;eUJonf*W>XMsm#F#`j)FbFd;%$g$s z6pZt9aSYKopRAFpz$3}lue9vaw;5 literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/received_bubble.9.png b/res/drawable-mdpi/received_bubble.9.png new file mode 100644 index 0000000000000000000000000000000000000000..f9806a42d6c504ab3012dc7b178da48d26044bed GIT binary patch literal 250 zcmV1QDkNoRD#Z4vRr3?{>8W(VZpAmoyxPTu+7jS{U5Mcc{ zwZJ-=0Bfh@lu}?z?nwk#Hz#KZ(ksB43E4xGPXtz~ukRJ$`iLALOshaOd;@X11ZLzY zo`3BU*pY{DxLr<*MgcA?$wfFk{CfWO05OC*FLa~U-@+I%CjbBd07*qoM6N<$f`92{ A)Bpeg literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/sent_bubble.9.png b/res/drawable-mdpi/sent_bubble.9.png new file mode 100644 index 0000000000000000000000000000000000000000..6409e09e521f90ecc7b21f2d2aea916cd9b9136b GIT binary patch literal 240 zcmVHL(*PM{!TO*8X&o&$6A%53%Y8 z@IVWU$Rz-W6rcqr!Oh>mHPKb)fG4u)f!#NNbk4v=3vf?t{u4j|jx#4q6mSC?EkFSF z8M8$M@B%KG!%YM*09#GKsbIW|02)<5;RR;^0~o*n2G9p!00aEPDX950dn^HTl^&-P q&@BP@h*;B!F|OfPeHB!wqI>|#vDV`#d2+r00000004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_008_+L_t(Y$L-ZU3c@fL2H=7q)Wr*k7SACF;@_sT_jtDs zg2!>IPJ;9lj{cp%O~s`qZPKLG`X$A&yi1!lPk-_yap3$XP6btvO@{C?=PnjypedfX zXq1Z`BKWq@gfS6Im|=K&cFZI0bVet~SiO;CPTv@FX#ATog-FH>QcSyuF@Z)V3=Itg zbNtODkc)slS8twSje304#npu2Py>5*;jU40yjV++QX$Q7sKrV?%1}#jyQCbNNj}Z{ zpjM*GCZz~Q{%ndO88vFf)D}&e(TBg7y3tIwj*2Og$rq%g4yffQ-*&0xl$;ET^2@B* io|xe({c2yUAR=%1-~y)Ra7!ux0000|k0wldT1B8K;Lb6AYF9SoB8UsT^3j@P1pisjL z28L1t28LG&3=CE?7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeOgEbxddW?@s&TDEMt z`%>&?d4qoL^Q~*Q{ZS8XfQG<;A|^rwU6AFG=^g~zntUMvR&iUWVsAh22Aj5 zR`THzN&OPQ{@5wlY)$56N$FXIX$PjZI%`Tu-zsD%&=7r`clH89LGr(aQ_j3kygg;s zM_=C+*4lni$L#AC&g0qYv%=kJ<;()b)*z#eY0^@*!uyq!EB~I_AGV-x55pD}&zajl S9{2+E34^DrpUXO@geCxw;&DI# literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/received_bubble.9.png b/res/drawable-xhdpi/received_bubble.9.png new file mode 100644 index 0000000000000000000000000000000000000000..4fa023312af8e482f0f3e1579c6eabe53f975be7 GIT binary patch literal 423 zcmeAS@N?(olHy`uVBq!ia0vp^c0laJ!3HGx6;uB)FfitMx;TbZ+0(^EFRDYM$v?Dm%Z0N3u*ahpV=lRvI}oZephV&h%c1^qWU-#nRV%lUiS+gF|L z*M)vrC(f_3eCT}RtbzI-BcAm|hq4cUuu{KM!Xh41aF7*7+%DkI+wq`@8%RVQfHT4T zChk1ezV+#MPBpoI3GDp9`)#Ak4^3-bu5&-P-4wU*FtT_amAd|+isr-LZ=wS~RBU_y zKx5^D+8cFcrnYm6b2cekcys-*{2eG_^RH&_;lyWc#c!mlnV0|M|I<(lG^8;08)M&P zDY^f(ybo+XAJ~3lxzI!Ldt%!AQ*LpcW3--k?QwmIjqx1m^_#ax^u=s#l&^|iV`B7M zd)mjG`}&N#?s{*%^Wn@#@u(fVW_;7lcemeJA86h`cjCVj>ep)K?AiS0I4CL@JYD@< J);T3K0RW#^X{}64Y_?ba%fNQPtbo&}fo=XphVP>3+`>6QN&r#bj`cj{6J#Er<<~W#3J-~?U>7$V`uDW zif5mZTmIp?-0kVn6})rU_DPp8)-zo5YLPElvu{&lyUXv!<2!uCV+szk;w17}-Qm)A zlx?1-&9Qnm(e&xJ)rCG4r+CW`&-f4$t+U)gRCr!e@LTQzryuoq>K+vT;F4fE|9{Gd qtb{**d8|wFSHJpe79004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00Cx6L_t(o!|m6-PQx$|!11&lNF}zyf?xr5Rvv+gm5(>5 zI{&3?yawWHVqir=qVN`F1%w1I0aC>=SZVCWt?G-#0G6lt9RFk`ck*Rqzc;dkB`jeH z`)^pAof(lH8*#BVSA4SPrAE9OE*>R_hwCvy5MEf1gO!xwc0H6JJhL2^5{BenN+_D2 zEP!f?&8AlBR5L7)YJvq*dQ3rSF%_l5l#~WjQ{mV=>S;a|j-BeM3hQ%D%d?=vH3!!7 zK3`g@#QJ;wR-3fQck`vjUa7Dbv!f?}6#T7*DV!E7o kD8mg>GnlZ1CG1aQKc$bxR8;SYcK`qY07*qoM6N<$f)Lor<^TWy literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/ic_done_grey600_18dp.png b/res/drawable-xxhdpi/ic_done_grey600_18dp.png new file mode 100644 index 0000000000000000000000000000000000000000..de5251cb5c9e335fe29eb8e910ab0d35c4a381ea GIT binary patch literal 407 zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL0wmRZ7KH&Rg=CK)Uj~LMH3o);76yi2K%s^g z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&_}|`tWO>_%)r1c48n{Iv*t)J zFfj6ax;TbJ9DaM;}fJU8Uqtl zCgqq_>Su0>&iy`f`{#S_&zgmWluPjy&p0d-mVaikZvgMJ!ehxt_ST$vd`5udpJnYE zZ$=iLiYe`_nm0D+tv6C$+MOCOD?)8)dt^Y=4AG^{kwH>3OjVB;1qA7cs~#>2IvFup zR=n?4h|sko>8B>ooT%+^bfcJ^FvGkvA5B+UTzlyDz1aUTSCHrV8;_+PiOFnP@r2E= zkV$Lp*UJ`yQ|;0N^G?S3&20NM-`Z2NxXEQ_!@izVU8@b+r<^)>%p!coCeBA1>I>ck y{XgERaa;8Bvz94;?Oq$Ez5bUD@EaktaqI2fy_SpML_gGWl2v zz`=t_9uIOSeXf5X`FY-)`x9g~EeYXLH(T=X*qK$Y8gGT(*QxJ(x6}BBv+3yzsaqF* zTWitz?NX3-26mZ(1B`fx4=xYbEFLs4^Pv;+>j~-woBToXMsmaNrhJBX?Y2wr zF}-8om(7@_@*t`_u9oo*|DPL7z1BOf#RTqW_TwnJ=MRR`CgF@!(QI}uIKB#+8 z?N)PO>$#?1T-)V;a9;6y5S1*Nre1J%e!%*KZ_M|bZg9qIPQOy!@%O;@howx{@3@|R zzTcpjyN+wE@Q$=~2Vb$QtDOAGbWPoZ+Y_uBv#+iB#jsMoLe>vxLS)eWhhLcOn~lQe z1vO`%uR(K1l24Sd&fPjk zB1ZiB6@HojzVW#$r*2W7T&&an%+jjYMgPP>V{7q^O<&H}Fsr@gRx9na&j2P322WQ% Jmvv4FO#r5?|1AIj literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/sent_bubble.9.png b/res/drawable-xxhdpi/sent_bubble.9.png new file mode 100644 index 0000000000000000000000000000000000000000..ffaface323c724b9ec0744cdf580bfe1c69b994c GIT binary patch literal 584 zcmeAS@N?(olHy`uVBq!ia0vp^F+iNe!3HGn&fn6?z`(@s>EaktaqI0}L$4S|nTC&s zZLJGD4#aKX=y)fn(;{Nonvj_MSW)K^ON^j+5exUhV{S);mv}79;1dwI=odJ7$4{M2 z9c?)>HTlnN%lGl$WBeAb^EvHbKc`~tmx@okGuXl!lOM3XzM2>Kf^7q1$(EW;@dru* z-`L77j;?=p|D|n3^x+rh8b78tGaDaR+jmh{Ji?%bVT(!6JC2H2kv|c~U)YJn2(>f( zxnQ_zuFyS4Cm=olz?26sv!;HTrd#2Xejxhb<*gx)>?S?%FJa)}p11D1>ia2N|K@M| zy}?wsqCc;pylMIC;Q4&VgM?XTSbri2cBxt2!e> zV9#w+1I>zEc51Uu3d&e8y0Q9ScRI9k^P7YF8P>D-U(Qc3`xujY?ZIqOo=s`ob*w%d z^VUu6a@)F@004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00F>BL_t(&-tE~hV2!4@cNXoYC6hX%6X#|tO| z4h6TM(6Rx6;1nfkiRyY{JF%Z5ghsPVo~2KTV^5NdvcFZCfCMBU0SQPz0us>w18ufR zr049>l$0}ZKyO4{flAK2DCOjoiIXls6~|7hIAxut2I-u7lFlhBPYE(PbGr0!l7a#` zsX)P;G$22xZ{wr@an40^4jvTAL4%?>SP+1N1VK1B5a*nSa8Mu^2Lo!td2hx+fS{as z5SSAS+G3ouIF1hL(h?0_ zxCV9-h*Q70D$h*GXv|0;j%~MZPXcl5?MDnLk7;S_r<8Zq8RI$b291+8jKmF^I(3)EF2VS{N990fib~ zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9;eUJonf*W>XMsm#F#`j)FbFd;%$g&? zz`$tj>EalYaqsPoz*UDFcvvs2J0O~&{i9-s{m%c9v$$9Oda&^J3j4Y#ueO{tDUULE zVlOje<`W~)Ri&Y#3m8~692mI*8koNDE;zf(A$rS%uMOKWE-v(*IPH;&XR76HId#XV zNt+Ekj%u<86?rw5?Ra64>cHm5Iid3~yQF1KK zW;pxkM{`=yF-P_}fwOO!7F#ASkpHvz@KJ}N2TL6H@7O;p%TsTT$cqm5^&dkWiykd; zSnl{)GpKnszj|#-l7eN?F}<(WD<2jgo4>d1$(fl_J;6)%nx|I<@q2EU%j~z$?@KFP z;vv$PH@#MAqQ$MJzx - + - + diff --git a/res/drawable/conversation_item_sent_indicator_text_shape_dark.xml b/res/drawable/conversation_item_sent_indicator_text_shape_dark.xml index 4e55dfe701..d02a391561 100644 --- a/res/drawable/conversation_item_sent_indicator_text_shape_dark.xml +++ b/res/drawable/conversation_item_sent_indicator_text_shape_dark.xml @@ -10,7 +10,7 @@ - + diff --git a/res/drawable/triangle_tick_incoming_dark.xml b/res/drawable/triangle_tick_incoming_dark.xml deleted file mode 100644 index 14bbf0f8ee..0000000000 --- a/res/drawable/triangle_tick_incoming_dark.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - diff --git a/res/drawable/triangle_tick_incoming_light.xml b/res/drawable/triangle_tick_incoming_light.xml deleted file mode 100644 index a738f898cf..0000000000 --- a/res/drawable/triangle_tick_incoming_light.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - diff --git a/res/drawable/triangle_tick_outgoing_pending_push_dark.xml b/res/drawable/triangle_tick_outgoing_pending_push_dark.xml deleted file mode 100644 index e360878584..0000000000 --- a/res/drawable/triangle_tick_outgoing_pending_push_dark.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - diff --git a/res/drawable/triangle_tick_outgoing_pending_push_light.xml b/res/drawable/triangle_tick_outgoing_pending_push_light.xml deleted file mode 100644 index 056df3823c..0000000000 --- a/res/drawable/triangle_tick_outgoing_pending_push_light.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - diff --git a/res/drawable/triangle_tick_outgoing_pending_sms_dark.xml b/res/drawable/triangle_tick_outgoing_pending_sms_dark.xml deleted file mode 100644 index 97cf746c5f..0000000000 --- a/res/drawable/triangle_tick_outgoing_pending_sms_dark.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - diff --git a/res/drawable/triangle_tick_outgoing_pending_sms_light.xml b/res/drawable/triangle_tick_outgoing_pending_sms_light.xml deleted file mode 100644 index dfe7b6a946..0000000000 --- a/res/drawable/triangle_tick_outgoing_pending_sms_light.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - diff --git a/res/drawable/triangle_tick_outgoing_sent_push_dark.xml b/res/drawable/triangle_tick_outgoing_sent_push_dark.xml deleted file mode 100644 index fa237ea7fb..0000000000 --- a/res/drawable/triangle_tick_outgoing_sent_push_dark.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - diff --git a/res/drawable/triangle_tick_outgoing_sent_push_light.xml b/res/drawable/triangle_tick_outgoing_sent_push_light.xml deleted file mode 100644 index d0f22ac0db..0000000000 --- a/res/drawable/triangle_tick_outgoing_sent_push_light.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - diff --git a/res/drawable/triangle_tick_outgoing_sent_sms_dark.xml b/res/drawable/triangle_tick_outgoing_sent_sms_dark.xml deleted file mode 100644 index 45abd07706..0000000000 --- a/res/drawable/triangle_tick_outgoing_sent_sms_dark.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - diff --git a/res/drawable/triangle_tick_outgoing_sent_sms_light.xml b/res/drawable/triangle_tick_outgoing_sent_sms_light.xml deleted file mode 100644 index e85fedc804..0000000000 --- a/res/drawable/triangle_tick_outgoing_sent_sms_light.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - diff --git a/res/layout/conversation_activity.xml b/res/layout/conversation_activity.xml index 59d5ff1083..5c7bdf651c 100644 --- a/res/layout/conversation_activity.xml +++ b/res/layout/conversation_activity.xml @@ -1,9 +1,10 @@ - - - - - - - - - - - - - - - -