From e5e532d990f7e1115b09e702f348ab884f1d68fc Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Sun, 13 Mar 2016 00:37:02 +0800
Subject: [PATCH] Fix GalleryActivity page left and right mistake

---
 .../hippo/ehviewer/ui/GalleryActivity.java    | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java
index 5e76db368..a831226a0 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java
@@ -328,18 +328,10 @@ public class GalleryActivity extends TrackedActivity
         // Check volume
         if (Settings.getVolumePage()) {
             if (keyCode == KeyEvent.KEYCODE_VOLUME_UP) {
-                if (mLayoutMode == GalleryView.LAYOUT_MODE_RIGHT_TO_LEFT) {
-                    mGalleryView.pageRight();
-                } else {
-                    mGalleryView.pageLeft();
-                }
+                mGalleryView.pageLeft();
                 return true;
             } else if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {
-                if (mLayoutMode == GalleryView.LAYOUT_MODE_RIGHT_TO_LEFT) {
-                    mGalleryView.pageLeft();
-                } else {
-                    mGalleryView.pageRight();
-                }
+                mGalleryView.pageRight();
                 return true;
             }
         }
@@ -347,7 +339,6 @@ public class GalleryActivity extends TrackedActivity
         // Check keyboard and Dpad
         switch (keyCode) {
             case KeyEvent.KEYCODE_PAGE_UP:
-            case KeyEvent.KEYCODE_DPAD_LEFT:
             case KeyEvent.KEYCODE_DPAD_UP:
                 if (mLayoutMode == GalleryView.LAYOUT_MODE_RIGHT_TO_LEFT) {
                     mGalleryView.pageRight();
@@ -355,8 +346,10 @@ public class GalleryActivity extends TrackedActivity
                     mGalleryView.pageLeft();
                 }
                 return true;
+            case KeyEvent.KEYCODE_DPAD_LEFT:
+                mGalleryView.pageLeft();
+                return true;
             case KeyEvent.KEYCODE_PAGE_DOWN:
-            case KeyEvent.KEYCODE_DPAD_RIGHT:
             case KeyEvent.KEYCODE_DPAD_DOWN:
                 if (mLayoutMode == GalleryView.LAYOUT_MODE_RIGHT_TO_LEFT) {
                     mGalleryView.pageLeft();
@@ -364,6 +357,9 @@ public class GalleryActivity extends TrackedActivity
                     mGalleryView.pageRight();
                 }
                 return true;
+            case KeyEvent.KEYCODE_DPAD_RIGHT:
+                mGalleryView.pageRight();
+                return true;
             case KeyEvent.KEYCODE_DPAD_CENTER:
             case KeyEvent.KEYCODE_SPACE:
             case KeyEvent.KEYCODE_MENU: