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 8c37a69e35..24d42281c4 100755 Binary files a/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_retract.png and b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_retract.png differ 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 0000000000..8a9ef00365 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_cloudy.png differ 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 0000000000..e4b369fd5d Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_dust_sand.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_duststorm.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_duststorm.png new file mode 100755 index 0000000000..3df9ec7236 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_duststorm.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_fog.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_fog.png new file mode 100755 index 0000000000..62fd9f4242 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_fog.png differ 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 0000000000..5448cd94e6 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_haze.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_heavy_rain.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_heavy_rain.png new file mode 100755 index 0000000000..fa9f6d73bf Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_heavy_rain.png differ 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 0000000000..19365b521a Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_light_rain.png differ 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 0000000000..19365b521a Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_moderate_rain.png differ 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 0000000000..4a90f7c87e Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_overcast.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_severe_storm.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_severe_storm.png new file mode 100755 index 0000000000..4650033797 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_severe_storm.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_shower.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_shower.png new file mode 100755 index 0000000000..ed7ccf66b9 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_shower.png differ 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 0000000000..67d43a2ee1 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_snow.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_sunny.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_sunny.png new file mode 100755 index 0000000000..73ceaaf264 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_sunny.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_thunder.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_thunder.png new file mode 100755 index 0000000000..8609690645 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_thunder.png differ 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 0000000000..e5821e3fc3 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_thundershower.png differ 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 0000000000..2e2a052a74 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_unknown.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_map_ic_search.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_map_ic_search.png old mode 100644 new mode 100755 index 27b414c367..a03c6eb313 Binary files a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_map_ic_search.png and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_map_ic_search.png differ 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