From 7afd224affadc2ae6ae1222994249e16b444aa04 Mon Sep 17 00:00:00 2001 From: inorichi Date: Wed, 12 Sep 2018 17:08:31 +0200 Subject: [PATCH] Fix volume keys intercepted even if the setting was off --- .../tachiyomi/ui/reader/viewer/pager/PagerViewer.kt | 8 ++++---- .../tachiyomi/ui/reader/viewer/webtoon/WebtoonViewer.kt | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewer.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewer.kt index 1454d67d46..699c8b9b9c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewer.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewer.kt @@ -264,16 +264,16 @@ abstract class PagerViewer(val activity: ReaderActivity) : BaseViewer { when (event.keyCode) { KeyEvent.KEYCODE_VOLUME_DOWN -> { - if (activity.menuVisible) { + if (!config.volumeKeysEnabled || activity.menuVisible) { return false - } else if (config.volumeKeysEnabled && isUp) { + } else if (isUp) { if (!config.volumeKeysInverted) moveDown() else moveUp() } } KeyEvent.KEYCODE_VOLUME_UP -> { - if (activity.menuVisible) { + if (!config.volumeKeysEnabled || activity.menuVisible) { return false - } else if (config.volumeKeysEnabled && isUp) { + } else if (isUp) { if (!config.volumeKeysInverted) moveUp() else moveDown() } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonViewer.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonViewer.kt index 335dd9bb57..046c2bde95 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonViewer.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonViewer.kt @@ -209,16 +209,16 @@ class WebtoonViewer(val activity: ReaderActivity) : BaseViewer { when (event.keyCode) { KeyEvent.KEYCODE_VOLUME_DOWN -> { - if (activity.menuVisible) { + if (!config.volumeKeysEnabled || activity.menuVisible) { return false - } else if (config.volumeKeysEnabled && isUp) { + } else if (isUp) { if (!config.volumeKeysInverted) scrollDown() else scrollUp() } } KeyEvent.KEYCODE_VOLUME_UP -> { - if (activity.menuVisible) { + if (!config.volumeKeysEnabled || activity.menuVisible) { return false - } else if (config.volumeKeysEnabled && isUp) { + } else if (isUp) { if (!config.volumeKeysInverted) scrollUp() else scrollDown() } }