Fix the incorrect content during animation.

#16

Author: openaphid

FlipView/Demo/src/com/aphidmobile/flip/demo/views/NumberTextView.java

@@ -20,7 +20,6 @@
 import android.graphics.Color;
 import android.view.Gravity;
 import android.widget.TextView;
-import com.aphidmobile.utils.AphidLog;
 
 public class NumberTextView extends TextView{
 	private int number;
@@ -42,12 +41,6 @@ public void setNumber(int number) {
 		setText(String.valueOf(number));
 	}
 
-	@Override
-	public void setVisibility(int visibility) {
-		super.setVisibility(visibility);
-		AphidLog.i("View %d, visibility %d", number, visibility);
-	}
-
 	@Override
 	public String toString() {
 		return "NumberTextView: " + number;

FlipView/FlipLibrary/src/com/aphidmobile/flip/FlipCards.java

@@ -46,8 +46,6 @@ public class FlipCards {
 	private float lastY = -1;
 	private float lastX = -1;
 
-	@SuppressWarnings("unused")
-	private VelocityTracker velocityTracker;
 	private FlipViewController controller;
 
 	private int activeIndex = -1;

FlipView/FlipLibrary/src/com/aphidmobile/flip/FlipRenderer.java

@@ -72,7 +72,7 @@ public void onSurfaceCreated(GL10 gl, EGLConfig config) {
 		flipViewController.reloadTexture();
 
 		if (AphidLog.ENABLE_DEBUG)
-			AphidLog.i("onSurfaceCreated");
+			AphidLog.d("onSurfaceCreated");
 	}
 
 	public static float[] light0Position = {0, 0, 100f, 0f};
@@ -108,7 +108,7 @@ public void onSurfaceChanged(GL10 gl, int width, int height) {
 		gl.glLightfv(GL_LIGHT0, GL_POSITION, light0Position, 0);
 
 		if (AphidLog.ENABLE_DEBUG)
-			AphidLog.i("onSurfaceChanged: %d, %d", width, height);
+			AphidLog.d("onSurfaceChanged: %d, %d", width, height);
 	}
 
 	@Override

FlipView/FlipLibrary/src/com/aphidmobile/flip/FlipViewController.java

@@ -331,7 +331,6 @@ protected void onLayout(boolean changed, int l, int t, int r, int b) {
 
 	@Override
 	protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-		//Logger.i( String.format("onMeasure: %d, %d, ; child %d", widthMeasureSpec, heightMeasureSpec, flipViews.size()));
 		super.onMeasure(widthMeasureSpec, heightMeasureSpec);
 
 		for (View child : bufferedViews)
@@ -399,7 +398,7 @@ private void setupAdapterView(View view, boolean addToTop, boolean isReusedView)
 
 	private void updateVisibleView(int index) {
 		if (AphidLog.ENABLE_DEBUG)
-			AphidLog.i("Update visible views, index %d, buffered: %d", index, bufferedViews.size());
+			AphidLog.d("Update visible views, index %d, buffered: %d", index, bufferedViews.size());
 
 		for (int i = 0; i < bufferedViews.size(); i++)
 			bufferedViews.get(i).setVisibility(index == i ? VISIBLE : INVISIBLE);

FlipView/FlipLibrary/src/com/aphidmobile/flip/ViewDualCards.java

@@ -21,6 +21,7 @@
 
 import android.graphics.Bitmap;
 import android.view.View;
+
 import com.aphidmobile.utils.TextureUtils;
 import com.aphidmobile.utils.UI;
 
@@ -55,10 +56,14 @@ public View getView() {
 
 	public boolean setView(int index, View view) {
 		UI.assertInMainThread();
-		this.index = index;
-		if (getView() == view
-				&& (screenshot != null || TextureUtils.isValidTexture(texture)))
+
+		if (this.index == index 
+				&& getView() == view
+				&& (screenshot != null || TextureUtils.isValidTexture(texture))
+				)
 			return false;
+		
+		this.index = index;
 		viewRef = null;
 		if (texture != null) {
 			texture.postDestroy();
@@ -72,6 +77,7 @@ public boolean setView(int index, View view) {
 			UI.recycleBitmap(screenshot);
 			screenshot = null;
 		}
+
 		return true;
 	}
 
@@ -178,4 +184,9 @@ public void buildTexture(FlipRenderer renderer, GL10 gl) {
 	public void abandonTexture() {
 		texture = null;
 	}
+	
+	@Override
+	public String toString() {
+		return "ViewDualCards: (" + index + ", view: " + getView() + ")";
+	}
 }