diff --git a/Clover/app/src/main/java/org/floens/chan/core/presenter/ImageViewerPresenter.java b/Clover/app/src/main/java/org/floens/chan/core/presenter/ImageViewerPresenter.java index 9a7511d6..9a0ac230 100644 --- a/Clover/app/src/main/java/org/floens/chan/core/presenter/ImageViewerPresenter.java +++ b/Clover/app/src/main/java/org/floens/chan/core/presenter/ImageViewerPresenter.java @@ -135,7 +135,7 @@ public class ImageViewerPresenter implements MultiImageView.Callback, ViewPager. private void onPageSwipedTo(int position) { callback.setTitle(images.get(selectedPosition)); - callback.scrollTo(images.get(selectedPosition)); + callback.scrollToImage(images.get(selectedPosition)); for (PostImage other : getOther(position, false)) { callback.setImageMode(other, MultiImageView.Mode.LOWRES); @@ -269,7 +269,7 @@ public class ImageViewerPresenter implements MultiImageView.Callback, ViewPager. void setTitle(PostImage postImage); - void scrollTo(PostImage postImage); + void scrollToImage(PostImage postImage); MultiImageView.Mode getImageMode(PostImage postImage); diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/ImageViewerController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/ImageViewerController.java index cc7c2cc5..f6a3aec4 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/ImageViewerController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/ImageViewerController.java @@ -220,8 +220,8 @@ public class ImageViewerController extends Controller implements View.OnClickLis navigationItem.updateTitle(); } - public void scrollTo(PostImage postImage) { - previewCallback.scrollTo(postImage); + public void scrollToImage(PostImage postImage) { + previewCallback.scrollToImage(postImage); } public void showProgress(boolean show) { @@ -416,6 +416,6 @@ public class ImageViewerController extends Controller implements View.OnClickLis void onPreviewDestroy(ImageViewerController imageViewerController); - void scrollTo(PostImage postImage); + void scrollToImage(PostImage postImage); } } diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/ThreadController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/ThreadController.java index 35be39ca..fe455e26 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/ThreadController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/ThreadController.java @@ -56,8 +56,10 @@ public abstract class ThreadController extends Controller implements ThreadLayou // presentingImageView = null; } - public void scrollTo(PostImage postImage) { - threadLayout.getPresenter().scrollTo(postImage); + public void scrollToImage(PostImage postImage) { + if (!threadLayout.postRepliesOpen()) { + threadLayout.getPresenter().scrollTo(postImage); + } } @Override diff --git a/Clover/app/src/main/java/org/floens/chan/ui/layout/ThreadLayout.java b/Clover/app/src/main/java/org/floens/chan/ui/layout/ThreadLayout.java index 2c9ee747..fd45a9f7 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/layout/ThreadLayout.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/layout/ThreadLayout.java @@ -183,6 +183,10 @@ public class ThreadLayout extends LoadView implements ThreadPresenter.ThreadPres } } + public boolean postRepliesOpen() { + return postPopupHelper.isOpen(); + } + private void switchVisible(boolean visible) { if (this.visible != visible) { this.visible = visible;