Don't enable tap to dismiss when loading the thumbnail.

captchafix
Florens Douwes 11 years ago
parent 416c626ec1
commit 1980eaae12
  1. 20
      Chan/src/org/floens/chan/ui/view/ThumbnailImageView.java

@ -34,6 +34,7 @@ public class ThumbnailImageView extends LoadView implements OnViewTapListener, V
private final float maxScale = 3f; private final float maxScale = 3f;
private boolean thumbnailNeeded = true; private boolean thumbnailNeeded = true;
private boolean tapDismiss = false;
private VideoView videoView; private VideoView videoView;
@ -103,6 +104,7 @@ public class ThumbnailImageView extends LoadView implements OnViewTapListener, V
setView(image, !isImmediate); setView(image, !isImmediate);
callback.setProgress(false); callback.setProgress(false);
thumbnailNeeded = false; thumbnailNeeded = false;
tapDismiss = true;
} }
} }
}, (int) (getWidth() * maxScale), (int) (getHeight() * maxScale)); }, (int) (getWidth() * maxScale), (int) (getHeight() * maxScale));
@ -119,6 +121,7 @@ public class ThumbnailImageView extends LoadView implements OnViewTapListener, V
setView(view, false); setView(view, false);
callback.setProgress(false); callback.setProgress(false);
thumbnailNeeded = false; thumbnailNeeded = false;
tapDismiss = true;
} }
}, new Response.ErrorListener() { }, new Response.ErrorListener() {
@Override @Override
@ -130,7 +133,7 @@ public class ThumbnailImageView extends LoadView implements OnViewTapListener, V
public void setVideo(String videoUrl) { public void setVideo(String videoUrl) {
callback.setProgress(true); callback.setProgress(true);
ChanApplication.getVolleyRequestQueue().add(new FileRequest(videoUrl, new Response.Listener<File>() { ChanApplication.getVolleyRequestQueue().add(new FileRequest(videoUrl, new Response.Listener<File>() {
@Override @Override
public void onResponse(File file) { public void onResponse(File file) {
@ -157,6 +160,7 @@ public class ThumbnailImageView extends LoadView implements OnViewTapListener, V
setView(videoView, false); setView(videoView, false);
callback.setProgress(false); callback.setProgress(false);
thumbnailNeeded = false; thumbnailNeeded = false;
tapDismiss = true;
} else { } else {
onError(); onError();
} }
@ -169,12 +173,12 @@ public class ThumbnailImageView extends LoadView implements OnViewTapListener, V
} }
})); }));
} }
@Override @Override
public void setView(View view, boolean animation) { public void setView(View view, boolean animation) {
super.setView(view, animation && !thumbnailNeeded); super.setView(view, animation && !thumbnailNeeded);
} }
public VideoView getVideoView() { public VideoView getVideoView() {
return videoView; return videoView;
} }
@ -186,17 +190,23 @@ public class ThumbnailImageView extends LoadView implements OnViewTapListener, V
@Override @Override
public void onViewTap(View view, float x, float y) { public void onViewTap(View view, float x, float y) {
callback.onTap(); if (tapDismiss) {
callback.onTap();
}
} }
@Override @Override
public void onClick(View v) { public void onClick(View v) {
callback.onTap(); if (tapDismiss) {
callback.onTap();
}
} }
public static interface ThumbnailImageViewCallback { public static interface ThumbnailImageViewCallback {
public void onTap(); public void onTap();
public void setProgress(boolean progress); public void setProgress(boolean progress);
public void onVideoLoaded(); public void onVideoLoaded();
} }

Loading…
Cancel
Save