Skip to content

Commit 5760445

Browse files
authored
Merge pull request #393 from cymcsg/dev
publish pull
2 parents 25933bc + 768048b commit 5760445

16 files changed

+28
-28
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ dependencies{
2828

2929
``` xml
3030
<com.marshalchen.ultimaterecyclerview.UltimateRecyclerView
31-
android:layout_width="fill_parent"
32-
android:layout_height="fill_parent"
31+
android:layout_width="match_parent"
32+
android:layout_height="match_parent"
3333
android:id="@+id/ultimate_recycler_view"
3434
/>
3535
```

UltimateRecyclerView/app/src/main/res/layout/activity_drag.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747

4848
<android.support.v7.widget.RecyclerView
4949
android:id="@+id/ultimate_recycler_view"
50-
android:layout_width="fill_parent"
51-
android:layout_height="fill_parent"
50+
android:layout_width="match_parent"
51+
android:layout_height="match_parent"
5252
android:layout_marginTop="?attr/actionBarSize"
5353
app:recyclerviewClipToPadding="true"
5454
app:recyclerviewDefaultSwipeColor="@array/google_colors"

UltimateRecyclerView/app/src/main/res/layout/activity_loadmore.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222

2323
<com.marshalchen.ultimaterecyclerview.UltimateRecyclerView
2424
android:id="@+id/ultimate_recycler_view"
25-
android:layout_width="fill_parent"
26-
android:layout_height="fill_parent"
25+
android:layout_width="match_parent"
26+
android:layout_height="match_parent"
2727
android:layout_marginTop="?attr/actionBarSize"
2828
app:recyclerviewClipToPadding="true"
2929
app:recyclerviewDefaultSwipeColor="@array/google_colors"

UltimateRecyclerView/app/src/main/res/layout/countable_rv_adp.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
<ImageView
3333
android:id="@+id/imageview"
34-
android:layout_width="fill_parent"
34+
android:layout_width="match_parent"
3535
android:layout_height="match_parent"
3636
android:layout_alignParentRight="true"
3737
android:layout_marginRight="2dp"

UltimateRecyclerView/app/src/main/res/layout/custom_bottom_progressbar.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
android:layout_centerHorizontal="true" />
1111

1212
<TextView
13-
android:layout_width="fill_parent"
13+
android:layout_width="match_parent"
1414
android:layout_height="wrap_content"
1515
android:layout_below="@id/bottom_progress_bar"
1616
android:layout_marginTop="2dp"

UltimateRecyclerView/app/src/main/res/layout/custom_refresh_activity.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
</android.support.v7.widget.Toolbar>
4646

4747
<com.marshalchen.ultimaterecyclerview.CustomUltimateRecyclerview
48-
android:layout_width="fill_parent"
49-
android:layout_height="fill_parent"
48+
android:layout_width="match_parent"
49+
android:layout_height="match_parent"
5050
android:id="@+id/custom_ultimate_recycler_view"
5151
app:recyclerviewClipToPadding="true"
5252
app:recyclerviewPadding="2dp"

UltimateRecyclerView/app/src/main/res/layout/exp_child.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
android:id="@id/exp_section_ripple_wrapper_click"
5-
android:layout_width="fill_parent"
5+
android:layout_width="match_parent"
66
android:layout_height="@dimen/sectionNormalHeight"
77
android:layout_margin="0dp"
88
android:padding="0dp">

UltimateRecyclerView/app/src/main/res/layout/exp_parent.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
android:id="@id/exp_section_ripple_wrapper_click"
5-
android:layout_width="fill_parent"
5+
android:layout_width="match_parent"
66
android:layout_height="@dimen/sectionNormalHeight"
77
android:layout_margin="0dp"
88
android:background="@color/red"

UltimateRecyclerView/app/src/main/res/layout/floatingbutton_grid_layout.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@
7575

7676
<com.marshalchen.ultimaterecyclerview.UltimateRecyclerView
7777
android:id="@+id/ultimate_recycler_view"
78-
android:layout_width="fill_parent"
79-
android:layout_height="fill_parent"
78+
android:layout_width="match_parent"
79+
android:layout_height="match_parent"
8080
android:layout_marginTop="?attr/actionBarSize"
8181
app:recyclerviewClipToPadding="true"
8282
app:recyclerviewDefaultSwipeColor="@array/google_colors"

UltimateRecyclerView/app/src/main/res/layout/package_row.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
-->
2020

2121
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
22-
android:layout_width="fill_parent"
23-
android:layout_height="fill_parent">
22+
android:layout_width="match_parent"
23+
android:layout_height="match_parent">
2424

2525
<LinearLayout
2626
android:id="@+id/back"
27-
android:layout_width="fill_parent"
27+
android:layout_width="match_parent"
2828
android:layout_height="wrap_content"
2929
android:tag="back">
3030

@@ -45,7 +45,7 @@
4545

4646
<RelativeLayout
4747
android:id="@+id/frontItemLayout"
48-
android:layout_width="fill_parent"
48+
android:layout_width="match_parent"
4949
android:layout_height="wrap_content"
5050
android:orientation="vertical" android:background="@color/bg_item_normal_state"
5151
android:tag="front">
@@ -59,7 +59,7 @@
5959
<TextView
6060
android:id="@+id/example_row_tv_title"
6161

62-
android:layout_width="fill_parent"
62+
android:layout_width="match_parent"
6363
android:layout_height="wrap_content"
6464
android:layout_toRightOf="@id/example_row_iv_image" />
6565

0 commit comments

Comments
 (0)