Don't scroll to post from image when replies are open.

captchafix
Floens 11 years ago
parent 63f12cfea0
commit e3c984a4c7
  1. 4
      Clover/app/src/main/java/org/floens/chan/core/manager/ThreadManager.java
  2. 10
      Clover/app/src/main/java/org/floens/chan/ui/activity/ImageViewActivity.java
  3. 2
      Clover/app/src/main/java/org/floens/chan/ui/fragment/ThreadFragment.java

@ -511,6 +511,10 @@ public class ThreadManager implements Loader.LoaderListener {
currentPopupFragment = null;
}
public boolean arePostRepliesOpen() {
return popupQueue.size() > 0;
}
private void deletePost(final Post post) {
final CheckBox checkBox = new CheckBox(activity);
checkBox.setText(R.string.delete_image_only);

@ -33,6 +33,7 @@ import android.widget.ProgressBar;
import org.floens.chan.R;
import org.floens.chan.chan.ImageSearch;
import org.floens.chan.core.ChanPreferences;
import org.floens.chan.core.manager.ThreadManager;
import org.floens.chan.core.model.Post;
import org.floens.chan.ui.adapter.ImageViewAdapter;
import org.floens.chan.ui.adapter.PostAdapter;
@ -53,10 +54,12 @@ public class ImageViewActivity extends Activity implements ViewPager.OnPageChang
private static PostAdapter postAdapter;
private static int selectedId = -1;
private static ThreadManager threadManagerStatic;
private ViewPager viewPager;
private ImageViewAdapter adapter;
private ProgressBar progressBar;
private ThreadManager threadManager;
private int currentPosition;
@ -66,9 +69,10 @@ public class ImageViewActivity extends Activity implements ViewPager.OnPageChang
* @param adapter the adapter to get image data from
* @param selected the no that the user clicked on
*/
public static void setAdapter(PostAdapter adapter, int selected) {
public static void setAdapter(PostAdapter adapter, int selected, ThreadManager threadManager) {
postAdapter = adapter;
selectedId = selected;
threadManagerStatic = threadManager;
}
@Override
@ -85,6 +89,8 @@ public class ImageViewActivity extends Activity implements ViewPager.OnPageChang
return;
}
threadManager = threadManagerStatic;
ThemeHelper.setTheme(this);
progressBar = new ProgressBar(this, null, android.R.attr.progressBarStyleHorizontal);
@ -170,7 +176,7 @@ public class ImageViewActivity extends Activity implements ViewPager.OnPageChang
}
Post post = adapter.getPost(position);
if (postAdapter != null) {
if (postAdapter != null && !threadManager.arePostRepliesOpen()) {
postAdapter.scrollToPost(post.no);
}
}

@ -177,7 +177,7 @@ public class ThreadFragment extends Fragment implements ThreadManager.ThreadMana
@Override
public void onThumbnailClicked(Post source) {
if (postAdapter != null) {
ImageViewActivity.setAdapter(postAdapter, source.no);
ImageViewActivity.setAdapter(postAdapter, source.no, threadManager);
Intent intent = new Intent(baseActivity, ImageViewActivity.class);
baseActivity.startActivity(intent);

Loading…
Cancel
Save