Skip to content

Commit b05ed9a

Browse files
author
scwang90
committed
Merge remote-tracking branch 'origin/master'
2 parents c17b29d + 5e5b2e0 commit b05ed9a

File tree

83 files changed

+649
-836
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+649
-836
lines changed

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ SmartRefreshLayout.setDefaultRefreshFooterCreater(new DefaultRefreshFooterCreate
144144
```xml
145145
<com.scwang.smartrefresh.layout.SmartRefreshLayout
146146
xmlns:app="http://schemas.android.com/apk/res-auto"
147-
android:id="@+id/smart"
147+
android:id="@+id/smartLayout"
148148
android:layout_width="match_parent"
149149
android:layout_height="match_parent"
150150
android:background="#444444"
@@ -180,7 +180,7 @@ SmartRefreshLayout.setDefaultRefreshFooterCreater(new DefaultRefreshFooterCreate
180180

181181
#### 3.方法三 Java代码设置
182182
```java
183-
final RefreshLayout refreshLayout = (RefreshLayout) findViewById(R.id.smart);
183+
final RefreshLayout refreshLayout = (RefreshLayout) findViewById(R.id.smartLayout);
184184
//设置 Header 为 Material风格
185185
refreshLayout.setRefreshHeader(new MaterialHeader(this).setShowBezierWave(true));
186186
//设置 Footer 为 球脉冲

‎app/src/main/AndroidManifest.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,10 @@
9595
android:name=".activity.using.AssignCodeUsingActivity"
9696
android:label="@string/title_activity_using_assign_code"
9797
android:screenOrientation="portrait"/>
98+
<activity
99+
android:name=".activity.using.OverScrollUsingActivity"
100+
android:label="@string/title_activity_using_overscroll"
101+
android:screenOrientation="portrait"/>
98102
<activity
99103
android:name=".activity.using.ListenerUsingActivity"
100104
android:label="@string/title_activity_using_listener"

‎app/src/main/java/com/scwang/refreshlayout/activity/SelectRegionActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public void onClick(View v) {
4141
});
4242
}
4343

44-
View view = findViewById(R.id.recycler);
44+
View view = findViewById(R.id.recyclerView);
4545
if (view instanceof RecyclerView) {
4646
RecyclerView recyclerView = (RecyclerView) view;
4747
recyclerView.setLayoutManager(new LinearLayoutManager(this));

‎app/src/main/java/com/scwang/refreshlayout/activity/practice/RepastPracticeActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public void onClick(View v) {
4949
}
5050
});
5151

52-
final RefreshLayout refreshLayout = (RefreshLayout) findViewById(R.id.smart);
52+
final RefreshLayout refreshLayout = (RefreshLayout) findViewById(R.id.smartLayout);
5353

5454
//第一次进入演示刷新
5555
if (isFirstEnter) {
@@ -58,7 +58,7 @@ public void onClick(View v) {
5858
}
5959

6060
//初始化列表和监听
61-
View view = findViewById(R.id.recycler);
61+
View view = findViewById(R.id.recyclerView);
6262
if (view instanceof RecyclerView) {
6363
RecyclerView recyclerView = (RecyclerView) view;
6464
recyclerView.setLayoutManager(new LinearLayoutManager(this));

‎app/src/main/java/com/scwang/refreshlayout/activity/style/BezierStyleActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@ public void onClick(View v) {
5555
}
5656
});
5757

58-
mRefreshLayout = (RefreshLayout)findViewById(R.id.smart);
58+
mRefreshLayout = (RefreshLayout)findViewById(R.id.smartLayout);
5959
if (isFirstEnter) {
6060
isFirstEnter = false;
6161
mRefreshLayout.autoRefresh();//第一次进入触发自动刷新，演示效果
6262
}
6363

64-
View view = findViewById(R.id.recycler);
64+
View view = findViewById(R.id.recyclerView);
6565
if (view instanceof RecyclerView) {
6666
RecyclerView recyclerView = (RecyclerView) view;
6767
recyclerView.setLayoutManager(new LinearLayoutManager(this));

‎app/src/main/java/com/scwang/refreshlayout/activity/style/CircleStyleActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@ public void onClick(View v) {
5555
}
5656
});
5757

58-
mRefreshLayout = (RefreshLayout)findViewById(R.id.smart);
58+
mRefreshLayout = (RefreshLayout)findViewById(R.id.smartLayout);
5959
if (isFirstEnter) {
6060
isFirstEnter = false;
6161
mRefreshLayout.autoRefresh();//第一次进入触发自动刷新，演示效果
6262
}
6363

64-
View view = findViewById(R.id.recycler);
64+
View view = findViewById(R.id.recyclerView);
6565
if (view instanceof RecyclerView) {
6666
RecyclerView recyclerView = (RecyclerView) view;
6767
recyclerView.setLayoutManager(new LinearLayoutManager(this));

‎app/src/main/java/com/scwang/refreshlayout/activity/style/ClassicsStyleActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public void onClick(View v) {
6969
}
7070
});
7171

