From 64a5b5595d10ef2be82565ca9f3c6ec9459b29f2 Mon Sep 17 00:00:00 2001 From: Nikolay Moskvin Date: Thu, 19 Sep 2013 16:59:44 +0700 Subject: [PATCH 1/4] Fixed building project by maven --- pom.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 1a755fea7..f73728367 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ 1.6 4.1.1.4 16 - 3.2.0 + 3.6.1 @@ -113,8 +113,9 @@ com.android.ide.eclipse.adt.ApkBuilder - - + + + src From ab6f5c73870d4552b4a258453ca84caf9100e145 Mon Sep 17 00:00:00 2001 From: Nikolay Moskvin Date: Wed, 25 Dec 2013 15:25:59 +0700 Subject: [PATCH 2/4] Increased API in project.properties --- extras/PullToRefreshViewPager/project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extras/PullToRefreshViewPager/project.properties b/extras/PullToRefreshViewPager/project.properties index 927fba41c..f8231ba8e 100644 --- a/extras/PullToRefreshViewPager/project.properties +++ b/extras/PullToRefreshViewPager/project.properties @@ -12,5 +12,5 @@ android.library=true # Project target. -target=android-16 +target=android-19 android.library.reference.1=../../library From 475e0b9822e724ed9caadc72d270c201137b23ad Mon Sep 17 00:00:00 2001 From: Nikolay Moskvin Date: Wed, 25 Dec 2013 15:32:02 +0700 Subject: [PATCH 3/4] Disable pulling during refreshing(both start and end), Enable scrolling while refreshing by default. Previously it is only enabled in ListView, get from @truenight0 --- .../handmark/pulltorefresh/library/PullToRefreshBase.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/library/src/com/handmark/pulltorefresh/library/PullToRefreshBase.java b/library/src/com/handmark/pulltorefresh/library/PullToRefreshBase.java index e76b234f3..344ada82b 100644 --- a/library/src/com/handmark/pulltorefresh/library/PullToRefreshBase.java +++ b/library/src/com/handmark/pulltorefresh/library/PullToRefreshBase.java @@ -82,7 +82,7 @@ public abstract class PullToRefreshBase extends LinearLayout imp private FrameLayout mRefreshableViewWrapper; private boolean mShowViewWhileRefreshing = true; - private boolean mScrollingWhileRefreshingEnabled = false; + private boolean mScrollingWhileRefreshingEnabled = true; private boolean mFilterTouchEvents = true; private boolean mOverScrollEnabled = true; private boolean mLayoutVisibilityChangesEnabled = true; @@ -1130,7 +1130,7 @@ private void init(Context context, AttributeSet attrs) { if (a.hasValue(R.styleable.PullToRefresh_ptrScrollingWhileRefreshingEnabled)) { mScrollingWhileRefreshingEnabled = a.getBoolean( - R.styleable.PullToRefresh_ptrScrollingWhileRefreshingEnabled, false); + R.styleable.PullToRefresh_ptrScrollingWhileRefreshingEnabled, true); } // Let the derivative classes have a go at handling attributes, then @@ -1143,6 +1143,9 @@ private void init(Context context, AttributeSet attrs) { } private boolean isReadyForPull() { + if (isRefreshing()) { + return false; + } switch (mMode) { case PULL_FROM_START: return isReadyForPullStart(); From 6e587996868a27b13af7caf9867ebb7751e7406e Mon Sep 17 00:00:00 2001 From: Nikolay Moskvin Date: Wed, 25 Dec 2013 19:25:48 +0700 Subject: [PATCH 4/4] Increased version and disabled DEBUG mode --- library/AndroidManifest.xml | 2 +- library/pom.xml | 2 +- .../com/handmark/pulltorefresh/library/PullToRefreshBase.java | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/library/AndroidManifest.xml b/library/AndroidManifest.xml index c3db5673d..780e594b4 100644 --- a/library/AndroidManifest.xml +++ b/library/AndroidManifest.xml @@ -2,7 +2,7 @@ + android:versionName="2.1.3" > diff --git a/library/pom.xml b/library/pom.xml index 6b48e0adb..cf02da978 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -10,7 +10,7 @@ com.github.chrisbanes.pulltorefresh parent - 2.1.2-SNAPSHOT + 2.1.3 diff --git a/library/src/com/handmark/pulltorefresh/library/PullToRefreshBase.java b/library/src/com/handmark/pulltorefresh/library/PullToRefreshBase.java index 344ada82b..63d795919 100644 --- a/library/src/com/handmark/pulltorefresh/library/PullToRefreshBase.java +++ b/library/src/com/handmark/pulltorefresh/library/PullToRefreshBase.java @@ -46,7 +46,7 @@ public abstract class PullToRefreshBase extends LinearLayout imp // Constants // =========================================================== - static final boolean DEBUG = true; + static final boolean DEBUG = false; static final boolean USE_HW_LAYERS = false; diff --git a/pom.xml b/pom.xml index f73728367..2f6e06e5d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.github.chrisbanes.pulltorefresh parent pom - 2.1.2-SNAPSHOT + 2.1.3 Android-PullToRefresh Project Implementation of the Pull-to-Refresh UI Pattern for Android. https://github.com/chrisbanes/Android-PullToRefresh