From 80bd63ca6c6c2986bf6a6600d3d34ade273abbbe Mon Sep 17 00:00:00 2001 From: Fang Yang Date: Fri, 19 Sep 2014 20:22:57 +0800 Subject: [PATCH 1/6] 1. upgrade gradle version 2. fix dependency support v4, the old way will cause duplicate classes problem while use as git submodule --- build.gradle | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index e6c1cc9..91beea5 100644 --- a/build.gradle +++ b/build.gradle @@ -3,19 +3,19 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.6.+' + classpath 'com.android.tools.build:gradle:0.12.+' } } 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' sourceSets { main { @@ -27,4 +27,4 @@ android { minSdkVersion 4 } } -} \ No newline at end of file +} From cac1909d4e017d88592008a6e414b23ec4bc5166 Mon Sep 17 00:00:00 2001 From: Fang Yang Date: Wed, 24 Sep 2014 10:40:06 +0800 Subject: [PATCH 2/6] ignore *.iml --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 From acb33050e35ba6ea10154b3d9c0841dd13660d90 Mon Sep 17 00:00:00 2001 From: Fang Yang Date: Wed, 22 Oct 2014 13:04:15 +0800 Subject: [PATCH 3/6] incremental compile --- build.gradle | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build.gradle b/build.gradle index 91beea5..0dab9dd 100644 --- a/build.gradle +++ b/build.gradle @@ -17,6 +17,11 @@ android { compileSdkVersion 19 buildToolsVersion '19.1.0' + dexOptions { + incremental true + preDexLibraries = true + } + sourceSets { main { manifest.srcFile 'AndroidManifest.xml' From 2fada45aba9a4c97236d442adcae2589f77d1b6c Mon Sep 17 00:00:00 2001 From: Fang Yang Date: Sun, 7 Dec 2014 20:16:34 +0800 Subject: [PATCH 4/6] upgrade gradle to 1.0.0-rc4 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0dab9dd..db01120 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.12.+' + classpath 'com.android.tools.build:gradle:1.0.0-rc4' } } From c7959c61756c921a32860801980551c74d0901ee Mon Sep 17 00:00:00 2001 From: Fang Yang Date: Tue, 9 Dec 2014 18:19:05 +0800 Subject: [PATCH 5/6] support swipe enabled switch --- src/com/imbryk/viewPager/LoopViewPager.java | 27 +++++++++++++++++++++ 1 file changed, 27 insertions(+) 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; From 5a7744427f9e51e7e326106067f3ae5ddb345407 Mon Sep 17 00:00:00 2001 From: Kai Wang Date: Fri, 8 Apr 2016 17:26:26 +0800 Subject: [PATCH 6/6] update gradle version --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index db01120..17a5628 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:1.0.0-rc4' + classpath 'com.android.tools.build:gradle:1.5.0' } }