github/tachiyomi
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix volume keys intercepted even if the setting was off

Browse source
This commit is contained in:
inorichi 2018-09-12 17:08:31 +02:00
parent 62e7bead73
commit 7afd224aff
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewer.kt
View file

@ -264,16 +264,16 @@ abstract class PagerViewer(val activity: ReaderActivity) : BaseViewer {
when (event.keyCode) { when (event.keyCode) {
KeyEvent.KEYCODE_VOLUME_DOWN -> { KeyEvent.KEYCODE_VOLUME_DOWN -> {
if (activity.menuVisible) { if (!config.volumeKeysEnabled || activity.menuVisible) {
return false return false
} else if (config.volumeKeysEnabled && isUp) { } else if (isUp) {
if (!config.volumeKeysInverted) moveDown() else moveUp() if (!config.volumeKeysInverted) moveDown() else moveUp()
} }
} }
KeyEvent.KEYCODE_VOLUME_UP -> { KeyEvent.KEYCODE_VOLUME_UP -> {
if (activity.menuVisible) { if (!config.volumeKeysEnabled || activity.menuVisible) {
return false return false
} else if (config.volumeKeysEnabled && isUp) { } else if (isUp) {
if (!config.volumeKeysInverted) moveUp() else moveDown() if (!config.volumeKeysInverted) moveUp() else moveDown()
} }
} }

8
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonViewer.kt
View file

@ -209,16 +209,16 @@ class WebtoonViewer(val activity: ReaderActivity) : BaseViewer {
when (event.keyCode) { when (event.keyCode) {
KeyEvent.KEYCODE_VOLUME_DOWN -> { KeyEvent.KEYCODE_VOLUME_DOWN -> {
if (activity.menuVisible) { if (!config.volumeKeysEnabled || activity.menuVisible) {
return false return false
} else if (config.volumeKeysEnabled && isUp) { } else if (isUp) {
if (!config.volumeKeysInverted) scrollDown() else scrollUp() if (!config.volumeKeysInverted) scrollDown() else scrollUp()
} }
} }
KeyEvent.KEYCODE_VOLUME_UP -> { KeyEvent.KEYCODE_VOLUME_UP -> {
if (activity.menuVisible) { if (!config.volumeKeysEnabled || activity.menuVisible) {
return false return false
} else if (config.volumeKeysEnabled && isUp) { } else if (isUp) {
if (!config.volumeKeysInverted) scrollUp() else scrollDown() if (!config.volumeKeysInverted) scrollUp() else scrollDown()
} }
} }