From f3f79a7a5ba712ebebca6649c19c5e78030c37dc Mon Sep 17 00:00:00 2001 From: Margaux Clerc Date: Mon, 3 Aug 2015 14:46:51 +0200 Subject: [PATCH] Chat update --- res/drawable-xhdpi/chat_photo_default.png | Bin 1674 -> 0 bytes res/drawable-xhdpi/chat_photo_disabled.png | Bin 1673 -> 0 bytes res/drawable-xhdpi/chat_picture_default.png | Bin 1338 -> 1525 bytes res/drawable-xhdpi/chat_send_default.png | Bin 1149 -> 1286 bytes res/drawable-xhdpi/list_details_default.png | Bin 746 -> 879 bytes res/drawable/chat_send_message.xml | 2 - res/drawable/chat_send_picture.xml | 6 +- res/layout/chat.xml | 26 +++-- res/layout/chat_bubble_alt_incoming.xml | 54 ---------- res/layout/chat_bubble_alt_outgoing.xml | 51 --------- res/layout/chat_bubble_incoming.xml | 68 +++++++----- res/layout/chat_bubble_outgoing.xml | 114 ++++++++++---------- res/values/non_localizable_custom.xml | 1 - res/values/styles.xml | 2 +- src/org/linphone/ChatFragment.java | 8 +- src/org/linphone/ui/BubbleChat.java | 31 +++--- 16 files changed, 135 insertions(+), 228 deletions(-) delete mode 100644 res/drawable-xhdpi/chat_photo_default.png delete mode 100644 res/drawable-xhdpi/chat_photo_disabled.png delete mode 100644 res/layout/chat_bubble_alt_incoming.xml delete mode 100644 res/layout/chat_bubble_alt_outgoing.xml diff --git a/res/drawable-xhdpi/chat_photo_default.png b/res/drawable-xhdpi/chat_photo_default.png deleted file mode 100644 index 6867dafa7039bf40c2a561eb02dbe4ecd6958fda..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1674 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 diff --git a/res/drawable-xhdpi/chat_picture_default.png b/res/drawable-xhdpi/chat_picture_default.png index 505d1c8dd752a85472840e3f42f95fe24047c629..f5c3bf9491af030cccdc1cd6398fdc0039ab048d 100644 GIT binary patch delta 1504 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 Z{{pV2ziDepE|CBL002ovPDHLkV1nlTUr7J} diff --git a/res/drawable-xhdpi/chat_send_default.png b/res/drawable-xhdpi/chat_send_default.png index 22f2e496f847e36ad3b41a34c7bf27fee3c3fa80..05a49484f2710cce59c6802ed6d6643832a18bb4 100644 GIT binary patch delta 1263 zcmV4qk+ed^9y$Ri##3^98l^cw1 zeFQj2K0dH|&6PS2SO>ffoTM1HTFK^#9RVhQUn$4oIs?{_>Uwu;6h&iEe-v$wqG)|Z z_1YcB@d>Njj&7aFKfs6;p1Wu34ZvGDpRGRwe;BUX)vYIhH-PJaT{*^WwBq$hT>xwZ z_J`YMR=xwa0_OoS@M2TLRaeEXDA28cg>GFNLRVBkF2IBa`uA)d1NMYlYgT>&wgVR= zoO80rxQ|m-t}f9=f4cRTe}df_C!BM(&V2xQE#cqyYosC1)*k1cP3~4;IQ)?qt{Tv- z$AYlcN!^-PZaD6K!&P-shYEJ|K8yA z@!Fp3aUDBm8GCQSnBRegU6Q*PIGR!H55U8~lA5lqu-q{ItAueoyVkvHGd^F(``xWM z}Hbo#s6to#sRG4OSf zP}W7!!(k^xo-c2G7Usog)-BhStKy>P12^ToeIE|D@1=Fge+}n*)s?Gqvacw3`(9Op zTvx6daQhw)fv!@yhO7RGUI^S74Jq~<2i`?f*e$Jwl(098Q>XW@HynIi(eLr9F-1l_;wP1rp z-<=@iXqoLje}=1O2|f!rlJ*UR0_VFXW##H(t37v;ClaI_Eb?~Bm8)h7zA)u?Hg2wH zF(ESM8C!BjwlW78tJDJ!RUEGh9tt&B2;7e;qJfwSUUAGU3=)3|H-$GEF6f zt7*ekd!|g&z_8(}-BYHA3|H-*G93!LFb!8No-%DRT(w8?-UN}Kr0lu6!-@@_;A?a2 ztu|b>Xv$=`YWbAOaMgh+Q|rRjyeTv*<~9Heix6V{2<$rJYO!CW=r0e zAoyu3MbjR^qci?P=RXZs?UQ^x@DA`MaFrDi5fKp)5fKp)5fKp)5fKp)5fKp)5fQ18 Ze*tXF-M_j=QF8zQ002ovPDHLkV1mWATSfo? delta 1125 zcmV-r1e*JX3jGKniBL{Q4GJ0x0000DNk~Le0000-0000+2nGNE0G{lLx{)C%e*_&# zL_t(|+U=Z6Yz}V+QRtZawE~F|!QW~$7wq8lCG@3?G@;JSoik@un4#Y{2*AYNE?(QU_bByvuN)zfS$h?5Fs zVgQwVlPW2b1}y@B0ob2ZFDVBu%j4iT-U4;NSjC+69^>x2RK$~$sFL>qRpKb-%%qqt zzy-zMZ>GXaJm$^>W-CxA0Vl_Z1FED`Zg#dxCAwhbb(<4m#6Vs^l{^7zfT2F`;}?tr zJkP2T0}~8XQmlC|2RPv|e{bzy*UrsKMI4t(G{MyMx;|bbj#DLuV1~OGaaGQ%L;>cg zUodjarbvxATPg_wOf*JpppwU7sKgXZBt{I3mnvz?mP*0^<6*?N;#SF!h)mxEjJXlZ z4}LE+fc%gR>_t7Fgd@y|`#jchAj8-ViZP#nfqrj34EW*`%4=W;e=sVhf-*1|IsU0) z+(DfMl=<|N>Znzs0jA!^_}MP4i77gZ7zuRy0MrFE0MlXsv)2TSoa2mQ?A;)XsgP&U zZ#2s>c?ktmApe=YV`Uh<7QgXPru;D>fjQ!FuiYB+Y;sxafG`$0L)I*vnjN~*1b}gX zXF&{Hcfp0SgQoK!fBuoIdj`b~CM&H8`3lEU%_G+?kKE|Ez{vT|8&|{zpr!{rawRc< ziKjIY;gPGB<{v7U$c;GQf(8O>TfoLd|;Sc|G6K9rPaQL})Hnh)o~0%Kkg#{_8< zuqT5;LIdMb5#JL@4SD3MfrlBu95cL6flGo|C2}Ev64`iCe;v8whI6ksYE2{v(mKUP zzL>OB6K%wr8yO6AxILK+Fy9=Pig=R9#gLVA?`RG3DL<^ zFDn_PUSMOQD&i2~%ymiYQxnyi$ReN?#pX^M81e6%HDbjE*Sa+GhXpj^+afLDk=D0a zX~c?+9&mZ~qhBi2ak6`Dp|FVYw;X}#G>Bi2ak#fodsrP_!!(t3l!h`Up7#6Ht{ zH&AGu5o@IN?N%DG&$QkqpH|pq#2RV6%1R?v0BTe~c;M0_UTqtkc^c2Yto*%+79Vix zg^l5o*6lQ6jkF%C5%)_X9LI6Ggb)oLmz)wdhx|UdJL+Ze4xJaH(hR6c0q3yj3n75g rUOxu()mkHV0kiHMK z*`1Iv`PckSr!wX|u3Bk2%f{=G?1MhuwmT{xo$7sz16TbM*e<+>(WLPf+hM!KXFcXT zoW71%#q`DU{>ldq$3AF(F%o$EC&r*B-NT33R`Tv%k;!|4R{SfzbIeG*(OL5F`b&=* zElyuuH7{}PrNsOIaiYHKwedaedvyj z+T1F<8~G))>Mh2mKr(1gUjc3A}7C+fDcjoSb z^q29|tj(?N95!SBlzp<&+^GEhBQd7PH(heuexCZZ>dBcsmD+ze>X$lYrmuHwufB23 zL8$nESLaOQ$jbAVlzuF5`KzB~Rm}dqNG?Keqh$Iny$Lgt7%gH8ZnYa8y?%3X^d7E1 zVGI6o9sKx4?pl11zv!EXi?!@nOP?JrXcTYsH!8nc{>3OvJ965#J;ykzGcPMhEI6yzVNiBL{Q4GJ0x0000DNk~Le0000$0000F2nGNE090qmXOST(e*%h0 zL_t(Y$F0{vXdPt~1>o;avPd+Gc3q{SRM3S8Rl%Uug@}k?#XO48G-(#PcO`-@ita>O z)Qw0?-fL4eMo__mhz&(>Q7aUMBCZUrQY#iwn~>zq@8Z=Of{Fk9@h*pR?wxby%s+F( zx=Q2j)OAqhKDBMaAHr$0W7;WOf2=faKy5!puoHcf3&O`%y&W?yZ+XT6cVI%e|Eh*R z@s&zDrp&L!#x+vQkO6N9qie6Ps}oinjN>jA-Po9iC2!%z4Iq~#&ql{oQU6ib3$I}e z)dsLn)yCtfpRO5@T80do$L@?dKj=3clYVR{{wYZZeg6p#FT}K$8ufqLe|46e#621C z^SbVhW6t+n8uWUmc-U#x@rJSAC7H|;56Pi)z(b85|B@q_;^78;-c3ZLQMU=-ZW5V| z>d|OBk@-$`u)kTJosLePpfqlm+PQ3l|4G{86!`*4jEtzJGG#20E z?W;s~^w-y2S*Y5r7%H5xe>-zVv4#rU3d!3uUEZ#=a=B5ip~5eP6#8{PFXer?cyS$Hm6NAIWX)rJ~AjA^HOpT7mq-_8+S$+9bX zCZ?TfBxli!_$U*7)_^g8fB$3NssVe2!&uqyNJ@^m;(?g-d*igVom6=c=Qe>|kUUYc z3&gCh1yACYO*MpfbnS^Z{pR16o;2ZRD@KH2?7+pVo77xP`DV+TT1%fnj|q=RZbv`9 z$7dGJ#jM5uVdK0>C9Ne4tL+dj;f&f`9Cdar_AfY-#3hzEeQy8&002ovPDHLkV1gN6 BVh;cS diff --git a/res/drawable/chat_send_message.xml b/res/drawable/chat_send_message.xml index 2a8bb6a57..8cc2b9dc4 100644 --- a/res/drawable/chat_send_message.xml +++ b/res/drawable/chat_send_message.xml @@ -2,8 +2,6 @@ - diff --git a/res/drawable/chat_send_picture.xml b/res/drawable/chat_send_picture.xml index b28c8c74a..84c43169c 100644 --- a/res/drawable/chat_send_picture.xml +++ b/res/drawable/chat_send_picture.xml @@ -1,8 +1,8 @@ - + + android:drawable="@drawable/chat_picture_default" /> diff --git a/res/layout/chat.xml b/res/layout/chat.xml index dcab9e76b..3ae7ef855 100644 --- a/res/layout/chat.xml +++ b/res/layout/chat.xml @@ -104,37 +104,34 @@ android:orientation="vertical" android:layout_alignParentBottom="true" android:layout_centerHorizontal="true" - android:background="@color/colorD"> + android:background="@color/colorF"> - + android:src="@drawable/chat_send_picture" /> - + android:layout_alignParentRight="true"/> diff --git a/res/layout/chat_bubble_alt_incoming.xml b/res/layout/chat_bubble_alt_incoming.xml deleted file mode 100644 index 5a5cea187..000000000 --- a/res/layout/chat_bubble_alt_incoming.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - -