Skip to content
This repository has been archived by the owner on Oct 15, 2018. It is now read-only.

Fixed building project by maven #237

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fixed building project by maven #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
64a5b55
Fixed building project by maven
Sep 19, 2013
ab6f5c7
Increased API in project.properties
Dec 25, 2013
475e0b9
Disable pulling during refreshing(both start and end), Enable scroll…
Dec 25, 2013
6e58799
Increased version and disabled DEBUG mode
Dec 25, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion extras/PullToRefreshViewPager/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@

android.library=true
# Project target.
target=android-16
target=android-19
android.library.reference.1=../../library
2 changes: 1 addition & 1 deletion library/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.handmark.pulltorefresh.library"
android:versionCode="2110"
android:versionName="2.1.1" >
android:versionName="2.1.3" >

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

Expand Down
2 changes: 1 addition & 1 deletion library/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>com.github.chrisbanes.pulltorefresh</groupId>
<artifactId>parent</artifactId>
<version>2.1.2-SNAPSHOT</version>
<version>2.1.3</version>
</parent>

<dependencies>
Expand Down
9 changes: 6 additions & 3 deletions library/src/com/handmark/pulltorefresh/library/PullToRefreshBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public abstract class PullToRefreshBase<T extends View> extends LinearLayout imp
// Constants
// ===========================================================

static final boolean DEBUG = true;
static final boolean DEBUG = false;

static final boolean USE_HW_LAYERS = false;

Expand Down Expand Up @@ -82,7 +82,7 @@ public abstract class PullToRefreshBase<T extends View> 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;
Expand Down Expand Up @@ -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
Expand All @@ -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();
Expand Down
9 changes: 5 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<groupId>com.github.chrisbanes.pulltorefresh</groupId>
<artifactId>parent</artifactId>
<packaging>pom</packaging>
<version>2.1.2-SNAPSHOT</version>
<version>2.1.3</version>
<name>Android-PullToRefresh Project</name>
<description>Implementation of the Pull-to-Refresh UI Pattern for Android.</description>
<url>https://github.com/chrisbanes/Android-PullToRefresh</url>
Expand Down Expand Up @@ -45,7 +45,7 @@
<java.version>1.6</java.version>
<android.version>4.1.1.4</android.version>
<android.platform>16</android.platform>
<android-maven.version>3.2.0</android-maven.version>
<android-maven.version>3.6.1</android-maven.version>
</properties>
<dependencyManagement>
<dependencies>
Expand Down Expand Up @@ -113,8 +113,9 @@
<buildcommand>com.android.ide.eclipse.adt.ApkBuilder</buildcommand>
</additionalBuildcommands>
</configuration>
</plugin>
</plugins>
</plugin>

</plugins>
</pluginManagement>
<sourceDirectory>src</sourceDirectory>
</build>
Expand Down