Prechádzať zdrojové kódy

Fix volume keys intercepted even if the setting was off

inorichi 6 rokov pred
rodič
commit
7afd224aff

+ 4 - 4
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()
                 }
             }

+ 4 - 4
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()
                 }
             }