Skip to content

Commit 40d1034

Browse files
author
monsterLin
committed
更新个人资料界面
1 parent 8d61da4 commit 40d1034

File tree

9 files changed

+108
-116
lines changed

9 files changed

+108
-116
lines changed

‎app/build/generated/source/r/debug/android/support/design/R.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -517,8 +517,8 @@ public static final class drawable {
517517
public static final int abc_textfield_search_default_mtrl_alpha = 0x7f020039;
518518
public static final int abc_textfield_search_material = 0x7f02003a;
519519
public static final int fab_background = 0x7f02005c;
520-
public static final int notification_template_icon_bg = 0x7f0200af;
521-
public static final int snackbar_background = 0x7f0200aa;
520+
public static final int notification_template_icon_bg = 0x7f0200ae;
521+
public static final int snackbar_background = 0x7f0200a9;
522522
}
523523
public static final class id {
524524
public static final int action0 = 0x7f0d00fc;

‎app/build/generated/source/r/debug/android/support/v7/appcompat/R.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ public static final class drawable {
426426
public static final int abc_textfield_search_activated_mtrl_alpha = 0x7f020038;
427427
public static final int abc_textfield_search_default_mtrl_alpha = 0x7f020039;
428428
public static final int abc_textfield_search_material = 0x7f02003a;
429-
public static final int notification_template_icon_bg = 0x7f0200af;
429+
public static final int notification_template_icon_bg = 0x7f0200ae;
430430
}
431431
public static final class id {
432432
public static final int action0 = 0x7f0d00fc;

‎app/build/generated/source/r/debug/com/monsterlin/blives/R.java‎

Lines changed: 39 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -5044,46 +5044,45 @@ public static final class drawable {
50445044
public static final int ic_guide_two=0x7f020085;
50455045
public static final int ic_home=0x7f020086;
50465046
public static final int ic_inform_bg=0x7f020087;
5047-
public static final int ic_inform_bg_other=0x7f020088;
5048-
public static final int ic_launcher=0x7f020089;
5049-
public static final int ic_life=0x7f02008a;
5050-
public static final int ic_map_marker=0x7f02008b;
5051-
public static final int ic_map_pop=0x7f02008c;
5052-
public static final int ic_mark=0x7f02008d;
5053-
public static final int ic_mark_=0x7f02008e;
5054-
public static final int ic_news_default=0x7f02008f;
5055-
public static final int ic_nick=0x7f020090;
5056-
public static final int ic_nopic=0x7f020091;
5057-
public static final int ic_notifications=0x7f020092;
5058-
public static final int ic_password=0x7f020093;
5059-
public static final int ic_pop_map_arrow=0x7f020094;
5060-
public static final int ic_refush=0x7f020095;
5061-
public static final int ic_scenery=0x7f020096;
5062-
public static final int ic_send=0x7f020097;
5063-
public static final int ic_setting=0x7f020098;
5064-
public static final int ic_share=0x7f020099;
5065-
public static final int ic_square=0x7f02009a;
5066-
public static final int ic_tel=0x7f02009b;
5067-
public static final int ic_to_send=0x7f02009c;
5068-
public static final int ic_trash=0x7f02009d;
5069-
public static final int ic_username=0x7f02009e;
5070-
public static final int ic_weixin_share=0x7f02009f;
5071-
public static final int ic_wenhao=0x7f0200a0;
5072-
public static final int label=0x7f0200a1;
5073-
public static final int location_arrows=0x7f0200a2;
5074-
public static final int location_tips=0x7f0200a3;
5075-
public static final int material_card=0x7f0200a4;
5076-
public static final int material_card_nos=0x7f0200a5;
5077-
public static final int material_card_nos_pressed=0x7f0200a6;
5078-
public static final int material_dialog_window=0x7f0200a7;
5079-
public static final int met_ic_clear=0x7f0200a8;
5080-
public static final int notification_template_icon_bg=0x7f0200af;
5081-
public static final int side_nav_bar=0x7f0200a9;
5082-
public static final int snackbar_background=0x7f0200aa;
5083-
public static final int sport_start_select=0x7f0200ab;
5084-
public static final int sport_start_shape_after=0x7f0200ac;
5085-
public static final int sport_start_shape_before=0x7f0200ad;
5086-
public static final int test_banner_load_fail=0x7f0200ae;
5047+
public static final int ic_launcher=0x7f020088;
5048+
public static final int ic_life=0x7f020089;
5049+
public static final int ic_map_marker=0x7f02008a;
5050+
public static final int ic_map_pop=0x7f02008b;
5051+
public static final int ic_mark=0x7f02008c;
5052+
public static final int ic_mark_=0x7f02008d;
5053+
public static final int ic_news_default=0x7f02008e;
5054+
public static final int ic_nick=0x7f02008f;
5055+
public static final int ic_nopic=0x7f020090;
5056+
public static final int ic_notifications=0x7f020091;
5057+
public static final int ic_password=0x7f020092;
5058+
public static final int ic_pop_map_arrow=0x7f020093;
5059+
public static final int ic_refush=0x7f020094;
5060+
public static final int ic_scenery=0x7f020095;
5061+
public static final int ic_send=0x7f020096;
5062+
public static final int ic_setting=0x7f020097;
5063+
public static final int ic_share=0x7f020098;
5064+
public static final int ic_square=0x7f020099;
5065+
public static final int ic_tel=0x7f02009a;
5066+
public static final int ic_to_send=0x7f02009b;
5067+
public static final int ic_trash=0x7f02009c;
5068+
public static final int ic_username=0x7f02009d;
5069+
public static final int ic_weixin_share=0x7f02009e;
5070+
public static final int ic_wenhao=0x7f02009f;
5071+
public static final int label=0x7f0200a0;
5072+
public static final int location_arrows=0x7f0200a1;
5073+
public static final int location_tips=0x7f0200a2;
5074+
public static final int material_card=0x7f0200a3;
5075+
public static final int material_card_nos=0x7f0200a4;
5076+
public static final int material_card_nos_pressed=0x7f0200a5;
5077+
public static final int material_dialog_window=0x7f0200a6;
5078+
public static final int met_ic_clear=0x7f0200a7;
5079+
public static final int notification_template_icon_bg=0x7f0200ae;
5080+
public static final int side_nav_bar=0x7f0200a8;
5081+
public static final int snackbar_background=0x7f0200a9;
5082+
public static final int sport_start_select=0x7f0200aa;
5083+
public static final int sport_start_shape_after=0x7f0200ab;
5084+
public static final int sport_start_shape_before=0x7f0200ac;
5085+
public static final int test_banner_load_fail=0x7f0200ad;
50875086
}
50885087
public static final class id {
50895088
public static final int ProgressBar=0x7f0d00e8;

‎app/build/intermediates/res/resources-debug.ap_‎

-64.4 KB
Binary file not shown.

‎app/build/intermediates/symbols/debug/R.txt‎

Lines changed: 39 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1031,46 +1031,45 @@ int drawable ic_guide_three 0x7f020084
10311031
int drawable ic_guide_two 0x7f020085
10321032
int drawable ic_home 0x7f020086
10331033
int drawable ic_inform_bg 0x7f020087
1034-
int drawable ic_inform_bg_other 0x7f020088
1035-
int drawable ic_launcher 0x7f020089
1036-
int drawable ic_life 0x7f02008a
1037-
int drawable ic_map_marker 0x7f02008b
1038-
int drawable ic_map_pop 0x7f02008c
1039-
int drawable ic_mark 0x7f02008d
1040-
int drawable ic_mark_ 0x7f02008e
1041-
int drawable ic_news_default 0x7f02008f
1042-
int drawable ic_nick 0x7f020090
1043-
int drawable ic_nopic 0x7f020091
1044-
int drawable ic_notifications 0x7f020092
1045-
int drawable ic_password 0x7f020093
1046-
int drawable ic_pop_map_arrow 0x7f020094
1047-
int drawable ic_refush 0x7f020095
1048-
int drawable ic_scenery 0x7f020096
1049-
int drawable ic_send 0x7f020097
1050-
int drawable ic_setting 0x7f020098
1051-
int drawable ic_share 0x7f020099
1052-
int drawable ic_square 0x7f02009a
1053-
int drawable ic_tel 0x7f02009b
1054-
int drawable ic_to_send 0x7f02009c
1055-
int drawable ic_trash 0x7f02009d
1056-
int drawable ic_username 0x7f02009e
1057-
int drawable ic_weixin_share 0x7f02009f
1058-
int drawable ic_wenhao 0x7f0200a0
1059-
int drawable label 0x7f0200a1
1060-
int drawable location_arrows 0x7f0200a2
1061-
int drawable location_tips 0x7f0200a3
1062-
int drawable material_card 0x7f0200a4
1063-
int drawable material_card_nos 0x7f0200a5
1064-
int drawable material_card_nos_pressed 0x7f0200a6
1065-
int drawable material_dialog_window 0x7f0200a7
1066-
int drawable met_ic_clear 0x7f0200a8
1067-
int drawable notification_template_icon_bg 0x7f0200af
1068-
int drawable side_nav_bar 0x7f0200a9
1069-
int drawable snackbar_background 0x7f0200aa
1070-
int drawable sport_start_select 0x7f0200ab
1071-
int drawable sport_start_shape_after 0x7f0200ac
1072-
int drawable sport_start_shape_before 0x7f0200ad
1073-
int drawable test_banner_load_fail 0x7f0200ae
1034+
int drawable ic_launcher 0x7f020088
1035+
int drawable ic_life 0x7f020089
1036+
int drawable ic_map_marker 0x7f02008a
1037+
int drawable ic_map_pop 0x7f02008b
1038+
int drawable ic_mark 0x7f02008c
1039+
int drawable ic_mark_ 0x7f02008d
1040+
int drawable ic_news_default 0x7f02008e
1041+
int drawable ic_nick 0x7f02008f
1042+
int drawable ic_nopic 0x7f020090
1043+
int drawable ic_notifications 0x7f020091
1044+
int drawable ic_password 0x7f020092
1045+
int drawable ic_pop_map_arrow 0x7f020093
1046+
int drawable ic_refush 0x7f020094
1047+
int drawable ic_scenery 0x7f020095
1048+
int drawable ic_send 0x7f020096
1049+
int drawable ic_setting 0x7f020097
1050+
int drawable ic_share 0x7f020098
1051+
int drawable ic_square 0x7f020099
1052+
int drawable ic_tel 0x7f02009a
1053+
int drawable ic_to_send 0x7f02009b
1054+
int drawable ic_trash 0x7f02009c
1055+
int drawable ic_username 0x7f02009d
1056+
int drawable ic_weixin_share 0x7f02009e
1057+
int drawable ic_wenhao 0x7f02009f
1058+
int drawable label 0x7f0200a0
1059+
int drawable location_arrows 0x7f0200a1
1060+
int drawable location_tips 0x7f0200a2
1061+
int drawable material_card 0x7f0200a3
1062+
int drawable material_card_nos 0x7f0200a4
1063+
int drawable material_card_nos_pressed 0x7f0200a5
1064+
int drawable material_dialog_window 0x7f0200a6
1065+
int drawable met_ic_clear 0x7f0200a7
1066+
int drawable notification_template_icon_bg 0x7f0200ae
1067+
int drawable side_nav_bar 0x7f0200a8
1068+
int drawable snackbar_background 0x7f0200a9
1069+
int drawable sport_start_select 0x7f0200aa
1070+
int drawable sport_start_shape_after 0x7f0200ab
1071+
int drawable sport_start_shape_before 0x7f0200ac
1072+
int drawable test_banner_load_fail 0x7f0200ad
10741073
int id ProgressBar 0x7f0d00e8
10751074
int id RelativeLayout1 0x7f0d00c4
10761075
int id action0 0x7f0d00fc

‎app/build/outputs/apk/app-debug-unaligned.apk‎

-64.4 KB
Binary file not shown.

‎app/build/outputs/apk/app-debug.apk‎

-64.4 KB
Binary file not shown.

‎app/src/main/res/layout/activity_about.xml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
android:orientation="vertical"
4-
android:background="#DDDDDD"
4+
android:background="#f1f1f1"
55
android:layout_width="match_parent"
66
android:layout_height="match_parent">
77

@@ -33,7 +33,8 @@
3333
android:orientation="vertical"
3434
android:layout_width="match_parent"
3535
android:layout_height="wrap_content"
36-
android:background="@color/ivory">
36+
android:layout_marginBottom="2dp"
37+
android:background="@color/white">
3738
<TextView
3839
android:layout_width="wrap_content"
3940
android:layout_height="wrap_content"
@@ -49,16 +50,15 @@
4950
android:layout_height="wrap_content"
5051
android:textSize="15sp"
5152
android:layout_marginTop="5dp"
52-
android:layout_marginBottom="2dp"
5353
android:layout_marginLeft="20dp"/>
5454
</LinearLayout>
5555

5656
<LinearLayout
5757
android:orientation="vertical"
5858
android:layout_width="match_parent"
5959
android:layout_height="wrap_content"
60-
android:layout_marginTop="2dp"
61-
android:background="@color/ivory">
60+
android:layout_marginBottom="2dp"
61+
android:background="@color/white">
6262
<TextView
6363
android:layout_width="wrap_content"
6464
android:layout_height="wrap_content"
@@ -82,8 +82,8 @@
8282
android:orientation="vertical"
8383
android:layout_width="match_parent"
8484
android:layout_height="wrap_content"
85-
android:layout_marginTop="2dp"
86-
android:background="@color/ivory">
85+
android:layout_marginBottom="2dp"
86+
android:background="@color/white">
8787
<TextView
8888
android:layout_width="wrap_content"
8989
android:layout_height="wrap_content"
@@ -107,8 +107,8 @@
107107
android:orientation="vertical"
108108
android:layout_width="match_parent"
109109
android:layout_height="wrap_content"
110-
android:layout_marginTop="2dp"
111-
android:background="@color/ivory">
110+
android:layout_marginBottom="2dp"
111+
android:background="@color/white">
112112
<TextView
113113
android:layout_width="wrap_content"
114114
android:layout_height="wrap_content"
@@ -141,8 +141,8 @@
141141
android:orientation="vertical"
142142
android:layout_width="match_parent"
143143
android:layout_height="wrap_content"
144-
android:layout_marginTop="2dp"
145-
android:background="@color/ivory">
144+
android:layout_marginBottom="2dp"
145+
android:background="@color/white">
146146
<TextView
147147
android:layout_width="wrap_content"
148148
android:layout_height="wrap_content"

‎app/src/main/res/layout/showuser_activity.xml‎

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
android:orientation="vertical"
4-
android:background="@color/borrow"
4+
android:background="#f1f1f1"
55
android:layout_width="match_parent"
66
android:layout_height="match_parent">
77

@@ -51,84 +51,78 @@
5151
<LinearLayout
5252
android:layout_width="match_parent"
5353
android:layout_height="wrap_content"
54-
android:layout_marginTop="40dp"
54+
android:padding="10dp"
55+
android:layout_marginTop="24dp"
56+
android:layout_marginBottom="1dp"
57+
android:background="@color/white"
5558
android:orientation="horizontal">
5659
<TextView
5760
android:layout_width="wrap_content"
5861
android:layout_height="wrap_content"
5962
android:layout_marginLeft="10dp"
6063
android:textSize="15sp"
6164
android:textColor="@color/black"
65+
android:padding="5dp"
6266
android:text="@string/tv_label_name"/>
6367
<TextView
6468
android:id="@+id/tv_name"
6569
android:layout_width="match_parent"
6670
android:layout_height="wrap_content"
6771
android:textSize="15sp"
6872
android:textColor="@color/black"
73+
android:padding="5dp"
6974
android:layout_marginLeft="35dp"/>
7075
</LinearLayout>
71-
<LinearLayout
72-
android:layout_width="match_parent"
73-
android:layout_height="0.8dp"
74-
android:layout_marginTop="10dp"
75-
android:layout_marginBottom="15dp"
76-
android:background="@drawable/drivide_shape"/>
7776

7877
<LinearLayout
7978
android:layout_width="match_parent"
8079
android:layout_height="wrap_content"
81-
android:layout_marginTop="10dp"
80+
android:padding="10dp"
81+
android:layout_marginBottom="1dp"
82+
android:background="@color/white"
8283
android:orientation="horizontal">
8384
<TextView
8485
android:layout_width="wrap_content"
8586
android:layout_height="wrap_content"
8687
android:layout_marginLeft="10dp"
8788
android:textColor="@color/black"
89+
android:padding="5dp"
8890
android:textSize="15sp"
8991
android:text="@string/tv_label_email"/>
9092
<TextView
9193
android:id="@+id/tv_email"
9294
android:layout_width="match_parent"
9395
android:layout_height="wrap_content"
9496
android:textSize="15sp"
97+
android:padding="5dp"
9598
android:textColor="@color/black"
9699
android:layout_marginLeft="35dp"/>
97100
</LinearLayout>
98101

99-
<LinearLayout
100-
android:layout_width="match_parent"
101-
android:layout_height="0.8dp"
102-
android:layout_marginTop="10dp"
103-
android:layout_marginBottom="15dp"
104-
android:background="@drawable/drivide_shape"/>
105102

106103
<LinearLayout
107104
android:layout_width="match_parent"
108105
android:layout_height="wrap_content"
109-
android:layout_marginTop="10dp"
106+
android:padding="10dp"
107+
android:background="@color/white"
110108
android:orientation="horizontal">
111109
<TextView
112110
android:layout_width="wrap_content"
113111
android:layout_height="wrap_content"
114112
android:layout_marginLeft="10dp"
115113
android:textSize="15sp"
114+
android:padding="5dp"
116115
android:textColor="@color/black"
117116
android:text="@string/tv_label_tel"/>
118117
<TextView
119118
android:id="@+id/tv_tel"
120119
android:layout_width="match_parent"
121120
android:layout_height="wrap_content"
122121
android:textSize="15sp"
122+
android:padding="5dp"
123123
android:textColor="@color/black"
124124
android:layout_marginLeft="20dp"/>
125125
</LinearLayout>
126126

127-
<LinearLayout
128-
android:layout_width="match_parent"
129-
android:layout_height="0.8dp"
130-
android:layout_marginTop="10dp"
131-
android:layout_marginBottom="15dp"
132-
android:background="@drawable/drivide_shape"/>
133127

134128
</LinearLayout>

0 commit comments

Comments
 (0)