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 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 5 <LinearLayout
7 6 android:layout_width="match_parent"
... ... @@ -10,8 +9,8 @@
10 9  
11 10 <RelativeLayout
12 11 android:layout_width="match_parent"
13   - android:layout_height="150dp"
14   - >
  12 + android:layout_height="48dp">
  13 +
15 14 <TextView
16 15 android:layout_width="wrap_content"
17 16 android:layout_height="wrap_content"
... ... @@ -19,41 +18,41 @@
19 18 android:singleLine="true"
20 19 android:text="我的"
21 20 android:textColor="@color/config_black_color"
22   - android:textSize="22sp"
23   - />
  21 + android:textSize="22sp" />
24 22  
25 23  
26 24 </RelativeLayout>
  25 +
27 26 <View
28 27 android:layout_width="match_parent"
29   - android:layout_marginBottom="@dimen/_20px"
30 28 android:layout_height="1px"
  29 + android:layout_marginBottom="@dimen/_20px"
31 30 android:background="@color/gray_line_color" />
32 31  
33 32  
34 33 <RelativeLayout
35 34 android:id="@+id/config_header"
  35 + style="@style/list_item_style"
36 36 android:layout_width="fill_parent"
37 37 android:layout_height="85dp"
38   - android:gravity="center_vertical"
39   - style="@style/list_item_style">
  38 + android:gravity="center_vertical">
40 39  
41 40 <com.cnlive.gundam.user.view.CircleImageView
42 41 android:id="@+id/head_img"
43 42 android:layout_width="55dip"
44 43 android:layout_height="55dip"
45 44 android:layout_centerVertical="true"
46   - android:src="@drawable/cnlive_user_header"
47 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 49 <LinearLayout
51 50 android:layout_width="wrap_content"
52 51 android:layout_height="wrap_content"
53 52 android:layout_centerVertical="true"
  53 + android:layout_toLeftOf="@+id/next"
54 54 android:layout_toRightOf="@+id/head_img"
55   - android:orientation="vertical"
56   - android:layout_toLeftOf="@+id/next">
  55 + android:orientation="vertical">
57 56  
58 57 <TextView
59 58 android:id="@+id/tv_nickname"
... ... @@ -80,38 +79,37 @@
80 79 </RelativeLayout>
81 80  
82 81  
83   -
84   -
85   -
86 82 <View
87 83 android:layout_width="match_parent"
88 84 android:layout_height="1px"
89 85 android:background="@color/gray_line_color" />
  86 +
90 87 <RelativeLayout
  88 + android:id="@+id/message"
  89 + style="@style/list_item_style"
91 90 android:layout_width="match_parent"
92 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 94 <ImageView
  95 + android:id="@+id/ic_setting_opinion"
98 96 android:layout_width="30dp"
99 97 android:layout_height="30dp"
100   - android:layout_marginLeft="@dimen/_20px"
101 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 102 <TextView
105 103 android:layout_width="wrap_content"
106 104 android:layout_height="wrap_content"
107 105 android:layout_centerVertical="true"
  106 + android:layout_marginLeft="30dp"
108 107 android:layout_toRightOf="@+id/ic_setting_opinion"
109 108 android:gravity="center_vertical"
110 109 android:singleLine="true"
111 110 android:text="意见反馈"
112 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 115 <ImageView
... ...