code refactor

Author: eschao

PageFlip/src/main/java/com/eschao/android/widget/pageflip/PageFlip.java

@@ -50,7 +50,7 @@
  * @author escchao
  */
 public class PageFlip {
-	final static String TAG	= "PageFlip";
+    final static String TAG    = "PageFlip";
 
     // default pixels of mesh vertex
     private final static int DEFAULT_MESH_VERTEX_PIXELS = 10;
@@ -229,7 +229,7 @@ public class PageFlip {
      */
     public PageFlip(Context context) {
         mContext = context;
-        mScroller = new Scroller(context, new AccelerateInterpolator(), true);
+        mScroller = new Scroller(context);
         mFlipState = PageFlipState.END_FLIP;
         mIsVertical = false;
         mViewRect = new GLViewRect();
@@ -277,9 +277,6 @@ public PageFlip(Context context) {
                                              FOLD_BASE_SHADOW_START_ALPHA,
                                              FOLD_BASE_SHADOW_END_COLOR,
                                              FOLD_BASE_SHADOW_END_ALPHA);
-
-        // init default scroller
-        mScroller = new Scroller(context);
     }
 
     /**
@@ -599,7 +596,7 @@ private void createPages() {
      * @param touchX x of finger down point
      * @param touchY y of finger down point
      */
-	public void onFingerDown(float touchX, float touchY) {
+    public void onFingerDown(float touchX, float touchY) {
         // covert to OpenGL coordinate
         touchX = mViewRect.toOpenGLX(touchX);
         touchY = mViewRect.toOpenGLY(touchY);
@@ -628,7 +625,7 @@ else if (mPages[SECOND_PAGE] != null &&
             mTouchP.set(touchX, touchY);
             mFlipState = PageFlipState.BEGIN_FLIP;
         }
-	}
+    }
 
     /**
      * Handle finger moving event
@@ -638,7 +635,7 @@ else if (mPages[SECOND_PAGE] != null &&
      * @return true if moving will trigger to draw a new frame for page flip,
      *         False means the movement should be ignored.
      */
-	public boolean onFingerMove(float touchX, float touchY) {
+    public boolean onFingerMove(float touchX, float touchY) {
         touchX = mViewRect.toOpenGLX(touchX);
         touchY = mViewRect.toOpenGLY(touchY);
 
@@ -1010,7 +1007,7 @@ else if (mIsVertical) {
             computeVertexesWhenSlope();
         }
 
-    	return isAnimating;
+        return isAnimating;
     }
 
     /**
@@ -1026,7 +1023,7 @@ public boolean isAnimating() {
      * Abort animating
      */
     public void abortAnimating() {
-    	mScroller.abortAnimation();
+        mScroller.abortAnimation();
         if (mFlipState == PageFlipState.FORWARD_FLIP) {
             mFlipState = PageFlipState.END_WITH_FORWARD;
         }
@@ -1055,7 +1052,7 @@ public boolean isStartedFlip() {
      * @return true if flip is ended
      */
     public boolean isEndedFlip() {
-    	return mFlipState == PageFlipState.END_FLIP ||
+        return mFlipState == PageFlipState.END_FLIP ||
                mFlipState == PageFlipState.END_WITH_RESTORE ||
                mFlipState == PageFlipState.END_WITH_BACKWARD ||
                mFlipState == PageFlipState.END_WITH_FORWARD;
@@ -1129,7 +1126,7 @@ public void drawFlipFrame() {
     /**
      * Draw frame with full page
      */
-	public void drawPageFrame() {
+    public void drawPageFrame() {
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
         glUseProgram(mVertexProgram.mProgramRef);
         glUniformMatrix4fv(mVertexProgram.mMVPMatrixLoc, 1, false,
@@ -1143,7 +1140,7 @@ public void drawPageFrame() {
         if (mPages[SECOND_PAGE] != null) {
             mPages[SECOND_PAGE].drawFullPage(mVertexProgram, true);
         }
-	}
+    }
 
     /**
      * Compute max mesh count and allocate vertexes buffer
@@ -1291,22 +1288,22 @@ private void computeVertexesWhenVertical() {
     /**
      * Compute key vertexes when page flip is slope
      */
-	private void computeKeyVertexesWhenSlope() {
+    private void computeKeyVertexesWhenSlope() {
         final float oX = mPages[FIRST_PAGE].originP.x;
         final float oY = mPages[FIRST_PAGE].originP.y;
 
-		float dX = mMiddleP.x - oX;
-		float dY = mMiddleP.y - oY;
-		
+        float dX = mMiddleP.x - oX;
+        float dY = mMiddleP.y - oY;
+        
         // compute key points on X axis
         float r0 = 1 - mSemiPerimeterRatio;
         float r1 = 1 + mSemiPerimeterRatio;
-		mXFoldP.set(mMiddleP.x + dY * dY / dX, oY);
+        mXFoldP.set(mMiddleP.x + dY * dY / dX, oY);
         mXFoldP0.set(oX + (mXFoldP.x - oX) * r0, mXFoldP.y);
         mXFoldP1.set(oX + r1 * (mXFoldP.x - oX), mXFoldP.y);
 
         // compute key points on Y axis
-		mYFoldP.set(oX, mMiddleP.y + dX * dX / dY);
+        mYFoldP.set(oX, mMiddleP.y + dX * dX / dY);
         mYFoldP0.set(mYFoldP.x, oY + (mYFoldP.y - oY) * r0);
         mYFoldP1.set(mYFoldP.x, oY + r1 * (mYFoldP.y - oY));
 
@@ -1322,7 +1319,7 @@ private void computeKeyVertexesWhenSlope() {
 
         // compute mesh count
         computeMeshCount();
-	}
+    }
 
     /**
      * Compute back vertex and edge shadow vertex of fold page

PageFlip/src/main/java/com/eschao/android/widget/pageflip/PageFlipState.java

@@ -21,12 +21,12 @@
  * @author eschao
  */
 public enum PageFlipState {
-	BEGIN_FLIP,
-	FORWARD_FLIP,
-	BACKWARD_FLIP,
-	RESTORE_FLIP,
-	END_FLIP,
-	END_WITH_FORWARD,
-	END_WITH_BACKWARD,
-	END_WITH_RESTORE,
+    BEGIN_FLIP,
+    FORWARD_FLIP,
+    BACKWARD_FLIP,
+    RESTORE_FLIP,
+    END_FLIP,
+    END_WITH_FORWARD,
+    END_WITH_BACKWARD,
+    END_WITH_RESTORE,
 }

PageFlip/src/main/java/com/eschao/android/widget/pageflip/ShadowVertexes.java

@@ -188,16 +188,14 @@ public ShadowVertexes setVertexes(int offset,
      */
     public ShadowVertexes addVertexesBackward(float startX, float startY,
                                               float endX, float endY) {
-        mBackward -= 8;
-        int i = mBackward;
-        mVertexes[i++] = startX;
-        mVertexes[i++] = startY;
-        mVertexes[i++] = mColor.startColor;
-        mVertexes[i++] = mColor.startAlpha;
-        mVertexes[i++] = endX;
-        mVertexes[i++] = endY;
-        mVertexes[i++] = mColor.endColor;
-        mVertexes[i] = mColor.endAlpha;
+        mVertexes[--mBackward] = mColor.endAlpha;
+        mVertexes[--mBackward] = mColor.endColor;
+        mVertexes[--mBackward] = endY;
+        mVertexes[--mBackward] = endX;
+        mVertexes[--mBackward] = mColor.startAlpha;
+        mVertexes[--mBackward] = mColor.startColor;
+        mVertexes[--mBackward] = startY;
+        mVertexes[--mBackward] = startX;
         return this;
     }
 

Sample/src/main/java/com/eschao/android/widget/sample/pageflip/SampleActivity.java

@@ -145,7 +145,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 editor.putInt(Constants.PREF_DURATION, 2000);
                 break;
             case R.id.animation_5s:
-                mPageFlipView.setAnimateDuration(25000);
+                mPageFlipView.setAnimateDuration(5000);
                 editor.putInt(Constants.PREF_DURATION, 5000);
                 break;
             case R.id.auoto_page:

gradle.properties

@@ -1,18 +1,17 @@
-# Project-wide Gradle settings.
-
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-
+## Project-wide Gradle settings.
+#
 # For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
-
+#
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# Default value: -Xmx1024m -XX:MaxPermSize=256m
 # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-
+#
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
+# org.gradle.parallel=true
+#Sat Dec 24 22:22:36 CST 2016
+systemProp.http.proxyHost=127.0.0.1
+systemProp.http.proxyPort=1080