Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-10-02 12:55:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Volume keys scroll pages. Closes #95

Browse Source
This commit is contained in:
inorichi 2016-02-10 15:06:18 +01:00
parent e50c683159
commit 0c0ebe06e5
5 changed files with 54 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.java
View File

@ -10,6 +10,7 @@ import android.support.annotation.NonNull;
import android.support.v4.app.FragmentManager;
import android.support.v4.content.ContextCompat;
import android.support.v7.widget.Toolbar;
import android.view.KeyEvent;
import android.view.Menu;
import android.view.MenuItem;
import android.view.Surface;
@ -153,6 +154,24 @@ public class ReaderActivity extends BaseRxActivity<ReaderPresenter> {
}
}
@Override
public boolean dispatchKeyEvent(KeyEvent event) {
int action = event.getAction();
int keyCode = event.getKeyCode();
switch (keyCode) {
case KeyEvent.KEYCODE_VOLUME_DOWN:
if (action == KeyEvent.ACTION_UP && viewer != null)
viewer.moveToNext();
return true;
case KeyEvent.KEYCODE_VOLUME_UP:
if (action == KeyEvent.ACTION_UP && viewer != null)
viewer.moveToPrevious();
return true;
default:
return super.dispatchKeyEvent(event);
}
}
public void onChapterError() {
finish();
ToastUtil.showShort(this, R.string.page_list_error);

2
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/base/BaseReader.java
View File

@ -93,6 +93,8 @@ public abstract class BaseReader extends BaseFragment {
public abstract void setSelectedPage(int pageNumber);
public abstract void onSetChapter(Chapter chapter, Page currentPage);
public abstract void onAppendChapter(Chapter chapter);
public abstract void moveToNext();
public abstract void moveToPrevious();
public void setDecoderClass(int value) {
switch (value) {

18
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerReader.java
View File

@ -148,14 +148,14 @@ public abstract class PagerReader extends BaseReader {
}
protected void onLeftSideTap() {
if (pager.getCurrentItem() != 0) {
pager.setCurrentItem(pager.getCurrentItem() - 1, transitions);
} else {
getReaderActivity().requestPreviousChapter();
}
moveToPrevious();
}
protected void onRightSideTap() {
moveToNext();
}
public void moveToNext() {
if (pager.getCurrentItem() != pager.getAdapter().getCount() - 1) {
pager.setCurrentItem(pager.getCurrentItem() + 1, transitions);
} else {
@ -163,6 +163,14 @@ public abstract class PagerReader extends BaseReader {
}
}
public void moveToPrevious() {
if (pager.getCurrentItem() != 0) {
pager.setCurrentItem(pager.getCurrentItem() - 1, transitions);
} else {
getReaderActivity().requestPreviousChapter();
}
}
private void setImageScaleType(int scaleType) {
this.scaleType = scaleType;
}

4
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/horizontal/RightToLeftReader.java
View File

@ -19,12 +19,12 @@ public class RightToLeftReader extends PagerReader {
@Override
protected void onLeftSideTap() {
super.onRightSideTap();
moveToNext();
}
@Override
protected void onRightSideTap() {
super.onLeftSideTap();
moveToPrevious();
}
}

21
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonReader.java
View File

@ -69,9 +69,9 @@ public class WebtoonReader extends BaseReader {
final float positionX = e.getX();
if (positionX < recycler.getWidth() * LEFT_REGION) {
recycler.smoothScrollBy(0, -scrollDistance);
moveToPrevious();
} else if (positionX > recycler.getWidth() * RIGHT_REGION) {
recycler.smoothScrollBy(0, scrollDistance);
moveToNext();
} else {
getReaderActivity().onCenterSingleTap();
}
@ -113,6 +113,16 @@ public class WebtoonReader extends BaseReader {
recycler.scrollToPosition(pageNumber);
}
@Override
public void moveToNext() {
recycler.smoothScrollBy(0, scrollDistance);
}
@Override
public void moveToPrevious() {
recycler.smoothScrollBy(0, -scrollDistance);
}
@Override
public void onSetChapter(Chapter chapter, Page currentPage) {
pages = new ArrayList<>(chapter.getPages());
@ -134,6 +144,9 @@ public class WebtoonReader extends BaseReader {
if (recycler != null) {
adapter.setPages(pages);
adapter.notifyItemRangeInserted(insertStart, chapter.getPages().size());
if (subscription != null && subscription.isUnsubscribed()) {
observeStatus(insertStart);
}
}
}
@ -162,8 +175,10 @@ public class WebtoonReader extends BaseReader {
}
private void observeStatus(int position) {
if (position == pages.size())
if (position == pages.size()) {
unsubscribeStatus();
return;
}
final Page page = pages.get(position);