From 91a53afca8b0e27a07c243a0f8aea2abbe13221e Mon Sep 17 00:00:00 2001 From: liujing Date: Fri, 4 Sep 2020 10:51:54 +0800 Subject: [PATCH] =?UTF-8?q?[add]=20=E9=9D=A2=E6=9D=BF=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/drawable-ldpi/v2x_panel_close.png | Bin 0 -> 1687 bytes .../main/res/drawable-xhdpi/v2x_panel_close.png | Bin 0 -> 1593 bytes .../res/drawable/v2x_drawable_event_more_bkg.xml | 4 +--- ...dule_v2x_event_panel_fragment_event_panel.xml | 2 +- .../main/res/values-xhdpi-1920x1000/dimens.xml | 2 +- .../src/main/res/values-xhdpi/dimens.xml | 2 +- .../drawable-ldpi/v2x_panel_close_light.png | Bin 0 -> 1369 bytes .../drawable-mdpi/v2x_panel_close_light.png | Bin 0 -> 749 bytes .../drawable-xhdpi/v2x_panel_close_light.png | Bin 0 -> 1878 bytes .../v2x_drawable_event_more_bkg_light.xml | 4 +--- 10 files changed, 5 insertions(+), 9 deletions(-) create mode 100644 modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_panel_close.png create mode 100644 modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close.png create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_panel_close_light.png create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_panel_close_light.png create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_panel_close_light.png diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_panel_close.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_panel_close.png new file mode 100644 index 0000000000000000000000000000000000000000..23a53b903c89b5f3eb5e5b87dd2c996fcefb073a GIT binary patch literal 1687 zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL1|)l2v+e>Z#^NA%Cx&(BWL^R}EvXTnX}-P; zT0k}j11qBt12aeo5Hc`IF|dN!3=Ce3(r|VVqXtwB69YqgCIbspO%#v@0S_Ps>W0$H z3m6e5E?|PIHe0}qV1u+VR5~vQlAHw|k;M!Q+`=Ht$S`Y;1kkj|%#etZ2wxwoRtc=a3djZt>nkaMm6T-LDnNc-DA*LGq*(>IxIwi8dA3R!B_#z``ugSN<$C4Ddih1^`i7R4mih)p z`bI{&Koz>hm3bwJ6}oxF$`C_f=D4I5Cl_TFlw{`TDS*sPOv*1Uu~kw6Sp)|Vca~(P zA#BPkhI$L=L4A;nzM-ChKHO}eRvVD0m48uYD$r(-`F4gjV3jChPEalY!TL7pymv^TNZqv*Zf${bBOcSsE-hO)e+hR@ z3W#~ae`%_h=C%MSuakuuOJc4pYTZ&aQO|9QPlr(3f@z)s(wZ&{rJ5EPaTvGHG@qLv z=f3{DdH%e8)@J1|4n6&6_5R-b-S>AsziYlK^Z(>1>wrf>?=q|IxmVght<`(Jsp^k) zsnY)Ce{P*ph`wLeVR|{GeUtAF=D+=!z1w$QEA)C}<@@A{+4WgQ$Kx-ioL{4MC-rLP ztJTZO6elsAnLNdI#f)IR1K}?lgFZX6-jGxE=~h~IH|cQ5`{mp2?l}2pzFGg}SNk>U z(?o8@2zsrYc23{{7hA3?Pr4WD_hi1Ln zqEPVHn8+?5WhfLi$w+(JRga^LVQ&_6J$P$iyfL`UO{>q)u*P3BG$|?7^=Q`#1H;Tc zt5&VzJ9GA|`-J9$3m)^XUY~Cv)4jLn%o&^h3LCl4M-xx~SR%x{GUJP4Z003Nh2UU+ zCqDsG6BD-Ex2~*HbJFB*Ci`&Bx zJ>ikhY@xDEnm2Qn2t9UXFq-L;wKBx3+fChR^X7b|Mu&vS(N3B>5eg*;jLuco_l9a*B?<~dPJOl;chS?BmWR~b46x~@B|()v}me)8dl zo-I3eOepjY>-02mj6ELdqa3iqE;wyZWpIzUl-xe^E&)EH0{fJf(#3ssheL11h0QEa zD!bS}_4Ch~+4l~6Kx5Y~DhxSwOqMQqI>U&JMSN)G0gFD{^7`%GPv7%0Yc_50UQ{x9$=(Iir|nZ^ za4T`XvUZ9PgEKDqJT^`X{`#^ll4(m(x z8->*GH~wN-YnZc@YTtCwWia$I?my{GICvTJK& y;!L_DP#87Wuy9Y4)Z8R@#%mAjzMtLkkKy>-C$A@e5&%{X3=E#GelF{r5}E*v#gy3q literal 0 HcmV?d00001 diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close.png new file mode 100644 index 0000000000000000000000000000000000000000..289028afee7f8c915aac3a19b20c5edd2d7d036d GIT binary patch literal 1593 zcmV-92FCe`P)ciYk?xyn%Wer@htQ~lS`;X zlvo>RDs80@`bTL`fuhwnc>-e9AUv3+m|SZ))I|AnYks#3%~*%xbPk4XLB09?{)ORRv_184*g>wQ}75n1m?0AEMz zFqVOq0C+K4gGpHaK7fUAc54N60szIERJ|?$m{J>@7C`T%Diy`JJOD zcAo+GLkTFEXUOpaQM>!0aYi-s$A#;5Ks?0js5=^m1(GDe;V6k2Qf1}tyqcQ& zDgr}4)DHdLv7^`!NJ0SJxiir$g8`(a=PVD-kJ3`Rdva2nk_gVhgNLdJ3IoIambPy% zYSLRph6AFQbL-ak?=a=?PhEBq3FYMu_vGYcM0ewr!=S9RC9BA8FFu)cfXHB`AW{$S z8Z^+w#l?UcDl5yvLXwqJUqwJy;E;-BHzUZB{}rh=8k+=>Ry-@mvhyC?&;bLXoksa)^Na2I0+6QsVrFI6EiP&C-;>fOtb)M5@_ zmjN>h4%sdY5OtQDn`iCqy%K<=5@eSZvVVV-d+XM1PgAzy-B9g5BjE@KBty!zc6awF zAjxrr2e1@Zg8rt2YBZdL0Ai3XUhD~iq^6EwU~+t6L0tr#gaM+Cb8>R6U0q*M@`3sGa;*ng&+|Lh@a1stkhLmmX?Cfe}>WDDU5f0~(07OO% z5C6~{ZjQu&&CSjKTV8JeK<{}@wDyFic{O7O2fuS!ES7a@8BCeteZCp*fdhL#jy5Pg z%M%Jn9nSL7fh{4p<%J(JGd^!^?LJ|U5(X$doZxiM2XL0+XJ>uhy1LhdKuQRpP&oX; zb45YQ?8e6_Qj*hIYd9p~fQE){yCg|k$M5MV=RRX&qa#^aSsQJ(^bEFIr|lBFMbivJVh~w;`gB`q zet!N7YS}8*5xLzTI&C)FldLU|=c{gy=f=;mwxgxKFhFEXQBmtz(mQ9;BKY#9A$Mt*n?*1K5TaoT%fZj~N@kyh`q-(q8`$17~ns1nC1Z2LW z7zUL2ma9euQ8n`|GZk3ooAxm%$ULhN3M=TWhUsRZfPzl@P_cPlEErPAc`+(BPaMjS zR8JgIfq7RqSgweReigIK}vOZ ri|gwz3{t8FZe6|~#2~G?FHrpt6)zUzGP%K;00000NkvXXu0mjf`JwR} literal 0 HcmV?d00001 diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml b/modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml index c5f6baf569..bf2f16368a 100644 --- a/modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml +++ b/modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml @@ -2,9 +2,7 @@ - + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml index 3270297d56..8d61e6c0b5 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml @@ -84,7 +84,7 @@ android:layout_width="@dimen/dp_88" android:layout_height="@dimen/dp_88" android:layout_marginRight="28px" - android:background="@drawable/icon_window_close" + android:background="@drawable/v2x_panel_close" app:layout_constraintBottom_toBottomOf="@+id/rgTabSelect" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="@+id/rgTabSelect" /> diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml index a81b6217db..a3bd47781b 100644 --- a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -50,5 +50,5 @@ 18px 20px 16px - + 30px diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml index ca2c085464..b52dd520b4 100644 --- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml @@ -53,7 +53,7 @@ 16px 16px 4px - 30px + 16px 120px diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_panel_close_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_panel_close_light.png new file mode 100644 index 0000000000000000000000000000000000000000..5bb2114ce2c149c9cd7f2413f6b1f5ed636f86eb GIT binary patch literal 1369 zcmV-f1*ZCmP)#FL8T^4?4?nO$8mUQBkG>5?~_8RoCM>vi|*>BQ~hbXC2ouj|#T zH~kvn-c=)j_c+`o&@&LlV)0$qb)Q7UJOErKq6ZQ22mpQtfHERpFBA%2C-tBb1EG|9 zfr!2j8Q2{mga&mdq<)~9br4cY3iQH2018&Mq!see10%@#&RM#>@e<0+Pd1q2aq2qAJN_CkY@QeFpu7fl9BQZ}2-=1rzbC=g1iDiLLp3@pr8i1?Ne;!}>U z5r|^3IOMwS-yFkflHt@2Hi+{I;p~C@>Nw6beh-HQf{3z8sY;rjvZ*hK_>BN!o-c^Q!^10;O65D#!O|?RA!rzE5K5`Pi0I)o z2NlJ)_C1PcMqH%2&z+q1V9b zFgie7^xDv|S|GkJgt*oMLMb&zM4P>SN=c8ev!Vrrt!&ua+k;A_0%K!ip<~?H*@4l~ zQ5YH;3T?wj@i*%rrl+SH<1Z{M!1(yMaUe4@GvK;+o58`sLD<;XFt!n-kSGZ4%>4X3 zOiWA!`PI1J46^>?*47qVpDWk^5%Il4*YS3DcVTU9t?NBbFx?<%V;o&BfVx~Wh#!dP zc~b*H@?OEr&CS8&mW=ZXlOw_hAkM) zAU*_u4>)Pgl_{6Yu(Y()RXnIi@B+7LF_)RIRAoRd-*NNlf zV^~~V>;S>-;Hh_bJ16W>OuGv^!U4>lE=)fF{hjkDv zFM2G5i0`z&;7M#d-s9L?hVOX6b53H{fbaeFS$;ru|mIqIT zc|`nI2=Rb+#_L$XDFED`3U4hs(cj0K_KFn zLWo!E@p>K|QcAr>L|=r)opQzY^Ol@*ma%?{lmb2p3P$(31ThR3ioEptqNxuk+3sNSN$rTEP8-DhT zK%CcU66=R6b(-hx93}^XZ)X{lmin76{cTr}T(9nP0R%QwoB*Vh`V)pL9N8pg5b=@_ z;-<-%#xB8|AgZk1O852kJyG99 bhPC$}AWR#+&o}0P00000NkvXXu0mjf;PHRw literal 0 HcmV?d00001 diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_panel_close_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_panel_close_light.png new file mode 100644 index 0000000000000000000000000000000000000000..1680352bfda88557b5833c87ceaed916b4d4f902 GIT binary patch literal 749 zcmV|FaR}cq5!O6iv!P%*E|AAM0K{r9@&{3%V0WO`o*;SpyO+lr& z<(e)9h5EeWDBEIL-~%bwBC)83TKs$8{$Y*#DxGo>z^f4O}AV z79%2lCWKs>7#y%e~r6p+Cq z;yXgf?W|oP@V;PUNJM-^2)Unz76R`&4Md6~;ypsh>tqpmhO^o1?rODqBYSMS8c%P; zT!r_Y3VA}r&}V?_2pcZIah!*)>kbYEID`&W-U6~$^sTCorP_;+tBa#rB6h7G@Am40kbe! zXxX?9b(F)K*P5?7j#*m~RGF~Jrt>`SB>;47fJI7YW2$V-B92I5&-11C%6D#~40B+d?ihc8PR;A>r&K&_W#-4M|k5!#Sc15sdK}W!x^CQMs zm=?yromPp>#xw3S$V!)NTt}tkE@66bsKTh)$>2)|7L~5?cnrhgaEr&J%q75#v2UF7 zi?S7F$GhDwEEbFCZy7)udN3G3v)R<0?*H}DHjlMuHgq_&3;fS5;Q4%hVYyuXFkF1) zZfD-!}!A9n(0AO0rV-QG%2^W?p}tA&o;Pg z+aJz@Eli2@quob(h&~-i6^_Ao*e~u;N}r1Mf--Ozpz4D~_CZEDC9r6*rPf|00000NkvXXu0mjf(w1T8 literal 0 HcmV?d00001 diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_panel_close_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_panel_close_light.png new file mode 100644 index 0000000000000000000000000000000000000000..c18352b4fa6ac1c012efed7e517951ef46fc75ce GIT binary patch literal 1878 zcmV-c2dVgpP)-Q+Nv#DJTCyBpW;CpAt_dUvL$t7~eydv>}nbC_4} z=c_k0Rozvu5i)!^j`JW9J@0wm1Bh56qEh|yc0{ZaQB{5dz$_x3E|<&SBH}+;3JJ5~ zj1b}p060KIj~ntyg8qOpHjyUuQ~}$z{gLN+uNeZ`Rt+LvM#SeTmCE@f?D;kl2P}km z834W@qC%2^25lkY%(`{!wwFq!`EL7=7+@j9`$V*_+X2PYe{FDZaJW<|U5(jJS-k6j zIp?1Oz#e6f(hAq0TU70wtba| zHkfoYNnMCI${0Ij!lqHcj^jM#y6z7q97|gVB3@#Q4Rz{=F~FSj(*W>frw(PUeX&?9 zbuu;^0W5@Y)0}p7yHgPHRmRvSI(9k&OhiQ?#J@U*d#w#3PBX@K$Mstqux;DxJz(VoY+(#D+6{MXUKJ3d2>6zZW6d+S=K%6fG7jzoKsG= zC4q6vvfd6IuT`K4AubV7+n!R;+i3n9)E(W7c6aw*2x03y0U5}|T(>Oi4kf^x^F;u-MaxVd zH(Il1&3zj;Zfs0vTV`;zTD@ywVd2j{=A<1uBF;0$Zu1qi1k5>~1At|zu5GbD8?Lu3 z>zWL`32?Pqy>($>;qU(BVl3*bmSx@D60i_rhKRNrGu5Yx{CROx2Iuo$GZ}%1uQSFb zmjSkId$Z?xznC$hre$(+63(4FR}&r{9)^jD3AKh1QWq{3_8JP1QW9X}+F z<(tgnWq^~u=P)ud0`v3D+ry3>I~FUDmBJ@ZoPZ-ojx^~=8ggyn5%eO-;bCrW4n{{u zLqY074uk6(($%Zku53W^)#D&}oa2tRf$Jy?>?pG#%8aldEAm9A!5Pa2pvcg!qz(UW#%$sqZ_5oE5l1z-NhQOHu$;?C3(y65JqQn~2IP zfhQ>w7jo9%HUOuw$WZMlRmfR{8_ZyND(Fttpp%kQor?MXM6LLe^1Epk!8!j803J@m zfiRnK;bs-GKTZ3Nh@Q;~U|qObgj@s6IX?^lBUu34Dcr0<_5r^kYb&G;SoN-$s-IaH zlWTxwWf9kP|4?(3TcXBTNh&cxlcxN!Xr?ghxH1J;GxE09wKeDdT;IDA~G+FhDh<;RU*s0u^GiP9G zs{M&DRk(2=C;g|FKeq2QQ`)p&_Sn9@;7IJjXP<05d2>~6oeEp9q`q}3-~4BGylC3| zm-H}UHk@o}Yq@<@x+sJ=MMTeJ%iZ4dCUgUKeuThCXNDgks1FnQA(+lMhaZBGdh=sk z`gE0!an-XpKZvNoS?M66)SDlr)u0QYew4O8qsR|~$KV|6Fu1Qb$#WYqV#%DSRyl)u z7Uu;y6uMKpAV(c?UQ(w0T{HcXGWk#unZEB@mL(4mwY(xr%J{AFSw%~J=E{22hl;!~ zU4XOE!gRjgytLx~Bvjx^IprZD_ybAf0cqq&n4mzRP#COKDsrV8d1(QbTC=z#GcsBO z0);|hs8Xq1QdOl5xIQL-O++uK8tZkrIGO9m+7aM7_C&3L~dt?c6j1SQ?OTA+T+GX_dW=plxMUmHsyd*f+*G{~iFIRxzGsnRXRbH5}H0Jd$9d7k&Nu5$^uyUrNfu(G&kr#^HQu_gMzt4b&R2P>sysi6=p QLjV8(07*qoM6N<$f - + \ No newline at end of file