Skip to content

Commit bccd3e0

Browse files
AllenTomAllenTom
committed
修改布局
1 parent 32367eb commit bccd3e0

File tree

4 files changed

+59
-30
lines changed

4 files changed

+59
-30
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
android:layout_height="match_parent"
88
android:background="?android:colorBackground"
99
android:visibility="invisible"
10+
android:backgroundTint="#FFF"
1011
app:layout_behavior="@string/appbar_scrolling_view_behavior"
1112
tools:context=".ui.activity.BlocksActivity"
1213
tools:showIn="@layout/activity_blocks" />

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,7 @@
33
android:id="@+id/tv_text"
44
android:layout_width="match_parent"
55
android:layout_height="wrap_content"
6+
android:textColor="#000"
7+
android:textSize="16dp"
68
android:layout_margin="10dp"
79
android:textIsSelectable="true" />

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

Lines changed: 55 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,37 @@
44
android:layout_height="wrap_content"
55
xmlns:app="http://schemas.android.com/apk/res-auto">
66

7-
<RelativeLayout
7+
<LinearLayout
88
android:layout_width="match_parent"
9-
android:layout_height="wrap_content">
9+
android:layout_height="wrap_content"
10+
android:orientation="horizontal">
1011

1112
<ImageView
1213
android:layout_width="@dimen/profile_pic_size"
1314
android:layout_height="@dimen/profile_pic_size"
1415
android:src="@mipmap/ic_user_black"
1516
android:id="@+id/block_userIcon"
1617
android:layout_marginLeft="10dp"
17-
android:layout_marginTop="20dp"
18+
android:layout_marginTop="10dp"
1819
android:layout_marginBottom="10dp"
1920
android:layout_marginRight="5dp" />
20-
21-
<TextView
21+
<LinearLayout
2222
android:layout_width="wrap_content"
23+
android:orientation="vertical"
24+
android:layout_height="wrap_content"
25+
android:layout_marginTop="10dp">
26+
<TextView
27+
android:layout_width="match_parent"
2328
android:layout_height="wrap_content"
2429
android:id="@+id/block_username"
2530
android:text="username"
2631
android:layout_alignTop="@+id/block_userIcon"
2732
android:layout_toRightOf="@+id/block_userIcon"
28-
android:layout_toEndOf="@+id/block_userIcon" />
33+
android:layout_toEndOf="@+id/block_userIcon"
34+
android:layout_gravity="center_vertical" />
2935

3036
<TextView
31-
android:layout_width="wrap_content"
37+
android:layout_width="241dp"
3238
android:layout_height="wrap_content"
3339
android:id="@+id/block_sub_title"
3440
android:text="subtitle"
@@ -37,30 +43,50 @@
3743
android:layout_below="@+id/block_username"
3844
android:layout_alignLeft="@+id/block_username"
3945
android:layout_alignStart="@+id/block_username"
40-
android:layout_marginRight="50dp"
41-
android:layout_marginBottom="5dp" />
42-
43-
<TextView
44-
android:layout_width="50dp"
46+
android:layout_marginBottom="5dp"
47+
android:layout_gravity="center_vertical" />
48+
</LinearLayout>
49+
<android.support.v7.widget.CardView
50+
android:layout_width="wrap_content"
4551
android:layout_height="wrap_content"
46-
android:text="0"
47-
android:id="@+id/block_likecount_title"
48-
android:gravity="center"
49-
android:layout_alignBottom="@+id/block_sub_title"
52+
53+
android:layout_alignBottom="@+id/block_userIcon"
5054
android:layout_alignParentRight="true"
51-
android:layout_alignParentEnd="true" />
55+
android:layout_alignParentEnd="true"
56+
android:layout_marginTop="10dp"
57+
android:layout_marginLeft="25dp"
58+
android:layout_marginBottom="10dp">
59+
<LinearLayout
60+
android:layout_width="match_parent"
61+
android:orientation="vertical"
62+
android:background="#eee"
63+
android:layout_height="match_parent"
64+
android:gravity="center"
65+
android:translationZ="3dp"
66+
android:transitionGroup="false">
67+
5268

53-
<com.like.LikeButton
54-
app:icon_type="heart"
55-
app:icon_size="24dp"
56-
android:id="@+id/block_like_title"
57-
android:layout_width="30dp"
58-
android:layout_height="30dp"
59-
android:layout_centerVertical="true"
60-
android:layout_alignRight="@+id/block_likecount_title"
61-
android:layout_alignEnd="@+id/block_likecount_title"
62-
android:layout_marginRight="10dp">
69+
<com.like.LikeButton
70+
app:icon_type="heart"
71+
app:icon_size="24dp"
72+
android:id="@+id/block_like_title"
73+
android:layout_width="30dp"
74+
android:layout_height="30dp"
75+
android:layout_centerVertical="true"
76+
android:layout_alignRight="@+id/block_likecount_title"
77+
android:layout_alignEnd="@+id/block_likecount_title">
6378

64-
</com.like.LikeButton>
65-
</RelativeLayout>
79+
</com.like.LikeButton>
80+
<TextView
81+
android:layout_width="50dp"
82+
android:layout_height="wrap_content"
83+
android:text="0"
84+
android:id="@+id/block_likecount_title"
85+
android:gravity="center"
86+
android:layout_alignBottom="@+id/block_sub_title"
87+
android:layout_alignParentRight="true"
88+
android:layout_alignParentEnd="true" />
89+
</LinearLayout>
90+
</android.support.v7.widget.CardView>
91+
</LinearLayout>
6692
</android.support.v7.widget.CardView>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</data>
1010

1111
<android.support.v7.widget.CardView
12-
style="@style/FullWidthCardView"
12+
1313
android:layout_width="match_parent"
1414
android:layout_height="wrap_content">
1515

0 commit comments

Comments
 (0)