Do not scroll to image when post replies are open.

filtering
Floens 10 years ago
parent b18a65982a
commit ead819eeb4
  1. 4
      Clover/app/src/main/java/org/floens/chan/core/presenter/ImageViewerPresenter.java
  2. 6
      Clover/app/src/main/java/org/floens/chan/ui/controller/ImageViewerController.java
  3. 6
      Clover/app/src/main/java/org/floens/chan/ui/controller/ThreadController.java
  4. 4
      Clover/app/src/main/java/org/floens/chan/ui/layout/ThreadLayout.java

@ -135,7 +135,7 @@ public class ImageViewerPresenter implements MultiImageView.Callback, ViewPager.
private void onPageSwipedTo(int position) { private void onPageSwipedTo(int position) {
callback.setTitle(images.get(selectedPosition)); callback.setTitle(images.get(selectedPosition));
callback.scrollTo(images.get(selectedPosition)); callback.scrollToImage(images.get(selectedPosition));
for (PostImage other : getOther(position, false)) { for (PostImage other : getOther(position, false)) {
callback.setImageMode(other, MultiImageView.Mode.LOWRES); callback.setImageMode(other, MultiImageView.Mode.LOWRES);
@ -269,7 +269,7 @@ public class ImageViewerPresenter implements MultiImageView.Callback, ViewPager.
void setTitle(PostImage postImage); void setTitle(PostImage postImage);
void scrollTo(PostImage postImage); void scrollToImage(PostImage postImage);
MultiImageView.Mode getImageMode(PostImage postImage); MultiImageView.Mode getImageMode(PostImage postImage);

@ -220,8 +220,8 @@ public class ImageViewerController extends Controller implements View.OnClickLis
navigationItem.updateTitle(); navigationItem.updateTitle();
} }
public void scrollTo(PostImage postImage) { public void scrollToImage(PostImage postImage) {
previewCallback.scrollTo(postImage); previewCallback.scrollToImage(postImage);
} }
public void showProgress(boolean show) { public void showProgress(boolean show) {
@ -416,6 +416,6 @@ public class ImageViewerController extends Controller implements View.OnClickLis
void onPreviewDestroy(ImageViewerController imageViewerController); void onPreviewDestroy(ImageViewerController imageViewerController);
void scrollTo(PostImage postImage); void scrollToImage(PostImage postImage);
} }
} }

@ -56,8 +56,10 @@ public abstract class ThreadController extends Controller implements ThreadLayou
// presentingImageView = null; // presentingImageView = null;
} }
public void scrollTo(PostImage postImage) { public void scrollToImage(PostImage postImage) {
threadLayout.getPresenter().scrollTo(postImage); if (!threadLayout.postRepliesOpen()) {
threadLayout.getPresenter().scrollTo(postImage);
}
} }
@Override @Override

@ -183,6 +183,10 @@ public class ThreadLayout extends LoadView implements ThreadPresenter.ThreadPres
} }
} }
public boolean postRepliesOpen() {
return postPopupHelper.isOpen();
}
private void switchVisible(boolean visible) { private void switchVisible(boolean visible) {
if (this.visible != visible) { if (this.visible != visible) {
this.visible = visible; this.visible = visible;

Loading…
Cancel
Save