Add spoiler support

filtering
Floens 10 years ago
parent 1942a8f539
commit 77e0e06874
  1. 4
      Clover/app/src/main/java/org/floens/chan/core/model/PostImage.java
  2. 4
      Clover/app/src/main/java/org/floens/chan/core/presenter/ImageViewerPresenter.java
  3. 2
      Clover/app/src/main/java/org/floens/chan/core/presenter/ThreadPresenter.java

@ -12,10 +12,11 @@ public class PostImage {
public String extension; public String extension;
public int imageWidth; public int imageWidth;
public int imageHeight; public int imageHeight;
public boolean spoiler;
public Type type; public Type type;
public PostImage(String originalName, String thumbnailUrl, String imageUrl, String filename, String extension, int imageWidth, int imageHeight) { public PostImage(String originalName, String thumbnailUrl, String imageUrl, String filename, String extension, int imageWidth, int imageHeight, boolean spoiler) {
this.originalName = originalName; this.originalName = originalName;
this.thumbnailUrl = thumbnailUrl; this.thumbnailUrl = thumbnailUrl;
this.imageUrl = imageUrl; this.imageUrl = imageUrl;
@ -23,6 +24,7 @@ public class PostImage {
this.extension = extension; this.extension = extension;
this.imageWidth = imageWidth; this.imageWidth = imageWidth;
this.imageHeight = imageHeight; this.imageHeight = imageHeight;
this.spoiler = spoiler;
switch (extension) { switch (extension) {
case "gif": case "gif":

@ -155,7 +155,7 @@ public class ImageViewerPresenter implements MultiImageView.Callback, ViewPager.
private void onLowResInCenter() { private void onLowResInCenter() {
PostImage postImage = images.get(selectedPosition); PostImage postImage = images.get(selectedPosition);
if (imageAutoLoad) { if (imageAutoLoad && !postImage.spoiler) {
if (postImage.type == PostImage.Type.STATIC) { if (postImage.type == PostImage.Type.STATIC) {
callback.setImageMode(postImage, MultiImageView.Mode.BIGIMAGE); callback.setImageMode(postImage, MultiImageView.Mode.BIGIMAGE);
} else if (postImage.type == PostImage.Type.GIF) { } else if (postImage.type == PostImage.Type.GIF) {
@ -171,7 +171,7 @@ public class ImageViewerPresenter implements MultiImageView.Callback, ViewPager.
// Don't mistake a swipe when the pager is disabled as a tap // Don't mistake a swipe when the pager is disabled as a tap
if (viewPagerVisible) { if (viewPagerVisible) {
PostImage postImage = images.get(selectedPosition); PostImage postImage = images.get(selectedPosition);
if (imageAutoLoad) { if (imageAutoLoad && !postImage.spoiler) {
if (movieAutoLoad) { if (movieAutoLoad) {
onExit(); onExit();
} else { } else {

@ -231,7 +231,7 @@ public class ThreadPresenter implements ChanLoader.ChanLoaderCallback, PostAdapt
for (int i = 0; i < chanLoader.getThread().posts.size(); i++) { for (int i = 0; i < chanLoader.getThread().posts.size(); i++) {
Post item = chanLoader.getThread().posts.get(i); Post item = chanLoader.getThread().posts.get(i);
if (item.hasImage) { if (item.hasImage) {
images.add(new PostImage(String.valueOf(item.tim), item.thumbnailUrl, item.imageUrl, item.filename, item.ext, item.imageWidth, item.imageHeight)); images.add(new PostImage(String.valueOf(item.tim), item.thumbnailUrl, item.imageUrl, item.filename, item.ext, item.imageWidth, item.imageHeight, item.spoiler));
if (item.no == post.no) { if (item.no == post.no) {
index = images.size() - 1; index = images.size() - 1;
} }

Loading…
Cancel
Save