Allow tapping on the edges of the chapter to change pages

This commit is contained in:
inorichi
2015-10-22 02:20:42 +02:00
parent 38c6fac385
commit 3a748a9453
4 changed files with 173 additions and 16 deletions
@@ -18,12 +18,13 @@ import eu.kanade.mangafeed.data.models.Page;
import eu.kanade.mangafeed.presenter.ReaderPresenter;
import eu.kanade.mangafeed.ui.activity.base.BaseRxActivity;
import eu.kanade.mangafeed.ui.adapter.ReaderPageAdapter;
import eu.kanade.mangafeed.widget.ReaderViewPager;
import nucleus.factory.RequiresPresenter;
@RequiresPresenter(ReaderPresenter.class)
public class ReaderActivity extends BaseRxActivity<ReaderPresenter> {
@Bind(R.id.view_pager) ViewPager viewPager;
@Bind(R.id.view_pager) ReaderViewPager viewPager;
@Bind(R.id.page_number) TextView pageNumber;
private ReaderPageAdapter adapter;
@@ -43,6 +44,12 @@ public class ReaderActivity extends BaseRxActivity<ReaderPresenter> {
setupViewPager();
}
@Override
public void onDestroy() {
getPresenter().setCurrentPage(currentPage);
super.onDestroy();
}
private void createAdapter() {
adapter = new ReaderPageAdapter(getSupportFragmentManager());
viewPager.setAdapter(adapter);
@@ -67,14 +74,24 @@ public class ReaderActivity extends BaseRxActivity<ReaderPresenter> {
}
});
viewPager.setOnChapterBoundariesOutListener(new ReaderViewPager.OnChapterBoundariesOutListener() {
@Override
public void onFirstPageOut() {
// TODO load previous chapter
}
@Override
public void onLastPageOut() {
// TODO load next chapter
}
});
}
@Override
public void onDestroy() {
getPresenter().setCurrentPage(currentPage);
super.onDestroy();
public ReaderViewPager getViewPager() {
return viewPager;
}
public void onPageList(List<Page> pages) {
adapter.setPages(pages);
updatePageNumber();
@@ -104,4 +121,5 @@ public class ReaderActivity extends BaseRxActivity<ReaderPresenter> {
}
}
}
@@ -12,12 +12,13 @@ import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView;
import eu.kanade.mangafeed.R;
import eu.kanade.mangafeed.data.models.Page;
import eu.kanade.mangafeed.ui.activity.ReaderActivity;
import eu.kanade.mangafeed.util.PageFileTarget;
public class ReaderPageFragment extends Fragment {
public static final String URL_ARGUMENT_KEY = "UrlArgumentKey";
private SubsamplingScaleImageView mPageImageView;
private SubsamplingScaleImageView imageView;
private String mUrl;
@@ -53,19 +54,21 @@ public class ReaderPageFragment extends Fragment {
private void loadImage() {
Glide.with(getActivity())
.load(mUrl)
.downloadOnly(new PageFileTarget(mPageImageView));
.downloadOnly(new PageFileTarget(imageView));
}
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
mPageImageView = (SubsamplingScaleImageView)inflater.inflate(R.layout.fragment_page, container, false);
mPageImageView.setDoubleTapZoomStyle(SubsamplingScaleImageView.ZOOM_FOCUS_FIXED);
mPageImageView.setPanLimit(SubsamplingScaleImageView.PAN_LIMIT_INSIDE);
mPageImageView.setMinimumScaleType(SubsamplingScaleImageView.SCALE_TYPE_CENTER_INSIDE);
mPageImageView.setOnImageEventListener(new SubsamplingScaleImageView.OnImageEventListener() {
imageView = (SubsamplingScaleImageView)inflater.inflate(R.layout.fragment_page, container, false);
imageView.setDoubleTapZoomStyle(SubsamplingScaleImageView.ZOOM_FOCUS_FIXED);
imageView.setPanLimit(SubsamplingScaleImageView.PAN_LIMIT_INSIDE);
imageView.setMinimumScaleType(SubsamplingScaleImageView.SCALE_TYPE_CENTER_INSIDE);
imageView.setOnTouchListener((view, motionEvent) ->
((ReaderActivity) getActivity()).getViewPager().onImageTouch(motionEvent));
imageView.setOnImageEventListener(new SubsamplingScaleImageView.OnImageEventListener() {
@Override
public void onReady() {
mPageImageView.setVisibility(View.VISIBLE);
imageView.setVisibility(View.VISIBLE);
}
@Override
@@ -85,7 +88,7 @@ public class ReaderPageFragment extends Fragment {
}
});
return mPageImageView;
return imageView;
}
@Override
@@ -93,4 +96,5 @@ public class ReaderPageFragment extends Fragment {
super.onActivityCreated(savedInstanceState);
loadImage();
}
}