From 8b1aca97c49808294aee9d0c4c8bd0fb608b21df Mon Sep 17 00:00:00 2001 From: liujing Date: Tue, 8 Sep 2020 14:02:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[rm]=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E6=96=87=E4=BB=B6=20=20+=E6=8C=89=E9=92=AE=E9=98=B4=E5=BD=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawable-ldpi/icon_event_panel_more.png | Bin 280 -> 995 bytes .../drawable-mdpi/icon_event_panel_more.png | Bin 0 -> 280 bytes .../drawable-xhdpi/icon_event_panel_more.png | Bin 643 -> 1248 bytes .../drawable/v2x_drawable_event_more_bkg.xml | 8 -------- ...le_v2x_event_panel_fragment_event_panel.xml | 10 +++++----- .../layout/view_event_panel_history_count.xml | 10 +++++----- .../src/main/res/values-mdpi/dimens.xml | 4 +++- .../main/res/values-xhdpi-1920x1000/dimens.xml | 1 + .../src/main/res/values-xhdpi/dimens.xml | 6 ++++-- .../src/main/res/values/dimens.xml | 3 ++- .../v2x_drawable_event_more_bkg_light.xml | 8 -------- .../module-v2x-res/values-xhdpi/dimens.xml | 2 -- .../src/main/module-v2x-res/values/dimens.xml | 1 - 13 files changed, 20 insertions(+), 33 deletions(-) create mode 100644 modules/mogo-module-v2x/src/main/res/drawable-mdpi/icon_event_panel_more.png delete mode 100644 modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml delete mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_drawable_event_more_bkg_light.xml diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_event_panel_more.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_event_panel_more.png index ab63bcf60e320a73f8fcc8db332c979a7750b944..c3372edaf260ae73431ff081ecc342c26d60ff90 100644 GIT binary patch literal 995 zcmeAS@N?(olHy`uVBq!ia0vp^mLSZ*1|)kVnp=SsV{wqX6T`Z5GB1IgmedH(G+$o^ zEg+kNft68+ff=L(2pJfq7+Aq<1_m!iX*fHGQ3I-miGiU#lYs@QCJIP{fCmr*bwg?9 z1&jz27cjw9TP|QmutC~fRzF`1q&N#aB8wRqxP?KOkzv*x37~0_nIRD+5xzcF$@#f@ zi7EL>sd^Q;1t47vHWgMtW^QUpqC!P(PF}H9g{=};g%ywu64qBz04piUwpEJo4N!2- zFG^J~)icpEP_pAvP*AWbN=dT{a&d!d2l8x{GD=Dctn~HE%ggo3jrH=2()A53EiLs8 zjP#9+bb%^#i!1X=5-W7`ij^UTz|3(;Elw`VEGWs$&r<-Io0ybeT4JlD1hNPYAnq*5 zOhed|R}A$Q(1ZFQ8GS=N1AVyJK&>_)Q7iwV%v7MwAoJ}EZNMr~#Gv-r=z}araty?$ zU{Rn~?YM08;lXCd<#R|q5*WynJzX3_GFabE-|NNfDAKw)Nj)-WQ*IZ&3)Ha7 zAN0~S;h&^7wfFtPgvnY{o4T5Abu20V94ipiYMJ6ucEGs6BjMfsn)2y;FK1QGY~Y-M zghZSd1Zk~&UB$dRc}t&)ylP&XZ|{5SU29jp(p5fpW2*DF3j$NOESh(3$ElP5m#h=B=CL^EPF6!tV@jPdl$qJhLm*;{)dV z)ukWVxEf~VfqDf6U;Q)d*bi8^S9{2^rk{L2{Q>ip#7C7LszLmf?h6iwY+(EL-ttMH z*7{phw}vce`?hqK*wIJlHtcruUi8=IOr1y3LX{x->o0zoMY&GupJa1bEl*MY#mwWT z_x$yR4H&_wQIpd{zKrdQ1e;l4=HUaYjd)fh-{oX~vq0jtiouPuMMsYaC&%9D$qVXS z()99)a${N0L8%+{ize@0x#yLx%CjRv(?h2J+A*)_kax(fr9W4>d|G#s#peJ5EmJjM YYIt({_$22qH$W-f)78&qol`;+0E|#eX8-^I literal 280 zcmV+z0q6dSP)Q-}7uT|7DmEqR@|p z`a&3UPbP>3F_(a=uPXm)95m>|n!Q5P=JAQr@2 e0Q-}7uT|7DmEqR@|p z`a&3UPbP>3F_(a=uPXm)95m>|n!Q5P=JAQr@2 e0L?%0y#=eD>ycCdc2C@@O&(uq0RM5U%=NXV8VnM z3YtpG1e&cjeUTA3xwm}A=Cp`&mF9PzZAv@4`(FC9IeQb&-fUZ^DYHRyRe&JJ6P0cU z1=b=Vb~R0B>mUX7!h}giTa;-aaHuRr^J&%ty$7lf1Rt0MFn_7P=E-=DX+BeXLvY$R z_ajkVES2&FB0J(4w!1ub*v~l6aC83lo^>1@EI;)�zN0{8vAcC}+AkeYJazkOb$a zGmjpdI9=cM#3DOwySs=q=O^n2eH?+=Qyy0v?>1g^&tn36BeUS5YZ}L+)4mnC?477k z&Tzbey)j$qi0_=orF9m5EF< zrTq6=G_LusRl3As*|A`KKZVzOy<{~fto(STTbLZ>ZH+ohE7nOj+8%JWGAeL=cUqY_ zp6TEB%`<=g58J2Yc#mffuMK0&_D!313jblN;nN889?!_|z0A+g=A_sDI5u&j!e8V2`{hfo zT7Q^0(>7Axj_nEa0riIYdR);8g05<39+t1Ft9ol_{M*VYe#XP4BKuF?+Fi34ppe@+}weK37Ry2pG?kte54dvVSJ23*?f zB3_XbF*dWVa-?i7-O0w4q9=DYi)GWzT`|n8M&kWxrc5_;V%Ie?&FpsHEY+B^P4Bux zGH(wQMrmjA|=;x{PwKm_^KU;mFby7CJ$;yxKcBX#5YJEWb<*fByn*Vlj zwDJcqdP(Q?mLU=4rM0gDOrs&FUyYaWZATMr*bg&6OZlI=Ts-io|T;$ zrQp8nZlPY|n~ZlSt}t0%dfQjbnc`mTzD(@I#Juu3-U`;Utc|uh^p)&>9K&?;;+=^r lS&Nq3mVGWnycNInCvDkK{9Dqq8(4BNc)I$ztaD0e0sxv4F}?r* literal 643 zcmeAS@N?(olHy`uVBq!ia0vp^J|N7&1|*M957cI0VDj>GaSW-5dwct!S7@Th(T`g> zxHN@?q&R$)JXqxyEXZW_o%KaP?Chd;jyaunEls8!89FzZSt14en%Ep2C$>1f`Efw* z!T-h&b59rTId}8-zju!gSbooV%FijWR5rg~S&neE)Z&9$@NTxZ^<^>XQw*C`hoZXPbn-1v9io3?|u zPOg46XNmMAy@`p;srBB!a(?UIUCG_UH*;ytfd|_qH#9ghO86gUVq;CP;pLVPY4~WO zlMujg>@ry5IMDXbljeEuvi>;x{kJ2fcfWBOzGl2V;Y$mTq{Z&U-Vu6l1dU^JH&HayWHt)Uf*9UZT>TkoF>z5~rtJvEA zJ>CW~t1hiN@%Im(gC|a=8+J>Zb#pv1X6?y%>MpQCbVEZSV};8){IU0s|B+3a@0RT$ Rn!v=x;OXk;vd$@?2>=#B9V!3- 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 deleted file mode 100644 index e4ec12dbe4..0000000000 --- a/modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ 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 f12d64563b..a8a16214d7 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 @@ -89,10 +89,10 @@ app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="@+id/rgTabSelect" /> - - - - - + + + + + diff --git a/modules/mogo-module-v2x/src/main/res/layout/view_event_panel_history_count.xml b/modules/mogo-module-v2x/src/main/res/layout/view_event_panel_history_count.xml index 7535edfbae..70a8bdcd36 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/view_event_panel_history_count.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/view_event_panel_history_count.xml @@ -5,15 +5,15 @@ android:id="@+id/llEventMore" android:layout_width="@dimen/module_v2x_panel_width" android:layout_height="@dimen/module_v2x_panel_width" - android:background="@drawable/v2x_drawable_event_more_bkg" + android:background="@drawable/v2x_shadow_bg" + android:translationY="@dimen/v2x_panel_btn_translationY" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - tools:translationZ="1dp"> + app:layout_constraintTop_toTopOf="parent"> diff --git a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml index c6fadac6c2..65c5c57c95 100644 --- a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml @@ -57,7 +57,7 @@ 16px 17px 15.4px - 66px + 74px 16px 117px 200px @@ -73,5 +73,7 @@ 15px 29px -8px + 57px + 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 a32a64e53a..9c31211f00 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 @@ -56,5 +56,6 @@ 42px 16px 120px + 114px 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 0939e17d89..30bd6a2d2c 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 @@ -56,7 +56,7 @@ 31.9px 26px 30px - 120px + 136px 219px 400px 281px @@ -71,5 +71,7 @@ 36px 54px -10px - + 114px + + diff --git a/modules/mogo-module-v2x/src/main/res/values/dimens.xml b/modules/mogo-module-v2x/src/main/res/values/dimens.xml index 7685508ab7..41926f091f 100644 --- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml @@ -57,7 +57,7 @@ 16px 16px 20px - 66px + 74px 16px 117px 200px @@ -73,6 +73,7 @@ 15px 29px -8px + 38px diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_drawable_event_more_bkg_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_drawable_event_more_bkg_light.xml deleted file mode 100644 index 14f3f0a514..0000000000 --- a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_drawable_event_more_bkg_light.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/values-xhdpi/dimens.xml b/skin/mogo-skin-light/src/main/module-v2x-res/values-xhdpi/dimens.xml index 5e7f253323..10308d87da 100644 --- a/skin/mogo-skin-light/src/main/module-v2x-res/values-xhdpi/dimens.xml +++ b/skin/mogo-skin-light/src/main/module-v2x-res/values-xhdpi/dimens.xml @@ -1,7 +1,5 @@ - - 30px 42px diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/values/dimens.xml b/skin/mogo-skin-light/src/main/module-v2x-res/values/dimens.xml index 9266d3c6f7..311b8d6151 100644 --- a/skin/mogo-skin-light/src/main/module-v2x-res/values/dimens.xml +++ b/skin/mogo-skin-light/src/main/module-v2x-res/values/dimens.xml @@ -1,6 +1,5 @@ - 16px 24px From 042beb61d554cd9583b02f0f06f6d27524f2a0b7 Mon Sep 17 00:00:00 2001 From: liujing Date: Tue, 8 Sep 2020 14:11:36 +0800 Subject: [PATCH 2/2] no message --- .../src/main/module-v2x-res/values-xhdpi/dimens.xml | 2 -- skin/mogo-skin-light/src/main/module-v2x-res/values/dimens.xml | 1 - 2 files changed, 3 deletions(-) diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/values-xhdpi/dimens.xml b/skin/mogo-skin-light/src/main/module-v2x-res/values-xhdpi/dimens.xml index 10308d87da..618f4f8ca5 100644 --- a/skin/mogo-skin-light/src/main/module-v2x-res/values-xhdpi/dimens.xml +++ b/skin/mogo-skin-light/src/main/module-v2x-res/values-xhdpi/dimens.xml @@ -2,5 +2,3 @@ 42px - - diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/values/dimens.xml b/skin/mogo-skin-light/src/main/module-v2x-res/values/dimens.xml index 311b8d6151..ddcdea848e 100644 --- a/skin/mogo-skin-light/src/main/module-v2x-res/values/dimens.xml +++ b/skin/mogo-skin-light/src/main/module-v2x-res/values/dimens.xml @@ -3,4 +3,3 @@ 24px -