Commit 6684682d517b9ea79207689392258dae407c99c0
1 parent
d310981e
Exists in
yxb_dev
and in
2 other branches
no message
Showing
3 changed files
with
20 additions
and
17 deletions
Show diff stats
27.8 KB
app/src/main/res/drawable/rudiobtn.xml
1 | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | 2 | <shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android"> |
3 | 3 | <stroke android:color="#00000000" android:width="1dp"/> |
4 | - <solid android:color="#a4c4fd"/> | |
4 | + <solid android:color="#b3cfff" /> | |
5 | 5 | <corners android:radius="5dp"/> |
6 | 6 | </shape> |
7 | 7 | \ No newline at end of file | ... | ... |
app/src/main/res/layout/fragment_login_and_regist.xml
... | ... | @@ -12,19 +12,22 @@ |
12 | 12 | android:orientation="vertical"> |
13 | 13 | |
14 | 14 | <com.makeramen.roundedimageview.RoundedImageView |
15 | - android:layout_width="60dp" | |
16 | - android:layout_height="60dp" | |
15 | + android:layout_width="80dp" | |
16 | + android:layout_height="80dp" | |
17 | 17 | android:layout_gravity="center" |
18 | - android:layout_marginTop="100dp" | |
19 | - android:background="#a4c4fd" | |
20 | - app:riv_corner_radius_bottom_right="10dp" /> | |
18 | + android:layout_marginTop="80dp" | |
19 | + android:scaleType="centerCrop" | |
20 | + android:src="@drawable/test" | |
21 | + app:riv_border_width="0dp" | |
22 | + app:riv_corner_radius="10dp" | |
23 | + app:riv_oval="false" /> | |
21 | 24 | |
22 | 25 | <LinearLayout |
23 | 26 | android:layout_width="match_parent" |
24 | 27 | android:layout_height="match_parent" |
25 | 28 | android:layout_marginLeft="40dp" |
26 | 29 | android:layout_marginRight="40dp" |
27 | - android:layout_marginTop="30dp" | |
30 | + android:layout_marginTop="50dp" | |
28 | 31 | android:orientation="vertical"> |
29 | 32 | |
30 | 33 | <LinearLayout |
... | ... | @@ -53,7 +56,8 @@ |
53 | 56 | |
54 | 57 | <LinearLayout |
55 | 58 | android:layout_width="match_parent" |
56 | - android:layout_height="wrap_content"> | |
59 | + android:layout_height="wrap_content" | |
60 | + android:orientation="horizontal"> | |
57 | 61 | |
58 | 62 | <EditText |
59 | 63 | android:layout_width="wrap_content" |
... | ... | @@ -134,27 +138,26 @@ |
134 | 138 | android:textSize="@dimen/sp_16" /> |
135 | 139 | |
136 | 140 | <LinearLayout |
137 | - android:layout_marginTop="30dp" | |
138 | 141 | android:layout_width="match_parent" |
139 | 142 | android:layout_height="wrap_content" |
140 | - android:orientation="horizontal" | |
143 | + android:layout_marginTop="30dp" | |
141 | 144 | android:gravity="center" |
142 | - > | |
145 | + android:orientation="horizontal"> | |
146 | + | |
143 | 147 | <TextView |
144 | 148 | android:layout_width="wrap_content" |
145 | 149 | android:layout_height="wrap_content" |
146 | - android:textSize="@dimen/sp_16" | |
147 | - android:textColor="@color/hintTextColor" | |
148 | 150 | android:text="已注册,直接登录" |
149 | - /> | |
151 | + android:textColor="@color/hintTextColor" | |
152 | + android:textSize="@dimen/sp_16" /> | |
153 | + | |
150 | 154 | <TextView |
151 | - android:layout_marginLeft="20dp" | |
152 | 155 | android:layout_width="wrap_content" |
153 | 156 | android:layout_height="wrap_content" |
157 | + android:layout_marginLeft="20dp" | |
154 | 158 | android:text="登录" |
155 | 159 | android:textColor="#acc9fc" |
156 | - android:textSize="@dimen/sp_16" | |
157 | - /> | |
160 | + android:textSize="@dimen/sp_16" /> | |
158 | 161 | |
159 | 162 | </LinearLayout> |
160 | 163 | ... | ... |