From ecab439d0a242ecf9599e0fc48a62adc3b347804 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Wed, 21 Jun 2017 12:08:47 +0200 Subject: [PATCH] Unify error icon. --- .../main/java/com/b44t/ui/Cells/DialogCell.java | 8 ++++---- .../main/res/drawable-hdpi/dialogs_warning.png | Bin 1466 -> 0 bytes .../src/main/res/drawable-hdpi/msg_warning.png | Bin 1092 -> 0 bytes .../main/res/drawable-mdpi/dialogs_warning.png | Bin 1312 -> 0 bytes .../src/main/res/drawable-mdpi/msg_warning.png | Bin 1070 -> 0 bytes .../main/res/drawable-xhdpi/dialogs_warning.png | Bin 1664 -> 0 bytes .../main/res/drawable-xxhdpi/dialogs_warning.png | Bin 2050 -> 0 bytes .../src/main/res/drawable-xxhdpi/msg_warning.png | Bin 1161 -> 0 bytes 8 files changed, 4 insertions(+), 4 deletions(-) delete mode 100755 MessengerProj/src/main/res/drawable-hdpi/dialogs_warning.png delete mode 100644 MessengerProj/src/main/res/drawable-hdpi/msg_warning.png delete mode 100755 MessengerProj/src/main/res/drawable-mdpi/dialogs_warning.png delete mode 100644 MessengerProj/src/main/res/drawable-mdpi/msg_warning.png delete mode 100755 MessengerProj/src/main/res/drawable-xhdpi/dialogs_warning.png delete mode 100755 MessengerProj/src/main/res/drawable-xxhdpi/dialogs_warning.png delete mode 100644 MessengerProj/src/main/res/drawable-xxhdpi/msg_warning.png diff --git a/MessengerProj/src/main/java/com/b44t/ui/Cells/DialogCell.java b/MessengerProj/src/main/java/com/b44t/ui/Cells/DialogCell.java index da51377ff..edd155f50 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Cells/DialogCell.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Cells/DialogCell.java @@ -114,7 +114,7 @@ public class DialogCell extends BaseCell { private StaticLayout messageLayout; private boolean drawError; - private int errorTop = AndroidUtilities.dp(39); + private int errorTop = AndroidUtilities.dp(42); private int errorLeft; private boolean drawCount; @@ -168,7 +168,7 @@ public class DialogCell extends BaseCell { checkDrawable = getResources().getDrawable(R.drawable.dialogs_check); halfCheckDrawable = getResources().getDrawable(R.drawable.dialogs_halfcheck); clockDrawable = getResources().getDrawable(R.drawable.msg_clock); - errorDrawable = getResources().getDrawable(R.drawable.dialogs_warning); + errorDrawable = getResources().getDrawable(R.drawable.msg_warning); countDrawable = getResources().getDrawable(R.drawable.dialogs_badge); countDrawableGrey = getResources().getDrawable(R.drawable.dialogs_badge2); groupDrawable = getResources().getDrawable(R.drawable.list_group); @@ -429,9 +429,9 @@ public class DialogCell extends BaseCell { int w = errorDrawable.getIntrinsicWidth() + AndroidUtilities.dp(8); messageWidth -= w; if (!LocaleController.isRTL) { - errorLeft = getMeasuredWidth() - errorDrawable.getIntrinsicWidth() - AndroidUtilities.dp(11); + errorLeft = getMeasuredWidth() - errorDrawable.getIntrinsicWidth() - AndroidUtilities.dp(16); } else { - errorLeft = AndroidUtilities.dp(11); + errorLeft = AndroidUtilities.dp(16); messageLeft += w; } } else if (countString != null) { diff --git a/MessengerProj/src/main/res/drawable-hdpi/dialogs_warning.png b/MessengerProj/src/main/res/drawable-hdpi/dialogs_warning.png deleted file mode 100755 index c1474e23b3933197759c5db61b17e0c505090954..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1466 zcmeAS@N?(olHy`uVBq!ia0vp^N+8U^1|+TAxeoy;$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%u1Od5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|81#=KlDb#X~hD#E>34K5C;EJ)Q4 zN-fSWElLJPT$(b-ssbzLqSVBa{GyQj{2W*)24v)y2=9ZF3nBND}m`vLFjeDsTY(KatnYqyQCInmZhe+73JqDfW2&$iQ6p}IL(9V zO~LIJOPqT3fsWA!MJ!T8!-RmT2gHOYTObFX@Kf`Esl5o8tT}R)9AjW$((`n245_$v zX2xFc!wwS1)@O=MT(O`eM0-bsCSRYI?AEte{9Zk};o7dmr_|Ne-Q3;$gZ;+Yv+D!3 zS%I8+2w@=sc%9Be+zBJ17s(jzaU%q$u_jAkDgnS$r1y}_y@b7Zu z-doN1{ejS&2IUVaVjJ?y!~aj!m6Bj9PWaMqCVNC-29uNp%j*YMbQ)7W?PGt_sMEnM z@%&TpY@MSoHfE>D%xRWb9dFoWs+g4`n8Ne;eM`j}*{7y%89-jU-qup)Mi>VDR)$MN<3eL0Ey2$oy ztDDL#*S%pLi`L%BW>vko^{}euosRX4JufbAzrtYWWwiF|+p?(ekg2vgIaj{TvMM>> zyCUQsr?<9Pq~-MDMece(FUXi5xG?8L$b)^iBV%VDN)(&%W7WTVpDM#{+}f1f^xW>j zN$!we$6b|wh_;%3|90)Rw7W%+$g17%ceNj0^!%G7UqrRs6&3auy*IwkDt$Kpy2!lj zU&|l;6kGD|qDNQJzlfvhb=Kt;YgA8teZDhos$I$DBVAV~%l$79nj&iwuxy6*qV)KC zrOXNUJ8wE}G%Cwy&dXTXec{VBmPz#ivpICR&C^;}i>7umu&#}}Qqmaq>zU+}my6WA hqmM5Ry*{6bhvC@es?^mj7eOU6gQu&X%Q~loCIE~>EQtUB diff --git a/MessengerProj/src/main/res/drawable-hdpi/msg_warning.png b/MessengerProj/src/main/res/drawable-hdpi/msg_warning.png deleted file mode 100644 index 8c3a54caca56ff6d448f6b132938514228d947f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1092 zcmbVLOK8+U7*46yQd=yDuR>u+JyNxVYjbMYZtn;Y!_Ta!E7?!jcqb9nRV0B zgQ$qTh=@vWJxC7)v47|gE+UYz^%BY<-JHMv8YLN~ z)wl8mQpirI2DW)UwBZBWrD%pp4hF7n%pwAcsAM@Q_S=h17FcGAy(nkJteZwk6vEw%q zMN=jOx+_3l6l^<;t7h$!9Qq?;PisFv?;;_Gd|dGiT928&CYa`Ke@CGqRij?;ELs$O zPQymUMh?knDVF}>P0Lgb6qBTw9Oo1mhg>uw7C9vji(DdMMvRz&6lj=Dp1ts5LRO@x zHarGnX$VK95jif6NMd44PRkOM>Mv62eaTt8n6k?i|p=?j#|Hj*my@gkP6uD~K1YWLF0@`1s`Wp#0* t|1JCV$m8Chhs-aFXL~xO(!kKo7Utcj{( zJaZG%Q-e|yQz{EjrrIztFe_z-M3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWv2L<~p`n7AnVzAE zshOFfj)IYap^?4;5Si&3npl~dSs9rtK!Fm_wxX0Ys~{IQs9ivwtx`rwNr9EVetCJh zUb(Seeo?xx^|#0uTKVr7^KE~&-IMVSR9nfZANAQKal@=Hr> zm4GgVcpgi&u1T;Y}Gc(1?$qz%*4pp(9qSy!pz9T&BD>p(a_D* z%+0_Brq?AuximL5uLPzy1)b$qZDbPQX86diP{(lOcw>dE!28QlyT8esF-sImykkBx*I~_3 z2Zz8*j|yoYj}f$mG}-eepzr_k@R^OpIbCa?Vc)B1MUH8RUSRB?dRH^{qXgcX@Q!O(4F+gX?ed|LiWY)o)$8FJ_9Rv;4X`= zUnDBltd+bWBGO@6V|(K1?}i^%CJ!I8Bn1ZY+*!4XXT4coO2y{~jEc>U&)zcblnJ>o zJHX?AKZXDSric8V#a`3LhynW9*pBXuWC z1-WN6#a}3r4N)!?>`Ga3Li=!7`=$pM7=m{2hU6$+{nxd?ih0U>2T7Kd-|ly>{>IK> Zz~EPv`oVna)1RO+%hT1*Wt~$(698qB&Bg!# diff --git a/MessengerProj/src/main/res/drawable-mdpi/msg_warning.png b/MessengerProj/src/main/res/drawable-mdpi/msg_warning.png deleted file mode 100644 index 968a0d27c4d6562c944cfbc99ddf9784e6e9b3b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1070 zcmbVLO>5LZ7!DLgixm$d+KWSqV!?dOB-!1BuC?9lc7tYJw~MZ~W|P@&Z1Z6Oh@c3bym|1@i{1opPPV(%L+Qc5WagcDp7;A*saB?j28Rb3 zh8Z%-dX4Uf({*4!{huszpXqjj6dPnZXpxQ;VP?V!niv?KHH&N5au#pA$72jL5WDpT zX_yx^JMefb#qfz2QZ~bkjVGaH&tU?Zc-Hmv?9W$kSl~K&_NrovW>~;&x4abL>7`2D zUYfI2haEo$#uAMx@G!AJ;?4W9mgL#4UX7m9Yk>t_2${>X+fFsiDkuaI1`4lmwg_dA zRe7jDIS0=IBtl6LB>_qtM4G5-PyxMJx5NMD1FV>@y~;s!oQHCoMJf#g~0>2?TSXqr2U{kWGXnld4= zLILuk;CX3WU35%p_^%tgqT~8vh=m%CgN4YZ^=OUs$uxI+8%lxH8|_l$(xO=NdSEYj z*e8abXXy*?xQ=Gy3_=+t%c(F6Iav~$oSKDAE|+s8J7Z%N+D>23ZhSGPs7Tg}C73Bd zSVWUb7EK~CS5gWJf=KCe4L>H9Z{xmgm)h=e^*y;-A;K03qIwX__q(9l4oDEUgAf!7 z;EZY6uAj=IX^pl+)^X(C#7-#+JkU+D=I-Kvjao3LNEW9e(cxsZC2=_zfLfC@X4gnc?b5uKBd$5tzJ#x5KBL_PW1T=%ZO zytlmk?*6hIK3q9uf|-rG7fRp1j2cHaPkq`rfBN{r;cKC>{$uNR`RV4P=T~lxe0U~5 pm|Cm6wp+i}9#4OIVtw0pn;BrLt4H6?Y$?Tbf{kKDe=#|8=MOWUQquqc diff --git a/MessengerProj/src/main/res/drawable-xhdpi/dialogs_warning.png b/MessengerProj/src/main/res/drawable-xhdpi/dialogs_warning.png deleted file mode 100755 index 83fd07ad73679a60bf3b05aa18516bb69539189f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1664 zcmeAS@N?(olHy`uVBq!ia0vp^dLYcf1|-9GYMTQo$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%u1Od5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|81#=KlDb#X~hD#E>34K5C;EJ)Q4 zN-fSWElLJPT$(b-ssbzLqSVBa{GyQj{2W*)24v)y2=9ZF3nBND}m`vLFhHYsTY(KatnYqyQCInmZhe+73JqDfW2&$iPJ46ZaB?@ z>P^Az76Y7m^?{Dj2SqGWM8kxDsRzV_CtDx~p72xifT_I*n5>`b)IMZjVEW?e;uunK z>&mRV-oc47$K~%TJonb&cRFiyxq51U{xME{RI0#| zc2F>I--fr5C)yoiS3c7Hlqw}YmHT&>)4rptDy%D*{W?xPxA@)m=V8*(=z}sZ1g>)b zp4VQpI`U(c0W)9ct9Cx)3G2<3>)2(4zj4OC`{!RH5F_&KG;2t0fqEgIcZR_@m*lT_{t=UzcrE$-* zu)pn*tjPW43xC9Qy}uT)XJc4~RM-Ct7k;ZBy>24%|J==o?gb&4mWu)>GNhhS5Bt;H zCR!h_y8Ed><@>yu zv+aPmw8!N{j;r@fl+Uec*r&CB&70l)m$a?V9_Nm|!F(^waaQd&hpLqqoE8OKTk_{H zmzVv7ORU#9{e*c7Id-wk>pWvtvUA^_+Ghnk55?1_=cOH9xJf!D)W$YqYHr!=scBw+ zRqEpQ9SO7RJm0K-=#hHi@}pWC7cZY=tF-z5iSmQmM$#YtxZTX~i9KNcbCbG5$T~)| hic7EN3;g3SVAwNv?~d(>N1Q=*f~TvW%Q~loCIGxcfX)B_ diff --git a/MessengerProj/src/main/res/drawable-xxhdpi/dialogs_warning.png b/MessengerProj/src/main/res/drawable-xxhdpi/dialogs_warning.png deleted file mode 100755 index 8b1332493c6c6296ab19673a0ea2d16641a839b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2050 zcmaJ?Yg7|w8V-txT!NH? zT{duvC?aaXR#DMi5G+)YatH_|;6 z0}^o{KEa>o$CHOb8Itfk1d7Xx7Nq87r833%pdG+=4TuUzA*Be=NcYJUpe7LiMi)fq z#%&TFcmq*p1>%28O332_p)djg{zR&8svnsQ(CI`n&7V#u`v4R_GKJ)azI0zQ4fLmj zlx@J<2aiTW#A#qGoAWjnx(dW+D3x-ML{h8OL^YKNBk3eElgTt{P$<4A!dH|p`lp`h0BIhbEJ?=xxy9y&LywPHCjO`M?#ZPCR$<3lpk?Fee?#t|k3gE3Wc*(`zP z?=z?NgyVL--yQR?NTujB-2Ex-#%@BDtMV-1W#O%jHMh{#mFIow++-Qvt~@t)%^TOw zws8~`?jo^RMW&zMEF}0=Bu7yVQG&YV$xq?}rW>Z8C8<>XF0ZxSIsNKS0@C}d6zx@H z>#nXl?iar99WRn&_kVcGZ2$N_^uYnE8lOJ<2Ws6kX;R};6ni(nZOu#btS94)DJJp$ zSw1FVEc5%V??vt?o6fwHqVxVHLZb1pFS(rWR6meG@E+eJZ@*eR#~iKTu!c>8CVDDQ z>%Pf`4UYQVOV}BQm%8f5Dd#rfPL_-oY&GA1Y@%aew#2gZgw2n(J+3y*-J85|Am))T z&#vc!WP}*w!}pTX^mi#<@nsHrGsnKriTI~{xALr`IVXDWY;MI7Jh>%idRxt3Lu>oA zy?D!R_N80A;_7>+PPEL=cL}c~#Q*J~0iRdEx*oD*Jw=HA+>_a$wkD|x-wFV-y zVJMov8|AityJdEdrXt?<)uoHJ9cxVD6Jr$DEBIQ|3xj%dkTxgu{b+5@nL{&VuLtkp zBEJ9CEz#;I;}$^BeYVFtx3IrFsbjggsbzsbw=}>Sc0E5-|M(*|d9rWw><4$g@bbRn zie0XBO-T&2@Hn((Fz4fa9s;BDoXDuk^{T>;ge(k!kWyP>~KtMSXbn5`elHr-sF@=@?fy5=RmLf z^@e<#8?XIFoabCcV|J$*46>8QN`I2hTTFKfF&H zDX!z*u3fD3m0!7ccmWCcxNPBe#(b=^B4O&9=cmqP%h@y+XI>LF`QmrCe~_9LP9z5n zh1-#E2C8jd(--|822U|Z>(BkWUTA3j2_FVGw^WV=6WSrSWWl1gE~)EjZq@N?g3PNY z8I1L8Z-^Wzi~GtAA*DSOV9 RpmO7_%ngfXH-`K{`yUBmFuMQ% diff --git a/MessengerProj/src/main/res/drawable-xxhdpi/msg_warning.png b/MessengerProj/src/main/res/drawable-xxhdpi/msg_warning.png deleted file mode 100644 index ac1c5f331132bd817c382e05ebc5da0bedf19fb8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1161 zcmbVMTWHi+7>-Iy85I;(!M+$Gh__5~l1V0s9mmd0XFIM_%XHLYA2f4v+KFv0CZ|r? zU9=T+5kXiMgzm%YgA1#Of*^ud@P?NM74$(LyrHO7@&2ahN!zJD6dw#E=ltjV-~WIA zEjwFVew`kvk5CjfJ=dHmkabb`*42{l#q(D>$T9~vwc|FY6IXN(QH_RELUhj3yHEk? zM&G6@sDYxU_-3&kx93-C(6OR=s1pq=m!K)CAsM(j>_(U_p)S)-Ft1OZWoXk#Fl(he zpLf%!Y&Q3MsI9-H2>ZLCYB0%VbVHyK0~W$M9aufKuLTKa#I8p6;W5Y1BPzH%!Hkk> z&$rTP$3wIfl~~Aw7#&xmKmsuZETIJ+h#W6+KxBcS@u~(SdhB6{H_zzQ3YqMfFCrzF zGRCgPag|CXS`nj;*Tn%1YU+o6nCMw*9e0k(6`*S#SPbsIyaOWVme1J!5af=_d!C<8d9^d!e*dTL(O*h|oW?z1EulF}`>4Bxv(2-NOcWLsv-NX0(nE$zF?}}@eK6PEb zv6?C$T+%$Sr=@MU>4mxROJeJX&wt;XQWN=QLF>NdgOh9OU+q{wJpcN$!FRK+J{vsx zLLC}7@#mSz%F}75YX<&(e>nO7u@lnPzf~}cqfHFhg?%j=5T7m Fwy(bugCPI_