Merge pull request #8943 from JosJuice/android-horizontal-wiimote-buttons

Android: Fix saving Horizonal Wii Remote overlay A/B/1/2 positions

1 files changed, 42 insertions, 49 deletions

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.java
index 2093c45bcb..ea1a6ecb54 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.java
@@ -329,6 +329,8 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
     int fingerPositionX = (int) event.getX(pointerIndex);
     int fingerPositionY = (int) event.getY(pointerIndex);
 
+    final SharedPreferences sPrefs = PreferenceManager.getDefaultSharedPreferences(getContext());
+    int controller = sPrefs.getInt("wiiController", 3);
     String orientation =
             getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT ?
                     "-Portrait" : "";
@@ -367,7 +369,7 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
             // Persist button position by saving new place.
             saveControlPosition(mButtonBeingConfigured.getId(),
                     mButtonBeingConfigured.getBounds().left,
-                    mButtonBeingConfigured.getBounds().top, orientation);
+                    mButtonBeingConfigured.getBounds().top, controller, orientation);
             mButtonBeingConfigured = null;
           }
           break;
@@ -405,7 +407,7 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
             // Persist button position by saving new place.
             saveControlPosition(mDpadBeingConfigured.getId(0),
                     mDpadBeingConfigured.getBounds().left, mDpadBeingConfigured.getBounds().top,
-                    orientation);
+                    controller, orientation);
             mDpadBeingConfigured = null;
           }
           break;
@@ -438,7 +440,7 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
           {
             saveControlPosition(mJoystickBeingConfigured.getId(),
                     mJoystickBeingConfigured.getBounds().left,
-                    mJoystickBeingConfigured.getBounds().top, orientation);
+                    mJoystickBeingConfigured.getBounds().top, controller, orientation);
             mJoystickBeingConfigured = null;
           }
           break;
@@ -793,15 +795,42 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
     refreshControls();
   }
 
-  private void saveControlPosition(int sharedPrefsId, int x, int y, String orientation)
+  private void saveControlPosition(int sharedPrefsId, int x, int y, int controller,
+          String orientation)
   {
     final SharedPreferences sPrefs = PreferenceManager.getDefaultSharedPreferences(getContext());
     SharedPreferences.Editor sPrefsEditor = sPrefs.edit();
-    sPrefsEditor.putFloat(sharedPrefsId + orientation + "-X", x);
-    sPrefsEditor.putFloat(sharedPrefsId + orientation + "-Y", y);
+    sPrefsEditor.putFloat(getXKey(sharedPrefsId, controller, orientation), x);
+    sPrefsEditor.putFloat(getYKey(sharedPrefsId, controller, orientation), y);
     sPrefsEditor.apply();
   }
 
+  private static String getKey(int sharedPrefsId, int controller, String orientation, String suffix)
+  {
+    if (controller == 2 && WIIMOTE_H_BUTTONS.contains(sharedPrefsId))
+    {
+      return sharedPrefsId + "_H" + orientation + suffix;
+    }
+    else if (controller == 1 && WIIMOTE_O_BUTTONS.contains(sharedPrefsId))
+    {
+      return sharedPrefsId + "_O" + orientation + suffix;
+    }
+    else
+    {
+      return sharedPrefsId + orientation + suffix;
+    }
+  }
+
+  private static String getXKey(int sharedPrefsId, int controller, String orientation)
+  {
+    return getKey(sharedPrefsId, controller, orientation, "-X");
+  }
+
+  private static String getYKey(int sharedPrefsId, int controller, String orientation)
+  {
+    return getKey(sharedPrefsId, controller, orientation, "-Y");
+  }
+
   /**
    * Initializes an InputOverlayDrawableButton, given by resId, with all of the
    * parameters set for it to be properly shown on the InputOverlay.
@@ -903,27 +932,8 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
 
     // The X and Y coordinates of the InputOverlayDrawableButton on the InputOverlay.
     // These were set in the input overlay configuration menu.
-    String xKey;
-    String yKey;
-
-    if (controller == 2 && WIIMOTE_H_BUTTONS.contains(buttonId))
-    {
-      xKey = buttonId + "_H" + orientation + "-X";
-      yKey = buttonId + "_H" + orientation + "-Y";
-    }
-    else if (controller == 1 && WIIMOTE_O_BUTTONS.contains(buttonId))
-    {
-      xKey = buttonId + "_O" + orientation + "-X";
-      yKey = buttonId + "_O" + orientation + "-Y";
-    }
-    else
-    {
-      xKey = buttonId + orientation + "-X";
-      yKey = buttonId + orientation + "-Y";
-    }
-
-    int drawableX = (int) sPrefs.getFloat(xKey, 0f);
-    int drawableY = (int) sPrefs.getFloat(yKey, 0f);
+    int drawableX = (int) sPrefs.getFloat(getXKey(buttonId, controller, orientation), 0f);
+    int drawableY = (int) sPrefs.getFloat(getYKey(buttonId, controller, orientation), 0f);
 
     int width = overlayDrawable.getWidth();
     int height = overlayDrawable.getHeight();
@@ -1006,26 +1016,8 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
 
     // The X and Y coordinates of the InputOverlayDrawableDpad on the InputOverlay.
     // These were set in the input overlay configuration menu.
-    String xKey;
-    String yKey;
-
-    if (controller == 2 && WIIMOTE_H_BUTTONS.contains(buttonUp))
-    {
-      xKey = buttonUp + "_H" + orientation + "-X";
-      yKey = buttonUp + "_H" + orientation + "-Y";
-    }
-    else if (controller == 1 && WIIMOTE_O_BUTTONS.contains(buttonUp))
-    {
-      xKey = buttonUp + "_O" + orientation + "-X";
-      yKey = buttonUp + "_O" + orientation + "-Y";
-    }
-    else
-    {
-      xKey = buttonUp + orientation + "-X";
-      yKey = buttonUp + orientation + "-Y";
-    }
-    int drawableX = (int) sPrefs.getFloat(xKey, 0f);
-    int drawableY = (int) sPrefs.getFloat(yKey, 0f);
+    int drawableX = (int) sPrefs.getFloat(getXKey(buttonUp, controller, orientation), 0f);
+    int drawableY = (int) sPrefs.getFloat(getYKey(buttonUp, controller, orientation), 0f);
 
     int width = overlayDrawable.getWidth();
     int height = overlayDrawable.getHeight();
@@ -1058,6 +1050,7 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
 
     // SharedPreference to retrieve the X and Y coordinates for the InputOverlayDrawableJoystick.
     final SharedPreferences sPrefs = PreferenceManager.getDefaultSharedPreferences(context);
+    int controller = sPrefs.getInt("wiiController", 3);
 
     // Decide scale based on user preference
     float scale = 0.275f;
@@ -1072,8 +1065,8 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
 
     // The X and Y coordinates of the InputOverlayDrawableButton on the InputOverlay.
     // These were set in the input overlay configuration menu.
-    int drawableX = (int) sPrefs.getFloat(joystick + orientation + "-X", 0f);
-    int drawableY = (int) sPrefs.getFloat(joystick + orientation + "-Y", 0f);
+    int drawableX = (int) sPrefs.getFloat(getXKey(joystick, controller, orientation), 0f);
+    int drawableY = (int) sPrefs.getFloat(getYKey(joystick, controller, orientation), 0f);
 
     // Decide inner scale based on joystick ID
     float innerScale;