Skip to content

Commit ed84625

Browse files
author
Chris Banes
committed
Merge tag 'v2.0.1'
[maven-release-plugin] copy for tag v2.0.1
2 parents cbed684 + 2826a16 commit ed84625

12 files changed

Lines changed: 35 additions & 29 deletions

File tree

‎extras/PullToRefreshListFragment/AndroidManifest.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="com.handmark.pulltorefresh.extras.listfragment"
4-
android:versionCode="2000"
5-
android:versionName="2.0" >
4+
android:versionCode="2010"
5+
android:versionName="2.0.1" >
66

77
<application />
88

‎extras/PullToRefreshListFragment/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<groupId>com.github.chrisbanes.pulltorefresh</groupId>
1212
<artifactId>extras</artifactId>
13-
<version>2.0</version>
13+
<version>2.0.1</version>
1414
</parent>
1515

1616
<dependencies>

‎extras/PullToRefreshViewPager/AndroidManifest.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="com.handmark.pulltorefresh.extras.viewpager"
4-
android:versionCode="2000"
5-
android:versionName="2.0" >
4+
android:versionCode="2010"
5+
android:versionName="2.0.1" >
66

77
<uses-sdk android:minSdkVersion="4" />
88

‎extras/PullToRefreshViewPager/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<groupId>com.github.chrisbanes.pulltorefresh</groupId>
1212
<artifactId>extras</artifactId>
13-
<version>2.0</version>
13+
<version>2.0.1</version>
1414
</parent>
1515

1616
<dependencies>

‎extras/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<groupId>com.github.chrisbanes.pulltorefresh</groupId>
1212
<artifactId>parent</artifactId>
13-
<version>2.0</version>
13+
<version>2.0.1</version>
1414
</parent>
1515

1616
<modules>

‎library/AndroidManifest.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="com.handmark.pulltorefresh.library"
4-
android:versionCode="2000"
5-
android:versionName="2.0" >
4+
android:versionCode="2010"
5+
android:versionName="2.0.1" >
66

77
<uses-sdk android:minSdkVersion="4" />
88

‎library/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<groupId>com.github.chrisbanes.pulltorefresh</groupId>
1212
<artifactId>parent</artifactId>
13-
<version>2.0</version>
13+
<version>2.0.1</version>
1414
</parent>
1515

1616
<dependencies>

‎library/src/com/handmark/pulltorefresh/library/PullToRefreshListView.java‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -138,38 +138,44 @@ void onRefreshing(final boolean doScroll) {
138138

139139
super.onRefreshing(false);
140140

141-
final LoadingLayout originalLoadingLayout, listViewLoadingLayout;
141+
final LoadingLayout origLoadingView, listViewLoadingView, oppositeListViewLoadingView;
142142
final int selection, scrollToY;
143143

144144
switch (getCurrentMode()) {
145145
case MANUAL_REFRESH_ONLY:
146146
case PULL_FROM_END:
147-
originalLoadingLayout = getFooterLayout();
148-
listViewLoadingLayout = mFooterLoadingView;
147+
origLoadingView = getFooterLayout();
148+
listViewLoadingView = mFooterLoadingView;
149+
oppositeListViewLoadingView = mHeaderLoadingView;
149150
selection = mRefreshableView.getCount() - 1;
150151
scrollToY = getScrollY() - getFooterHeight();
151152
break;
152153
case PULL_FROM_START:
153154
default:
154-
originalLoadingLayout = getHeaderLayout();
155-
listViewLoadingLayout = mHeaderLoadingView;
155+
origLoadingView = getHeaderLayout();
156+
listViewLoadingView = mHeaderLoadingView;
157+
oppositeListViewLoadingView = mFooterLoadingView;
156158
selection = 0;
157159
scrollToY = getScrollY() + getHeaderHeight();
158160
break;
159161
}
160162

161163
// Hide our original Loading View
162-
originalLoadingLayout.setVisibility(View.INVISIBLE);
164+
origLoadingView.setVisibility(View.INVISIBLE);
165+
166+
// Make sure the opposite end is hidden too
167+
oppositeListViewLoadingView.setVisibility(View.GONE);
163168

164169
// Show the ListView Loading View and set it to refresh. If it has a 0
165170
// height, then we need to set it to WRAP_CONTENT
166-
if (listViewLoadingLayout.getHeight() == 0) {
167-
ViewGroup.LayoutParams lp = listViewLoadingLayout.getLayoutParams();
171+
if (listViewLoadingView.getHeight() == 0) {
172+
ViewGroup.LayoutParams lp = listViewLoadingView.getLayoutParams();
168173
lp.height = ViewGroup.LayoutParams.WRAP_CONTENT;
169-
listViewLoadingLayout.setLayoutParams(lp);
174+
listViewLoadingView.setLayoutParams(lp);
170175
}
171-
listViewLoadingLayout.setVisibility(View.VISIBLE);
172-
listViewLoadingLayout.refreshing();
176+
listViewLoadingView.setVisibility(View.VISIBLE);
177+
178+
listViewLoadingView.refreshing();
173179

174180
if (doScroll) {
175181
// We scroll slightly so that the ListView's header/footer is at the
@@ -253,7 +259,7 @@ protected ListView createRefreshableView(Context context, AttributeSet attrs) {
253259
TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.PullToRefresh);
254260

255261
// We use a 0 height (instead of View.GONE) for now so that it's still
256-
// layed out
262+
// measured and laid out
257263
final FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, 0,
258264
Gravity.CENTER_HORIZONTAL);
259265

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>com.github.chrisbanes.pulltorefresh</groupId>
55
<artifactId>parent</artifactId>
66
<packaging>pom</packaging>
7-
<version>2.0</version>
7+
<version>2.0.1</version>
88
<name>Android-PullToRefresh Project</name>
99
<description>Implementation of the Pull-to-Refresh UI Pattern for Android.</description>
1010
<url>https://github.com/chrisbanes/Android-PullToRefresh</url>
@@ -24,7 +24,7 @@
2424
<url>https://github.com/chrisbanes/Android-PullToRefresh</url>
2525
<connection>scm:git:git://github.com/chrisbanes/Android-PullToRefresh.git</connection>
2626
<developerConnection>scm:git:git@github.com:chrisbanes/Android-PullToRefresh.git</developerConnection>
27-
<tag>v2.0</tag>
27+
<tag>v2.0.1</tag>
2828
</scm>
2929
<developers>
3030
<developer>

‎sample/AndroidManifest.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="com.handmark.pulltorefresh.samples"
4-
android:versionCode="2000"
5-
android:versionName="2.0" >
4+
android:versionCode="2010"
5+
android:versionName="2.0.1" >
66

77
<uses-sdk
88
android:minSdkVersion="4"

0 commit comments

Comments
 (0)