From 8364365a574d1745836d1fe08972605367f1fa1f Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 25 Jul 2012 14:10:49 +0200 Subject: [PATCH] Fix status bar issue + chat is displaying emoticons in messages --- res/drawable-mdpi/emo_im_angel.png | Bin 0 -> 893 bytes res/drawable-mdpi/emo_im_cool.png | Bin 0 -> 916 bytes res/drawable-mdpi/emo_im_crying.png | Bin 0 -> 873 bytes res/drawable-mdpi/emo_im_happy.png | Bin 0 -> 862 bytes res/drawable-mdpi/emo_im_kissing.png | Bin 0 -> 926 bytes res/drawable-mdpi/emo_im_laughing.png | Bin 0 -> 893 bytes res/drawable-mdpi/emo_im_money_mouth.png | Bin 0 -> 985 bytes res/drawable-mdpi/emo_im_sad.png | Bin 0 -> 856 bytes res/drawable-mdpi/emo_im_surprised.png | Bin 0 -> 916 bytes .../emo_im_tongue_sticking_out.png | Bin 0 -> 941 bytes res/drawable-mdpi/emo_im_undecided.png | Bin 0 -> 884 bytes res/drawable-mdpi/emo_im_winking.png | Bin 0 -> 895 bytes res/drawable-mdpi/emo_im_wtf.png | Bin 0 -> 893 bytes res/drawable-mdpi/emo_im_yelling.png | Bin 0 -> 927 bytes src/org/linphone/StatusFragment.java | 9 ++- src/org/linphone/ui/BubbleChat.java | 63 ++++++++++++++++-- 16 files changed, 66 insertions(+), 6 deletions(-) create mode 100644 res/drawable-mdpi/emo_im_angel.png create mode 100644 res/drawable-mdpi/emo_im_cool.png create mode 100644 res/drawable-mdpi/emo_im_crying.png create mode 100644 res/drawable-mdpi/emo_im_happy.png create mode 100644 res/drawable-mdpi/emo_im_kissing.png create mode 100644 res/drawable-mdpi/emo_im_laughing.png create mode 100644 res/drawable-mdpi/emo_im_money_mouth.png create mode 100644 res/drawable-mdpi/emo_im_sad.png create mode 100644 res/drawable-mdpi/emo_im_surprised.png create mode 100644 res/drawable-mdpi/emo_im_tongue_sticking_out.png create mode 100644 res/drawable-mdpi/emo_im_undecided.png create mode 100644 res/drawable-mdpi/emo_im_winking.png create mode 100644 res/drawable-mdpi/emo_im_wtf.png create mode 100644 res/drawable-mdpi/emo_im_yelling.png diff --git a/res/drawable-mdpi/emo_im_angel.png b/res/drawable-mdpi/emo_im_angel.png new file mode 100644 index 0000000000000000000000000000000000000000..3efea42df15238391d9dcb71b3e488ce4817f8b9 GIT binary patch literal 893 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fY)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvY{U|E4;A8`+3PR;%k~Wj+8kFKb}YzbvEbAj?+>NN9Iq_7e)P+N z?UPh>7IyHnu6roUw^%m*@f!i318F%&n{=LCS9M*(%oNzSLx|J<$WE^c!Roh>qMUbP zdM4KH5PF?d)BhlCOM;-=v8MsON2YHy)~>hhJ9ckg%a1x0D{0PMOb40o917lZFnZ4+ zWgDJfR?HUy_Z(O$^O29|n48RD)h&r`YB}{~!q1tWhOar|Ei%<-i|>pM(+F8rF2}0h zo>2*WX-99G-RbRG?Yit)kV&fJ-iJ?pcH9x}wcYsc(4h+p=1ki5h{uh!pZ%lVs+at_ zGRHYhj?6rEA;W4Hch7-^J@0jI^mR*$R(f+XZco(pV{ed`X#2bJ3Ga+qsu{->&Ya6w zxxH|P`2P7vX5GqToEExamEH@dEf!Xv^G6Z&dT3!`%UWK1>TdV86Tt`Id{DGgsF*alWIkqsN#zy3zAD@MejT9 zx&AQTfR)`S)=KL}d#U1ydmMF5)fIimUvLz*v$G0cVLP{lVM4|Gfb5-jm(Dn@Y!LjG z)Bku%PrnND>m6_TuFPlpSiE&-q522rg3taYi#?$z8glbfGSez?YbZ!%c?r}Y1F|7FKdq!Zu_%?n mF(p4KRlzN@D78GlD7#p}IoPyt>ti#ZItEWyKbLh*2~7ZI19ZRu literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/emo_im_cool.png b/res/drawable-mdpi/emo_im_cool.png new file mode 100644 index 0000000000000000000000000000000000000000..650ed8f62febd9c21365c1e1d1e2e474f65bc700 GIT binary patch literal 916 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fY)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvY{U|E4mwmV~EA+t5^LyLQ^H!KHRq~-nvCb zg-x{i5Lb-Ltwrm+ZaSP*3hL}on*Q!qw6~*ppuqN9I}ENYFw2eFHesEFNQU#z>8He; zW(!<&V+}qw)B5_++I{anT0Pt)9(Qi%{mTD#??2aVzcj&bdu-flo8KF%v#PEvJGFg! zq3H5cksH@0+laO6S~T+(u5lMKYt}nx{=?vT>E#tq<8C(aZ?HYK_@MTgMA5KEmprDI zr@nmp*J9rhvo{B7Zq3&3YW=b1KI=$P?8UdmHj zJZTEwy|q?%zvVOsZ7&df+_=JE!G#rlXX8EhEo=PG|MMSH+N%dUCWuX!)H&gD?pIrk ze)KLL|5jVo7lv=LZuD#yieNh1``}E0VBJx1HtF#8MdD8DBW1W^3fA&%3s2gka?5B> zgI81MnFmb=onrhK9A+y&lM+$N5xr{7Coh|R--quOKm1}5#xiN?!xDaT;fiAknso;` z|IFFE%At_=zH4{S!^UF?r&YHKM4gR}Id(z6-0|QRo>k#mw{1;pH@`G3dTGA!mAOa3 z`M1}mocg=;{-29~xPSjYDZ63*)*G@P1y=x5qezKsM2T}zYGO%dex5=|W^O8jk-nwA zpPHL%n*v2 MboFyt=akR{0H?5$yZ`_I literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/emo_im_crying.png b/res/drawable-mdpi/emo_im_crying.png new file mode 100644 index 0000000000000000000000000000000000000000..ad1e50f585a6e623b237feecf7d9438fb92ff24c GIT binary patch literal 873 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fY)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvY{U|E4lJQz3G#1 z&B%nr#$^*&-8`4*xa0`bH@31GdYtNC@@Iu&_R^GQrBhwy>5C__I&GYI^~v{sAD;KW zqxL*MX?(dy(t7#4ceV41&wZcsyypDQ?JriAJ1*4KeGzv%dyUXPPc4%RTEz!M5;{Ic zIC}r_ig49XKYnn#L5AA|rEiBlwckV~UOr@HbM&=V&$|Snu!qLST)(Kza`v8_8nu9# z`9|w!i;l~jJNgdqXzYE#-|qV2&C2q#2YW1j_k>q;9RJa%%lJ!1Jb0tGOlQycM_hS{ z@>cGepOx<%$=h?>Y>#WCYpzyFvYuI@ZPvnU9_EOaIzzEzzvXN^muecDnJ4=)d`)Eu zJG|z7#k7g+>Khba#cDHW)J{p@>Ps?v*Xlg)JZF6?w)W^vmpQ&q-X8dKB8{uB_3|qNy+@}~89Ml?#D8%Xn(4g>OU%9){JyGT z>CDd_lh_uCd4}wesd>Xc_rQwqTYI&bef{{8dyntoxHpm2^Q-*=+rn-myJ@P^KIdF6 z&CljPkP>rLJ?Hqj4~(-i>uC#M~cE_Rq`>lKb?qtvCul~0= zW7#n>6FH=L&Nie*lx1NQrAiiE~kEVo7FxolV~EA+t5MosdDWdKC z$62BOA5`u4d|wf~K>iW$}yZtB_6pMK|T zcT!2nj@74_)*LiHb25kTaa8BukE=R$jz&-YcCzvEz9Vx_EU>-C_Uust?{1?BQDIZQ zB>SlQp5ZuKn~>c(^`l`|e8jwuGprJ{Joz<~WV^RA+nUz@TeAH|qod7{{+?MYO;W$B z?8>ygv?Xhr1pndEDCQS6C7!lgcUPJUTOG>u$@Zu{y4>RRQP(wnIj4iNwdNj3D|wu= z+-h5%q5q_ZOW5be=T;{+2j5o@Xldl8@>zT z8B-1x3a@w4PtUz7wjgz>^Q*uYR%;*5M@?!zopr E0G0D-0RR91 literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/emo_im_kissing.png b/res/drawable-mdpi/emo_im_kissing.png new file mode 100644 index 0000000000000000000000000000000000000000..f18a391b3e2c251b2731bf04c4f253c75541a458 GIT binary patch literal 926 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fY)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvY{U|E4w zIwqHu%9l3vta#w_R%O}I3r-U^2ozm(YAtxY!=qqf63fAk*$P= z?cBKRr_Q6G9Ol@P)wAL|`RtBpSMdE$X=!$tyfrat&B_&)p&vi8ls$00bEK)VVfROs zORW|i`Ub(g3I8;&J!QNzS0cNNO{Sis_(o^#j>egb*sMg{@3&pPA>Eg~xQ_MR!}OS= zTP+@b{`gz(+JdRqcQn>NuFYK|?^^k6vsqf9#QH?RZwp%8rZ$#sU<{6E)jl}S>od>1 zzN%@CJNVL->e%KlXIo)(;rhqYjt}Pd_?N3MKBvz7$M{df_K&F(-X71&IU1g^H8zwUrXqI zOlv61cAC1QA$f<4Bk!Nicw@$D$wYSj7<{ABu?<%}V67pWm8g0>aSB|$c=WbL| z^0dT#eyQiWou_>N;NDTqu>J7<@NQYX#V_6_oIAd4cITxd+bzWBDz^N#z4y8>R8lfT z@^g$uPS;ocKN9ctUA`Htx&M4FgZIg)i|)F8Fs$o7yO3kf1^FqKdqkD`U-kbGs(EyA zMtEe=_79GRmbR1fmM>Q-V2(TFrE|C}=2Xkg9%scT`a9O!J8a(3@%~6`Aj@TDpW~CQ z61)E`Is2&ZpX{Zsyq|WTS4S^CWv9}#r*z-J$UR-@A6Ndwrc03$*N775qSVBa%=|os zkj&gv1|xk-eM7^JCO=l7yeddOC9x#cDjB2*C~IJ7sB2)UYiJo_Xli9_W@TcbYhZ3= zV8CdxClp0PZhlH;S|x4`1*t4Aff{5$HU#IVm6RtIr7}3C?BWlc4|r literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/emo_im_laughing.png b/res/drawable-mdpi/emo_im_laughing.png new file mode 100644 index 0000000000000000000000000000000000000000..963a4ba68f77f1c3f16669e70e8d6a09deac0097 GIT binary patch literal 893 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fY)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvY{U|E4gweeD|VB zD>S%vFLLtOD8v%zCdhKMaAT*(2lt6uOE!ee2s?VpNmBP4zd){w;KuSJK@tKR144MT zRy^Rp(wH%+H2v74x!do^x~VQ@*W-U@`~0`<_v&-D`jaCzhZ>)e`nv7^>u_Hg<1d9W zvU40+Z4a-tv2IbdxR-O)=!^8%Z8;nteAgVdxRxSbD+)P;2a%8sjp=d3m4zJ zmUHz}!M>ieH`-ReFn#s*U4uyFguhLx7SisOi|@^A)Va8N&#m(n9omY=Rjwt}HI#l} zGT$J3e1ov=lNaZ*=EU&dd#L}X&DPQ4Ods3D7UaA4r;WM0?Kamdh^-1j3^QivCP!SnB;_J>UF`Pt4ReZ0f4LAv7zL=}Vr)RK`rk z(`UpVU2BLJPqv6SI-mJhX`wC0v5g|1Pc3p0|I>TDLXveh&!K z!*Czd7iR&VWb-mtC)J;~vNEpl9t+xU&-5d{Cg;j+*=IcSbw1kKT+p=*(K`PcL2%WL0UpODI!#1Sat% zr2>a>QWe}Xi&D$;i?WLqoP$jZw>~xls$=kU^>bP0l+XkK&AoL= literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/emo_im_money_mouth.png b/res/drawable-mdpi/emo_im_money_mouth.png new file mode 100644 index 0000000000000000000000000000000000000000..718c7e3a63cfd6b13459e23672262da197127cd0 GIT binary patch literal 985 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fY)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvY{U|E4fbEZvc&V-Cl=1JZvsw%G9vx1YRwe&I<9T2NN zvaY6V=FIa4t8Mo^mwvl&`LgeGpYMGCd*{2?``-P|4aqinH~l)>>8Ixl3<@Q7hi=;% ztKTMjrjW7iM&o>O{fLOCIkIMt_g>twza`CLhR$~_WeZXBN76Pu$_DWc5n=505B+Q! zx(!eMTf;K%`A@yNBVjgj$AK!>IN3^lm-bmY%2-~(8GdYCv_N_BZ-)HG88%&k-;P(9I2H&x7_97kah+Ncq#Wd`r}R zk>hRi`1B6GmW^30`opGm)?>DsSq;%2T<1J<{GQUaTYbxwRaTt0t8aw8%(vWMUC5E` zZMZ6_z9oI~)hL;nn=@0lFKt$Ok|$Gb5v~1WZ-ud`M&I(sJ~eA(8S_K_x$a9hU0hf{ z>#Y0-zPzJ`6L0P-i2o6~w_g0p>yOg&j=!&9xh(h3V?pT;x$uniW6wVPPh~nIT(Ioz z9^sFUCG`x?Gj{VoJDYK5zrmci-o-^1Ekxs+qc_>Fu86zDw_5h(n@txsh};*q`eAd+ zn)iCf?zJoRnw$?Ge4@Y?mHC)Wy=Btwt;VU&NpG^;9@nk>wWcWI8sCiH1<@0xe~uF= zu6}Vd(sOOfl`mpJIiGZF<9Fqn$@rxGu{P?q;a-sx{p`dkldj<2irSD($4_n0dhWf0 z!`~%u@56+k*A=A?v??NxXFosw==n;{>%X~JyYCyiEBiO zb5UwyNoIbYLP%zADua=}rM{tIN0T2bP+k=zpORRTYLyI91e7%}G}JY))HSpWF*LO@ zHnTFZ&^0i(GB9AY*b|DPAvZrIGp!Q0hJsXfH6BWnrt}{<6c#w?>V|7eA~afS`demfF#5c2 z{ZU)~^D)YsOJ0@De{T2u&-vnWKj#;B2Q%-z(8#pd>DO;IUzbC6o}Fg1T;FbJyw)P{ ze~RHYS;k#**@gBZw*(y}f4jX9-}vstm!b=?FOFR{;@g&>zU+YuL*KG1S1t!}?-y3S z(ObNu>9(te?@@+nN&0@tX4e+57aQ8<{o-A3*kN7K&%2{jJ)*N;^Gae)-{Hv-tydYR zU7Fzm~Djhfe@KMM9vneDgd;MRgIf|r$!q%Bzz8QtGwsQt!$A`-6=5g^L{TcQcik9I$(6aW8e@>b3E%3-_n+SoW7@m>KZ58=o%_WG^)P zc9zFt?fHicdPo1c@99qrQqH&}%hp*}8zCd=$0z)E(&r;HL?z!wC2n7AVS3>=NB1VL zjF=ie;~kE!VQ@Ogi6rTkrUjGoD&y{*n&9`)`*2z-RUmRYWRHygAE&FO=@-_&YHazu=!n@H z$9#r+AM*b#D=B5?4r-kLKud4R!sy_i)9wGm z{9FBLf0_J6Yn1dmnt&-vq{KC%#JMOnu_QA;Paz~THl$(U6;;l9^VCTSGxA%S)gJ z8ITRZ`DrEPiAAXljw$&`sS0kHMXBZaMcKs)&cUXITOXSN)iHRw`njxgN@xNAt1@MF literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/emo_im_surprised.png b/res/drawable-mdpi/emo_im_surprised.png new file mode 100644 index 0000000000000000000000000000000000000000..b4b614dc55de1120dbe5393cb44154d092f10c46 GIT binary patch literal 916 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fY)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvY{U|E4mwmV~EA+t5^4S$An6-eYn5Zcz4T! zJV8^1jvtXLel!{wia8d#TnG#CP+T@~#SNc-Ox~$d!9N%mnRTuWZR%Ok`(nWY%_C_W z1G%cjNu*yMxrGu#emUguwNl!yNT^PZN+mKF1wyGy5@SL1tJ zYSR|nx|%m*-p}GcU5lqamf3u?0whtiuCp+w_Y7goAh1jTG6js z#kX3VQg060-e~8w>CY}Sth?1?x$gM#3dZ#h*!E0qHecOw`d3Iz+_B&vJm1wG#VPJ( zTQ1Bx=X{LNm3I;wCY9>{p8Y}a-LW+)?^WiVOV@3$F#TnA^4I&5C%u+5>~D@gHT}y+ zR=%wkE$WLOZ(6%(zpZDbg!yB$J5A9aJtp00E0Mb-$@jp+ewLW$t~KEwS@!uIiOszJ zF{MDxKC$U~0aJNMXKVVbk0~F#H{E`EREn={i%YPShk-BCj*P(P!7;Ki-CNCOon7U! zSNzi6ZMU|sblX^IaR2e&S2tz6YomRGPQ8eER@xo5ZFaAEbFWVQnV2P4deoa2SFBsb z(D}n;-_i48xqtkRd8ynImwb2p@eZSXt1C87iPq<|$heqWo>YI}bZ3%s{8sf%xl8Vx zQ*BtUqqoR7LO{TI&p|1c;aWmUvjpl!Tw*XV4NQrAiiE~kEVo7Fxoa>QWe}Xi&D$;i?WLqoP$jZw>~xls$=kU L^>bP0l+XkKheV9H literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/emo_im_tongue_sticking_out.png b/res/drawable-mdpi/emo_im_tongue_sticking_out.png new file mode 100644 index 0000000000000000000000000000000000000000..9fa6534c90f7d81dd4146c9ebe1f2f4006cc2e02 GIT binary patch literal 941 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fY)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvY{U|E4WB53Y{5GCb&ojPL7cg zY+-4#cR1_V)YTLxQvU3z!PRWzb6u>y``@iw_v_mBRlh_pWSO^`Y!Ed6z`^=zN))6t=+qa(q|mRF9)P87UWy~ zW8FrE`bQC6d$?YduD1H&mv7+~bsh0e`I`S+BU2r^X2d_1+?M3MZN9hcZ~a2X#Xoc{zR=3*)&A&D-8;v8|MYfhIe+AmExB}f zo~7=EzN)=q<<}ltn(?aab670#gL{f3YbE=)3s>HsEBw3dZqMDuf~slVQeUn0!=Ggs zi0@sHZX#3~xZhg6-utJ1&W*_yQx}JHeLZluyhrUR|I{OiaiU*CPW@+YJ#%>9!_s#w zz+@^?;u=xnT$Gwvl9`{U5R#dj%3!2#sc&f5(d5Splvf4GrzDo7S|x)N0c8yg4RsAH zbqy^;3{9DSr1-Hzi)bjkI>|zDyVAH~_kIjJU7(8A5T-G@yGywoGhmv9d literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/emo_im_undecided.png b/res/drawable-mdpi/emo_im_undecided.png new file mode 100644 index 0000000000000000000000000000000000000000..8b2577af738b337dfb68d4d80e6fdd2726bd0ab0 GIT binary patch literal 884 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fY)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvY{U|E4dqlV~EA+vsdjqLc%3jKiuCl^CHXt zO%W^`4K#bYx?0z55)<>wR5Y8&ku{-Z~*+QF5|k z2S*o&m(YzQR#R*1&0_C&zn=S?Bl_3Ds22yU2l3~^zQ(t%z=LapF)pz)#=o6hZnF}7jlIMs`O7!5K}KS3%Sx>G3)odSM@qa zRb{vv?<#SmZRE9o%=ztsL7GvM(!8i`9$a$AHVDRwxURU}cl!q)f1&*T$EEk2X7ZZa z98&Z-@*~VAN%xoQj~cmbr5W-c%&mUdd319b{^^oVyj#+<_V`YbdlzrG>A#+I*ZGg{ zlas&WKj@kzs@%TnxJAlhQtKqA-Cf6j2u2&pU$%*umUy|so<$}SlVMc<@k4=GR^*{X{q{s394Zs z+wLEotuXW0{)#U4Q)Ykpw{E$$Wz$Y|ZAZOco=>l|{a>x=w_V#bJKtqfX0_&=65D;b z+pY48uS_s^+m!dPOV*?Eg!JO7o&2l+tkC~e`YrVu`_{BY4Xs@}F9B1VNQrAiiE~kE zVo7Fxoa>QWe}Xi&D$; bi?WLqoP$jZw>~xls$=kU^>bP0l+XkKx}0rX literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/emo_im_winking.png b/res/drawable-mdpi/emo_im_winking.png new file mode 100644 index 0000000000000000000000000000000000000000..069e9e33f95d2fa688650871e98cd94453f57b8a GIT binary patch literal 895 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fY)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvY{U|E4g*(Dl+;A0(y|JrUdzVO*_{t`|D?0>S zV@niUvlg=jXRWaR`O{APzNC@oERk|KiFb3YKhLxLJn#FQXovp})6a03Tw1ce`a+DE z{JIzNFTCWZCF`y`5_NcYWM|kOzsXTLHLdqI7|+?ZpewL@Z)W|kd5`xWi~phF8ndV` zbVqYwNrHrH{PzcIP8f4t%ANi|PAu89ZFND^VP~1cnKH-AZ(O#&aJ92cheuuc2XlF$ zX#FB_?Lrf#Rb6ksa0&0|SzFQRTKwT=N5=nymT!(G*K~$!oVpRgy?pmY$?LC9P>V?`1<>V7&_Z=|fNpci(n0LXg?Z4Ry8TYk4{dX;d9|*tT zyukP7@YaHW`Hm;|SIk;F_fVaW+S|VZa}Iu+a8Drb_}8-5<|PZ3OktjQ1^^0+? zF7w$J@T@F7vdrq;aoxJ(?U9dKoQ{3uHgnYrdk`SH{8`v}KFy7C;+wvfyk)X~^!$vw z==phE^N%h$b3jz?f#kM~X_?(CwY;mZKVB}`erWm9w5>if?n-A_bV$!S8aN~O>;D7S z0;eqsVw#a5aai4A^~%f2v#ezK3zUOB620zs9*XMZot0{nv})xRwu<7EKgls?WYn!b zEt?{BRbb!w+s}e>uITibE^IK<>Glb)nCNP?D)Q3#j~Z8sxy=n{X=r>juj`$-=ES6F zw^ANe=}fZPoUtHm=DAS5Ge75jRiAm$YO<8j_sK_PW*1-hf78VD?04zK^x(4P}1_q24dqPn({;<5~x82WJ7R%T1k0g pQ7VIDN`6wRf?H-$YI%N9cCmtUuxa7e$7Vov44$rjF6*2UngBE{c5eUx literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/emo_im_wtf.png b/res/drawable-mdpi/emo_im_wtf.png new file mode 100644 index 0000000000000000000000000000000000000000..0d963ec826bf7b82d7e9889fda5aa46fb2b3ae0a GIT binary patch literal 893 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fY)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvY{U|E4x zp<7oQPWUIq2_3i_w)w84L%rF(#|nIp4R7^Iy?C?WpS0cseH*T`r$5Z>Il%wHKtk{6 z-yhrfF7G_1YIp4Ottl~V5!?CRJ(8$9%KwA;vc_tjEzP_?*p(MX>z7P9Tgl$jvP?D4 zHJ7WTi)Txx^h2KX4N|*5*loK1_Kl@$K>ZHG14#9`){v0+@Yj_qpw#ZqM>yIZuW3 zH1^j|epd@ldHqfO*`wSXE2-C^W^GAt8|r@Np5@xJ-6`vdinso)=Y4hgX3YoBR@BQ$ zibt%x|M<0W*@k_G`X5FdJMQN4&+^#H3vVNDUCr9|`Eoeh56&F^&Q-^L9C_ib!?nER z-{iLkr=D0hd!yHxs(p7vS@YZ{8{%}M1q+1q3uOO4Disak+H=XCCw%i6uD`Df@^~Xys--`N zvoAko;>#FRI{9Akj8*>~v$iK`)$EG4>iu7smd4GyN%AJ&uh!cC-y~~_H#}RQdwRCHOPQ$2+mI{DNig)WpGT% kPfAsA%PdMQ&o9a@R&WkBE!_Ip45*I5)78&qol`;+0Lf=?-T(jq literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/emo_im_yelling.png b/res/drawable-mdpi/emo_im_yelling.png new file mode 100644 index 0000000000000000000000000000000000000000..836f60f68bd20c7292b3d12788f3191554183571 GIT binary patch literal 927 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fY)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvY{U|E4^l2qziko2^n^;*-WoJ$d&E*qi*CJA&zteG0BCh&jJ z)cTGl4nwUOS1o?0>D>E%$J+bCE#~}pd!N@mzf*kv=ewC+DXFgF|?01@Oiai%q+rjPs z@b!&zjK5yr(E_ zGwkbs+}q^&_s0J2#aB<=x@3B1XRB9kSEUSe)$W`9=?UMo{j2Vlj8{)m1)jE@HMiI0QCs}5BH2X7zhus`Y@6#j-+KSKF<;^B zdldTS{L5PBTMJ)H%P)$HjQ*wj>uu++2!qWxLOEY0@45NCOX_=TR(0X_b;WN_#P!-g zu2@*`$+qr@`418CQk(f^u2OcV!%sE6TgcPZb-w89>)KpkeB9iu&2#GAHTP@Jzt5NX zf7;$7b@K1xva7xamR_tsxh5uu_rZVFdgiLn`x!1p?R^PMm?9;v5hcz=sfi_-`FRQ< znYpP9M*5cehK3zYeyl)wRgip2Vo9o1GDs0n*1*tE*T7QO&@#l()XLb*%EUs~z}(8f zfYD-4D2j&M{FKbJO57R>QdvMQkOA2coS#-wo>-L1;Fyx1l&avCS(I9yUzA;};2dmP Txb?9aP#uG(tDnm{r-UW|kSdLp literal 0 HcmV?d00001 diff --git a/src/org/linphone/StatusFragment.java b/src/org/linphone/StatusFragment.java index 513ad125c..9b40f6b54 100644 --- a/src/org/linphone/StatusFragment.java +++ b/src/org/linphone/StatusFragment.java @@ -26,6 +26,7 @@ import org.linphone.core.LinphoneCore.MediaEncryption; import org.linphone.core.LinphoneCore.RegistrationState; import org.linphone.core.LinphoneProxyConfig; import org.linphone.ui.SlidingDrawer; +import org.linphone.ui.SlidingDrawer.OnDrawerOpenListener; import android.app.Activity; import android.os.Bundle; @@ -68,6 +69,12 @@ public class StatusFragment extends Fragment { encryption = (ImageView) view.findViewById(R.id.encryption); drawer = (SlidingDrawer) view.findViewById(R.id.statusBar); + drawer.setOnDrawerOpenListener(new OnDrawerOpenListener() { + @Override + public void onDrawerOpened() { + populateSliderContent(); + } + }); sliderContent = (RelativeLayout) view.findViewById(R.id.content); exit = (TextView) view.findViewById(R.id.exit); exit.setOnClickListener(new OnClickListener() { @@ -128,7 +135,7 @@ public class StatusFragment extends Fragment { hashMapAccountsStateList.add(entitiesHashMap); } Adapter adapterForList = new SimpleAdapter(getActivity(), hashMapAccountsStateList, R.layout.accounts, - new String[] {"Identity", "State"}, + new String[] {"Identity", "State" }, new int[] { R.id.Identity, R.id.State }); accounts.setAdapter((ListAdapter) adapterForList); diff --git a/src/org/linphone/ui/BubbleChat.java b/src/org/linphone/ui/BubbleChat.java index 89dd2996b..7e2ecc437 100644 --- a/src/org/linphone/ui/BubbleChat.java +++ b/src/org/linphone/ui/BubbleChat.java @@ -19,12 +19,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ import java.text.SimpleDateFormat; import java.util.Calendar; +import java.util.HashMap; +import java.util.Map.Entry; +import org.linphone.LinphoneUtils; import org.linphone.R; import android.content.Context; import android.graphics.Color; -import android.util.TypedValue; +import android.text.Spannable; +import android.text.SpannableStringBuilder; +import android.text.style.ImageSpan; import android.view.View; import android.widget.RelativeLayout; import android.widget.RelativeLayout.LayoutParams; @@ -34,6 +39,38 @@ import android.widget.TextView; * @author Sylvain Berfini */ public class BubbleChat { + private static final HashMap emoticons = new HashMap(); + static { + emoticons.put(":)", R.drawable.emo_im_happy); + emoticons.put(":-)", R.drawable.emo_im_happy); + emoticons.put(":(", R.drawable.emo_im_sad); + emoticons.put(":-(", R.drawable.emo_im_sad); + emoticons.put(":-P", R.drawable.emo_im_tongue_sticking_out); + emoticons.put(":P", R.drawable.emo_im_tongue_sticking_out); + emoticons.put(";-)", R.drawable.emo_im_winking); + emoticons.put(";)", R.drawable.emo_im_winking); + emoticons.put(":-D", R.drawable.emo_im_laughing); + emoticons.put(":D", R.drawable.emo_im_laughing); + emoticons.put("8-)", R.drawable.emo_im_cool); + emoticons.put("8)", R.drawable.emo_im_cool); + emoticons.put("O:)", R.drawable.emo_im_angel); + emoticons.put("O:-)", R.drawable.emo_im_angel); + emoticons.put(":-*", R.drawable.emo_im_kissing); + emoticons.put(":*", R.drawable.emo_im_kissing); + emoticons.put(":-/", R.drawable.emo_im_undecided); + emoticons.put(":/", R.drawable.emo_im_undecided); + emoticons.put(":-\\", R.drawable.emo_im_undecided); + emoticons.put(":\\", R.drawable.emo_im_undecided); + emoticons.put(":-O", R.drawable.emo_im_surprised); + emoticons.put(":O", R.drawable.emo_im_surprised); + emoticons.put(":-@", R.drawable.emo_im_yelling); + emoticons.put(":@", R.drawable.emo_im_yelling); + emoticons.put("O.o", R.drawable.emo_im_wtf); + emoticons.put("o.O", R.drawable.emo_im_wtf); + emoticons.put(":'(", R.drawable.emo_im_crying); + emoticons.put("$.$", R.drawable.emo_im_money_mouth); + } + private RelativeLayout view; public BubbleChat(Context context, int id, String message, String time, boolean isIncoming, int previousID) { @@ -57,11 +94,11 @@ public class BubbleChat { TextView messageView = new TextView(context); messageView.setId(id); messageView.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT)); - messageView.setText(message); + messageView.setText(getSmiledText(context, message)); messageView.setTextColor(Color.BLACK); view.setId(id); - layoutParams.setMargins(0, pixelsToDpi(context, 10), 0, 0); + layoutParams.setMargins(0, LinphoneUtils.pixelsToDpi(context.getResources(), 10), 0, 0); view.setLayoutParams(layoutParams); view.addView(messageView); @@ -113,7 +150,23 @@ public class BubbleChat { cal1.get(Calendar.DAY_OF_YEAR) == cal2.get(Calendar.DAY_OF_YEAR)); } - private int pixelsToDpi(Context context, int pixels) { - return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, (float) pixels, context.getResources().getDisplayMetrics()); + public static Spannable getSmiledText(Context context, String text) { + SpannableStringBuilder builder = new SpannableStringBuilder(text); + int index; + + for (index = 0; index < builder.length(); index++) { + for (Entry entry : emoticons.entrySet()) { + int length = entry.getKey().length(); + if (index + length > builder.length()) + continue; + if (builder.subSequence(index, index + length).toString().equals(entry.getKey())) { + builder.setSpan(new ImageSpan(context, entry.getValue()), index, index + length, + Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + index += length - 1; + break; + } + } + } + return builder; } }