CNLive Android Team / CNLiveApp · Commits

Commit 832922084af36c47636dfd6d08e58be7f56419d8

Authored by 朱显松
1 parent 970c6223

代码整理

Inline Side-by-side
Showing 1 changed file with 22 additions and 24 deletions
app/src/main/res/layout/user_fragment.xml
  View file @8329220
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 2
3 -<layout xmlns:android="http://schemas.android.com/apk/res/android"  
4 - > 3 +<layout xmlns:android="http://schemas.android.com/apk/res/android">
5 4
6 <LinearLayout 5 <LinearLayout
7 android:layout_width="match_parent" 6 android:layout_width="match_parent"
@@ -10,8 +9,8 @@ @@ -10,8 +9,8 @@
10 9
11 <RelativeLayout 10 <RelativeLayout
12 android:layout_width="match_parent" 11 android:layout_width="match_parent"
13 - android:layout_height="150dp"  
14 - > 12 + android:layout_height="48dp">
  13 +
15 <TextView 14 <TextView
16 android:layout_width="wrap_content" 15 android:layout_width="wrap_content"
17 android:layout_height="wrap_content" 16 android:layout_height="wrap_content"
@@ -19,41 +18,41 @@ @@ -19,41 +18,41 @@
19 android:singleLine="true" 18 android:singleLine="true"
20 android:text="我的" 19 android:text="我的"
21 android:textColor="@color/config_black_color" 20 android:textColor="@color/config_black_color"
22 - android:textSize="22sp"  
23 - /> 21 + android:textSize="22sp" />
24 22
25 23
26 </RelativeLayout> 24 </RelativeLayout>
  25 +
27 <View 26 <View
28 android:layout_width="match_parent" 27 android:layout_width="match_parent"
29 - android:layout_marginBottom="@dimen/_20px"  
30 android:layout_height="1px" 28 android:layout_height="1px"
  29 + android:layout_marginBottom="@dimen/_20px"
31 android:background="@color/gray_line_color" /> 30 android:background="@color/gray_line_color" />
32 31
33 32
34 <RelativeLayout 33 <RelativeLayout
35 android:id="@+id/config_header" 34 android:id="@+id/config_header"
  35 + style="@style/list_item_style"
36 android:layout_width="fill_parent" 36 android:layout_width="fill_parent"
37 android:layout_height="85dp" 37 android:layout_height="85dp"
38 - android:gravity="center_vertical"  
39 - style="@style/list_item_style"> 38 + android:gravity="center_vertical">
40 39
41 <com.cnlive.gundam.user.view.CircleImageView 40 <com.cnlive.gundam.user.view.CircleImageView
42 android:id="@+id/head_img" 41 android:id="@+id/head_img"
43 android:layout_width="55dip" 42 android:layout_width="55dip"
44 android:layout_height="55dip" 43 android:layout_height="55dip"
45 android:layout_centerVertical="true" 44 android:layout_centerVertical="true"
46 - android:src="@drawable/cnlive_user_header"  
47 android:layout_marginLeft="11dp" 45 android:layout_marginLeft="11dp"
48 - android:layout_marginRight="16dp" /> 46 + android:layout_marginRight="16dp"
  47 + android:src="@drawable/cnlive_user_header" />
49 48
50 <LinearLayout 49 <LinearLayout
51 android:layout_width="wrap_content" 50 android:layout_width="wrap_content"
52 android:layout_height="wrap_content" 51 android:layout_height="wrap_content"
53 android:layout_centerVertical="true" 52 android:layout_centerVertical="true"
  53 + android:layout_toLeftOf="@+id/next"
54 android:layout_toRightOf="@+id/head_img" 54 android:layout_toRightOf="@+id/head_img"
55 - android:orientation="vertical"  
56 - android:layout_toLeftOf="@+id/next"> 55 + android:orientation="vertical">
57 56
58 <TextView 57 <TextView
59 android:id="@+id/tv_nickname" 58 android:id="@+id/tv_nickname"
@@ -80,38 +79,37 @@ @@ -80,38 +79,37 @@
80 </RelativeLayout> 79 </RelativeLayout>
81 80
82 81
83 -  
84 -  
85 -  
86 <View 82 <View
87 android:layout_width="match_parent" 83 android:layout_width="match_parent"
88 android:layout_height="1px" 84 android:layout_height="1px"
89 android:background="@color/gray_line_color" /> 85 android:background="@color/gray_line_color" />
  86 +
90 <RelativeLayout 87 <RelativeLayout
  88 + android:id="@+id/message"
  89 + style="@style/list_item_style"
91 android:layout_width="match_parent" 90 android:layout_width="match_parent"
92 android:layout_height="50dp" 91 android:layout_height="50dp"
93 - android:layout_marginTop="@dimen/_20px"  
94 - android:id="@+id/message"  
95 - style="@style/list_item_style"> 92 + android:layout_marginTop="@dimen/_20px">
96 93
97 <ImageView 94 <ImageView
  95 + android:id="@+id/ic_setting_opinion"
98 android:layout_width="30dp" 96 android:layout_width="30dp"
99 android:layout_height="30dp" 97 android:layout_height="30dp"
100 - android:layout_marginLeft="@dimen/_20px"  
101 android:layout_centerVertical="true" 98 android:layout_centerVertical="true"
102 - android:id="@+id/ic_setting_opinion"  
103 - android:src="@drawable/ic_setting_opinion"/> 99 + android:layout_marginLeft="@dimen/_20px"
  100 + android:src="@drawable/ic_setting_opinion" />
  101 +
104 <TextView 102 <TextView
105 android:layout_width="wrap_content" 103 android:layout_width="wrap_content"
106 android:layout_height="wrap_content" 104 android:layout_height="wrap_content"
107 android:layout_centerVertical="true" 105 android:layout_centerVertical="true"
  106 + android:layout_marginLeft="30dp"
108 android:layout_toRightOf="@+id/ic_setting_opinion" 107 android:layout_toRightOf="@+id/ic_setting_opinion"
109 android:gravity="center_vertical" 108 android:gravity="center_vertical"
110 android:singleLine="true" 109 android:singleLine="true"
111 android:text="意见反馈" 110 android:text="意见反馈"
112 android:textColor="@color/config_black_color" 111 android:textColor="@color/config_black_color"
113 - android:layout_marginLeft="30dp"  
114 - android:textSize="17sp"/> 112 + android:textSize="17sp" />
115 113
116 114
117 <ImageView 115 <ImageView