diff --git a/.gitignore b/.gitignore index e4e7198..5babc31 100755 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,7 @@ proguard-project.txt *.iws */.idea/workspace.xml */.idea/tasks.xml +*.iml # Gradle files -/.gradle \ No newline at end of file +/.gradle diff --git a/build.gradle b/build.gradle index e6c1cc9..17a5628 100644 --- a/build.gradle +++ b/build.gradle @@ -3,19 +3,24 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.6.+' + classpath 'com.android.tools.build:gradle:1.5.0' } } apply plugin: 'android-library' dependencies { - compile files('libs/android-support-v4.jar') + compile 'com.android.support:support-v4:19.1.0' } android { - compileSdkVersion 17 - buildToolsVersion '17.0.0' + compileSdkVersion 19 + buildToolsVersion '19.1.0' + + dexOptions { + incremental true + preDexLibraries = true + } sourceSets { main { @@ -27,4 +32,4 @@ android { minSdkVersion 4 } } -} \ No newline at end of file +} diff --git a/src/com/imbryk/viewPager/LoopViewPager.java b/src/com/imbryk/viewPager/LoopViewPager.java index 2feccbc..a13f938 100644 --- a/src/com/imbryk/viewPager/LoopViewPager.java +++ b/src/com/imbryk/viewPager/LoopViewPager.java @@ -20,6 +20,7 @@ import android.support.v4.view.PagerAdapter; import android.support.v4.view.ViewPager; import android.util.AttributeSet; +import android.view.MotionEvent; /** * A ViewPager subclass enabling infinte scrolling of the viewPager elements @@ -47,6 +48,8 @@ public class LoopViewPager extends ViewPager { OnPageChangeListener mOuterPageChangeListener; private LoopPagerAdapterWrapper mAdapter; private boolean mBoundaryCaching = DEFAULT_BOUNDARY_CASHING; + + private boolean swipeEnable = true; /** @@ -128,6 +131,30 @@ private void init() { super.setOnPageChangeListener(onPageChangeListener); } + public boolean isSwipeEnable() { + return swipeEnable; + } + + public void setSwipeEnable(boolean swipeEnable) { + this.swipeEnable = swipeEnable; + } + + @Override + public boolean onInterceptTouchEvent(MotionEvent event) { + if (!swipeEnable) + return false; + + return super.onInterceptTouchEvent(event); + } + + @Override + public boolean onTouchEvent(MotionEvent event) { + if (!swipeEnable) + return false; + + return super.onTouchEvent(event); + } + private OnPageChangeListener onPageChangeListener = new OnPageChangeListener() { private float mPreviousOffset = -1; private float mPreviousPosition = -1;