Merge pull request #82 from ypresto/fix-crash-fling-zero

arpit · arpit · commit 96ebb0cc959b · 2015-05-26T09:27:00.000-04:00
Fix crash when getScaledOverflingDistance() == 0
diff --git a/FreeFlow/build.gradle b/FreeFlow/build.gradle
@@ -1,9 +1,9 @@
 buildscript {
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.14.4'
+        classpath 'com.android.tools.build:gradle:1.1.0'
     }
 }
-apply plugin: 'android-library'
+apply plugin: 'com.android.library'
 
 repositories {
     mavenLocal()
@@ -29,4 +29,4 @@ repositories {
     mavenLocal()
     mavenCentral()
 }
-apply from: '../maven_push.gradle'
+apply from: '../maven_push.gradle'
diff --git a/FreeFlow/src/com/comcast/freeflow/core/FreeFlowContainer.java b/FreeFlow/src/com/comcast/freeflow/core/FreeFlowContainer.java
@@ -1261,7 +1261,7 @@ protected void moveViewport(boolean isInFlingMode) {
 				viewPortY = (int) (mScrollableHeight + overflingDistance);
 			}
 
-			if (mEdgeEffectsEnabled) {
+			if (mEdgeEffectsEnabled && overflingDistance > 0) {
 				if (viewPortX <= 0) {
 					mLeftEdge.onPull(viewPortX / (-overflingDistance));
 				} else if (viewPortX >= mScrollableWidth) {
diff --git a/examples/Artbook/build.gradle b/examples/Artbook/build.gradle
@@ -1,10 +1,10 @@
 buildscript {
   dependencies {
-    classpath 'com.android.tools.build:gradle:0.14.4'
+    classpath 'com.android.tools.build:gradle:1.1.0'
   }
 }
 
-apply plugin: 'android'
+apply plugin: 'com.android.application'
 
 dependencies {
   compile project(':FreeFlow')
diff --git a/examples/PhotoGrid/build.gradle b/examples/PhotoGrid/build.gradle
@@ -1,10 +1,10 @@
 buildscript {
   dependencies {
-    classpath 'com.android.tools.build:gradle:0.14.4'
+    classpath 'com.android.tools.build:gradle:1.1.0'
   }
 }
 
-apply plugin: 'android'
+apply plugin: 'com.android.application'
 
 dependencies {
   compile project(':FreeFlow')

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`buildscript {`
`2`	`2`	`dependencies {`
`3`		`- classpath 'com.android.tools.build:gradle:0.14.4'`
	`3`	`+ classpath 'com.android.tools.build:gradle:1.1.0'`
`4`	`4`	`}`
`5`	`5`	`}`
`6`		`-apply plugin: 'android-library'`
	`6`	`+apply plugin: 'com.android.library'`
`7`	`7`
`8`	`8`	`repositories {`
`9`	`9`	`mavenLocal()`
`@@ -29,4 +29,4 @@ repositories {`
`29`	`29`	`mavenLocal()`
`30`	`30`	`mavenCentral()`
`31`	`31`	`}`
`32`		`-apply from: '../maven_push.gradle'`
	`32`	`+apply from: '../maven_push.gradle'`
Original file line number	Diff line number	Diff line change
`@@ -1261,7 +1261,7 @@ protected void moveViewport(boolean isInFlingMode) {`
`1261`	`1261`	`viewPortY = (int) (mScrollableHeight + overflingDistance);`
`1262`	`1262`	`}`
`1263`	`1263`
`1264`		`- if (mEdgeEffectsEnabled) {`
	`1264`	`+ if (mEdgeEffectsEnabled && overflingDistance > 0) {`
`1265`	`1265`	`if (viewPortX <= 0) {`
`1266`	`1266`	`mLeftEdge.onPull(viewPortX / (-overflingDistance));`
`1267`	`1267`	`} else if (viewPortX >= mScrollableWidth) {`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`buildscript {`
`2`	`2`	`dependencies {`
`3`		`- classpath 'com.android.tools.build:gradle:0.14.4'`
	`3`	`+ classpath 'com.android.tools.build:gradle:1.1.0'`
`4`	`4`	`}`
`5`	`5`	`}`
`6`	`6`
`7`		`-apply plugin: 'android'`
	`7`	`+apply plugin: 'com.android.application'`
`8`	`8`
`9`	`9`	`dependencies {`
`10`	`10`	`compile project(':FreeFlow')`