72-
mRefreshLayout = (RefreshLayout)findViewById(R.id.smart);
72+
mRefreshLayout = (RefreshLayout)findViewById(R.id.smartLayout);
7373

7474
int deta = new Random().nextInt(7 * 24 * 60 * 60 * 1000);
7575
mClassicsHeader = (ClassicsHeader)mRefreshLayout.getRefreshHeader();
@@ -78,7 +78,7 @@ public void onClick(View v) {
7878
mClassicsHeader.setTimeFormat(new DynamicTimeFormat("更新于 %s"));
7979

8080

81-
View view = findViewById(R.id.recycler);
81+
View view = findViewById(R.id.recyclerView);
8282
if (view instanceof RecyclerView) {
8383
RecyclerView recyclerView = (RecyclerView) view;
8484
recyclerView.setLayoutManager(new LinearLayoutManager(this));

‎app/src/main/java/com/scwang/refreshlayout/activity/style/DeliveryStyleActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,13 @@ public void onClick(View v) {
6262
}
6363
});
6464

65-
mRefreshLayout = (RefreshLayout)findViewById(R.id.smart);
65+
mRefreshLayout = (RefreshLayout)findViewById(R.id.smartLayout);
6666
if (isFirstEnter) {
6767
isFirstEnter = false;
6868
mRefreshLayout.autoRefresh();//第一次进入触发自动刷新，演示效果
6969
}
7070

71-
View view = findViewById(R.id.recycler);
71+
View view = findViewById(R.id.recyclerView);
7272
if (view instanceof RecyclerView) {
7373
RecyclerView recyclerView = (RecyclerView) view;
7474
recyclerView.setLayoutManager(new LinearLayoutManager(this));

‎app/src/main/java/com/scwang/refreshlayout/activity/style/DropboxStyleActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ public void onClick(View v) {
5454
}
5555
});
5656

57-
mRefreshLayout = (RefreshLayout)findViewById(R.id.smart);
57+
mRefreshLayout = (RefreshLayout)findViewById(R.id.smartLayout);
5858
if (isFirstEnter) {
5959
isFirstEnter = false;
6060
mRefreshLayout.autoRefresh();//第一次进入触发自动刷新，演示效果
6161
}
6262

63-
View view = findViewById(R.id.recycler);
63+
View view = findViewById(R.id.recyclerView);
6464
if (view instanceof RecyclerView) {
6565
RecyclerView recyclerView = (RecyclerView) view;
6666
recyclerView.setLayoutManager(new LinearLayoutManager(this));

‎app/src/main/java/com/scwang/refreshlayout/activity/style/FlyRefreshStyleActivity.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public void onClick(View v) {
8686
mScenceView = (MountanScenceView) findViewById(R.id.mountan);
8787
mFlyRefreshHeader = (FlyRefreshHeader)findViewById(R.id.flyrefresh);
8888
mFlyRefreshHeader.setUp(mScenceView, mFlyView);//绑定场景和纸飞机
89-
mRefreshlayout = (RefreshLayout) findViewById(R.id.smart);
89+
mRefreshlayout = (RefreshLayout) findViewById(R.id.smartLayout);
9090
mRefreshlayout.setReboundInterpolator(new ElasticOutInterpolator());//设置回弹插值器，会带有弹簧震动效果
9191
mRefreshlayout.setReboundDuration(800);//设置回弹动画时长
9292
mRefreshlayout.setOnRefreshListener(new OnRefreshListener() {
@@ -115,12 +115,12 @@ public void onAnimationEnd(Animator animation) {
115115
final AppBarLayout appBar = (AppBarLayout) findViewById(R.id.app_bar);
116116
mRefreshlayout.setOnMultiPurposeListener(new SimpleMultiPurposeListener() {
117117
@Override
118-
public void onHeaderPulling(RefreshHeader header, float percent, int offset, int bottomHeight, int extendHeight) {
118+
public void onHeaderPulling(RefreshHeader header, float percent, int offset, int footerHeight, int extendHeight) {
119119
appBar.setTranslationY(offset);
120120
mToolbar.setTranslationY(-offset);
121121
}
122122
@Override
123-
public void onHeaderReleasing(RefreshHeader header, float percent, int offset, int bottomHeight, int extendHeight) {
123+
public void onHeaderReleasing(RefreshHeader header, float percent, int offset, int footerHeight, int extendHeight) {
124124
appBar.setTranslationY(offset);
125125
mToolbar.setTranslationY(-offset);
126126
}
@@ -140,7 +140,7 @@ public void onHeaderReleasing(RefreshHeader header, float percent, int offset, i
140140
initDataSet();
141141
mAdapter = new ItemAdapter(this);
142142
mLayoutManager = new LinearLayoutManager(this);
143-
mListView = (RecyclerView) findViewById(R.id.recycler);
143+
mListView = (RecyclerView) findViewById(R.id.recyclerView);
144144
mListView.setLayoutManager(mLayoutManager);
145145
mListView.setAdapter(mAdapter);
146146
mListView.setItemAnimator(new SampleItemAnimator());

0 commit comments

Comments
 (0)