From d6ee74b96f23c7fc0d4a27ef52231daa8d9e2e53 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Thu, 3 Sep 2020 13:47:04 +0800 Subject: [PATCH] =?UTF-8?q?=E9=BB=91=E5=A4=9C=E7=99=BD=E5=A4=A9=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E7=BB=86=E8=8A=82=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module_map_ic_move2_current_location.png | Bin 600 -> 865 bytes .../module_map_ic_move2_current_location.png | Bin 600 -> 865 bytes .../layout/module_ext_layout_extensions.xml | 4 + .../res/values-xhdpi-1920x1000/dimens.xml | 1 + .../src/main/res/values-xhdpi/dimens.xml | 1 + .../src/main/res/values/dimens.xml | 1 + .../com/mogo/module/main/MainActivity.java | 2 +- .../module_media_next_bg_selector.xml | 0 .../share/dialog/LaucherShareDialog.java | 81 +++++----- ...le_map_ic_move2_current_location_light.png | Bin 1324 -> 1226 bytes ...le_map_ic_move2_current_location_light.png | Bin 1324 -> 1226 bytes .../values-xhdpi-1920x1000/dimens.xml | 147 ----------------- .../values-xhdpi/dimens.xml | 147 ----------------- .../module-extensions-res/values/dimens.xml | 151 ------------------ .../module_media_next_bg_selector_light.xml | 14 ++ .../module_media_play_bg_selector_light.xml | 13 ++ .../drawable/module_share_btn_bg_light.xml | 2 +- 17 files changed, 77 insertions(+), 487 deletions(-) rename modules/mogo-module-media/src/main/res/{drawable-xhdpi => drawable}/module_media_next_bg_selector.xml (100%) delete mode 100644 skin/mogo-skin-light/src/main/module-extensions-res/values-xhdpi-1920x1000/dimens.xml delete mode 100644 skin/mogo-skin-light/src/main/module-extensions-res/values-xhdpi/dimens.xml delete mode 100644 skin/mogo-skin-light/src/main/module-extensions-res/values/dimens.xml create mode 100644 skin/mogo-skin-light/src/main/module-media-res/drawable/module_media_next_bg_selector_light.xml create mode 100644 skin/mogo-skin-light/src/main/module-media-res/drawable/module_media_play_bg_selector_light.xml diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_map_ic_move2_current_location.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_map_ic_move2_current_location.png index fddef2479bc503e80af7a9a6d0c69ac29a13986b..b542105123dfff3b07b7224d7df25ec91bd2a9b4 100644 GIT binary patch delta 850 zcmV-Y1Fihn1mOmd9Df1dI@ve?0004VQb$4nuFf3k0009UNklnch(0|mZ|k6>3(CLiou4;A9*WKTY zc6a`cj^2{>di}E#7eH4XaDoP$%b@ub4)!~Nb!p>&v4OoR;D0m@l=s18H|TM+iv>)h z#9ju7|8IZ+YQc{UW|?}xbyr*ajLCnfESkjx9_oOZbvyZB7wA`XhQ1CG1PGj=H`yPu zv;q`7iVuXq3z}pQtN}7^>-Gos{WD{RSI>)1KJ^chAQuEaV}0az0?276c~gVL^hrdV z_Br~DrgtZfKYvGGBByCd2sz0`lFTC6VD0DR&2Ni@1$tK%z2+j#b%ht=z?zn#(@Ze$ zCxAbqPknrJTjJ5lhs5chz}OeCaXL99Nc`qvwRg`;JI_|br6|5L=c04+1a-|+It%QZ z#3aX7(i{cx`_Y6Xx`dW5AO8k*j-JOT@Rep~k&~=h0e|5BMlVsfgB6+xvHs=mK_ZH@ z1aHwKf!nBj37>PW&oD{Eo7Rj7^n6Dc`;jjtz2(Sl+8)6-+gZx4N87i&XcE*QNmpol zgCmhxXC46t$6*a>tuoE+5F$@4N;xe@zhKv>J9J+>O_x)2 zl^+*~MPNHyI#}jj&uS7d&mKy-P)A%WMXC#kF@G>OZRP!qJIHEFVL5Ijn!i8kvJ!bf z9*C4#U}42lBp*pC+^bh#enosM3yX(N#XDUQ+Fr|iWh*oeTMkHH%vd?eSx7t1oIeWD zt`1~=xUn=0W}=;=aimQ5N3ni?U~^QFYwHQr=SyvfT)W~n?4fuxvAL) z#Y+Hj)1lGV6W0TexB6l+194N$v};)N5dzYgPr{|dZ*Yl*=!+Q}{bV=wvo{{2+MDP= c@V`BQKj8u+JH}w?TL1t607*qoM6N<$f(0gt8~^|S delta 583 zcmV-N0=WI*2G|6U9De|)J?X9h00JLLL_t(oN9~s}NE}fRhW}rJy`b1A+FB+^EYjEs zLDI!wVV5F-V3SHB2!U7%A|ypx33y!!!OkXyAVSKt##GV5Hih}+9lPP(@@DtF-Mw(d zUb*{b=6f^${C7u;=!YZ9g$^urGF`{Ij-_@W^?d6ZlOzX0vVT$TM!}&jbYQ947^#j) z`Uc>Mb%{E9Yoswr*8nDCyP5)68!R7L2KAlfLt`0M0GxR5=1Bgmx=bxFA1byBl1>3E zXF#(gf0e-{gVlk`0VFK}IE(SQBrr*D035_5wz?t7fjPiZ6HWyyb@hVoTA07P;u6c-I9=?cIMfDMv|elo99k4c_;n(B8Lz#Yj4p%`m< zOfbu%iisq-PPvXbrxJU9uEKDn-9M;zU(_x+4#B5$&I~gX}CjhTT4y>&S+yiB< V5H^~wB?JHf002ovPDHLkV1j>A2PXgk diff --git a/modules/mogo-module-extensions/src/main/res/drawable-mdpi/module_map_ic_move2_current_location.png b/modules/mogo-module-extensions/src/main/res/drawable-mdpi/module_map_ic_move2_current_location.png index fddef2479bc503e80af7a9a6d0c69ac29a13986b..b542105123dfff3b07b7224d7df25ec91bd2a9b4 100644 GIT binary patch delta 850 zcmV-Y1Fihn1mOmd9Df1dI@ve?0004VQb$4nuFf3k0009UNklnch(0|mZ|k6>3(CLiou4;A9*WKTY zc6a`cj^2{>di}E#7eH4XaDoP$%b@ub4)!~Nb!p>&v4OoR;D0m@l=s18H|TM+iv>)h z#9ju7|8IZ+YQc{UW|?}xbyr*ajLCnfESkjx9_oOZbvyZB7wA`XhQ1CG1PGj=H`yPu zv;q`7iVuXq3z}pQtN}7^>-Gos{WD{RSI>)1KJ^chAQuEaV}0az0?276c~gVL^hrdV z_Br~DrgtZfKYvGGBByCd2sz0`lFTC6VD0DR&2Ni@1$tK%z2+j#b%ht=z?zn#(@Ze$ zCxAbqPknrJTjJ5lhs5chz}OeCaXL99Nc`qvwRg`;JI_|br6|5L=c04+1a-|+It%QZ z#3aX7(i{cx`_Y6Xx`dW5AO8k*j-JOT@Rep~k&~=h0e|5BMlVsfgB6+xvHs=mK_ZH@ z1aHwKf!nBj37>PW&oD{Eo7Rj7^n6Dc`;jjtz2(Sl+8)6-+gZx4N87i&XcE*QNmpol zgCmhxXC46t$6*a>tuoE+5F$@4N;xe@zhKv>J9J+>O_x)2 zl^+*~MPNHyI#}jj&uS7d&mKy-P)A%WMXC#kF@G>OZRP!qJIHEFVL5Ijn!i8kvJ!bf z9*C4#U}42lBp*pC+^bh#enosM3yX(N#XDUQ+Fr|iWh*oeTMkHH%vd?eSx7t1oIeWD zt`1~=xUn=0W}=;=aimQ5N3ni?U~^QFYwHQr=SyvfT)W~n?4fuxvAL) z#Y+Hj)1lGV6W0TexB6l+194N$v};)N5dzYgPr{|dZ*Yl*=!+Q}{bV=wvo{{2+MDP= c@V`BQKj8u+JH}w?TL1t607*qoM6N<$f(0gt8~^|S delta 583 zcmV-N0=WI*2G|6U9De|)J?X9h00JLLL_t(oN9~s}NE}fRhW}rJy`b1A+FB+^EYjEs zLDI!wVV5F-V3SHB2!U7%A|ypx33y!!!OkXyAVSKt##GV5Hih}+9lPP(@@DtF-Mw(d zUb*{b=6f^${C7u;=!YZ9g$^urGF`{Ij-_@W^?d6ZlOzX0vVT$TM!}&jbYQ947^#j) z`Uc>Mb%{E9Yoswr*8nDCyP5)68!R7L2KAlfLt`0M0GxR5=1Bgmx=bxFA1byBl1>3E zXF#(gf0e-{gVlk`0VFK}IE(SQBrr*D035_5wz?t7fjPiZ6HWyyb@hVoTA07P;u6c-I9=?cIMfDMv|elo99k4c_;n(B8Lz#Yj4p%`m< zOfbu%iisq-PPvXbrxJU9uEKDn-9M;zU(_x+4#B5$&I~gX}CjhTT4y>&S+yiB< V5H^~wB?JHf002ovPDHLkV1j>A2PXgk diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml index ce5f8afa46..fc085fceb9 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml @@ -24,6 +24,10 @@ android:layout_width="@dimen/module_ext_weather_icon_width" android:layout_height="@dimen/module_ext_weather_icon_height" /> + + 54px 100px 90px + 8px 180px 180px diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml index c28815a838..00944d0a4f 100644 --- a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml @@ -18,6 +18,7 @@ 54px 100px 90px + 8px 180px 180px diff --git a/modules/mogo-module-extensions/src/main/res/values/dimens.xml b/modules/mogo-module-extensions/src/main/res/values/dimens.xml index e14a3012a0..00d9c62dbf 100644 --- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml @@ -71,6 +71,7 @@ 24px 18px 18.48px + 5px 16px 22px 16px diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java index d19c0f9d04..d2810aa359 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java @@ -146,6 +146,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme // obuManager.registerObuDataChangedListener(EventDispatchCenter.getInstance()); // } + initAdasControlStatusListener(); EventDispatchCenter.getInstance().setMapLoadedCallback( () -> { Logger.d( TAG, "map loaded." + Thread.currentThread().getName() ); @@ -181,7 +182,6 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme // IMogoMonitorProvider monitorProvider = (IMogoMonitorProvider) ARouter.getInstance().build(MogoServicePaths.PATH_MOGO_MONITOR).navigation(this); // monitorProvider.resetActivityContext(this); mServiceApis.getMogoMonitorApi().resetActivityContext( this ); - initAdasControlStatusListener(); } private void initAdasControlStatusListener() { diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_next_bg_selector.xml b/modules/mogo-module-media/src/main/res/drawable/module_media_next_bg_selector.xml similarity index 100% rename from modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_next_bg_selector.xml rename to modules/mogo-module-media/src/main/res/drawable/module_media_next_bg_selector.xml diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java index a07777a45f..45666a44f2 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java @@ -3,6 +3,7 @@ package com.mogo.module.share.dialog; import android.content.Context; import android.view.View; import android.view.WindowManager; +import android.widget.ImageView; import android.widget.TextView; import com.alibaba.android.arouter.launcher.ARouter; @@ -33,17 +34,17 @@ public class LaucherShareDialog extends BaseFloatDialog implements View.OnClickL private boolean isShown = false; - private TextView tvBlock; - private TextView tvTrafficCheck; - private TextView tvClosure; - private TextView tvNeedHelp; + private ImageView ivBlock; + private ImageView ivTrafficCheck; + private ImageView ivClosure; + private ImageView ivNeedHelp; - private TextView tvAccident; - private TextView tvRealTimeTraffic; - private TextView tvStagnantWater; - private TextView tvRoadIcy; - private TextView tvDenseFog; - private TextView tvConstruction; + private ImageView ivAccident; + private ImageView ivRealTimeTraffic; + private ImageView ivStagnantWater; + private ImageView ivRoadIcy; + private ImageView ivDenseFog; + private ImageView ivConstruction; private Context mContext; private IMogoAnalytics mAnalytics; @@ -86,83 +87,83 @@ public class LaucherShareDialog extends BaseFloatDialog implements View.OnClickL // }); - tvBlock = findViewById(R.id.tvBlock); - tvTrafficCheck = findViewById(R.id.tvTrafficCheck); - tvClosure = findViewById(R.id.tvClosure); - tvNeedHelp = findViewById(R.id.tvSeekHelp); + ivBlock = findViewById(R.id.ivBlock); + ivTrafficCheck = findViewById(R.id.ivTrafficCheck); + ivClosure = findViewById(R.id.ivClosure); + ivNeedHelp = findViewById(R.id.ivSeekHelp); - tvAccident = findViewById(R.id.tvAccident); - tvRealTimeTraffic = findViewById(R.id.tvRealTimeTraffic); - tvStagnantWater = findViewById(R.id.tvStagnantWater); - tvRoadIcy = findViewById(R.id.tvRoadIcy); - tvDenseFog = findViewById(R.id.tvDenseFog); - tvConstruction = findViewById(R.id.tvConstruction); + ivAccident = findViewById(R.id.ivAccident); + ivRealTimeTraffic = findViewById(R.id.ivRealTimeTraffic); + ivStagnantWater = findViewById(R.id.ivStagnantWater); + ivRoadIcy = findViewById(R.id.ivRoadIcy); + ivDenseFog = findViewById(R.id.ivDenseFog); + ivConstruction = findViewById(R.id.ivConstruction); } private void initListener() { - tvBlock.setOnClickListener(this); - tvNeedHelp.setOnClickListener(this); - tvTrafficCheck.setOnClickListener(this); - tvClosure.setOnClickListener(this); + ivBlock.setOnClickListener(this); + ivNeedHelp.setOnClickListener(this); + ivTrafficCheck.setOnClickListener(this); + ivClosure.setOnClickListener(this); - tvAccident.setOnClickListener(this); - tvRealTimeTraffic.setOnClickListener(this); - tvStagnantWater.setOnClickListener(this); - tvRoadIcy.setOnClickListener(this); - tvDenseFog.setOnClickListener(this); - tvConstruction.setOnClickListener(this); + ivAccident.setOnClickListener(this); + ivRealTimeTraffic.setOnClickListener(this); + ivStagnantWater.setOnClickListener(this); + ivRoadIcy.setOnClickListener(this); + ivDenseFog.setOnClickListener(this); + ivConstruction.setOnClickListener(this); } @Override public void onClick(View view) { int id = view.getId(); - if (id == R.id.tvBlock) { + if (id == R.id.ivBlock) { //拥堵 Logger.d(TAG,"点击拥堵"); sendShareReceiver(IMogoTanluProvider.TYPE_BLOCK); dismiss(); - } else if (id == R.id.tvTrafficCheck) { + } else if (id == R.id.ivTrafficCheck) { //交通检查 Logger.d(TAG,"点击交通检查"); sendShareReceiver(IMogoTanluProvider.TYPE_TRAFFIC_CHECK); dismiss(); - } else if (id == R.id.tvClosure) { + } else if (id == R.id.ivClosure) { //封路 Logger.d(TAG,"点击封路"); sendShareReceiver(IMogoTanluProvider.TYPE_CLOSURE); dismiss(); - } else if (id == R.id.tvSeekHelp) { + } else if (id == R.id.ivSeekHelp) { // 故障求助 Logger.d(TAG,"点击求助"); SeekHelpManager.INSTANCE.seekHelp(mContext,seekListener,true); dismiss(); - } else if (id == R.id.tvAccident) { + } else if (id == R.id.ivAccident) { // 事故 Logger.d(TAG,"点击事故"); sendShareReceiver(IMogoTanluProvider.TYPE_ACCIDENT); dismiss(); - } else if (id == R.id.tvConstruction) { + } else if (id == R.id.ivConstruction) { // 道路施工 Logger.d(TAG,"点击道路施工"); sendShareReceiver(IMogoTanluProvider.TYPE_ROAD_CONSTRUCTION); dismiss(); - } else if (id == R.id.tvRealTimeTraffic) { + } else if (id == R.id.ivRealTimeTraffic) { // 实时路况 Logger.d(TAG,"点击实时路况"); sendShareReceiver(IMogoTanluProvider.TYPE_REAL_TIME_TRAFFIC); dismiss(); - } else if (id == R.id.tvStagnantWater) { + } else if (id == R.id.ivStagnantWater) { // 道路积水 Logger.d(TAG,"点击道路积水"); sendShareReceiver(IMogoTanluProvider.TYPE_STAGNANT_WATER); dismiss(); - } else if (id == R.id.tvRoadIcy) { + } else if (id == R.id.ivRoadIcy) { // 道路结冰 Logger.d(TAG,"点击道路结冰"); sendShareReceiver(IMogoTanluProvider.TYPE_ROAD_ICY); dismiss(); - } else if (id == R.id.tvDenseFog) { + } else if (id == R.id.ivDenseFog) { // 浓雾 Logger.d(TAG,"点击浓雾"); sendShareReceiver(IMogoTanluProvider.TYPE_DENSE_FOG); diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_map_ic_move2_current_location_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_map_ic_move2_current_location_light.png index cc87445c6945d0686302742268532588bd4f0f58..1b49fddbc4eda62f35f3b41348053a3877ae0053 100644 GIT binary patch delta 1214 zcmV;v1VQ_(3d#wP9Df1dI@ve?0004VQb$4nuFf3k000DpNklY(Yc|?WU_jONp&6M61$;D^~?8Zi*`tAzdkq zNlIuk0at=?p@ll#wT2{2KFFlM|KpvPJ8$00JY~QZbK%ZC_kVofd(S!dzG-OKt@ZTu z+%|fn03Y$bA?r2fa=AyQ%QK|O_V)I53~n2tVPIh3O-*`xd&dG~eE{rCnI@ST8XDSf z^I$YDVgA;Tu7fEiv##>U1o^YinU1izxzq%c<-yriM%I_ExdH0@w0*0y{r9_?hPk)OlCG;-i6wQS-cTa1d5jEZnx)({QRO-7hzdMiIv;O}6%*MvXpX}EVS$W?TK(Qk40EV(IJ~6E2 zBxc@Ytp5%qJ%Gs2Fn1Jlq|X@r2)OaKwzkh^W@i2|dU%X1Yl<^@Lpy=MM{m%GxnE1A z(%;J2uzwPpS9xYv30}Mv*tE0K*s2@bBPgg2bLw#(LV8l#rk zVJU=AnWg>)U(eRo)?HJmvc!_FyNW85Df?wH#E>Efuh4aEyp6(JqN~0!jE4CG&)9-F8|;%11}N32lM&-S_q$f>g?ODLRHI*;r_o| z@iFf2p#)}xCg4XrxDmKaEoYG~py1M!m1wbD;-cvh{7yJ_C{R&n2 z>VJzChQyBf&$Zt%rf2PA41R8RPMl*ZeJtQ7=!fagD1k>4J%eFRG_qdjhxegHQXNau};KF*!@SlahqTa)Q7ye@n&lcr_QC$8D~ypl&@O@-(|;xGc5rg|qIg^xU{8mmGeq8*MrI`nClU6t zjM3vxr_&XmNZ@n6nwvZ70!X;a4v$A@ZEY>Ct*z;AizCiOH_4(t3?zLZ(lI?k{FG6F?6sz*rsKSY@=Tt>bB@s*JPCZBUKS5y(D>H*#Gl;8nU4cP1Q3pmDt{I~ zaGyZvAU3K#p!Dh^2EVc0A+`$e{Wv!_H|;9(Gc*rwi3B=SD}ib{CgrMKJnE)>;iWtw(keSLj|V;sToJ2yC?k03d*2>g)aoFLdIlJ4xw_>f3OS>|L~BAGp= c*J20$1?2hv#T|Ls&;S4c07*qoM6N<$f*@mHdH?_b delta 1313 zcmV++1>X9~39Jf`9De|)J?X9h00i?%L_t(oN9~twh?G?n$N%T<%)}@KwP_?JYLQDe zvpx3)n;K*<1k#6;Fe^x~EPM$eBb543frd)?A@Dd+#~F`#6&bb=^ybfSC@NX>?kpSQ? zB2qZL2<35FM1R&W^9BItY6Ywt%sDp)z!m_P15hP4g%Gx%I&~^Oa^y%+9Xsc)C8Aj& zgvU#2l8AhB_UzfYot>SkX4O#_SQJGM8e_HrNCDW|(9p2FwYBw+p}a&~=V9m|V(^9EatA_TDcV#IV|vf##fZ69F)QMiH6M%pVN}R}+|X?mhs!0USMZ=FHTtuCBimM#);c zh=>*g$N}gT5iJ{Q<2c@vbRI>~6ULZLB65hCZyq+7wRRg3%?}~0isN`)!k}@^Y0k|n z-%KLX!+&bB2N8KLj$^%z<&kpE{S4sx5W2&&VsU#$QvG?AUKjicI@#%E>7=RPr`*D>aan3aXI0WFZ_kL=5 z-Z`g-{I+tvh%8LLN(KyNE|;59!=Jmq`>o*2qo%eoK!kE^u%|x_t z00-wpWEnHRkvNDp_g}Th_V)JXIyySeCwt}os-Z09#cjqIZAV&Io4of&lZK)wdbm_z z^F-961s1^iWSJ zY1ml{P=?` diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_map_ic_move2_current_location_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_map_ic_move2_current_location_light.png index cc87445c6945d0686302742268532588bd4f0f58..1b49fddbc4eda62f35f3b41348053a3877ae0053 100644 GIT binary patch delta 1214 zcmV;v1VQ_(3d#wP9Df1dI@ve?0004VQb$4nuFf3k000DpNklY(Yc|?WU_jONp&6M61$;D^~?8Zi*`tAzdkq zNlIuk0at=?p@ll#wT2{2KFFlM|KpvPJ8$00JY~QZbK%ZC_kVofd(S!dzG-OKt@ZTu z+%|fn03Y$bA?r2fa=AyQ%QK|O_V)I53~n2tVPIh3O-*`xd&dG~eE{rCnI@ST8XDSf z^I$YDVgA;Tu7fEiv##>U1o^YinU1izxzq%c<-yriM%I_ExdH0@w0*0y{r9_?hPk)OlCG;-i6wQS-cTa1d5jEZnx)({QRO-7hzdMiIv;O}6%*MvXpX}EVS$W?TK(Qk40EV(IJ~6E2 zBxc@Ytp5%qJ%Gs2Fn1Jlq|X@r2)OaKwzkh^W@i2|dU%X1Yl<^@Lpy=MM{m%GxnE1A z(%;J2uzwPpS9xYv30}Mv*tE0K*s2@bBPgg2bLw#(LV8l#rk zVJU=AnWg>)U(eRo)?HJmvc!_FyNW85Df?wH#E>Efuh4aEyp6(JqN~0!jE4CG&)9-F8|;%11}N32lM&-S_q$f>g?ODLRHI*;r_o| z@iFf2p#)}xCg4XrxDmKaEoYG~py1M!m1wbD;-cvh{7yJ_C{R&n2 z>VJzChQyBf&$Zt%rf2PA41R8RPMl*ZeJtQ7=!fagD1k>4J%eFRG_qdjhxegHQXNau};KF*!@SlahqTa)Q7ye@n&lcr_QC$8D~ypl&@O@-(|;xGc5rg|qIg^xU{8mmGeq8*MrI`nClU6t zjM3vxr_&XmNZ@n6nwvZ70!X;a4v$A@ZEY>Ct*z;AizCiOH_4(t3?zLZ(lI?k{FG6F?6sz*rsKSY@=Tt>bB@s*JPCZBUKS5y(D>H*#Gl;8nU4cP1Q3pmDt{I~ zaGyZvAU3K#p!Dh^2EVc0A+`$e{Wv!_H|;9(Gc*rwi3B=SD}ib{CgrMKJnE)>;iWtw(keSLj|V;sToJ2yC?k03d*2>g)aoFLdIlJ4xw_>f3OS>|L~BAGp= c*J20$1?2hv#T|Ls&;S4c07*qoM6N<$f*@mHdH?_b delta 1313 zcmV++1>X9~39Jf`9De|)J?X9h00i?%L_t(oN9~twh?G?n$N%T<%)}@KwP_?JYLQDe zvpx3)n;K*<1k#6;Fe^x~EPM$eBb543frd)?A@Dd+#~F`#6&bb=^ybfSC@NX>?kpSQ? zB2qZL2<35FM1R&W^9BItY6Ywt%sDp)z!m_P15hP4g%Gx%I&~^Oa^y%+9Xsc)C8Aj& zgvU#2l8AhB_UzfYot>SkX4O#_SQJGM8e_HrNCDW|(9p2FwYBw+p}a&~=V9m|V(^9EatA_TDcV#IV|vf##fZ69F)QMiH6M%pVN}R}+|X?mhs!0USMZ=FHTtuCBimM#);c zh=>*g$N}gT5iJ{Q<2c@vbRI>~6ULZLB65hCZyq+7wRRg3%?}~0isN`)!k}@^Y0k|n z-%KLX!+&bB2N8KLj$^%z<&kpE{S4sx5W2&&VsU#$QvG?AUKjicI@#%E>7=RPr`*D>aan3aXI0WFZ_kL=5 z-Z`g-{I+tvh%8LLN(KyNE|;59!=Jmq`>o*2qo%eoK!kE^u%|x_t z00-wpWEnHRkvNDp_g}Th_V)JXIyySeCwt}os-Z09#cjqIZAV&Io4of&lZK)wdbm_z z^F-961s1^iWSJ zY1ml{P=?` diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/values-xhdpi-1920x1000/dimens.xml b/skin/mogo-skin-light/src/main/module-extensions-res/values-xhdpi-1920x1000/dimens.xml deleted file mode 100644 index ad9dc6d8fb..0000000000 --- a/skin/mogo-skin-light/src/main/module-extensions-res/values-xhdpi-1920x1000/dimens.xml +++ /dev/null @@ -1,147 +0,0 @@ - - - - 90px - 32px - 2px - 16px - 26px - 26px - 32px - - 90px - 32px - 2px - 100px - 90px - 2px - 54px - 100px - 90px - - 180px - 180px - 2px - 60px - 60px - 28px - - 32px - 2px - - 120px - 32px - 60px - 92px - 24px - 48px - 2px - 120px - 120px - 120px - 30px - 30px - 32px - 32px - - 120px - 120px - 32px - 60px - 32px - 60px - 32px - 20px - - - 100px - 60px - 60px - 32px - 48px - 80px - 28px - 26px - 44px - 44px - 18px - 34px - 26px - 28px - 30px - 30px - 30px - 20px - - 103px - 103px - - - 1058px - 210px - 144px - 159px - 159px - 70px - 70px - 56px - 83px - 24px - 40px - 60px - 50px - 12px - 10px - 40px - 30px - 34px - 24px - 28px - 23px - 17px - 17px - 36px - 36px - -2px - 95px - - 30px - 40px - 40px - 15px - 15px - 5px - 50px - 56px - 30px - 56px - 30px - 56px - 30px - 15px - 15px - - - 1000px - 390px - 200px - 200px - 240px - 30px - 120px - 120px - 30px - 22px - 28px - 28px - 30px - 90px - 90px - 6dp - 15px - 4px - 10px - 20px - - 40px - \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/values-xhdpi/dimens.xml b/skin/mogo-skin-light/src/main/module-extensions-res/values-xhdpi/dimens.xml deleted file mode 100644 index 7423964cdd..0000000000 --- a/skin/mogo-skin-light/src/main/module-extensions-res/values-xhdpi/dimens.xml +++ /dev/null @@ -1,147 +0,0 @@ - - - - 90px - 32px - 2px - 16px - 26px - 26px - 32px - - 90px - 32px - 2px - 100px - 90px - 2px - 54px - 100px - 90px - - 180px - 180px - 2px - 60px - 60px - 28px - - 32px - 2px - - 120px - 32px - 60px - 92px - 24px - 48px - 2px - 120px - 120px - 120px - 30px - 30px - 32px - 32px - - 120px - 120px - 32px - 60px - 32px - 60px - 32px - 20px - - - 100px - 60px - 60px - 32px - 48px - 80px - 28px - 26px - 44px - 44px - 18px - 34px - 26px - 28px - 30px - 30px - 30px - 20px - - 103px - 103px - - - 1058px - 210px - 144px - 159px - 159px - 70px - 70px - 56px - 83px - 24px - 40px - 60px - 50px - 12px - 10px - 40px - 30px - 34px - 24px - 28px - 24px - 17px - 17px - 36px - 36px - -2px - 95px - - 30px - 40px - 40px - 15px - 15px - 5px - 50px - 37px - 26px - 37px - 26px - 37px - 26px - 15px - 15px - - - 1000px - 390px - 200px - 200px - 240px - 30px - 120px - 120px - 30px - 22px - 28px - 28px - 30px - 90px - 90px - 6dp - 15px - 4px - 10px - 20px - - 34px - \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/values/dimens.xml b/skin/mogo-skin-light/src/main/module-extensions-res/values/dimens.xml deleted file mode 100644 index 26b9b2c5fe..0000000000 --- a/skin/mogo-skin-light/src/main/module-extensions-res/values/dimens.xml +++ /dev/null @@ -1,151 +0,0 @@ - - - - 58px - 18px - 1px - 11.2px - 10.8px - 17px - 20px - - 58px - 19px - 1px - 64.2px - 58px - 1px - 33.4px - 64.2px - 58px - - - 96px - 96px - 1px - 32px - 32px - 15px - - 20px - 1px - - 66px - 20px - 34.5px - 58px - 17px - 31.4px - 1.2px - 66px - 66px - 66px - 16px - 16px - 34.5px - 20px - - - 66px - 66px - 20px - 32px - 20px - 30px - 16px - 8px - - - 56px - 32px - 32px - - 22px - 28px - 22px - 22px - 16px - 24px - 24px - 18px - 18.48px - 16px - 22px - 16px - 15px - 15px - 11.73px - - 56px - 56px - - - 544px - 117px - 80px - 85px - 85px - 40px - 40px - 30px - 44px - 13px - 20px - 32px - 28px - 7px - 5px - 22px - 16px - 18px - 24px - 15px - 13px - 58px - - 9px - 9px - 18px - 18px - -1px - - 30px - 23px - 23px - 15px - 15px - 5px - 20px - 14px - 20px - 14px - 20px - 14px - 34px - 8px - 8px - - - 550px - 208px - 100px - 100px - 16px - 142px - 66px - 66px - 16px - 12px - 14px - 14px - 18px - 58px - 58px - 3dp - 10px - 4px - 6px - 10px - - 19px - \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-media-res/drawable/module_media_next_bg_selector_light.xml b/skin/mogo-skin-light/src/main/module-media-res/drawable/module_media_next_bg_selector_light.xml new file mode 100644 index 0000000000..9bb9aa1a6a --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-media-res/drawable/module_media_next_bg_selector_light.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-media-res/drawable/module_media_play_bg_selector_light.xml b/skin/mogo-skin-light/src/main/module-media-res/drawable/module_media_play_bg_selector_light.xml new file mode 100644 index 0000000000..adce397ed8 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-media-res/drawable/module_media_play_bg_selector_light.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-share-res/drawable/module_share_btn_bg_light.xml b/skin/mogo-skin-light/src/main/module-share-res/drawable/module_share_btn_bg_light.xml index efa03f2ee4..38ac04abf5 100644 --- a/skin/mogo-skin-light/src/main/module-share-res/drawable/module_share_btn_bg_light.xml +++ b/skin/mogo-skin-light/src/main/module-share-res/drawable/module_share_btn_bg_light.xml @@ -3,7 +3,7 @@ - + \ No newline at end of file