From e5659a16092dc90fd7b06f3659158ddae6e1edd3 Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期一, 06 七月 2020 17:06:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
app/src/main/res/layout/profile_layout.xml | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/app/src/main/res/layout/profile_layout.xml b/app/src/main/res/layout/profile_layout.xml
index 93d32d4..acb67a2 100644
--- a/app/src/main/res/layout/profile_layout.xml
+++ b/app/src/main/res/layout/profile_layout.xml
@@ -8,6 +8,7 @@
<LinearLayout android:layout_width="457dp"
android:layout_height="105dp"
android:orientation="horizontal"
+ android:layout_weight="3"
android:background="@drawable/stu_score_bg"
>
@@ -69,9 +70,10 @@
</LinearLayout>
<LinearLayout android:layout_width="166dp"
android:layout_height="105dp"
+ android:layout_weight="1"
android:orientation="vertical"
android:id="@+id/view_map"
- android:layout_marginLeft="@dimen/ui_margin_10dp"
+ android:layout_marginLeft="@dimen/ui_margin_35dp"
android:background="@drawable/view_map_bg"
>
<ImageView
@@ -96,7 +98,8 @@
<LinearLayout
android:layout_width="143dp"
android:layout_height="105dp"
- android:layout_marginLeft="10dp"
+ android:layout_weight="1"
+ android:layout_marginLeft="@dimen/ui_margin_35dp"
android:orientation="vertical"
>
<LinearLayout
@@ -130,7 +133,7 @@
/>
</LinearLayout>
<Button
- android:layout_width="match_parent"
+ android:layout_width="143dp"
android:layout_height="match_parent"
android:textColor="#ffffff"
android:background="@drawable/start_exam_bg"
--
Gitblit v1.8.0