From b59c1762e23e9aa70f08ef14938d8f3dfe8778fa Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Thu, 16 Jan 2020 19:58:16 +0800 Subject: [PATCH] opt --- .../com/mogo/launcher/MogoApplication.java | 2 +- .../drawable-ldpi/module_apps_ic_retract.png | Bin 1124 -> 469 bytes .../res/layout/module_apps_fragment_apps.xml | 10 +- .../module_apps_fragment_apps_navigator.xml | 24 ++--- .../main/res/layout/module_apps_item_app.xml | 8 +- .../res/layout/module_apps_item_app_pager.xml | 6 +- .../src/main/res/values-ldpi/dimens.xml | 16 +++ .../src/main/res/values-xhdpi/dimens.xml | 16 +++ .../src/main/res/values/dimens.xml | 16 +++ .../src/main/res/drawable-ldpi/ic_cloudy.png | Bin 0 -> 510 bytes .../main/res/drawable-ldpi/ic_dust_sand.png | Bin 0 -> 454 bytes .../main/res/drawable-ldpi/ic_duststorm.png | Bin 0 -> 479 bytes .../src/main/res/drawable-ldpi/ic_fog.png | Bin 0 -> 268 bytes .../src/main/res/drawable-ldpi/ic_haze.png | Bin 0 -> 408 bytes .../main/res/drawable-ldpi/ic_heavy_rain.png | Bin 0 -> 419 bytes .../main/res/drawable-ldpi/ic_light_rain.png | Bin 0 -> 373 bytes .../res/drawable-ldpi/ic_moderate_rain.png | Bin 0 -> 373 bytes .../main/res/drawable-ldpi/ic_overcast.png | Bin 0 -> 516 bytes .../res/drawable-ldpi/ic_severe_storm.png | Bin 0 -> 541 bytes .../src/main/res/drawable-ldpi/ic_shower.png | Bin 0 -> 525 bytes .../src/main/res/drawable-ldpi/ic_snow.png | Bin 0 -> 521 bytes .../src/main/res/drawable-ldpi/ic_sunny.png | Bin 0 -> 502 bytes .../src/main/res/drawable-ldpi/ic_thunder.png | Bin 0 -> 452 bytes .../res/drawable-ldpi/ic_thundershower.png | Bin 0 -> 534 bytes .../src/main/res/drawable-ldpi/ic_unknown.png | Bin 0 -> 464 bytes .../drawable-ldpi/module_map_ic_search.png | Bin 1038 -> 712 bytes .../ic_cloudy.png | Bin .../ic_dust_sand.png | Bin .../ic_duststorm.png | Bin .../ic_fog.png | Bin .../ic_haze.png | Bin .../ic_heavy_rain.png | Bin .../ic_light_rain.png | Bin .../ic_moderate_rain.png | Bin .../ic_overcast.png | Bin .../ic_severe_storm.png | Bin .../ic_shower.png | Bin .../ic_snow.png | Bin .../ic_sunny.png | Bin .../ic_thunder.png | Bin .../ic_thundershower.png | Bin .../ic_unknown.png | Bin .../res/layout/module_ext_layout_entrance.xml | 86 ++++++++-------- .../layout/module_ext_layout_extensions.xml | 42 ++++---- .../module_map_layout_navi_info_panel.xml | 28 +++--- .../src/main/res/values-ldpi/dimens.xml | 93 ++++++++++++++++++ .../src/main/res/values-xhdpi/dimens.xml | 91 +++++++++++++++++ .../src/main/res/values/dimens.xml | 91 +++++++++++++++++ .../res/layout/module_main_activity_main.xml | 12 +-- .../src/main/res/values-ldpi/dimens.xml | 10 ++ .../src/main/res/values-xhdpi/dimens.xml | 10 ++ .../src/main/res/values/dimens.xml | 10 ++ 52 files changed, 462 insertions(+), 109 deletions(-) create mode 100644 modules/mogo-module-apps/src/main/res/values-ldpi/dimens.xml create mode 100644 modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml create mode 100644 modules/mogo-module-apps/src/main/res/values/dimens.xml create mode 100755 modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_cloudy.png create mode 100755 modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_dust_sand.png create mode 100755 modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_duststorm.png create mode 100755 modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_fog.png create mode 100755 modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_haze.png create mode 100755 modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_heavy_rain.png create mode 100755 modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_light_rain.png create mode 100755 modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_moderate_rain.png create mode 100755 modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_overcast.png create mode 100755 modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_severe_storm.png create mode 100755 modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_shower.png create mode 100755 modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_snow.png create mode 100755 modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_sunny.png create mode 100755 modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_thunder.png create mode 100755 modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_thundershower.png create mode 100755 modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_unknown.png mode change 100644 => 100755 modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_map_ic_search.png rename modules/mogo-module-extensions/src/main/res/{drawable-nodpi => drawable-xhdpi}/ic_cloudy.png (100%) rename modules/mogo-module-extensions/src/main/res/{drawable-nodpi => drawable-xhdpi}/ic_dust_sand.png (100%) rename modules/mogo-module-extensions/src/main/res/{drawable-nodpi => drawable-xhdpi}/ic_duststorm.png (100%) rename modules/mogo-module-extensions/src/main/res/{drawable-nodpi => drawable-xhdpi}/ic_fog.png (100%) rename modules/mogo-module-extensions/src/main/res/{drawable-nodpi => drawable-xhdpi}/ic_haze.png (100%) rename modules/mogo-module-extensions/src/main/res/{drawable-nodpi => drawable-xhdpi}/ic_heavy_rain.png (100%) rename modules/mogo-module-extensions/src/main/res/{drawable-nodpi => drawable-xhdpi}/ic_light_rain.png (100%) rename modules/mogo-module-extensions/src/main/res/{drawable-nodpi => drawable-xhdpi}/ic_moderate_rain.png (100%) rename modules/mogo-module-extensions/src/main/res/{drawable-nodpi => drawable-xhdpi}/ic_overcast.png (100%) rename modules/mogo-module-extensions/src/main/res/{drawable-nodpi => drawable-xhdpi}/ic_severe_storm.png (100%) rename modules/mogo-module-extensions/src/main/res/{drawable-nodpi => drawable-xhdpi}/ic_shower.png (100%) rename modules/mogo-module-extensions/src/main/res/{drawable-nodpi => drawable-xhdpi}/ic_snow.png (100%) rename modules/mogo-module-extensions/src/main/res/{drawable-nodpi => drawable-xhdpi}/ic_sunny.png (100%) rename modules/mogo-module-extensions/src/main/res/{drawable-nodpi => drawable-xhdpi}/ic_thunder.png (100%) rename modules/mogo-module-extensions/src/main/res/{drawable-nodpi => drawable-xhdpi}/ic_thundershower.png (100%) rename modules/mogo-module-extensions/src/main/res/{drawable-nodpi => drawable-xhdpi}/ic_unknown.png (100%) create mode 100644 modules/mogo-module-extensions/src/main/res/values-ldpi/dimens.xml create mode 100644 modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml create mode 100644 modules/mogo-module-extensions/src/main/res/values/dimens.xml create mode 100644 modules/mogo-module-main/src/main/res/values-ldpi/dimens.xml create mode 100644 modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml create mode 100644 modules/mogo-module-main/src/main/res/values/dimens.xml diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 5cd280f032..85eed210cb 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -31,7 +31,7 @@ public class MogoApplication extends AbsMogoApplication { // MogoModulePaths.addModule( new MogoModule( DemoConstants.TAG, "CARD_DEMO" ) ); // MogoModulePaths.addModule( new MogoModule( Demo2Constants.TAG, "CARD_DEMO2" ) ); DebugConfig.setNetMode( DebugConfig.NET_MODE_QA ); - MogoModulePaths.addModule( new MogoModule( OnLineCarConstants.TAG, OnLineCarConstants.MODULE_NAME ) ); +// MogoModulePaths.addModule( new MogoModule( OnLineCarConstants.TAG, OnLineCarConstants.MODULE_NAME ) ); MogoModulePaths.addModule( new MogoModule( TanluConstants.TAG, TanluConstants.MODEL_NAME ) ); MogoModulePaths.addModule( new MogoModule( CallChatConstant.PROVIDER, CallChatConstant.MODULE_NAME ) ); MogoModulePaths.addModule(new MogoModule(MediaConstants.TAG, MediaConstants.MODULE_TYPE)); diff --git a/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_retract.png b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_retract.png index 8c37a69e35b1b08db041762fe407bb64e809aedc..24d42281c4d4c70c2f1144e8251800720ca42096 100755 GIT binary patch literal 469 zcmeAS@N?(olHy`uVBq!ia0vp^S|H591|*LjJ{b+97>k44ofy`glX(eb_j|fHhD30_ zow8StB~hfU{7C%KIEIB&BJ3yb2`N+0!-q zcE`E5ooaVJD-<%#GI@8fz$sQS^9%cewi}We>z*x_pYZOpu?ojZ8XKQL8$oK^f>BA`{;+~aUrqK5B` zS(zVdiwcFi3Jo)NupMCgVSiip`_CO!p900#pZMF?UC6C*{6L`vqop=q;*smc^Bbct z?2gf6i!~nVg)(SMf_fUbODLg5B`2<(fnW?8+WFxL@wvInioU!T2 za{n@6?&vH0=?}HOi(W{YuJhyB{YVp(pfX@r;;Uh{<%(G<_xi;PU_3E+y85}Sb4q9e E05P@4eEV3G55aSW+o zd^^LpV``|(vFFp)Z4%kPEvjW%-=u8zo(y5Z$X80Ycy@fe-J4?YPG;qqEs<9iN#5n@ z&xl50| z)ws7oZQhoZrHg)K2tC_#$klw_x;6*X(pZM9B%W;d_|9vK!vkaF1YWqZ8{ECHMeb*F zUi!K#@3iFY7dZc@@QMvyDShAp)91@O!lLR$k^=uqzs)zO*Xz1|Cnc};zS)ASlFf6~ z{)raW6!w}q@4$~tkG zYs~}mpM;2rFa26~g}-6bmS>TFZ@hQ0n)PCa(Dc(RB_@)6)>2pH${P|D4+z-ER!(Wt zl=pI6`c*Qk@%rs+t#RSjT2`}a`uU3M&$>^}c++)u%EvDLE4zgaxFv!!@6I#)rupcW zE2~xLt2z@;-$|m`Rt}QPi)vc7Tx*-W{Lfk6-Ib5qKHa&qqB@ExAwou>^h#jVYjI!I zeEZAm|NpqNI4^5u%BIX?3@Z0)>qH%<1*7|p#>Q|OG??NpPo>5-#bH~ oBGua1P+Zu6kz|x%%XFThJ)K|7WPbTmV6nmA>FVdQ&MBb@0Ou9`pa1{> diff --git a/modules/mogo-module-apps/src/main/res/layout/module_apps_fragment_apps.xml b/modules/mogo-module-apps/src/main/res/layout/module_apps_fragment_apps.xml index 1229ca7d01..20a38ba132 100644 --- a/modules/mogo-module-apps/src/main/res/layout/module_apps_fragment_apps.xml +++ b/modules/mogo-module-apps/src/main/res/layout/module_apps_fragment_apps.xml @@ -19,11 +19,11 @@ android:layout_height="match_parent"> @@ -38,7 +38,7 @@ android:id="@+id/module_apps_id_apps_pager" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginTop="@dimen/dp_210" + android:layout_marginTop="@dimen/module_apps_pager_marginTop" android:overScrollMode="never" /> + android:paddingBottom="@dimen/module_apps_navigation_icon_paddingBottom"> \ No newline at end of file diff --git a/modules/mogo-module-apps/src/main/res/layout/module_apps_item_app.xml b/modules/mogo-module-apps/src/main/res/layout/module_apps_item_app.xml index 499d8a5166..7fe69dfb38 100644 --- a/modules/mogo-module-apps/src/main/res/layout/module_apps_item_app.xml +++ b/modules/mogo-module-apps/src/main/res/layout/module_apps_item_app.xml @@ -8,16 +8,16 @@ + android:layout_width="@dimen/module_apps_navigation_icon_width" + android:layout_height="@dimen/module_apps_navigation_icon_height" /> + android:textSize="@dimen/module_apps_app_name_textSize" /> \ No newline at end of file diff --git a/modules/mogo-module-apps/src/main/res/layout/module_apps_item_app_pager.xml b/modules/mogo-module-apps/src/main/res/layout/module_apps_item_app_pager.xml index 1e159101ce..b7fce405bf 100644 --- a/modules/mogo-module-apps/src/main/res/layout/module_apps_item_app_pager.xml +++ b/modules/mogo-module-apps/src/main/res/layout/module_apps_item_app_pager.xml @@ -5,8 +5,8 @@ android:layout_height="match_parent" android:numColumns="6" android:orientation="vertical" - android:paddingLeft="@dimen/dp_220" - android:paddingRight="@dimen/dp_220" - android:verticalSpacing="@dimen/dp_154"> + android:paddingLeft="@dimen/module_apps_page_paddingLeft" + android:paddingRight="@dimen/module_apps_page_paddingRight" + android:verticalSpacing="@dimen/module_apps_page_item_verticalSpacing"> \ No newline at end of file diff --git a/modules/mogo-module-apps/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-apps/src/main/res/values-ldpi/dimens.xml new file mode 100644 index 0000000000..a5316a0ea2 --- /dev/null +++ b/modules/mogo-module-apps/src/main/res/values-ldpi/dimens.xml @@ -0,0 +1,16 @@ + + + 117px + 2.7px + 16px + 54.9px + 64px + 64px + 31.6px + 33px + 24px + 18px + 112px + 112px + 89px + \ No newline at end of file diff --git a/modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml new file mode 100644 index 0000000000..da464ff5de --- /dev/null +++ b/modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml @@ -0,0 +1,16 @@ + + + 260px + 5px + 30px + 103px + 120px + 120px + 61px + 60px + 32px + 32px + 220px + 220px + 154px + \ No newline at end of file diff --git a/modules/mogo-module-apps/src/main/res/values/dimens.xml b/modules/mogo-module-apps/src/main/res/values/dimens.xml new file mode 100644 index 0000000000..da464ff5de --- /dev/null +++ b/modules/mogo-module-apps/src/main/res/values/dimens.xml @@ -0,0 +1,16 @@ + + + 260px + 5px + 30px + 103px + 120px + 120px + 61px + 60px + 32px + 32px + 220px + 220px + 154px + \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_cloudy.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_cloudy.png new file mode 100755 index 0000000000000000000000000000000000000000..8a9ef0036558df7ea8607d65c01e49e6495db859 GIT binary patch literal 510 zcmVPx$xJg7oR7ef&Q#nfmK@|RGqo8=;K|C5)FcPqfSXg)>h_)6MHX?|XSlcUhb}DLq zfSuS`cwhueK@bE@5U;|<0}&NBv*Wi(vpY##HHA%v{n&Z$eeb>5Z{7lhRZzgKfKp1R z^X^3zA87OXr;61@&zy=6SGxVq-q0Q2*+K{fAsS$R&U$!>^GVv{C@Hr*ei}k|_}S`i zpcas&c#{)M53|BOL|_BTco(gEXL^2-?(nrO8N{bNBCiHesRu~Tzz}SRj0RaHqSgj6 zO>7f!VwV^v1d?(nT^w#XieY0-B?jyC17=9XA|)j45M4T%_9iik>)s}q^*2bomI3dB zu;o1cj$DpxFT5ucq41Ir>sB_27D&!koNkN|D==ftd`A$%E#FaG^>@Ou_gTDxb{lNf zfxD+w?k&$3q$B_y8K@$DvlejKx5W$j5G{wN?nJ$T$>5cn@WZ_%FUT=|()s!&x9fx- z+5wq-j#2@RaE`^`7$J##)-jXyL#I13aF9=BSFT3|cejTeANN~##yzA8@B|U!*>#e? zY?t-Z=u^~4g7c?V>qH;hnW7U;QOt)|2>*iuUm}KL@OuJ<*#H0l07*qoM6N<$f*I1? Aod5s; literal 0 HcmV?d00001 diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_dust_sand.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_dust_sand.png new file mode 100755 index 0000000000000000000000000000000000000000..e4b369fd5d3aef7c5ee63a4223911fd6e67523bc GIT binary patch literal 454 zcmV;%0XhDOP)Px$fJsC_R7ef&lD|p=K@i5j*@QzZ{MV$h5|ccDAQ&*>6Id9n(wM?t1m8h}=mUsW zHg-0Gf}jxsf{mgeiP%I1#WdO&NN${+3um|s7_{(H5GelcK$Alrc zJPD!^e~pE0Gw9RINXoG?XJQ^x4D1S1Rk=mVv>6SIrU1%Z>LD zF;~h_bAkqEC3ZM9sQUe~Jooedg2t%|8R`4N&ZbV%cc zB0r>4;@g~fa!-l#J=HdYX$2j-?wGvqni#h1uUWSJt1;|pkWqGN!ehy*;RSzBa}YKe zRFRwPfZVqqv9LDhLlfZ`Y@T8GPTA&$-NUz@uA5@WWLq3Fx1Im3a3bQMCSqn+|n7SvS4FH(j5E!tSweeEPx$nMp)JR7ef&R6R=rK@fd&IW++ltQ177lC)M@C4O`f^aqGR{Q;I1)^-sKe}Ny^ zSqLJEAS9%=Nud&B)FKkF^eduV#@S199CtCs15-!_Zg*z(?Yz5ry9c!G-*UC21(O$c5&?LyGOtU)CqN&e zaJmQNn*nhEY^*t}{hEN838Za6qd5vEGpZnkQb#ft#SN<1Zn`~CKIdXx&`W*JycOS1 z0v&W{V(%sfWcK6Jh)c@`MUPVpS9M$jptmV}l#iXjA7erunt#=at3$vA5VoAa2JySJ zCxbx$E)DIM8sPqBsqQf~g{<-s5!a||d3#Q+eV12jE&{$8kHM&EKqqnxr_CbS=z^5m zR=$Y2L!tDda``&4BKIMoe7Og43a0iFmWL9EGioTqT8?NiNeFcDb=? zxOJ)KH@y08U}W^q)jYf6gJBcL&FBLUg4jOYZI~e%DZ~HU&R~U^^6AYA#TzzkZAf|) zaioxwlRy{-3N|F+73(j2UJaWtB z*JIs)SYCq+IiaO;8I5uRletb6O7`ha(q|S8XEfBbi|9Dr6!=k4fQdnMVV@71?HWm- Pj~F~%{an^LB{Ts53jJT# literal 0 HcmV?d00001 diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_haze.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_haze.png new file mode 100755 index 0000000000000000000000000000000000000000..5448cd94e6124c331dfda1733bb816902f872df0 GIT binary patch literal 408 zcmV;J0cZY+P)Px$Qb|NXR7ef&lRr)ZVGzZ44TbcEP*_+PO^gM$+<*!yZ=q+P@C1~efKzY17{es9^X7eT=KH%@cCdec0(sdEi=t@5_wY;n6@SX}{DZi) zCYr4{0t!d?J04B>&~@Nijcb!=g=)OS$M~&91bYoM1BP5H>B!g!^|wN-!e4I*8Z?qPx$T}ebiR7eeDU>F6%J_Hy^_2K{j|5<=~yn$E;h<^j|X&^qy$jJB&NK*!YhC2cA z6Cg$h_kjWqB%2P@!~(=pAdNuU1&IFuF)r{ADB(erB|wGJK)fD^zXLG{yaM8nU>1Jj zF;JQhuO&bQ;y?^CkX#UkYylH82g>dN(xOR`Xlov;d}mlpeSc000u+kEG?1@#O#j N002ovPDHLkV1jZ%t0({f literal 0 HcmV?d00001 diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_light_rain.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_light_rain.png new file mode 100755 index 0000000000000000000000000000000000000000..19365b521a6b83326b460acdf9b3091ca9010a64 GIT binary patch literal 373 zcmV-*0gC>KP)Px$FG)l}R7eeDU>F6%J_Hy^_2K{j|5<=~yn$E;h<^j|X&^qy$jJB&NK*!YhC2cA z6Cg$h_kjWqB%2P@!~(=pAdNuU1&IFuF)r{ADB(erB|wGJK)fD^zXLG{yaM8nU>1Jj zF;JQhuO&bQ;y?^CkX#UkYylH82g>dN(xOURhqBKAi5p4kzGgC9e|G&35IoM{9V!^0df*}9^U~YAm T7{R9h00000NkvXXu0mjf(gcz~ literal 0 HcmV?d00001 diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_moderate_rain.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_moderate_rain.png new file mode 100755 index 0000000000000000000000000000000000000000..19365b521a6b83326b460acdf9b3091ca9010a64 GIT binary patch literal 373 zcmV-*0gC>KP)Px$FG)l}R7eeDU>F6%J_Hy^_2K{j|5<=~yn$E;h<^j|X&^qy$jJB&NK*!YhC2cA z6Cg$h_kjWqB%2P@!~(=pAdNuU1&IFuF)r{ADB(erB|wGJK)fD^zXLG{yaM8nU>1Jj zF;JQhuO&bQ;y?^CkX#UkYylH82g>dN(xOURhqBKAi5p4kzGgC9e|G&35IoM{9V!^0df*}9^U~YAm T7{R9h00000NkvXXu0mjf(gcz~ literal 0 HcmV?d00001 diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_overcast.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_overcast.png new file mode 100755 index 0000000000000000000000000000000000000000..4a90f7c87e4fff1cc43bfb40a1c0588f098449d8 GIT binary patch literal 516 zcmV+f0{i`mP)Px$zDYzuR7ef&R7)rXaTx!;Vb&w>6tzfs%W*%OkG7jccz$o!>} z;=0m?&h%I@lGevE!dT>b*9?eOfG7BGut!(!!B+>XUBrB+H$XWvB+_g6cvu85P=s7} zv>3x?AU6sW0J`4_>;>KZISPrsQsabK)TnO}K(aAfNW$i#cf3T+Sj8<4nCVFo-ikSo z8%zVKoJS0e)%tu{&fWF;c;r*5FxzJO?BwPZdF;g$V$D8d7Pzn%Q;09)&fuyIz_snl z$%MyfF18C;eidlY--s3<-`Px$*GWV{R7ef&R7)sCVH7@R?lgw-C?+wKg|c8H62d}?vT;X>oyXeF&H`nJot1@! zQi`JNEWBn+WPy#HQf8(YATevrJ<&B^Zo{vVT-PSHt&kDi>u+Fz;)6K)^HE!3obBlkk9dO^z`o zcrz$CCOdqa=h>j*8ea0(UC1$M*EA3ds=7`iY^>n*ROA3F&m(!{!5o7^)2l@-J68Me z$^ExSdFsXPlw1LS6%B!CXh`UIAyAD3M|-Zq5nTuqeP z(nPx$$4Nv%R7ef&R6R=rK@gq2OGJx^*a#M)XwV?|iHe0Lv9PcRA~u4Rv9qg zkkB^B8{8LST`K6dDWw751-mJmyF%mof>MYyxwQ^zKW##85%2+N;1W0xLcC)wi6R4z zPb`zvKS<*~Vi^Yekc5cA$W1~&p{`RuauL8~>GX)_Fiegud9oM;7D>o2V(o!i=Huj9 z8H1n)NC3tgZv%FbL17psH+FV7r6n%k_L&s(;*FdZB>@afRH{vTk z^E%ZvT|lv#=0;B)@EV(Zs0;@3#VXf(vrc7@G!q=|FK|3>Wi^;V8<283UGQIlL2L7p zAsYk`d$DW*BR~UCE>b8)fe7B-xX%BJrRS)}Ne9&oZ1uCr^XZq2+_NPp3Kbj7Jw-!8 z=8lMjan~yj>p#U-C?$tb)CKXaElE+R*g(^@P2yavp}uZc(WjQG{sg`Oh}r3dLLLLh P00000NkvXXu0mjfd4}HV literal 0 HcmV?d00001 diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_snow.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_snow.png new file mode 100755 index 0000000000000000000000000000000000000000..67d43a2ee177fcbaa6c4b52db850f4df7ec49ae1 GIT binary patch literal 521 zcmV+k0`~ohP)Px$!%0LzR7ef&)k`QuQ5?tdxlED;rKCKQSelLPXtEWSY*<=(#1_SZtko3CLe^Fq z#DcJ~RmwY$6^p46Ngm_-o9`fuDL64X_YG56X!tLE1dTB^L$-@QPwsn8OR6 zaf^D5qF%&Gat4Ph1lM2zbx^`iJCP>YhbE0Bx36E*AAy!`*dgurWrCVT-u@B9%tW)|oSVA8n$gGeg0DZN&Ju2d-Cwc6!qYgs*d=~l+wxRQ=7HJQ= zR7>Px$ut`KgR7ef&l(9?0KorKmYtx}n2SG;_mFnc?AV^bN+ytFm1!osm2mc2bXTeEu za&T>FL~w9(YJ-Y8R&XhFXqxA}ODh+1Z4zj70|*^hI2Oy!lkB+- z(1qMv(pd<+0OC-rI1WAAYw&O;_X;RBHiQr~WWyDF?iHlbt2C^lkE4NkJz~ykm5}O+ zk*w0NmOZo)s$jTJ&2kC3>^r<(&1gOZ`OTGBxhi`7d9m8K(?h%tS1^bw(DRG2=FD>? zk~Nug*qDF=5dOM)CwYuvM<+;PoPZgffHIE>^Z_!4H6~CW*~+-VQH)8WK61uY8Uq?i zK<(WrYT8$T@4)j;_?*imzCjmkshDIG>pQGv51kJsz|2iY8ZJuX8nQU&OC;A7VPx$en~_@R7ef&Qn4-sQ53yrW@)Gt8WbcG6#jt8qR|M&N>ma{L+ck5Tajpd1G;TA zVyzF5kZiHmMudh+%g*lcW@RVu?as`OWGmU%%suCxd(XUkpGg1w`w1Y)4asy$D%=az zrtCbXu3tiPicCc%4E~X;B8?M+^8s)tla133UL!0mjt;?{kYr70XMr0pBo|O!4Om_p zQ|gtVq7}f(VY+bNf>GbD1_EzeNZV)tDTyhFJV4SXqn4Njq?mswlRMGduKjM>1bzUN8)QBZfcBCA0000nn literal 0 HcmV?d00001 diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_thundershower.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_thundershower.png new file mode 100755 index 0000000000000000000000000000000000000000..e5821e3fc3fd2445987c0899a9a1e47a1a76a66c GIT binary patch literal 534 zcmV+x0_pvUP)Px$&`Cr=R7ef&Q_U+xQ4~MtnO;7UWMN_9TS;UqjUsGB#)Q2EiIT{|LY5Z(1siK+ zVIegO8M8yO5oV*_BuPzSC}xh|oxJJJH80+NPW?JxzjN-r=iWAHf@Di0PHya1cfa`EyfxuoD}}Jc3UCr~Rb!%u8k@&6vx7hj9of zt)v7{kDx|5nw)F)Zxg3DFlOqy3nm*0^(S<>f}Guw+cN+ zA}Ok{2VnPVoD0}v%$(L@zsCWB`kfshg@86d?I@1;i`)k1NvH|_I@Lwqpr3&?K>d>l zI0Bs~YUckEiTC$X`sBPE2&dIV_>-wGxj62a;$;eJ1z^{tTttVSV7RJG6WLv}Bc$^GBoOXOtCdR^5 zZbMUhE?^OtW2RSBTXmy~L^i>dFqKwjn`avdmEkl=Ve80j?Ayl+YM1+wYTt#$g1;v4 Y4JR^H0)47zPXGV_07*qoM6N<$g2~wJPyhe` literal 0 HcmV?d00001 diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_unknown.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_unknown.png new file mode 100755 index 0000000000000000000000000000000000000000..2e2a052a7423c6f5dd75ce8ccf9fe5035d61ab7d GIT binary patch literal 464 zcmV;>0WbcEP)Px$ib+I4R7ef&l|L^8K^Vq&H6j{~^9hK8o|cG4BCgacRazfId6iZtP9fp$14x`k zTqG3ALqtVm@Aur!JGq^Z9V?>XNuGWG%=>3%Ze}h?{!y|6Y00=B&a!L-W70W#X_~(K z!S5&(uEQpLg$C*JZB(vJat*d&8CnF?zSKww@D|2GvGGj^j+uGbydAX)vb5(_Q7>&m z?Q9=k`wgqkS+BHuE7f#pp%QiciGkO zu0jL6I_IM{%306Q_smAV!Dl!HFDW)J2@T4%yE5>F4J>dVDWKqkA!iF+E4-)qBXR|* zfhO`H!UjE}G)seKIA;d(5UxYpo(CGeVBbMOxvJq&XyC5@nIFxSEoW<%*KihgSltA2 z8Va^er>;isPx%f=NU{R9Fe^mQ6@hQ5c5jnm+|7^n zL4iVh7f}lr4iOaTqJ?3S3$cj6oePN+Y0<)kF+Hz-1I{@2o-;$k1l|vx`R1PQ=e%>~ z+sL%<=#vBFa7y ze1fozsHA)`FF^=7LGd{BS(C5$6lg`ZK&#dSU7(yg_zjN`wT%C_hM+N6fsde73N_;O z@EDZ82+7doVgfY0Y0a1L?LIxo3t+YO<=s(@K*Jm@Sqlt4`-yt3M%L!rp8 z6_L?I;wteL*o0X}ZdRDRv&X=58|=*rMqIcA-LTsCHbF$IyrCsVe?c=VrA_ZNm!L-L zpu4JI<463V=$jQ@@@e1_blRHi_%sX2$<&?+iDwPF1nF5Kt3Pl>ed?Jc%k(<93i)&i z+P1pOA@x4PdcDYWV>rzv=!{kW`ij)eJ3X}?z3X}?z3X}@$)C#ofOuXCe?gH-^+D4C}2ZPcKybroY+d)@bt=3Q4 zMx_>l5Zggy^@5KGEH>2|{j|sN?A2=;*&4-qOrL@=2n9Pq$=( z5R>mU^zxPn@3>w@pQCS3y_yoeu1C=0=n#4c^>Uw!yAbXAo4Ixp!9eZ~!B4paK48zI zOCXSJqNC^m*Woett-47%{Awl%j-e|~=dcH>d2jZT4=P`eHMZH~A6O(a zyd|Ltt~GiliG0z?EtvYQYmul|lq57-K0<9kd4@f~E0s0eizGO+=m}J!f#*E9*`sT0 z2DxO^L_$F_Yq@613%4QqVq59(!8}_Q|V}pR?DcF;B48%JwLSe`+=_ z_UPXGr&NO46*MIt+ZQz{UJSuC7eQN|ro?0Wm`U+s2zFeAAyygM^3*B;Q+q{|jv1+K z48c``=$JvG&8qfub&D`NzUd(VznLJgLMwv+lEcMf?kJY(x6idK}&|@^m^%-p^a*@s)e&Hp0%!&>ecI@ zfBokRI2v>&QIi)KbR00o>=Q*mQ3u>b%707*qo IM6N<$f*3345dZ)H diff --git a/modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_cloudy.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_cloudy.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_cloudy.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_cloudy.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_dust_sand.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_dust_sand.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_dust_sand.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_dust_sand.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_duststorm.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_duststorm.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_duststorm.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_duststorm.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_fog.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_fog.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_fog.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_fog.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_haze.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_haze.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_haze.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_haze.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_heavy_rain.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_heavy_rain.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_heavy_rain.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_heavy_rain.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_light_rain.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_light_rain.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_light_rain.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_light_rain.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_moderate_rain.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_moderate_rain.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_moderate_rain.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_moderate_rain.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_overcast.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_overcast.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_overcast.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_overcast.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_severe_storm.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_severe_storm.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_severe_storm.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_severe_storm.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_shower.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_shower.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_shower.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_shower.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_snow.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_snow.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_snow.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_snow.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_sunny.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_sunny.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_sunny.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_sunny.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_thunder.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_thunder.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_thunder.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_thunder.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_thundershower.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_thundershower.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_thundershower.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_thundershower.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_unknown.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_unknown.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_unknown.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_unknown.png diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml index ac2d2f671c..2ea2761fe9 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml @@ -8,18 +8,18 @@ @@ -27,9 +27,9 @@ @@ -58,8 +58,8 @@ @@ -74,10 +74,10 @@ + android:textSize="@dimen/module_ext_speed_limit_unit_textSize" /> @@ -138,11 +138,11 @@ android:src="@drawable/module_map_ic_move2_current_location" android:text="实景" android:textColor="#CCFFFFFF" - android:textSize="@dimen/dp_24" /> + android:textSize="@dimen/module_ext_operation_panel_vr_textSize" /> @@ -151,7 +151,7 @@ @@ -164,30 +164,30 @@ + app:layout_goneMarginBottom="@dimen/module_ext_operation_panel_share_goneMarginBottom" + app:layout_goneMarginRight="@dimen/module_ext_operation_panel_share_goneMarginRight" /> 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 1518c15d64..7aafa02548 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 @@ -3,16 +3,16 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="@dimen/dp_120" + android:layout_height="@dimen/module_ext_height" android:background="@drawable/module_ext_dw_shadow_frame_bkg" android:orientation="vertical" - android:paddingLeft="@dimen/dp_60" - android:paddingRight="@dimen/dp_60"> + android:paddingLeft="@dimen/module_ext_paddingLeft" + android:paddingRight="@dimen/module_ext_paddingRight"> @@ -24,7 +24,7 @@ android:gravity="center_vertical" android:text="@string/module_ext_str_voice_msg" android:textColor="@color/module_ext_color_voice_text" - android:textSize="@dimen/dp_32" + android:textSize="@dimen/module_ext_voice_textSize" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toRightOf="@+id/module_ext_id_voice" app:layout_constraintTop_toTopOf="parent" /> @@ -35,7 +35,7 @@ android:layout_height="wrap_content" android:gravity="center_vertical" android:textColor="#FFFFFF" - android:textSize="@dimen/dp_48" + android:textSize="@dimen/module_ext_time_textSize" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -45,10 +45,10 @@ android:id="@+id/module_ext_id_date" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="@dimen/dp_80" + android:layout_marginRight="@dimen/module_ext_date_marginRight" android:gravity="center_vertical" android:textColor="#FFFFFF" - android:textSize="@dimen/dp_28" + android:textSize="@dimen/module_ext_date_textSize" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toLeftOf="@+id/module_ext_id_time" app:layout_constraintTop_toTopOf="parent" @@ -58,8 +58,8 @@ android:id="@+id/module_ext_id_weather_container" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="@dimen/dp_26" - android:gravity="center" + android:layout_marginRight="@dimen/module_ext_weather_marginRight" + android:gravity="bottom" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toLeftOf="@+id/module_ext_id_date" @@ -67,25 +67,25 @@ + android:layout_width="@dimen/module_ext_weather_icon_width" + android:layout_height="@dimen/module_ext_weather_icon_height" /> @@ -100,7 +100,7 @@ android:id="@+id/module_ext_id_msg" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="@dimen/dp_28" + android:layout_marginRight="@dimen/module_ext_msg_marginRight" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toLeftOf="@+id/module_ext_id_weather_container" @@ -113,13 +113,13 @@ diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_map_layout_navi_info_panel.xml b/modules/mogo-module-extensions/src/main/res/layout/module_map_layout_navi_info_panel.xml index 53427653f7..d9de30169c 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/module_map_layout_navi_info_panel.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/module_map_layout_navi_info_panel.xml @@ -1,17 +1,17 @@ @@ -20,10 +20,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignTop="@+id/module_map_id_navi_next_info_road_turn_icon" - android:layout_marginTop="@dimen/dp_10" + android:layout_marginTop="@dimen/module_ext_navi_info_panel_next_info_distance_marginTop" android:layout_toRightOf="@+id/module_map_id_navi_next_info_road_turn_icon" android:textColor="#282828" - android:textSize="@dimen/dp_60" + android:textSize="@dimen/module_ext_navi_info_panel_next_info_distance_textSize" tools:text="53" /> \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-ldpi/dimens.xml new file mode 100644 index 0000000000..9f9c7a937f --- /dev/null +++ b/modules/mogo-module-extensions/src/main/res/values-ldpi/dimens.xml @@ -0,0 +1,93 @@ + + + + 58px + 18px + 8px + 11.2px + 10.8px + 17px + 20px + + 58px + 19px + 8px + 64.2px + 58px + 1px + 33.4px + 64.2px + 58px + + + 96px + 96px + 8px + 32px + 32px + 15px + + 20px + 8px + + 58px + 20px + 34.5px + 58px + 17px + 31.4px + 1.2px + 58px + 58px + 58px + 21px + 14px + 34.5px + 20px + + + 130px + 58px + 20px + 32px + 22px + + + 640px + 32px + 32px + 64px + 64px + 22px + 28px + 22px + 22px + 16px + 24px + 24px + 18px + 18.48px + 16px + 22px + 28px + 15px + 15px + 11.73px + + + 244px + 170px + 85px + 85px + 13px + 13px + 20px + 32px + 7px + 8px + 16px + 15px + 24px + + 15px + \ No newline at end of file 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 new file mode 100644 index 0000000000..6280c4cf51 --- /dev/null +++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml @@ -0,0 +1,91 @@ + + + + 90px + 32px + 2px + 16px + 26px + 26px + 32px + + 90px + 32px + 2px + 100px + 90px + 2px + 54px + 100px + 90px + + 180px + 180px + 2px + 60px + 60px + 28px + + 32px + 2px + + 90px + 32px + 60px + 92px + 24px + 48px + 2px + 90px + 90px + 90px + 40px + 24px + 32px + 32px + + 200px + 90px + 32px + 60px + 32px + + + 120px + 60px + 60px + 120px + 120px + 32px + 48px + 80px + 28px + 26px + 44px + 44px + 18px + 34px + 26px + 28px + 28px + 30px + 30px + 20px + + + 458px + 318px + 159px + 159px + 24px + 24px + 10px + 60px + 12px + 16px + 28px + 28px + 24px + 28px + + \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values/dimens.xml b/modules/mogo-module-extensions/src/main/res/values/dimens.xml new file mode 100644 index 0000000000..bb5f4d1780 --- /dev/null +++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml @@ -0,0 +1,91 @@ + + + + 90px + 32px + 2px + 16px + 26px + 26px + 32px + + 90px + 32px + 2px + 100px + 90px + 2px + 54px + 100px + 90px + + 180px + 180px + 2px + 60px + 60px + 28px + + 32px + 2px + + 90px + 32px + 60px + 92px + 24px + 48px + 2px + 90px + 90px + 90px + 40px + 24px + 32px + 32px + + 200px + 90px + 32px + 60px + 32px + + + 120px + 60px + 60px + 120px + 120px + 32px + 48px + 80px + 28px + 26px + 44px + 44px + 18px + 34px + 26px + 28px + 28px + 30px + 30px + 20px + + + 458px + 318px + 159px + 159px + 24px + 24px + 10px + 60px + 12px + 16px + 28px + 28px + 24px + 28px + + \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml index f9e8a40907..e761f21d4f 100644 --- a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml +++ b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml @@ -15,7 +15,7 @@ @@ -36,21 +36,21 @@ + android:layout_marginTop="@dimen/module_main_card_container_marginTop"> + android:layout_marginLeft="@dimen/module_main_card_container_marginLeft"> + android:paddingBottom="@dimen/module_main_card_container_paddingBottom" /> + + + 720px + 10px + 660px + 60px + 211px + 20px + \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml new file mode 100644 index 0000000000..a707ceedb5 --- /dev/null +++ b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml @@ -0,0 +1,10 @@ + + + + 720px + 10px + 660px + 60px + 211px + 20px + \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/res/values/dimens.xml b/modules/mogo-module-main/src/main/res/values/dimens.xml new file mode 100644 index 0000000000..d69bd56a73 --- /dev/null +++ b/modules/mogo-module-main/src/main/res/values/dimens.xml @@ -0,0 +1,10 @@ + + + + 384px + 8px + 352px + 32px + 140.5px + 20px + \ No newline at end of file