Merge branch 'qa_light' into dev
# Conflicts: # modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml
wangcongtao
@@ -21,8 +21,8 @@
|
||||
<dimen name="module_apps_all_icon_width">50px</dimen>
|
||||
<dimen name="module_apps_all_icon_height">50px</dimen>
|
||||
|
||||
<dimen name="module_apps_navigator_icon_width">78px</dimen>
|
||||
<dimen name="module_apps_navigator_icon_height">78px</dimen>
|
||||
<dimen name="module_apps_navigator_icon_width">94px</dimen>
|
||||
<dimen name="module_apps_navigator_icon_height">94px</dimen>
|
||||
<dimen name="module_apps_navigator_icon_divider">17px</dimen>
|
||||
<dimen name="module_apps_voice_icon_width">55px</dimen>
|
||||
<dimen name="module_apps_voice_icon_height">55px</dimen>
|
||||
|
||||
@@ -19,20 +19,15 @@
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible" />
|
||||
|
||||
<!-- 时间、天气、消息 与entrance合到了一起，减少一个view -->
|
||||
<!-- <FrameLayout-->
|
||||
<!-- android:id="@+id/module_main_id_header_fragment_container"-->
|
||||
<!-- android:layout_width="match_parent"-->
|
||||
<!-- android:layout_height="@dimen/module_ext_height"-->
|
||||
<!-- android:layout_marginLeft="@dimen/module_main_header_fragment_container_marginLeft"-->
|
||||
<!-- android:layout_marginTop="@dimen/module_main_header_fragment_container_marginTop" />-->
|
||||
|
||||
<!-- 左边按钮 -->
|
||||
<FrameLayout
|
||||
android:id="@+id/module_main_id_apps_fragment_container"
|
||||
android:layout_width="@dimen/module_main_apps_fragment_container_width"
|
||||
android:layout_height="match_parent"
|
||||
android:padding="@dimen/module_main_apps_fragment_container_padding" />
|
||||
android:paddingLeft="@dimen/module_main_apps_fragment_container_padding"
|
||||
android:paddingRight="@dimen/module_main_apps_fragment_container_padding"
|
||||
android:paddingTop="@dimen/module_main_apps_fragment_container_paddingTop"
|
||||
android:paddingBottom="@dimen/module_main_apps_fragment_container_paddingTop"/>
|
||||
|
||||
<!-- 左侧浮层,布局位置目前只考虑了1+16独立app情况 -->
|
||||
<FrameLayout
|
||||
@@ -46,7 +41,10 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginLeft="@dimen/module_main_id_entrance_fragment_container_marginLeft"
|
||||
android:padding="@dimen/module_main_entrance_fragment_container_padding" />
|
||||
android:paddingLeft="@dimen/module_main_apps_fragment_container_padding"
|
||||
android:paddingRight="@dimen/module_main_apps_fragment_container_padding"
|
||||
android:paddingTop="@dimen/module_main_apps_fragment_container_paddingTop"
|
||||
android:paddingBottom="@dimen/module_main_apps_fragment_container_paddingTop" />
|
||||
|
||||
<!-- 浮层-->
|
||||
<FrameLayout
|
||||
@@ -59,7 +57,10 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginLeft="@dimen/module_main_id_entrance_fragment_container_marginLeft"
|
||||
android:padding="@dimen/module_event_fragment_container_padding" />
|
||||
android:paddingLeft="@dimen/module_main_apps_fragment_container_padding"
|
||||
android:paddingRight="@dimen/module_main_apps_fragment_container_padding"
|
||||
android:paddingTop="@dimen/module_main_apps_fragment_container_paddingTop"
|
||||
android:paddingBottom="@dimen/module_main_apps_fragment_container_paddingTop" />
|
||||
|
||||
<FrameLayout
|
||||
android:id="@+id/module_main_id_message_history_fragment_container"
|
||||
|
||||
@@ -26,5 +26,6 @@
|
||||
<dimen name="module_main_entrance_fragment_container_padding_top">16px</dimen>
|
||||
<dimen name="module_main_entrance_fragment_container_width">658px</dimen>
|
||||
<dimen name="module_event_fragment_container_padding">8px</dimen>
|
||||
<dimen name="module_main_apps_fragment_container_paddingTop">2px</dimen>
|
||||
|
||||
</resources>
|
||||
@@ -26,5 +26,6 @@
|
||||
<dimen name="module_main_id_left_panel_fragment_container_width">635px</dimen>
|
||||
<dimen name="module_main_entrance_fragment_container_width">1263px</dimen>
|
||||
<dimen name="module_event_fragment_container_padding">20px</dimen>
|
||||
<dimen name="module_main_apps_fragment_container_paddingTop">20px</dimen>
|
||||
|
||||
</resources>
|
||||
@@ -26,4 +26,5 @@
|
||||
<dimen name="module_main_id_left_panel_fragment_container_width">340px</dimen>
|
||||
<dimen name="module_main_entrance_fragment_container_width">1313px</dimen>
|
||||
<dimen name="module_event_fragment_container_padding">20px</dimen>
|
||||
<dimen name="module_main_apps_fragment_container_paddingTop">20px</dimen>
|
||||
</resources>
|
||||
@@ -26,5 +26,6 @@
|
||||
<dimen name="module_main_entrance_fragment_container_padding_top">16px</dimen>
|
||||
<dimen name="module_main_entrance_fragment_container_width">658px</dimen>
|
||||
<dimen name="module_event_fragment_container_padding">8px</dimen>
|
||||
<dimen name="module_main_apps_fragment_container_paddingTop">10px</dimen>
|
||||
|
||||
</resources>
|
||||
@@ -87,8 +87,8 @@
|
||||
<dimen name="module_push_item_minHeight_vertical">310px</dimen>
|
||||
<dimen name="module_push_item_maxHeight_vertical">350px</dimen>
|
||||
<dimen name="module_push_content_paddingBottom_vertical">60px</dimen>
|
||||
<dimen name="module_push_panel_marginTop">8px</dimen>
|
||||
<dimen name="module_push_panel_marginBottom">8px</dimen>
|
||||
<dimen name="module_push_panel_marginTop">2px</dimen>
|
||||
<dimen name="module_push_panel_marginBottom">2px</dimen>
|
||||
<dimen name="module_push_panel_marginRight">8px</dimen>
|
||||
<dimen name="module_push_panel_paddingLeft">28px</dimen>
|
||||
<dimen name="module_push_panel_paddingBottom">16px</dimen>
|
||||
|
||||
@@ -87,8 +87,8 @@
|
||||
<dimen name="module_push_item_minHeight_vertical">310px</dimen>
|
||||
<dimen name="module_push_item_maxHeight_vertical">350px</dimen>
|
||||
<dimen name="module_push_content_paddingBottom_vertical">60px</dimen>
|
||||
<dimen name="module_push_panel_marginTop">8px</dimen>
|
||||
<dimen name="module_push_panel_marginBottom">8px</dimen>
|
||||
<dimen name="module_push_panel_marginTop">2px</dimen>
|
||||
<dimen name="module_push_panel_marginBottom">2px</dimen>
|
||||
<dimen name="module_push_panel_marginRight">8px</dimen>
|
||||
<dimen name="module_push_panel_paddingLeft">28px</dimen>
|
||||
<dimen name="module_push_panel_paddingBottom">16px</dimen>
|
||||
|
||||
@@ -87,8 +87,8 @@
|
||||
<dimen name="module_push_item_minHeight_vertical">310px</dimen>
|
||||
<dimen name="module_push_item_maxHeight_vertical">350px</dimen>
|
||||
<dimen name="module_push_content_paddingBottom_vertical">60px</dimen>
|
||||
<dimen name="module_push_panel_marginTop">8px</dimen>
|
||||
<dimen name="module_push_panel_marginBottom">8px</dimen>
|
||||
<dimen name="module_push_panel_marginTop">2px</dimen>
|
||||
<dimen name="module_push_panel_marginBottom">2px</dimen>
|
||||
<dimen name="module_push_panel_marginRight">8px</dimen>
|
||||
<dimen name="module_push_panel_paddingLeft">28px</dimen>
|
||||
<dimen name="module_push_panel_paddingBottom">16px</dimen>
|
||||
|
||||
|
Before Width: | Height: | Size: 98 KiB |
|
Before Width: | Height: | Size: 99 KiB |
|
Before Width: | Height: | Size: 97 KiB |
|
Before Width: | Height: | Size: 93 KiB |
|
Before Width: | Height: | Size: 93 KiB |
|
Before Width: | Height: | Size: 96 KiB |
|
Before Width: | Height: | Size: 51 KiB |
|
Before Width: | Height: | Size: 84 KiB |
|
Before Width: | Height: | Size: 82 KiB |
|
Before Width: | Height: | Size: 87 KiB |
|
Before Width: | Height: | Size: 607 B |
|
Before Width: | Height: | Size: 98 KiB |
|
Before Width: | Height: | Size: 568 B |
|
Before Width: | Height: | Size: 99 KiB |
|
Before Width: | Height: | Size: 640 B |
|
Before Width: | Height: | Size: 97 KiB |
|
Before Width: | Height: | Size: 614 B |
|
Before Width: | Height: | Size: 93 KiB |
|
Before Width: | Height: | Size: 93 KiB |
|
Before Width: | Height: | Size: 747 B |
|
Before Width: | Height: | Size: 96 KiB |
|
Before Width: | Height: | Size: 908 B |
|
Before Width: | Height: | Size: 51 KiB |
|
Before Width: | Height: | Size: 336 B |
|
Before Width: | Height: | Size: 84 KiB |
|
Before Width: | Height: | Size: 551 B |
|
Before Width: | Height: | Size: 430 B |
|
Before Width: | Height: | Size: 82 KiB |
|
Before Width: | Height: | Size: 87 KiB |
|
Before Width: | Height: | Size: 670 B |
|
Before Width: | Height: | Size: 2.0 KiB |
|
Before Width: | Height: | Size: 2.6 KiB |
|
Before Width: | Height: | Size: 318 KiB |
|
Before Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 2.6 KiB |
|
Before Width: | Height: | Size: 329 KiB |
|
Before Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 2.0 KiB |
|
Before Width: | Height: | Size: 309 KiB |
|
Before Width: | Height: | Size: 2.0 KiB |
|
Before Width: | Height: | Size: 2.6 KiB |
|
Before Width: | Height: | Size: 287 KiB |
|
Before Width: | Height: | Size: 320 KiB |
|
Before Width: | Height: | Size: 2.5 KiB |
|
Before Width: | Height: | Size: 3.2 KiB |
|
Before Width: | Height: | Size: 328 KiB |
|
Before Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 908 B |
|
Before Width: | Height: | Size: 163 KiB |
|
Before Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 283 KiB |
|
Before Width: | Height: | Size: 2.0 KiB |
|
Before Width: | Height: | Size: 2.5 KiB |
|
Before Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 287 KiB |
|
Before Width: | Height: | Size: 274 KiB |
|
Before Width: | Height: | Size: 2.6 KiB |
|
Before Width: | Height: | Size: 2.7 KiB |