Try to reduce flickers. #52

openaphid · Jan 31, 2013 · 5c97861 · 5c97861
1 parent ef17e02
commit 5c97861
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 14 deletions.
diff --git a/FlipView/Demo/APK/Aphid-FlipView-Demo.apk b/FlipView/Demo/APK/Aphid-FlipView-Demo.apk
diff --git a/FlipView/FlipLibrary/src/com/aphidmobile/flip/FlipCards.java b/FlipView/FlipLibrary/src/com/aphidmobile/flip/FlipCards.java
@@ -50,7 +50,8 @@ public class FlipCards {
 
 	private FlipViewController controller;
 
-	private boolean visible = false;
+	private volatile boolean visible = false;
+	private volatile boolean waitForFirstDraw = false;
 
 	private int maxIndex = 0;
 
@@ -72,6 +73,10 @@ public void setVisible(boolean visible) {
 		this.visible = visible;
 	}
 
+	public void setWaitForFirstDraw(boolean waitForFirstDraw) {
+		this.waitForFirstDraw = waitForFirstDraw;
+	}
+
 	boolean refreshPageView(View view) {
 		boolean match = false;
 		if (frontCards.getView() == view) {
@@ -231,6 +236,11 @@ public synchronized void draw(FlipRenderer renderer, GL10 gl) {
 				backCards.getBottomCard().draw(gl);
 			}
 		}
+
+		if (waitForFirstDraw) {
+			waitForFirstDraw = false;
+			controller.sendMessage(FlipViewController.MSG_ANIMATION_READY);
+		}
 	}
 
 	public void invalidateTexture() {

diff --git a/FlipView/FlipLibrary/src/com/aphidmobile/flip/FlipRenderer.java b/FlipView/FlipLibrary/src/com/aphidmobile/flip/FlipRenderer.java
@@ -55,7 +55,7 @@ public void onSurfaceCreated(GL10 gl, EGLConfig config) {
 		created = true;
 
 		cards.invalidateTexture();
-		flipViewController.reloadTexture();
+		flipViewController.sendMessage(FlipViewController.MSG_SURFACE_CREATED);
 
 		if (AphidLog.ENABLE_DEBUG)
 			AphidLog.d("onSurfaceCreated");

diff --git a/FlipView/FlipLibrary/src/com/aphidmobile/flip/FlipViewController.java b/FlipView/FlipLibrary/src/com/aphidmobile/flip/FlipViewController.java
@@ -48,7 +48,8 @@ public static interface ViewFlipListener {
 
 	private static final int MAX_RELEASED_VIEW_SIZE = 1;
 
-	private static final int MSG_SURFACE_CREATED = 1;
+	static final int MSG_SURFACE_CREATED = 1;
+	static final int MSG_ANIMATION_READY = 2;
 
 	private Handler handler = new Handler(new Handler.Callback() {
 		@Override
@@ -58,6 +59,11 @@ public boolean handleMessage(Message msg) {
 				contentHeight = 0;
 				requestLayout();
 				return true;
+			} else if (msg.what == MSG_ANIMATION_READY) {
+				if (inFlipAnimation) {
+					AphidLog.i("First draw is ready, hide real views");
+					updateVisibleView(-1);
+				}
 			}
 			return false;
 		}
@@ -73,7 +79,7 @@ public boolean handleMessage(Message msg) {
 	@ViewDebug.ExportedProperty
 	private int flipOrientation;
 
-	private boolean inFlipAnimation = false;
+	private volatile boolean inFlipAnimation = false;
 
 	//AdapterView Related
 	private Adapter adapter;
@@ -382,9 +388,9 @@ int getContentWidth() {
 	int getContentHeight() {
 		return contentHeight;
 	}
-
-	void reloadTexture() {
-		handler.sendMessage(Message.obtain(handler, MSG_SURFACE_CREATED));
+	
+	void sendMessage(int message) {
+		handler.sendMessage(Message.obtain(handler, message));
 	}
 
 	//--------------------------------------------------------------------------------------------------------------------
@@ -518,14 +524,8 @@ void showFlipAnimation() {
 			inFlipAnimation = true;
 
 			cards.setVisible(true);
+			cards.setWaitForFirstDraw(true);
 			surfaceView.requestRender();
-
-			handler.postDelayed(new Runnable() { //use a delayed message to avoid flicker, the perfect solution would be sending a message from the GL thread 
-				public void run() {
-					if (inFlipAnimation)
-						updateVisibleView(-1);
-				}
-			}, 100);
 		}
 	}