diff options
| author | Andrew Dolgov <[email protected]> | 2012-10-17 17:11:26 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2012-10-17 17:11:26 +0400 |
| commit | 50aa792e3215b0d26df65bf5b358b50587685e1a (patch) | |
| tree | c6294790b54560e5823792938b7806cef2cc41eb /src | |
| parent | f3d4e3e31c488e5ded0a457308c746913aecef8c (diff) | |
prevent tap to change pages when paging is disabled
Diffstat (limited to 'src')
| -rw-r--r-- | src/it/sephiroth/android/library/imagezoom/ImageViewTouch.java | 7 | ||||
| -rw-r--r-- | src/org/fox/ttcomics/ComicPager.java | 11 | ||||
| -rw-r--r-- | src/org/fox/ttcomics/CommonActivity.java | 4 | ||||
| -rw-r--r-- | src/org/fox/ttcomics/ViewPager.java | 2 |
4 files changed, 16 insertions, 8 deletions
diff --git a/src/it/sephiroth/android/library/imagezoom/ImageViewTouch.java b/src/it/sephiroth/android/library/imagezoom/ImageViewTouch.java index c189cf8..f3399fd 100644 --- a/src/it/sephiroth/android/library/imagezoom/ImageViewTouch.java +++ b/src/it/sephiroth/android/library/imagezoom/ImageViewTouch.java @@ -121,11 +121,8 @@ public class ImageViewTouch extends ImageViewTouchBase { if ( !mScaleDetector.isInProgress() ) mCurrentScaleFactor = scale; if (mScaleChangedListener != null) { - RectF bitmapRect = getBitmapRect(); - - boolean widthFits = getWidth() >= (bitmapRect.right - bitmapRect.left); - - mScaleChangedListener.onScaleChanged(mCurrentScaleFactor, widthFits); + RectF bitmapRect = getBitmapRect(); + mScaleChangedListener.onScaleChanged(mCurrentScaleFactor, getWidth() >= (bitmapRect.right - bitmapRect.left)); } } diff --git a/src/org/fox/ttcomics/ComicPager.java b/src/org/fox/ttcomics/ComicPager.java index 8cc0fd1..a171d3e 100644 --- a/src/org/fox/ttcomics/ComicPager.java +++ b/src/org/fox/ttcomics/ComicPager.java @@ -155,6 +155,17 @@ public class ComicPager extends Fragment { out.putString("fileName", m_fileName);
}
+
+ public boolean isPagingEnabled() {
+
+ ViewPager pager = (ViewPager) getView().findViewById(R.id.comics_pager);
+
+ if (pager != null) {
+ return pager.isPagingEnabled();
+ }
+
+ return false;
+ }
}
diff --git a/src/org/fox/ttcomics/CommonActivity.java b/src/org/fox/ttcomics/CommonActivity.java index 197648d..8934fec 100644 --- a/src/org/fox/ttcomics/CommonActivity.java +++ b/src/org/fox/ttcomics/CommonActivity.java @@ -407,7 +407,7 @@ public class CommonActivity extends FragmentActivity { public void selectPreviousComic() {
ComicPager frag = (ComicPager) getSupportFragmentManager().findFragmentByTag(FRAG_COMICS_PAGER);
- if (frag != null && frag.isAdded() && frag.getPosition() > 0) {
+ if (frag != null && frag.isAdded() && frag.getPosition() > 0 && frag.isPagingEnabled()) {
frag.setCurrentItem(frag.getPosition() - 1);
}
}
@@ -415,7 +415,7 @@ public class CommonActivity extends FragmentActivity { public void selectNextComic() {
ComicPager frag = (ComicPager) getSupportFragmentManager().findFragmentByTag(FRAG_COMICS_PAGER);
- if (frag != null && frag.isAdded() && frag.getPosition() < frag.getCount()-1) {
+ if (frag != null && frag.isAdded() && frag.getPosition() < frag.getCount()-1 && frag.isPagingEnabled()) {
frag.setCurrentItem(frag.getPosition() + 1);
}
diff --git a/src/org/fox/ttcomics/ViewPager.java b/src/org/fox/ttcomics/ViewPager.java index 966edd7..c5d2f13 100644 --- a/src/org/fox/ttcomics/ViewPager.java +++ b/src/org/fox/ttcomics/ViewPager.java @@ -37,7 +37,7 @@ public class ViewPager extends android.support.v4.view.ViewPager { this.enabled = enabled;
}
- public boolean getPagingEnabled() {
+ public boolean isPagingEnabled() {
return this.enabled;
}
}
\ No newline at end of file |