From 8500490edbec4ea8b4ef1b9694d362fdee0cde74 Mon Sep 17 00:00:00 2001 From: liujing Date: Thu, 10 Sep 2020 11:57:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E9=9D=A2=E6=9D=BF-=E5=A4=A7?= =?UTF-8?q?=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/layout/module_main_activity_main.xml | 2 +- .../res/values-xhdpi-1920x1000/dimens.xml | 1 + .../src/main/res/values-xhdpi/dimens.xml | 1 + .../src/main/res/values/dimens.xml | 1 + .../res/drawable-xhdpi/v2x_shadow_bg.9.png | Bin 3927 -> 3928 bytes ...e_v2x_event_panel_fragment_event_panel.xml | 1 + 6 files changed, 5 insertions(+), 1 deletion(-) 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 5f69da7e64..a9cf9fe2a5 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 @@ -53,7 +53,7 @@ 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:padding="@dimen/module_event_fragment_container_padding" /> 635px 1263px + 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 index 89b96d6620..38353f4b23 100644 --- a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml @@ -25,4 +25,5 @@ 340px 1313px + 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 index c68d3e2a69..abb5b70e10 100644 --- a/modules/mogo-module-main/src/main/res/values/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values/dimens.xml @@ -25,5 +25,6 @@ 16px 16px 658px + 8px \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_shadow_bg.9.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_shadow_bg.9.png index b8c97e4a3a1a279798d8bed6929141ec190d3bff..239b9eb1145192edb2d2a0b5996c766591b3303e 100644 GIT binary patch literal 3928 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 literal 3927 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 diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml index a8a16214d7..72367f3873 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml @@ -76,6 +76,7 @@ android:overScrollMode="never" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/rgTabSelect" />