Fight with the flash issue when flipping backward

Issue #52
openaphid · May 1, 2013 · f6dabbf · f6dabbf
1 parent 8f230f7
commit f6dabbf
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 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
@@ -160,8 +160,8 @@ public synchronized void draw(FlipRenderer renderer, GL10 gl) {
     frontCards.buildTexture(renderer, gl);
     backCards.buildTexture(renderer, gl);
 
-    if (!TextureUtils.isValidTexture(frontCards.getTexture()) && !TextureUtils
-        .isValidTexture(backCards.getTexture())) {
+    if (!TextureUtils.isValidTexture(frontCards.getTexture()) &&
+        !TextureUtils.isValidTexture(backCards.getTexture())) {
       return;
     }
 
@@ -263,7 +263,10 @@ public synchronized void draw(FlipRenderer renderer, GL10 gl) {
       }
     }
 
-    firstDrawFinished = true;
+    if ((frontCards.getView() == null || TextureUtils.isValidTexture(frontCards.getTexture())) &&
+        (backCards.getView() == null || TextureUtils.isValidTexture(backCards.getTexture()))
+        )
+      firstDrawFinished = true;
   }
 
   public void invalidateTexture() {

diff --git a/FlipView/FlipLibrary/src/com/aphidmobile/flip/FlipViewController.java b/FlipView/FlipLibrary/src/com/aphidmobile/flip/FlipViewController.java
@@ -484,7 +484,7 @@ private void setupAdapterView(View view, boolean addToTop, boolean isReusedView)
 
   private void updateVisibleView(int index) {
     for (int i = 0; i < bufferedViews.size(); i++) {
-      bufferedViews.get(i).setVisibility(index == i ? VISIBLE : INVISIBLE);
+      bufferedViews.get(i).setVisibility(index == i ? VISIBLE : GONE);
     }
   }
 
@@ -525,7 +525,7 @@ void flippedToView(final int indexInAdapter, boolean isPost) {
           }
           bufferIndex = bufferedViews.indexOf(old) + 1;
           requestLayout();
-          updateVisibleView(inFlipAnimation ? -1 : bufferIndex);
+          updateVisibleView(bufferIndex);
         }
       } else if (indexInAdapter == adapterIndex - 1) {
         if (adapterIndex > 0) {
@@ -539,7 +539,7 @@ void flippedToView(final int indexInAdapter, boolean isPost) {
           }
           bufferIndex = bufferedViews.indexOf(old) - 1;
           requestLayout();
-          updateVisibleView(inFlipAnimation ? -1 : bufferIndex);
+          updateVisibleView(bufferIndex);
         }
       } else {
         AphidLog.e("Should not happen: indexInAdapter %d, adapterIndex %d", indexInAdapter,