author: german77 <juangerman-13@hotmail.com> 2023-03-04 19:29:19 +0100
committer: bunnei <bunneidev@gmail.com> 2023-06-03 09:05:34 +0200
commit: 7dd02363a3e05be1a9df7e26de70528facbf0604 (patch)
tree: abaa2f3d467e6e54ae50622d68031b2e06079d83 /src/android
parent: android: Enable Kotlin support (diff)
download: yuzu-7dd02363a3e05be1a9df7e26de70528facbf0604.tar
yuzu-7dd02363a3e05be1a9df7e26de70528facbf0604.tar.gz
yuzu-7dd02363a3e05be1a9df7e26de70528facbf0604.tar.bz2
yuzu-7dd02363a3e05be1a9df7e26de70528facbf0604.tar.lz
yuzu-7dd02363a3e05be1a9df7e26de70528facbf0604.tar.xz
yuzu-7dd02363a3e05be1a9df7e26de70528facbf0604.tar.zst
yuzu-7dd02363a3e05be1a9df7e26de70528facbf0604.zip
149 files changed, 613 insertions, 71 deletions
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.java b/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.java
index 881c6de91..76c437cb9 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.java
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.java
@@ -15,7 +15,9 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.Rect;
+import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
+import android.graphics.drawable.VectorDrawable;
 import android.hardware.Sensor;
 import android.hardware.SensorEvent;
 import android.hardware.SensorEventListener;
@@ -29,6 +31,8 @@ import android.view.SurfaceView;
 import android.view.View;
 import android.view.View.OnTouchListener;
 
+import androidx.core.content.ContextCompat;
+
 import org.yuzu.yuzu_emu.NativeLibrary;
 import org.yuzu.yuzu_emu.NativeLibrary.ButtonType;
 import org.yuzu.yuzu_emu.NativeLibrary.StickType;
@@ -103,21 +107,28 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener,
     /**
      * Resizes a {@link Bitmap} by a given scale factor
      *
-     * @param context The current {@link Context}
-     * @param bitmap  The {@link Bitmap} to scale.
-     * @param scale   The scale factor for the bitmap.
+     * @param vectorDrawable The {@link Bitmap} to scale.
+     * @param scale          The scale factor for the bitmap.
      * @return The scaled {@link Bitmap}
      */
-    public static Bitmap resizeBitmap(Context context, Bitmap bitmap, float scale) {
-        // Determine the button size based on the smaller screen dimension.
-        // This makes sure the buttons are the same size in both portrait and landscape.
-        DisplayMetrics dm = context.getResources().getDisplayMetrics();
-        int minDimension = Math.min(dm.widthPixels, dm.heightPixels);
-
-        return Bitmap.createScaledBitmap(bitmap,
-                (int) (minDimension * scale),
-                (int) (minDimension * scale),
-                true);
+    private static Bitmap getBitmap(VectorDrawable vectorDrawable, float scale) {
+        Bitmap bitmap = Bitmap.createBitmap((int) (vectorDrawable.getIntrinsicWidth() * scale),
+                (int) (vectorDrawable.getIntrinsicHeight() * scale), Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(bitmap);
+        vectorDrawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
+        vectorDrawable.draw(canvas);
+        return bitmap;
+    }
+
+    private static Bitmap getBitmap(Context context, int drawableId, float scale) {
+        Drawable drawable = ContextCompat.getDrawable(context, drawableId);
+        if (drawable instanceof BitmapDrawable) {
+            return BitmapFactory.decodeResource(context.getResources(), drawableId);
+        } else if (drawable instanceof VectorDrawable) {
+            return getBitmap((VectorDrawable) drawable, scale);
+        } else {
+            throw new IllegalArgumentException("unsupported drawable type");
+        }
     }
 
     /**
@@ -166,16 +177,16 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener,
             case ButtonType.BUTTON_CAPTURE:
             case ButtonType.BUTTON_PLUS:
             case ButtonType.BUTTON_MINUS:
-                scale = 0.08f;
+                scale = 0.35f;
                 break;
             case ButtonType.TRIGGER_L:
             case ButtonType.TRIGGER_R:
             case ButtonType.TRIGGER_ZL:
             case ButtonType.TRIGGER_ZR:
-                scale = 0.18f;
+                scale = 0.38f;
                 break;
             default:
-                scale = 0.11f;
+                scale = 0.40f;
                 break;
         }
 
@@ -183,10 +194,8 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener,
         scale /= 100;
 
         // Initialize the InputOverlayDrawableButton.
-        final Bitmap defaultStateBitmap =
-                resizeBitmap(context, BitmapFactory.decodeResource(res, defaultResId), scale);
-        final Bitmap pressedStateBitmap =
-                resizeBitmap(context, BitmapFactory.decodeResource(res, pressedResId), scale);
+        final Bitmap defaultStateBitmap = getBitmap(context, defaultResId, scale);
+        final Bitmap pressedStateBitmap = getBitmap(context, pressedResId, scale);
         final InputOverlayDrawableButton overlayDrawable =
                 new InputOverlayDrawableButton(res, defaultStateBitmap, pressedStateBitmap, buttonId);
 
@@ -243,20 +252,17 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener,
         final SharedPreferences sPrefs = PreferenceManager.getDefaultSharedPreferences(context);
 
         // Decide scale based on button ID and user preference
-        float scale = 0.23f;
+        float scale = 0.40f;
 
         scale *= (sPrefs.getInt("controlScale", 50) + 50);
         scale /= 100;
 
         // Initialize the InputOverlayDrawableDpad.
-        final Bitmap defaultStateBitmap =
-                resizeBitmap(context, BitmapFactory.decodeResource(res, defaultResId), scale);
-        final Bitmap pressedOneDirectionStateBitmap =
-                resizeBitmap(context, BitmapFactory.decodeResource(res, pressedOneDirectionResId),
-                        scale);
-        final Bitmap pressedTwoDirectionsStateBitmap =
-                resizeBitmap(context, BitmapFactory.decodeResource(res, pressedTwoDirectionsResId),
-                        scale);
+        final Bitmap defaultStateBitmap = getBitmap(context, defaultResId, scale);
+        final Bitmap pressedOneDirectionStateBitmap = getBitmap(context, pressedOneDirectionResId,
+                scale);
+        final Bitmap pressedTwoDirectionsStateBitmap = getBitmap(context, pressedTwoDirectionsResId,
+                scale);
         final InputOverlayDrawableDpad overlayDrawable =
                 new InputOverlayDrawableDpad(res, defaultStateBitmap,
                         pressedOneDirectionStateBitmap, pressedTwoDirectionsStateBitmap,
@@ -300,15 +306,14 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener,
         final SharedPreferences sPrefs = PreferenceManager.getDefaultSharedPreferences(context);
 
         // Decide scale based on user preference
-        float scale = 0.275f;
+        float scale = 0.35f;
         scale *= (sPrefs.getInt("controlScale", 50) + 50);
         scale /= 100;
 
         // Initialize the InputOverlayDrawableJoystick.
-        final Bitmap bitmapOuter =
-                resizeBitmap(context, BitmapFactory.decodeResource(res, resOuter), scale);
-        final Bitmap bitmapInnerDefault = BitmapFactory.decodeResource(res, defaultResInner);
-        final Bitmap bitmapInnerPressed = BitmapFactory.decodeResource(res, pressedResInner);
+        final Bitmap bitmapOuter = getBitmap(context, resOuter, scale);
+        final Bitmap bitmapInnerDefault = getBitmap(context, defaultResInner, 1.0f);
+        final Bitmap bitmapInnerPressed = getBitmap(context, pressedResInner, 1.0f);
 
         // The X and Y coordinates of the InputOverlayDrawableButton on the InputOverlay.
         // These were set in the input overlay configuration menu.
@@ -320,7 +325,7 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener,
         // Now set the bounds for the InputOverlayDrawableJoystick.
         // This will dictate where on the screen (and the what the size) the InputOverlayDrawableJoystick will be.
         int outerSize = bitmapOuter.getWidth();
-        Rect outerRect = new Rect(drawableX, drawableY, drawableX + (int) (outerSize / outerScale), drawableY + (int) (outerSize / outerScale));
+        Rect outerRect = new Rect(drawableX, drawableY, drawableX + outerSize, drawableY + outerSize);
         Rect innerRect = new Rect(0, 0, (int) (outerSize / outerScale), (int) (outerSize / outerScale));
 
         // Send the drawableId to the joystick so it can be referenced when saving control position.
@@ -476,68 +481,68 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener,
 
     private void addOverlayControls(String orientation) {
         if (mPreferences.getBoolean("buttonToggle0", true)) {
-            overlayButtons.add(initializeOverlayButton(getContext(), R.drawable.button_a,
-                    R.drawable.button_a_pressed, ButtonType.BUTTON_A, orientation));
+            overlayButtons.add(initializeOverlayButton(getContext(), R.drawable.facebutton_a,
+                    R.drawable.facebutton_a_depressed, ButtonType.BUTTON_A, orientation));
         }
         if (mPreferences.getBoolean("buttonToggle1", true)) {
-            overlayButtons.add(initializeOverlayButton(getContext(), R.drawable.button_b,
-                    R.drawable.button_b_pressed, ButtonType.BUTTON_B, orientation));
+            overlayButtons.add(initializeOverlayButton(getContext(), R.drawable.facebutton_b,
+                    R.drawable.facebutton_b_depressed, ButtonType.BUTTON_B, orientation));
         }
         if (mPreferences.getBoolean("buttonToggle2", true)) {
-            overlayButtons.add(initializeOverlayButton(getContext(), R.drawable.button_x,
-                    R.drawable.button_x_pressed, ButtonType.BUTTON_X, orientation));
+            overlayButtons.add(initializeOverlayButton(getContext(), R.drawable.facebutton_x,
+                    R.drawable.facebutton_x_depressed, ButtonType.BUTTON_X, orientation));
         }
         if (mPreferences.getBoolean("buttonToggle3", true)) {
-            overlayButtons.add(initializeOverlayButton(getContext(), R.drawable.button_y,
-                    R.drawable.button_y_pressed, ButtonType.BUTTON_Y, orientation));
+            overlayButtons.add(initializeOverlayButton(getContext(), R.drawable.facebutton_y,
+                    R.drawable.facebutton_y_depressed, ButtonType.BUTTON_Y, orientation));
         }
         if (mPreferences.getBoolean("buttonToggle4", true)) {
-            overlayButtons.add(initializeOverlayButton(getContext(), R.drawable.button_l,
-                    R.drawable.button_l_pressed, ButtonType.TRIGGER_L, orientation));
+            overlayButtons.add(initializeOverlayButton(getContext(), R.drawable.l_shoulder,
+                    R.drawable.l_shoulder_depressed, ButtonType.TRIGGER_L, orientation));
         }
         if (mPreferences.getBoolean("buttonToggle5", true)) {
-            overlayButtons.add(initializeOverlayButton(getContext(), R.drawable.button_r,
-                    R.drawable.button_r_pressed, ButtonType.TRIGGER_R, orientation));
+            overlayButtons.add(initializeOverlayButton(getContext(), R.drawable.r_shoulder,
+                    R.drawable.r_shoulder_depressed, ButtonType.TRIGGER_R, orientation));
         }
         if (mPreferences.getBoolean("buttonToggle6", true)) {
-            overlayButtons.add(initializeOverlayButton(getContext(), R.drawable.button_zl,
-                    R.drawable.button_zl_pressed, ButtonType.TRIGGER_ZL, orientation));
+            overlayButtons.add(initializeOverlayButton(getContext(), R.drawable.zl_trigger,
+                    R.drawable.zl_trigger_depressed, ButtonType.TRIGGER_ZL, orientation));
         }
         if (mPreferences.getBoolean("buttonToggle7", true)) {
-            overlayButtons.add(initializeOverlayButton(getContext(), R.drawable.button_zr,
-                    R.drawable.button_zr_pressed, ButtonType.TRIGGER_ZR, orientation));
+            overlayButtons.add(initializeOverlayButton(getContext(), R.drawable.zr_trigger,
+                    R.drawable.zr_trigger_depressed, ButtonType.TRIGGER_ZR, orientation));
         }
         if (mPreferences.getBoolean("buttonToggle8", true)) {
-            overlayButtons.add(initializeOverlayButton(getContext(), R.drawable.button_start,
-                    R.drawable.button_start_pressed, ButtonType.BUTTON_PLUS, orientation));
+            overlayButtons.add(initializeOverlayButton(getContext(), R.drawable.facebutton_plus,
+                    R.drawable.facebutton_plus_depressed, ButtonType.BUTTON_PLUS, orientation));
         }
         if (mPreferences.getBoolean("buttonToggle9", true)) {
-            overlayButtons.add(initializeOverlayButton(getContext(), R.drawable.button_select,
-                    R.drawable.button_select_pressed, ButtonType.BUTTON_MINUS, orientation));
+            overlayButtons.add(initializeOverlayButton(getContext(), R.drawable.facebutton_minus,
+                    R.drawable.facebutton_minus_depressed, ButtonType.BUTTON_MINUS, orientation));
         }
         if (mPreferences.getBoolean("buttonToggle10", true)) {
-            overlayDpads.add(initializeOverlayDpad(getContext(), R.drawable.dpad,
-                    R.drawable.dpad_pressed_one_direction,
-                    R.drawable.dpad_pressed_two_directions,
+            overlayDpads.add(initializeOverlayDpad(getContext(), R.drawable.dpad_standard,
+                    R.drawable.dpad_standard_cardinal_depressed,
+                    R.drawable.dpad_standard_diagonal_depressed,
                     ButtonType.DPAD_UP, ButtonType.DPAD_DOWN,
                     ButtonType.DPAD_LEFT, ButtonType.DPAD_RIGHT, orientation));
         }
         if (mPreferences.getBoolean("buttonToggle11", true)) {
-            overlayJoysticks.add(initializeOverlayJoystick(getContext(), R.drawable.stick_main_range,
-                    R.drawable.stick_main, R.drawable.stick_main_pressed,
+            overlayJoysticks.add(initializeOverlayJoystick(getContext(), R.drawable.joystick_range,
+                    R.drawable.joystick, R.drawable.joystick_depressed,
                     StickType.STICK_L, ButtonType.STICK_L, orientation));
         }
         if (mPreferences.getBoolean("buttonToggle12", true)) {
-            overlayJoysticks.add(initializeOverlayJoystick(getContext(), R.drawable.stick_main_range,
-                    R.drawable.stick_main, R.drawable.stick_main_pressed, StickType.STICK_R, ButtonType.STICK_R, orientation));
+            overlayJoysticks.add(initializeOverlayJoystick(getContext(), R.drawable.joystick_range,
+                    R.drawable.joystick, R.drawable.joystick_depressed, StickType.STICK_R, ButtonType.STICK_R, orientation));
         }
         if (mPreferences.getBoolean("buttonToggle13", true)) {
-            overlayButtons.add(initializeOverlayButton(getContext(), R.drawable.button_a,
-                    R.drawable.button_a, ButtonType.BUTTON_HOME, orientation));
+            overlayButtons.add(initializeOverlayButton(getContext(), R.drawable.facebutton_home,
+                    R.drawable.facebutton_home_depressed, ButtonType.BUTTON_HOME, orientation));
         }
         if (mPreferences.getBoolean("buttonToggle14", true)) {
-            overlayButtons.add(initializeOverlayButton(getContext(), R.drawable.button_a,
-                    R.drawable.button_a, ButtonType.BUTTON_CAPTURE, orientation));
+            overlayButtons.add(initializeOverlayButton(getContext(), R.drawable.facebutton_screenshot,
+                    R.drawable.facebutton_screenshot_depressed, ButtonType.BUTTON_CAPTURE, orientation));
         }
     }
 
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlayDrawableDpad.java b/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlayDrawableDpad.java
index d8ee6895b..aa3653e09 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlayDrawableDpad.java
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlayDrawableDpad.java
@@ -178,7 +178,7 @@ public final class InputOverlayDrawableDpad {
         // Pressed up right
         if (mUpButtonState && !mLeftButtonState && mRightButtonState) {
             canvas.save();
-            canvas.rotate(180, px, py);
+            canvas.rotate(90, px, py);
             mPressedTwoDirectionsStateBitmap.draw(canvas);
             canvas.restore();
             return;
diff --git a/src/android/app/src/main/res/drawable-hdpi/button_a.png b/src/android/app/src/main/res/drawable-hdpi/button_a.png
deleted file mode 100644
index f96a2061e..000000000
--- a/src/android/app/src/main/res/drawable-hdpi/button_a.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-hdpi/button_a_pressed.png b/src/android/app/src/main/res/drawable-hdpi/button_a_pressed.png
deleted file mode 100644
index 785a258ee..000000000
--- a/src/android/app/src/main/res/drawable-hdpi/button_a_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-hdpi/button_b.png b/src/android/app/src/main/res/drawable-hdpi/button_b.png
deleted file mode 100644
index b15d2b549..000000000
--- a/src/android/app/src/main/res/drawable-hdpi/button_b.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-hdpi/button_b_pressed.png b/src/android/app/src/main/res/drawable-hdpi/button_b_pressed.png
deleted file mode 100644
index b11d5fcee..000000000
--- a/src/android/app/src/main/res/drawable-hdpi/button_b_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-hdpi/button_l.png b/src/android/app/src/main/res/drawable-hdpi/button_l.png
deleted file mode 100644
index e19469a7b..000000000
--- a/src/android/app/src/main/res/drawable-hdpi/button_l.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-hdpi/button_l_pressed.png b/src/android/app/src/main/res/drawable-hdpi/button_l_pressed.png
deleted file mode 100644
index 280857f64..000000000
--- a/src/android/app/src/main/res/drawable-hdpi/button_l_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-hdpi/button_r.png b/src/android/app/src/main/res/drawable-hdpi/button_r.png
deleted file mode 100644
index f72cdc1dc..000000000
--- a/src/android/app/src/main/res/drawable-hdpi/button_r.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-hdpi/button_r_pressed.png b/src/android/app/src/main/res/drawable-hdpi/button_r_pressed.png
deleted file mode 100644
index c47d34253..000000000
--- a/src/android/app/src/main/res/drawable-hdpi/button_r_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-hdpi/button_select.png b/src/android/app/src/main/res/drawable-hdpi/button_select.png
deleted file mode 100644
index 6961b88d2..000000000
--- a/src/android/app/src/main/res/drawable-hdpi/button_select.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-hdpi/button_select_pressed.png b/src/android/app/src/main/res/drawable-hdpi/button_select_pressed.png
deleted file mode 100644
index 8ee471419..000000000
--- a/src/android/app/src/main/res/drawable-hdpi/button_select_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-hdpi/button_start.png b/src/android/app/src/main/res/drawable-hdpi/button_start.png
deleted file mode 100644
index 72856cf47..000000000
--- a/src/android/app/src/main/res/drawable-hdpi/button_start.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-hdpi/button_start_pressed.png b/src/android/app/src/main/res/drawable-hdpi/button_start_pressed.png
deleted file mode 100644
index f96cd3359..000000000
--- a/src/android/app/src/main/res/drawable-hdpi/button_start_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-hdpi/button_x.png b/src/android/app/src/main/res/drawable-hdpi/button_x.png
deleted file mode 100644
index 1a0fd1924..000000000
--- a/src/android/app/src/main/res/drawable-hdpi/button_x.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-hdpi/button_x_pressed.png b/src/android/app/src/main/res/drawable-hdpi/button_x_pressed.png
deleted file mode 100644
index 089cb3af1..000000000
--- a/src/android/app/src/main/res/drawable-hdpi/button_x_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-hdpi/button_y.png b/src/android/app/src/main/res/drawable-hdpi/button_y.png
deleted file mode 100644
index bc22680c4..000000000
--- a/src/android/app/src/main/res/drawable-hdpi/button_y.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-hdpi/button_y_pressed.png b/src/android/app/src/main/res/drawable-hdpi/button_y_pressed.png
deleted file mode 100644
index 6e9e89ec9..000000000
--- a/src/android/app/src/main/res/drawable-hdpi/button_y_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-hdpi/button_zl.png b/src/android/app/src/main/res/drawable-hdpi/button_zl.png
deleted file mode 100644
index dd5d4d5b3..000000000
--- a/src/android/app/src/main/res/drawable-hdpi/button_zl.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-hdpi/button_zl_pressed.png b/src/android/app/src/main/res/drawable-hdpi/button_zl_pressed.png
deleted file mode 100644
index 8cd395f3b..000000000
--- a/src/android/app/src/main/res/drawable-hdpi/button_zl_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-hdpi/button_zr.png b/src/android/app/src/main/res/drawable-hdpi/button_zr.png
deleted file mode 100644
index 728fcf4d1..000000000
--- a/src/android/app/src/main/res/drawable-hdpi/button_zr.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-hdpi/button_zr_pressed.png b/src/android/app/src/main/res/drawable-hdpi/button_zr_pressed.png
deleted file mode 100644
index 121877610..000000000
--- a/src/android/app/src/main/res/drawable-hdpi/button_zr_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-hdpi/dpad.png b/src/android/app/src/main/res/drawable-hdpi/dpad.png
deleted file mode 100644
index 921b3902d..000000000
--- a/src/android/app/src/main/res/drawable-hdpi/dpad.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-hdpi/dpad_pressed_one_direction.png b/src/android/app/src/main/res/drawable-hdpi/dpad_pressed_one_direction.png
deleted file mode 100644
index a8ffbb48a..000000000
--- a/src/android/app/src/main/res/drawable-hdpi/dpad_pressed_one_direction.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-hdpi/dpad_pressed_two_directions.png b/src/android/app/src/main/res/drawable-hdpi/dpad_pressed_two_directions.png
deleted file mode 100644
index ceb994a6d..000000000
--- a/src/android/app/src/main/res/drawable-hdpi/dpad_pressed_two_directions.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-hdpi/stick_c.png b/src/android/app/src/main/res/drawable-hdpi/stick_c.png
deleted file mode 100644
index d4c1d6c97..000000000
--- a/src/android/app/src/main/res/drawable-hdpi/stick_c.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-hdpi/stick_c_pressed.png b/src/android/app/src/main/res/drawable-hdpi/stick_c_pressed.png
deleted file mode 100644
index c8d14c029..000000000
--- a/src/android/app/src/main/res/drawable-hdpi/stick_c_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-hdpi/stick_c_range.png b/src/android/app/src/main/res/drawable-hdpi/stick_c_range.png
deleted file mode 100644
index 8263d4b8d..000000000
--- a/src/android/app/src/main/res/drawable-hdpi/stick_c_range.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-hdpi/stick_main.png b/src/android/app/src/main/res/drawable-hdpi/stick_main.png
deleted file mode 100644
index ae6d025a5..000000000
--- a/src/android/app/src/main/res/drawable-hdpi/stick_main.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-hdpi/stick_main_pressed.png b/src/android/app/src/main/res/drawable-hdpi/stick_main_pressed.png
deleted file mode 100644
index ca469c6a7..000000000
--- a/src/android/app/src/main/res/drawable-hdpi/stick_main_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-hdpi/stick_main_range.png b/src/android/app/src/main/res/drawable-hdpi/stick_main_range.png
deleted file mode 100644
index 9b5445edc..000000000
--- a/src/android/app/src/main/res/drawable-hdpi/stick_main_range.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xhdpi/button_a.png b/src/android/app/src/main/res/drawable-xhdpi/button_a.png
deleted file mode 100644
index 4e20f2b0e..000000000
--- a/src/android/app/src/main/res/drawable-xhdpi/button_a.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xhdpi/button_a_pressed.png b/src/android/app/src/main/res/drawable-xhdpi/button_a_pressed.png
deleted file mode 100644
index f18edd07e..000000000
--- a/src/android/app/src/main/res/drawable-xhdpi/button_a_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xhdpi/button_b.png b/src/android/app/src/main/res/drawable-xhdpi/button_b.png
deleted file mode 100644
index deb83a09d..000000000
--- a/src/android/app/src/main/res/drawable-xhdpi/button_b.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xhdpi/button_b_pressed.png b/src/android/app/src/main/res/drawable-xhdpi/button_b_pressed.png
deleted file mode 100644
index f583be028..000000000
--- a/src/android/app/src/main/res/drawable-xhdpi/button_b_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xhdpi/button_l.png b/src/android/app/src/main/res/drawable-xhdpi/button_l.png
deleted file mode 100644
index d24039fbf..000000000
--- a/src/android/app/src/main/res/drawable-xhdpi/button_l.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xhdpi/button_l_pressed.png b/src/android/app/src/main/res/drawable-xhdpi/button_l_pressed.png
deleted file mode 100644
index 378ac8751..000000000
--- a/src/android/app/src/main/res/drawable-xhdpi/button_l_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xhdpi/button_r.png b/src/android/app/src/main/res/drawable-xhdpi/button_r.png
deleted file mode 100644
index 7b01c043e..000000000
--- a/src/android/app/src/main/res/drawable-xhdpi/button_r.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xhdpi/button_r_pressed.png b/src/android/app/src/main/res/drawable-xhdpi/button_r_pressed.png
deleted file mode 100644
index 9b3e3e75a..000000000
--- a/src/android/app/src/main/res/drawable-xhdpi/button_r_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xhdpi/button_select.png b/src/android/app/src/main/res/drawable-xhdpi/button_select.png
deleted file mode 100644
index 57abf5666..000000000
--- a/src/android/app/src/main/res/drawable-xhdpi/button_select.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xhdpi/button_select_pressed.png b/src/android/app/src/main/res/drawable-xhdpi/button_select_pressed.png
deleted file mode 100644
index 29eda72af..000000000
--- a/src/android/app/src/main/res/drawable-xhdpi/button_select_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xhdpi/button_start.png b/src/android/app/src/main/res/drawable-xhdpi/button_start.png
deleted file mode 100644
index f9cf0d667..000000000
--- a/src/android/app/src/main/res/drawable-xhdpi/button_start.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xhdpi/button_start_pressed.png b/src/android/app/src/main/res/drawable-xhdpi/button_start_pressed.png
deleted file mode 100644
index 4d690fa7e..000000000
--- a/src/android/app/src/main/res/drawable-xhdpi/button_start_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xhdpi/button_x.png b/src/android/app/src/main/res/drawable-xhdpi/button_x.png
deleted file mode 100644
index 93a2ee997..000000000
--- a/src/android/app/src/main/res/drawable-xhdpi/button_x.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xhdpi/button_x_pressed.png b/src/android/app/src/main/res/drawable-xhdpi/button_x_pressed.png
deleted file mode 100644
index 6bbd39646..000000000
--- a/src/android/app/src/main/res/drawable-xhdpi/button_x_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xhdpi/button_y.png b/src/android/app/src/main/res/drawable-xhdpi/button_y.png
deleted file mode 100644
index d979e98e0..000000000
--- a/src/android/app/src/main/res/drawable-xhdpi/button_y.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xhdpi/button_y_pressed.png b/src/android/app/src/main/res/drawable-xhdpi/button_y_pressed.png
deleted file mode 100644
index a6c9bdb54..000000000
--- a/src/android/app/src/main/res/drawable-xhdpi/button_y_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xhdpi/button_zl.png b/src/android/app/src/main/res/drawable-xhdpi/button_zl.png
deleted file mode 100644
index f94474fea..000000000
--- a/src/android/app/src/main/res/drawable-xhdpi/button_zl.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xhdpi/button_zl_pressed.png b/src/android/app/src/main/res/drawable-xhdpi/button_zl_pressed.png
deleted file mode 100644
index 8f7d5ab7a..000000000
--- a/src/android/app/src/main/res/drawable-xhdpi/button_zl_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xhdpi/button_zr.png b/src/android/app/src/main/res/drawable-xhdpi/button_zr.png
deleted file mode 100644
index a76658351..000000000
--- a/src/android/app/src/main/res/drawable-xhdpi/button_zr.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xhdpi/button_zr_pressed.png b/src/android/app/src/main/res/drawable-xhdpi/button_zr_pressed.png
deleted file mode 100644
index bbe4e64ce..000000000
--- a/src/android/app/src/main/res/drawable-xhdpi/button_zr_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xhdpi/dpad.png b/src/android/app/src/main/res/drawable-xhdpi/dpad.png
deleted file mode 100644
index 94ae84405..000000000
--- a/src/android/app/src/main/res/drawable-xhdpi/dpad.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xhdpi/dpad_pressed_one_direction.png b/src/android/app/src/main/res/drawable-xhdpi/dpad_pressed_one_direction.png
deleted file mode 100644
index d6ccb2c4f..000000000
--- a/src/android/app/src/main/res/drawable-xhdpi/dpad_pressed_one_direction.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xhdpi/dpad_pressed_two_directions.png b/src/android/app/src/main/res/drawable-xhdpi/dpad_pressed_two_directions.png
deleted file mode 100644
index 2bba7749e..000000000
--- a/src/android/app/src/main/res/drawable-xhdpi/dpad_pressed_two_directions.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xhdpi/stick_c.png b/src/android/app/src/main/res/drawable-xhdpi/stick_c.png
deleted file mode 100644
index 7819f220a..000000000
--- a/src/android/app/src/main/res/drawable-xhdpi/stick_c.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xhdpi/stick_c_pressed.png b/src/android/app/src/main/res/drawable-xhdpi/stick_c_pressed.png
deleted file mode 100644
index a111c2ac7..000000000
--- a/src/android/app/src/main/res/drawable-xhdpi/stick_c_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xhdpi/stick_c_range.png b/src/android/app/src/main/res/drawable-xhdpi/stick_c_range.png
deleted file mode 100644
index 774c54292..000000000
--- a/src/android/app/src/main/res/drawable-xhdpi/stick_c_range.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xhdpi/stick_main.png b/src/android/app/src/main/res/drawable-xhdpi/stick_main.png
deleted file mode 100644
index 3f80cdf6c..000000000
--- a/src/android/app/src/main/res/drawable-xhdpi/stick_main.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xhdpi/stick_main_pressed.png b/src/android/app/src/main/res/drawable-xhdpi/stick_main_pressed.png
deleted file mode 100644
index 2a7675ef7..000000000
--- a/src/android/app/src/main/res/drawable-xhdpi/stick_main_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xhdpi/stick_main_range.png b/src/android/app/src/main/res/drawable-xhdpi/stick_main_range.png
deleted file mode 100644
index ca1672caf..000000000
--- a/src/android/app/src/main/res/drawable-xhdpi/stick_main_range.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxhdpi/button_a.png b/src/android/app/src/main/res/drawable-xxhdpi/button_a.png
deleted file mode 100644
index 999b4c01e..000000000
--- a/src/android/app/src/main/res/drawable-xxhdpi/button_a.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxhdpi/button_a_pressed.png b/src/android/app/src/main/res/drawable-xxhdpi/button_a_pressed.png
deleted file mode 100644
index bb4de9bd9..000000000
--- a/src/android/app/src/main/res/drawable-xxhdpi/button_a_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxhdpi/button_b.png b/src/android/app/src/main/res/drawable-xxhdpi/button_b.png
deleted file mode 100644
index 8ed042e7e..000000000
--- a/src/android/app/src/main/res/drawable-xxhdpi/button_b.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxhdpi/button_b_pressed.png b/src/android/app/src/main/res/drawable-xxhdpi/button_b_pressed.png
deleted file mode 100644
index 86f5d535e..000000000
--- a/src/android/app/src/main/res/drawable-xxhdpi/button_b_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxhdpi/button_l.png b/src/android/app/src/main/res/drawable-xxhdpi/button_l.png
deleted file mode 100644
index 9572c66f8..000000000
--- a/src/android/app/src/main/res/drawable-xxhdpi/button_l.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxhdpi/button_l_pressed.png b/src/android/app/src/main/res/drawable-xxhdpi/button_l_pressed.png
deleted file mode 100644
index 64bedc326..000000000
--- a/src/android/app/src/main/res/drawable-xxhdpi/button_l_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxhdpi/button_r.png b/src/android/app/src/main/res/drawable-xxhdpi/button_r.png
deleted file mode 100644
index abbcadede..000000000
--- a/src/android/app/src/main/res/drawable-xxhdpi/button_r.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxhdpi/button_r_pressed.png b/src/android/app/src/main/res/drawable-xxhdpi/button_r_pressed.png
deleted file mode 100644
index 07421767f..000000000
--- a/src/android/app/src/main/res/drawable-xxhdpi/button_r_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxhdpi/button_select.png b/src/android/app/src/main/res/drawable-xxhdpi/button_select.png
deleted file mode 100644
index 42c3b7c43..000000000
--- a/src/android/app/src/main/res/drawable-xxhdpi/button_select.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxhdpi/button_select_pressed.png b/src/android/app/src/main/res/drawable-xxhdpi/button_select_pressed.png
deleted file mode 100644
index 0d1e56f6a..000000000
--- a/src/android/app/src/main/res/drawable-xxhdpi/button_select_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxhdpi/button_start.png b/src/android/app/src/main/res/drawable-xxhdpi/button_start.png
deleted file mode 100644
index 4e9585bb4..000000000
--- a/src/android/app/src/main/res/drawable-xxhdpi/button_start.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxhdpi/button_start_pressed.png b/src/android/app/src/main/res/drawable-xxhdpi/button_start_pressed.png
deleted file mode 100644
index 8c089e237..000000000
--- a/src/android/app/src/main/res/drawable-xxhdpi/button_start_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxhdpi/button_x.png b/src/android/app/src/main/res/drawable-xxhdpi/button_x.png
deleted file mode 100644
index 0500f964f..000000000
--- a/src/android/app/src/main/res/drawable-xxhdpi/button_x.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxhdpi/button_x_pressed.png b/src/android/app/src/main/res/drawable-xxhdpi/button_x_pressed.png
deleted file mode 100644
index 56db5843d..000000000
--- a/src/android/app/src/main/res/drawable-xxhdpi/button_x_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxhdpi/button_y.png b/src/android/app/src/main/res/drawable-xxhdpi/button_y.png
deleted file mode 100644
index 53c5ca084..000000000
--- a/src/android/app/src/main/res/drawable-xxhdpi/button_y.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxhdpi/button_y_pressed.png b/src/android/app/src/main/res/drawable-xxhdpi/button_y_pressed.png
deleted file mode 100644
index 5d91cbfb0..000000000
--- a/src/android/app/src/main/res/drawable-xxhdpi/button_y_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxhdpi/button_zl.png b/src/android/app/src/main/res/drawable-xxhdpi/button_zl.png
deleted file mode 100644
index f8ce9a0c6..000000000
--- a/src/android/app/src/main/res/drawable-xxhdpi/button_zl.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxhdpi/button_zl_pressed.png b/src/android/app/src/main/res/drawable-xxhdpi/button_zl_pressed.png
deleted file mode 100644
index 981c8b0c8..000000000
--- a/src/android/app/src/main/res/drawable-xxhdpi/button_zl_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxhdpi/button_zr.png b/src/android/app/src/main/res/drawable-xxhdpi/button_zr.png
deleted file mode 100644
index 82065e126..000000000
--- a/src/android/app/src/main/res/drawable-xxhdpi/button_zr.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxhdpi/button_zr_pressed.png b/src/android/app/src/main/res/drawable-xxhdpi/button_zr_pressed.png
deleted file mode 100644
index b30b2e799..000000000
--- a/src/android/app/src/main/res/drawable-xxhdpi/button_zr_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxhdpi/dpad.png b/src/android/app/src/main/res/drawable-xxhdpi/dpad.png
deleted file mode 100644
index 36b7ea183..000000000
--- a/src/android/app/src/main/res/drawable-xxhdpi/dpad.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxhdpi/dpad_pressed_one_direction.png b/src/android/app/src/main/res/drawable-xxhdpi/dpad_pressed_one_direction.png
deleted file mode 100644
index 3715e1c11..000000000
--- a/src/android/app/src/main/res/drawable-xxhdpi/dpad_pressed_one_direction.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxhdpi/dpad_pressed_two_directions.png b/src/android/app/src/main/res/drawable-xxhdpi/dpad_pressed_two_directions.png
deleted file mode 100644
index fb0d7fc5c..000000000
--- a/src/android/app/src/main/res/drawable-xxhdpi/dpad_pressed_two_directions.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxhdpi/stick_c.png b/src/android/app/src/main/res/drawable-xxhdpi/stick_c.png
deleted file mode 100644
index e950c5b15..000000000
--- a/src/android/app/src/main/res/drawable-xxhdpi/stick_c.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxhdpi/stick_c_pressed.png b/src/android/app/src/main/res/drawable-xxhdpi/stick_c_pressed.png
deleted file mode 100644
index 3ac88ed9b..000000000
--- a/src/android/app/src/main/res/drawable-xxhdpi/stick_c_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxhdpi/stick_c_range.png b/src/android/app/src/main/res/drawable-xxhdpi/stick_c_range.png
deleted file mode 100644
index a3491c80f..000000000
--- a/src/android/app/src/main/res/drawable-xxhdpi/stick_c_range.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxhdpi/stick_main.png b/src/android/app/src/main/res/drawable-xxhdpi/stick_main.png
deleted file mode 100644
index 16ca58c0f..000000000
--- a/src/android/app/src/main/res/drawable-xxhdpi/stick_main.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxhdpi/stick_main_pressed.png b/src/android/app/src/main/res/drawable-xxhdpi/stick_main_pressed.png
deleted file mode 100644
index e7fe0c2d5..000000000
--- a/src/android/app/src/main/res/drawable-xxhdpi/stick_main_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxhdpi/stick_main_range.png b/src/android/app/src/main/res/drawable-xxhdpi/stick_main_range.png
deleted file mode 100644
index 8c47b2ba3..000000000
--- a/src/android/app/src/main/res/drawable-xxhdpi/stick_main_range.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxxhdpi/button_a.png b/src/android/app/src/main/res/drawable-xxxhdpi/button_a.png
deleted file mode 100644
index e364fae1e..000000000
--- a/src/android/app/src/main/res/drawable-xxxhdpi/button_a.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxxhdpi/button_a_pressed.png b/src/android/app/src/main/res/drawable-xxxhdpi/button_a_pressed.png
deleted file mode 100644
index 08d65cc99..000000000
--- a/src/android/app/src/main/res/drawable-xxxhdpi/button_a_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxxhdpi/button_b.png b/src/android/app/src/main/res/drawable-xxxhdpi/button_b.png
deleted file mode 100644
index faae9b6f7..000000000
--- a/src/android/app/src/main/res/drawable-xxxhdpi/button_b.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxxhdpi/button_b_pressed.png b/src/android/app/src/main/res/drawable-xxxhdpi/button_b_pressed.png
deleted file mode 100644
index 669780f28..000000000
--- a/src/android/app/src/main/res/drawable-xxxhdpi/button_b_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxxhdpi/button_l.png b/src/android/app/src/main/res/drawable-xxxhdpi/button_l.png
deleted file mode 100644
index 888b147de..000000000
--- a/src/android/app/src/main/res/drawable-xxxhdpi/button_l.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxxhdpi/button_l_pressed.png b/src/android/app/src/main/res/drawable-xxxhdpi/button_l_pressed.png
deleted file mode 100644
index 605493e3e..000000000
--- a/src/android/app/src/main/res/drawable-xxxhdpi/button_l_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxxhdpi/button_r.png b/src/android/app/src/main/res/drawable-xxxhdpi/button_r.png
deleted file mode 100644
index 90a93af8d..000000000
--- a/src/android/app/src/main/res/drawable-xxxhdpi/button_r.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxxhdpi/button_r_pressed.png b/src/android/app/src/main/res/drawable-xxxhdpi/button_r_pressed.png
deleted file mode 100644
index 4500cd2be..000000000
--- a/src/android/app/src/main/res/drawable-xxxhdpi/button_r_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxxhdpi/button_select.png b/src/android/app/src/main/res/drawable-xxxhdpi/button_select.png
deleted file mode 100644
index b18b2fd59..000000000
--- a/src/android/app/src/main/res/drawable-xxxhdpi/button_select.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxxhdpi/button_select_pressed.png b/src/android/app/src/main/res/drawable-xxxhdpi/button_select_pressed.png
deleted file mode 100644
index 53ed400e0..000000000
--- a/src/android/app/src/main/res/drawable-xxxhdpi/button_select_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxxhdpi/button_start.png b/src/android/app/src/main/res/drawable-xxxhdpi/button_start.png
deleted file mode 100644
index c55e56852..000000000
--- a/src/android/app/src/main/res/drawable-xxxhdpi/button_start.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxxhdpi/button_start_pressed.png b/src/android/app/src/main/res/drawable-xxxhdpi/button_start_pressed.png
deleted file mode 100644
index 1507cc365..000000000
--- a/src/android/app/src/main/res/drawable-xxxhdpi/button_start_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxxhdpi/button_x.png b/src/android/app/src/main/res/drawable-xxxhdpi/button_x.png
deleted file mode 100644
index 7ef2b883e..000000000
--- a/src/android/app/src/main/res/drawable-xxxhdpi/button_x.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxxhdpi/button_x_pressed.png b/src/android/app/src/main/res/drawable-xxxhdpi/button_x_pressed.png
deleted file mode 100644
index f3f11ede2..000000000
--- a/src/android/app/src/main/res/drawable-xxxhdpi/button_x_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxxhdpi/button_y.png b/src/android/app/src/main/res/drawable-xxxhdpi/button_y.png
deleted file mode 100644
index 4ce679c69..000000000
--- a/src/android/app/src/main/res/drawable-xxxhdpi/button_y.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxxhdpi/button_y_pressed.png b/src/android/app/src/main/res/drawable-xxxhdpi/button_y_pressed.png
deleted file mode 100644
index 926f5e269..000000000
--- a/src/android/app/src/main/res/drawable-xxxhdpi/button_y_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxxhdpi/button_zl.png b/src/android/app/src/main/res/drawable-xxxhdpi/button_zl.png
deleted file mode 100644
index 7faf8db3b..000000000
--- a/src/android/app/src/main/res/drawable-xxxhdpi/button_zl.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxxhdpi/button_zl_pressed.png b/src/android/app/src/main/res/drawable-xxxhdpi/button_zl_pressed.png
deleted file mode 100644
index cc56a749c..000000000
--- a/src/android/app/src/main/res/drawable-xxxhdpi/button_zl_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxxhdpi/button_zr.png b/src/android/app/src/main/res/drawable-xxxhdpi/button_zr.png
deleted file mode 100644
index ed1b6b683..000000000
--- a/src/android/app/src/main/res/drawable-xxxhdpi/button_zr.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxxhdpi/button_zr_pressed.png b/src/android/app/src/main/res/drawable-xxxhdpi/button_zr_pressed.png
deleted file mode 100644
index 892fa74f1..000000000
--- a/src/android/app/src/main/res/drawable-xxxhdpi/button_zr_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxxhdpi/dpad.png b/src/android/app/src/main/res/drawable-xxxhdpi/dpad.png
deleted file mode 100644
index 6272f39e6..000000000
--- a/src/android/app/src/main/res/drawable-xxxhdpi/dpad.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxxhdpi/dpad_pressed_one_direction.png b/src/android/app/src/main/res/drawable-xxxhdpi/dpad_pressed_one_direction.png
deleted file mode 100644
index 0cccd3a30..000000000
--- a/src/android/app/src/main/res/drawable-xxxhdpi/dpad_pressed_one_direction.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxxhdpi/dpad_pressed_two_directions.png b/src/android/app/src/main/res/drawable-xxxhdpi/dpad_pressed_two_directions.png
deleted file mode 100644
index 18a99ad2d..000000000
--- a/src/android/app/src/main/res/drawable-xxxhdpi/dpad_pressed_two_directions.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxxhdpi/stick_c.png b/src/android/app/src/main/res/drawable-xxxhdpi/stick_c.png
deleted file mode 100644
index 88e09b8a0..000000000
--- a/src/android/app/src/main/res/drawable-xxxhdpi/stick_c.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxxhdpi/stick_c_pressed.png b/src/android/app/src/main/res/drawable-xxxhdpi/stick_c_pressed.png
deleted file mode 100644
index edc920e8e..000000000
--- a/src/android/app/src/main/res/drawable-xxxhdpi/stick_c_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxxhdpi/stick_c_range.png b/src/android/app/src/main/res/drawable-xxxhdpi/stick_c_range.png
deleted file mode 100644
index a8b693494..000000000
--- a/src/android/app/src/main/res/drawable-xxxhdpi/stick_c_range.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxxhdpi/stick_main.png b/src/android/app/src/main/res/drawable-xxxhdpi/stick_main.png
deleted file mode 100644
index d157edca2..000000000
--- a/src/android/app/src/main/res/drawable-xxxhdpi/stick_main.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxxhdpi/stick_main_pressed.png b/src/android/app/src/main/res/drawable-xxxhdpi/stick_main_pressed.png
deleted file mode 100644
index 2ac2440be..000000000
--- a/src/android/app/src/main/res/drawable-xxxhdpi/stick_main_pressed.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable-xxxhdpi/stick_main_range.png b/src/android/app/src/main/res/drawable-xxxhdpi/stick_main_range.png
deleted file mode 100644
index 71e67e02a..000000000
--- a/src/android/app/src/main/res/drawable-xxxhdpi/stick_main_range.png
+++ /dev/null
diff --git a/src/android/app/src/main/res/drawable/dpad_standard.xml b/src/android/app/src/main/res/drawable/dpad_standard.xml
new file mode 100644
index 000000000..28aba657e
--- /dev/null
+++ b/src/android/app/src/main/res/drawable/dpad_standard.xml
@@ -0,0 +1,24 @@
+<vector android:alpha="0.6" android:height="221.78dp"
+    android:viewportHeight="221.78" android:viewportWidth="221.78"
+    android:width="221.78dp"
+    xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="0.75"
+        android:pathData="M221.78,87.07v47.64a11.53,11.53 0,0 1,-11.5 11.5H151.62a5.42,5.42 0,0 0,-5.41 5.41v58.66a11.53,11.53 0,0 1,-11.5 11.5H87.07a11.53,11.53 0,0 1,-11.5 -11.5V151.61a5.41,5.41 0,0 0,-5.41 -5.41H11.5A11.53,11.53 0,0 1,0 134.7V87.05a11.53,11.53 0,0 1,11.5 -11.5H70.16a5.41,5.41 0,0 0,5.41 -5.41V11.5A11.53,11.53 0,0 1,87.07 0h47.64a11.53,11.53 0,0 1,11.5 11.5V70.16a5.41,5.41 0,0 0,5.41 5.41h58.66A11.53,11.53 0,0 1,221.78 87.07Z" android:strokeAlpha="0.75">
+        <aapt:attr name="android:fillColor">
+            <gradient android:centerX="110.89" android:centerY="110.89"
+                android:gradientRadius="110.89" android:type="radial">
+                <item android:color="#FFC3C4C5" android:offset="0.58"/>
+                <item android:color="#FFC6C6C6" android:offset="0.84"/>
+                <item android:color="#FFC7C7C7" android:offset="0.88"/>
+                <item android:color="#FFC2C2C2" android:offset="0.91"/>
+                <item android:color="#FFB5B5B5" android:offset="0.94"/>
+                <item android:color="#FF9E9E9E" android:offset="0.98"/>
+                <item android:color="#FF8F8F8F" android:offset="1"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path android:fillColor="#FF000000" android:pathData="M195.47,110.32l-16.26,-9.38a0.65,0.65 0,0 0,-1 0.56v18.78a0.66,0.66 0,0 0,1 0.57l16.26,-9.39A0.66,0.66 0,0 0,195.47 110.32Z"/>
+    <path android:fillColor="#FF000000" android:pathData="M26.31,110.32l16.26,-9.38a0.65,0.65 0,0 1,1 0.56v18.78a0.66,0.66 0,0 1,-1 0.57l-16.26,-9.39A0.66,0.66 0,0 1,26.31 110.32Z"/>
+    <path android:fillColor="#FF000000" android:pathData="M110.32,26.31l-9.38,16.26a0.65,0.65 0,0 0,0.56 1h18.78a0.66,0.66 0,0 0,0.57 -1l-9.39,-16.26A0.66,0.66 0,0 0,110.32 26.31Z"/>
+    <path android:fillColor="#FF000000" android:pathData="M110.32,195.47l-9.38,-16.26a0.65,0.65 0,0 1,0.56 -1h18.78a0.66,0.66 0,0 1,0.57 1l-9.39,16.26A0.66,0.66 0,0 1,110.32 195.47Z"/>
+</vector>
diff --git a/src/android/app/src/main/res/drawable/dpad_standard_cardinal_depressed.xml b/src/android/app/src/main/res/drawable/dpad_standard_cardinal_depressed.xml
new file mode 100644
index 000000000..5eeb51dbe
--- /dev/null
+++ b/src/android/app/src/main/res/drawable/dpad_standard_cardinal_depressed.xml
@@ -0,0 +1,24 @@
+<vector android:alpha="0.6" android:height="221.78dp"
+    android:viewportHeight="221.78" android:viewportWidth="221.78"
+    android:width="221.78dp"
+    xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="0.5"
+        android:pathData="M221.78,87.07v47.64a11.53,11.53 0,0 1,-11.5 11.5H151.62a5.42,5.42 0,0 0,-5.41 5.41v58.66a11.53,11.53 0,0 1,-11.5 11.5H87.07a11.53,11.53 0,0 1,-11.5 -11.5V151.61a5.41,5.41 0,0 0,-5.41 -5.41H11.5A11.53,11.53 0,0 1,0 134.7V87.05a11.53,11.53 0,0 1,11.5 -11.5H70.16a5.41,5.41 0,0 0,5.41 -5.41V11.5A11.53,11.53 0,0 1,87.07 0h47.64a11.53,11.53 0,0 1,11.5 11.5V70.16a5.41,5.41 0,0 0,5.41 5.41h58.66A11.53,11.53 0,0 1,221.78 87.07Z" android:strokeAlpha="0.5">
+        <aapt:attr name="android:fillColor">
+            <gradient android:endX="110.89" android:endY="-38.27"
+                android:startX="110.89" android:startY="183.51" android:type="linear">
+                <item android:color="#7F000000" android:offset="0"/>
+                <item android:color="#BA000000" android:offset="0.43"/>
+                <item android:color="#FF000000" android:offset="0.5"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path android:fillAlpha="0.1" android:fillColor="#fff"
+        android:pathData="M195.47,110.32l-16.26,-9.38a0.65,0.65 0,0 0,-1 0.56v18.78a0.66,0.66 0,0 0,1 0.57l16.26,-9.39A0.66,0.66 0,0 0,195.47 110.32Z" android:strokeAlpha="0.1"/>
+    <path android:fillAlpha="0.1" android:fillColor="#fff"
+        android:pathData="M26.31,110.32l16.26,-9.38a0.65,0.65 0,0 1,1 0.56v18.78a0.66,0.66 0,0 1,-1 0.57l-16.26,-9.39A0.66,0.66 0,0 1,26.31 110.32Z" android:strokeAlpha="0.1"/>
+    <path android:fillAlpha="0.75" android:fillColor="#fff"
+        android:pathData="M110.32,26.31l-9.38,16.26a0.65,0.65 0,0 0,0.56 1h18.78a0.66,0.66 0,0 0,0.57 -1l-9.39,-16.26A0.66,0.66 0,0 0,110.32 26.31Z" android:strokeAlpha="0.75"/>
+    <path android:fillAlpha="0.1" android:fillColor="#fff"
+        android:pathData="M110.32,195.47l-9.38,-16.26a0.65,0.65 0,0 1,0.56 -1h18.78a0.66,0.66 0,0 1,0.57 1l-9.39,16.26A0.66,0.66 0,0 1,110.32 195.47Z" android:strokeAlpha="0.1"/>
+</vector>
diff --git a/src/android/app/src/main/res/drawable/dpad_standard_diagonal_depressed.xml b/src/android/app/src/main/res/drawable/dpad_standard_diagonal_depressed.xml
new file mode 100644
index 000000000..520fd447c
--- /dev/null
+++ b/src/android/app/src/main/res/drawable/dpad_standard_diagonal_depressed.xml
@@ -0,0 +1,24 @@
+<vector android:alpha="0.6" android:height="221.78dp"
+    android:viewportHeight="221.78" android:viewportWidth="221.78"
+    android:width="221.78dp"
+    xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="0.5"
+        android:pathData="M221.78,87.07v47.64a11.53,11.53 0,0 1,-11.5 11.5H151.62a5.42,5.42 0,0 0,-5.41 5.41v58.66a11.53,11.53 0,0 1,-11.5 11.5H87.07a11.53,11.53 0,0 1,-11.5 -11.5V151.61a5.41,5.41 0,0 0,-5.41 -5.41H11.5A11.53,11.53 0,0 1,0 134.7V87.05a11.53,11.53 0,0 1,11.5 -11.5H70.16a5.41,5.41 0,0 0,5.41 -5.41V11.5A11.53,11.53 0,0 1,87.07 0h47.64a11.53,11.53 0,0 1,11.5 11.5V70.16a5.41,5.41 0,0 0,5.41 5.41h58.66A11.53,11.53 0,0 1,221.78 87.07Z" android:strokeAlpha="0.5">
+        <aapt:attr name="android:fillColor">
+            <gradient android:endX="31.24" android:endY="31.24"
+                android:startX="188.07" android:startY="188.07" android:type="linear">
+                <item android:color="#7F000000" android:offset="0"/>
+                <item android:color="#BA000000" android:offset="0.43"/>
+                <item android:color="#FF000000" android:offset="0.5"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path android:fillAlpha="0.1" android:fillColor="#fff"
+        android:pathData="M195.47,110.32l-16.26,-9.38a0.65,0.65 0,0 0,-1 0.56v18.78a0.66,0.66 0,0 0,1 0.57l16.26,-9.39A0.66,0.66 0,0 0,195.47 110.32Z" android:strokeAlpha="0.1"/>
+    <path android:fillAlpha="0.75" android:fillColor="#fff"
+        android:pathData="M26.31,110.32l16.26,-9.38a0.65,0.65 0,0 1,1 0.56v18.78a0.66,0.66 0,0 1,-1 0.57l-16.26,-9.39A0.66,0.66 0,0 1,26.31 110.32Z" android:strokeAlpha="0.75"/>
+    <path android:fillAlpha="0.75" android:fillColor="#fff"
+        android:pathData="M110.32,26.31l-9.38,16.26a0.65,0.65 0,0 0,0.56 1h18.78a0.66,0.66 0,0 0,0.57 -1l-9.39,-16.26A0.66,0.66 0,0 0,110.32 26.31Z" android:strokeAlpha="0.75"/>
+    <path android:fillAlpha="0.1" android:fillColor="#fff"
+        android:pathData="M110.32,195.47l-9.38,-16.26a0.65,0.65 0,0 1,0.56 -1h18.78a0.66,0.66 0,0 1,0.57 1l-9.39,16.26A0.66,0.66 0,0 1,110.32 195.47Z" android:strokeAlpha="0.1"/>
+</vector>
diff --git a/src/android/app/src/main/res/drawable/facebutton_a.xml b/src/android/app/src/main/res/drawable/facebutton_a.xml
new file mode 100644
index 000000000..668652edb
--- /dev/null
+++ b/src/android/app/src/main/res/drawable/facebutton_a.xml
@@ -0,0 +1,22 @@
+<vector android:alpha="0.6" android:height="103.61dp"
+    android:viewportHeight="103.61" android:viewportWidth="103.61"
+    android:width="103.61dp"
+    xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="0.6"
+        android:pathData="M51.8,51.8m-51.8,0a51.8,51.8 0,1 1,103.6 0a51.8,51.8 0,1 1,-103.6 0" android:strokeAlpha="0.6">
+        <aapt:attr name="android:fillColor">
+            <gradient android:centerX="51.8" android:centerY="51.8"
+                android:gradientRadius="51.8" android:type="radial">
+                <item android:color="#FFC3C4C5" android:offset="0.58"/>
+                <item android:color="#FFC6C6C6" android:offset="0.84"/>
+                <item android:color="#FFC7C7C7" android:offset="0.88"/>
+                <item android:color="#FFC2C2C2" android:offset="0.91"/>
+                <item android:color="#FFB5B5B5" android:offset="0.94"/>
+                <item android:color="#FF9E9E9E" android:offset="0.98"/>
+                <item android:color="#FF8F8F8F" android:offset="1"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path android:fillAlpha="0.6" android:fillColor="#FF000000"
+        android:pathData="M49.88,34.36h4.29L69.1,69.25L63.58,69.25l-3.5,-8.63L43.48,60.62L40,69.25L34.51,69.25ZM58.36,56.48 L51.85,40.48h-0.1l-6.6,16Z" android:strokeAlpha="0.6"/>
+</vector>
diff --git a/src/android/app/src/main/res/drawable/facebutton_a_depressed.xml b/src/android/app/src/main/res/drawable/facebutton_a_depressed.xml
new file mode 100644
index 000000000..4fbe06962
--- /dev/null
+++ b/src/android/app/src/main/res/drawable/facebutton_a_depressed.xml
@@ -0,0 +1,8 @@
+<vector android:alpha="0.6" android:height="103.61dp"
+    android:viewportHeight="103.61" android:viewportWidth="103.61"
+    android:width="103.61dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="0.5" android:fillColor="#151515"
+        android:pathData="M51.8,51.8m-51.8,0a51.8,51.8 0,1 1,103.6 0a51.8,51.8 0,1 1,-103.6 0" android:strokeAlpha="0.5"/>
+    <path android:fillAlpha="0.75" android:fillColor="#fff"
+        android:pathData="M49.88,34.36h4.29L69.1,69.25L63.58,69.25l-3.5,-8.63L43.48,60.62L40,69.25L34.51,69.25ZM58.36,56.48 L51.85,40.48h-0.1l-6.6,16Z" android:strokeAlpha="0.75"/>
+</vector>
diff --git a/src/android/app/src/main/res/drawable/facebutton_b.xml b/src/android/app/src/main/res/drawable/facebutton_b.xml
new file mode 100644
index 000000000..8912219ca
--- /dev/null
+++ b/src/android/app/src/main/res/drawable/facebutton_b.xml
@@ -0,0 +1,22 @@
+<vector android:alpha="0.6" android:height="103.61dp"
+    android:viewportHeight="103.61" android:viewportWidth="103.61"
+    android:width="103.61dp"
+    xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="0.6"
+        android:pathData="M51.8,51.8m-51.8,0a51.8,51.8 0,1 1,103.6 0a51.8,51.8 0,1 1,-103.6 0" android:strokeAlpha="0.6">
+        <aapt:attr name="android:fillColor">
+            <gradient android:centerX="51.8" android:centerY="51.8"
+                android:gradientRadius="51.8" android:type="radial">
+                <item android:color="#FFC3C4C5" android:offset="0.58"/>
+                <item android:color="#FFC6C6C6" android:offset="0.84"/>
+                <item android:color="#FFC7C7C7" android:offset="0.88"/>
+                <item android:color="#FFC2C2C2" android:offset="0.91"/>
+                <item android:color="#FFB5B5B5" android:offset="0.94"/>
+                <item android:color="#FF9E9E9E" android:offset="0.98"/>
+                <item android:color="#FF8F8F8F" android:offset="1"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path android:fillAlpha="0.6" android:fillColor="#FF000000"
+        android:pathData="M41,35.67L53.15,35.67a15.78,15.78 0,0 1,4.22 0.54,10.07 10.07,0 0,1 3.36,1.6A7.49,7.49 0,0 1,63 40.53a8.73,8.73 0,0 1,0.81 3.88,7.13 7.13,0 0,1 -1.67,4.91 9.75,9.75 0,0 1,-4.35 2.79v0.1a7.4,7.4 0,0 1,3 0.82,8.1 8.1,0 0,1 2.4,1.87 9.14,9.14 0,0 1,2.2 6,8.73 8.73,0 0,1 -1,4.17 8.86,8.86 0,0 1,-2.64 3A12.39,12.39 0,0 1,57.79 70a17.12,17.12 0,0 1,-4.79 0.64L41,70.64ZM45.74,50.19h6.47a10.75,10.75 0,0 0,2.52 -0.28A5.56,5.56 0,0 0,56.8 49a4.73,4.73 0,0 0,1.41 -1.63A5.22,5.22 0,0 0,58.73 45a5,5 0,0 0,-5.53 -5.13L45.74,39.87ZM45.74,66.48h7a14.17,14.17 0,0 0,2.4 -0.22,7.23 7.23,0 0,0 2.44,-0.89 6,6 0,0 0,1.93 -1.8,5.15 5.15,0 0,0 0.79,-3 5.52,5.52 0,0 0,-2 -4.67,8.75 8.75,0 0,0 -5.48,-1.56h-7Z" android:strokeAlpha="0.6"/>
+</vector>
diff --git a/src/android/app/src/main/res/drawable/facebutton_b_depressed.xml b/src/android/app/src/main/res/drawable/facebutton_b_depressed.xml
new file mode 100644
index 000000000..012abeaf1
--- /dev/null
+++ b/src/android/app/src/main/res/drawable/facebutton_b_depressed.xml
@@ -0,0 +1,8 @@
+<vector android:alpha="0.6" android:height="103.61dp"
+    android:viewportHeight="103.61" android:viewportWidth="103.61"
+    android:width="103.61dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="0.5" android:fillColor="#151515"
+        android:pathData="M51.8,51.8m-51.8,0a51.8,51.8 0,1 1,103.6 0a51.8,51.8 0,1 1,-103.6 0" android:strokeAlpha="0.5"/>
+    <path android:fillAlpha="0.75" android:fillColor="#fff"
+        android:pathData="M41,35.67L53.15,35.67a15.78,15.78 0,0 1,4.22 0.54,10.07 10.07,0 0,1 3.36,1.6A7.49,7.49 0,0 1,63 40.53a8.73,8.73 0,0 1,0.81 3.88,7.13 7.13,0 0,1 -1.67,4.91 9.75,9.75 0,0 1,-4.35 2.79v0.1a7.4,7.4 0,0 1,3 0.82,8.1 8.1,0 0,1 2.4,1.87 9.14,9.14 0,0 1,2.2 6,8.73 8.73,0 0,1 -1,4.17 8.86,8.86 0,0 1,-2.64 3A12.39,12.39 0,0 1,57.79 70a17.12,17.12 0,0 1,-4.79 0.64L41,70.64ZM45.74,50.19h6.47a10.75,10.75 0,0 0,2.52 -0.28A5.56,5.56 0,0 0,56.8 49a4.73,4.73 0,0 0,1.41 -1.63A5.22,5.22 0,0 0,58.73 45a5,5 0,0 0,-5.53 -5.13L45.74,39.87ZM45.74,66.48h7a14.17,14.17 0,0 0,2.4 -0.22,7.23 7.23,0 0,0 2.44,-0.89 6,6 0,0 0,1.93 -1.8,5.15 5.15,0 0,0 0.79,-3 5.52,5.52 0,0 0,-2 -4.67,8.75 8.75,0 0,0 -5.48,-1.56h-7Z" android:strokeAlpha="0.75"/>
+</vector>
diff --git a/src/android/app/src/main/res/drawable/facebutton_home.xml b/src/android/app/src/main/res/drawable/facebutton_home.xml
new file mode 100644
index 000000000..03596ec2e
--- /dev/null
+++ b/src/android/app/src/main/res/drawable/facebutton_home.xml
@@ -0,0 +1,21 @@
+<vector android:alpha="0.6" android:height="70.55dp"
+    android:viewportHeight="70.55" android:viewportWidth="70.55"
+    android:width="70.55dp" xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="0.75"
+        android:pathData="M35.27,35.27m-35.27,0a35.27,35.27 0,1 1,70.54 0a35.27,35.27 0,1 1,-70.54 0" android:strokeAlpha="0.75">
+        <aapt:attr name="android:fillColor">
+            <gradient android:centerX="35.27" android:centerY="35.27"
+                android:gradientRadius="35.27" android:type="radial">
+                <item android:color="#FFC3C4C5" android:offset="0.58"/>
+                <item android:color="#FFC6C6C6" android:offset="0.84"/>
+                <item android:color="#FFC7C7C7" android:offset="0.88"/>
+                <item android:color="#FFC2C2C2" android:offset="0.91"/>
+                <item android:color="#FFB5B5B5" android:offset="0.94"/>
+                <item android:color="#FF9E9E9E" android:offset="0.98"/>
+                <item android:color="#FF8F8F8F" android:offset="1"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path android:fillAlpha="0.75" android:fillColor="#FF000000"
+        android:pathData="M55.19,32.72 L36.06,15.21a1.14,1.14 0,0 0,-1.57 0L15.36,32.72a1.13,1.13 0,0 0,0.79 1.94H19.4a0.72,0.72 0,0 1,0.72 0.72V51.49a1.13,1.13 0,0 0,1.12 1.13H49.31a1.13,1.13 0,0 0,1.12 -1.13V35.38a0.72,0.72 0,0 1,0.72 -0.72H54.4A1.13,1.13 0,0 0,55.19 32.72ZM41.45,43.86a0.9,0.9 0,0 1,-0.9 0.9H30a0.9,0.9 0,0 1,-0.9 -0.9V35.55a0.89,0.89 0,0 1,0.9 -0.89H40.55a0.89,0.89 0,0 1,0.9 0.89Z" android:strokeAlpha="0.75"/>
+</vector>
diff --git a/src/android/app/src/main/res/drawable/facebutton_home_depressed.xml b/src/android/app/src/main/res/drawable/facebutton_home_depressed.xml
new file mode 100644
index 000000000..cde7c6a9e
--- /dev/null
+++ b/src/android/app/src/main/res/drawable/facebutton_home_depressed.xml
@@ -0,0 +1,8 @@
+<vector android:alpha="0.6" android:height="70.55dp"
+    android:viewportHeight="70.55" android:viewportWidth="70.55"
+    android:width="70.55dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="0.5" android:fillColor="#151515"
+        android:pathData="M35.27,35.27m-35.27,0a35.27,35.27 0,1 1,70.54 0a35.27,35.27 0,1 1,-70.54 0" android:strokeAlpha="0.5"/>
+    <path android:fillAlpha="0.75" android:fillColor="#fff"
+        android:pathData="M55.19,32.72 L36.06,15.21a1.14,1.14 0,0 0,-1.57 0L15.36,32.72a1.13,1.13 0,0 0,0.79 1.94H19.4a0.72,0.72 0,0 1,0.72 0.72V51.49a1.13,1.13 0,0 0,1.12 1.13H49.31a1.13,1.13 0,0 0,1.12 -1.13V35.38a0.72,0.72 0,0 1,0.72 -0.72H54.4A1.13,1.13 0,0 0,55.19 32.72ZM41.45,43.86a0.9,0.9 0,0 1,-0.9 0.9H30a0.9,0.9 0,0 1,-0.9 -0.9V35.55a0.89,0.89 0,0 1,0.9 -0.89H40.55a0.89,0.89 0,0 1,0.9 0.89Z" android:strokeAlpha="0.75"/>
+</vector>
diff --git a/src/android/app/src/main/res/drawable/facebutton_minus.xml b/src/android/app/src/main/res/drawable/facebutton_minus.xml
new file mode 100644
index 000000000..4296b4fcc
--- /dev/null
+++ b/src/android/app/src/main/res/drawable/facebutton_minus.xml
@@ -0,0 +1,22 @@
+<vector android:alpha="0.6" android:height="69.95dp"
+    android:viewportHeight="69.95" android:viewportWidth="69.95"
+    android:width="69.95dp" xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="0.75"
+        android:pathData="M34.97,34.97m-34.97,0a34.97,34.97 0,1 1,69.94 0a34.97,34.97 0,1 1,-69.94 0" android:strokeAlpha="0.75">
+        <aapt:attr name="android:fillColor">
+            <gradient android:centerX="34.97" android:centerY="34.97"
+                android:gradientRadius="34.97" android:type="radial">
+                <item android:color="#FFC3C4C5" android:offset="0.58"/>
+                <item android:color="#FFC6C6C6" android:offset="0.84"/>
+                <item android:color="#FFC7C7C7" android:offset="0.88"/>
+                <item android:color="#FFC2C2C2" android:offset="0.91"/>
+                <item android:color="#FFB5B5B5" android:offset="0.94"/>
+                <item android:color="#FF9E9E9E" android:offset="0.98"/>
+                <item android:color="#FF8F8F8F" android:offset="1"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path android:fillAlpha="0.75" android:fillColor="#FF000000"
+        android:pathData="M52,38.28H17.91a0.52,0.52 0,0 1,-0.52 -0.52V32.19a0.52,0.52 0,0 1,0.52 -0.52H52a0.52,0.52 0,0 1,0.52 0.52v5.57A0.52,0.52 0,0 1,52 38.28Z"
+        android:strokeAlpha="0.75" android:strokeColor="#000" android:strokeWidth="2.5"/>
+</vector>
diff --git a/src/android/app/src/main/res/drawable/facebutton_minus_depressed.xml b/src/android/app/src/main/res/drawable/facebutton_minus_depressed.xml
new file mode 100644
index 000000000..628027841
--- /dev/null
+++ b/src/android/app/src/main/res/drawable/facebutton_minus_depressed.xml
@@ -0,0 +1,9 @@
+<vector android:alpha="0.6" android:height="69.95dp"
+    android:viewportHeight="69.95" android:viewportWidth="69.95"
+    android:width="69.95dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="0.5" android:fillColor="#151515"
+        android:pathData="M34.97,34.97m-34.97,0a34.97,34.97 0,1 1,69.94 0a34.97,34.97 0,1 1,-69.94 0" android:strokeAlpha="0.5"/>
+    <path android:fillAlpha="0.75" android:fillColor="#fff"
+        android:pathData="M52,38.28H17.91a0.52,0.52 0,0 1,-0.52 -0.52V32.19a0.52,0.52 0,0 1,0.52 -0.52H52a0.52,0.52 0,0 1,0.52 0.52v5.57A0.52,0.52 0,0 1,52 38.28Z"
+        android:strokeAlpha="0.75" android:strokeColor="#fff" android:strokeWidth="2.5"/>
+</vector>
diff --git a/src/android/app/src/main/res/drawable/facebutton_plus.xml b/src/android/app/src/main/res/drawable/facebutton_plus.xml
new file mode 100644
index 000000000..43ae14365
--- /dev/null
+++ b/src/android/app/src/main/res/drawable/facebutton_plus.xml
@@ -0,0 +1,22 @@
+<vector android:alpha="0.6" android:height="69.95dp"
+    android:viewportHeight="69.95" android:viewportWidth="69.95"
+    android:width="69.95dp" xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="0.75"
+        android:pathData="M34.97,34.97m-34.97,0a34.97,34.97 0,1 1,69.94 0a34.97,34.97 0,1 1,-69.94 0" android:strokeAlpha="0.75">
+        <aapt:attr name="android:fillColor">
+            <gradient android:centerX="34.97" android:centerY="34.97"
+                android:gradientRadius="34.97" android:type="radial">
+                <item android:color="#FFC3C4C5" android:offset="0.58"/>
+                <item android:color="#FFC6C6C6" android:offset="0.84"/>
+                <item android:color="#FFC7C7C7" android:offset="0.88"/>
+                <item android:color="#FFC2C2C2" android:offset="0.91"/>
+                <item android:color="#FFB5B5B5" android:offset="0.94"/>
+                <item android:color="#FF9E9E9E" android:offset="0.98"/>
+                <item android:color="#FF8F8F8F" android:offset="1"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path android:fillAlpha="0.75" android:fillColor="#FF000000"
+        android:pathData="M13.94,31.9H31.16a0.65,0.65 0,0 0,0.65 -0.64V14.59a0.65,0.65 0,0 1,0.64 -0.65h5a0.65,0.65 0,0 1,0.65 0.65V31.26a0.65,0.65 0,0 0,0.65 0.64H56a0.65,0.65 0,0 1,0.65 0.65V37.4a0.65,0.65 0,0 1,-0.65 0.65H38.79a0.65,0.65 0,0 0,-0.65 0.64V55.36a0.65,0.65 0,0 1,-0.65 0.64h-5a0.64,0.64 0,0 1,-0.64 -0.64V38.69a0.65,0.65 0,0 0,-0.65 -0.64H13.94a0.65,0.65 0,0 1,-0.65 -0.65V32.55A0.65,0.65 0,0 1,13.94 31.9Z"
+        android:strokeAlpha="0.75" android:strokeColor="#000" android:strokeWidth="2.5"/>
+</vector>
diff --git a/src/android/app/src/main/res/drawable/facebutton_plus_depressed.xml b/src/android/app/src/main/res/drawable/facebutton_plus_depressed.xml
new file mode 100644
index 000000000..c510e136e
--- /dev/null
+++ b/src/android/app/src/main/res/drawable/facebutton_plus_depressed.xml
@@ -0,0 +1,9 @@
+<vector android:alpha="0.6" android:height="69.95dp"
+    android:viewportHeight="69.95" android:viewportWidth="69.95"
+    android:width="69.95dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="0.5" android:fillColor="#151515"
+        android:pathData="M34.97,34.97m-34.97,0a34.97,34.97 0,1 1,69.94 0a34.97,34.97 0,1 1,-69.94 0" android:strokeAlpha="0.5"/>
+    <path android:fillAlpha="0.75" android:fillColor="#fff"
+        android:pathData="M13.94,31.9H31.16a0.65,0.65 0,0 0,0.65 -0.64V14.59a0.65,0.65 0,0 1,0.64 -0.65h5a0.65,0.65 0,0 1,0.65 0.65V31.26a0.65,0.65 0,0 0,0.65 0.64H56a0.65,0.65 0,0 1,0.65 0.65V37.4a0.65,0.65 0,0 1,-0.65 0.65H38.79a0.65,0.65 0,0 0,-0.65 0.64V55.36a0.65,0.65 0,0 1,-0.65 0.64h-5a0.64,0.64 0,0 1,-0.64 -0.64V38.69a0.65,0.65 0,0 0,-0.65 -0.64H13.94a0.65,0.65 0,0 1,-0.65 -0.65V32.55A0.65,0.65 0,0 1,13.94 31.9Z"
+        android:strokeAlpha="0.75" android:strokeColor="#fff" android:strokeWidth="2.5"/>
+</vector>
diff --git a/src/android/app/src/main/res/drawable/facebutton_screenshot.xml b/src/android/app/src/main/res/drawable/facebutton_screenshot.xml
new file mode 100644
index 000000000..984b4fd02
--- /dev/null
+++ b/src/android/app/src/main/res/drawable/facebutton_screenshot.xml
@@ -0,0 +1,21 @@
+<vector android:alpha="0.6" android:height="70dp"
+    android:viewportHeight="70" android:viewportWidth="70"
+    android:width="70dp" xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="0.75"
+        android:pathData="M10.63,0L59.37,0A10.63,10.63 0,0 1,70 10.63L70,59.37A10.63,10.63 0,0 1,59.37 70L10.63,70A10.63,10.63 0,0 1,0 59.37L0,10.63A10.63,10.63 0,0 1,10.63 0z" android:strokeAlpha="0.75">
+        <aapt:attr name="android:fillColor">
+            <gradient android:centerX="35" android:centerY="35"
+                android:gradientRadius="42.51" android:type="radial">
+                <item android:color="#FFC3C4C5" android:offset="0.58"/>
+                <item android:color="#FFC6C6C6" android:offset="0.84"/>
+                <item android:color="#FFC7C7C7" android:offset="0.88"/>
+                <item android:color="#FFC2C2C2" android:offset="0.91"/>
+                <item android:color="#FFB5B5B5" android:offset="0.94"/>
+                <item android:color="#FF9E9E9E" android:offset="0.98"/>
+                <item android:color="#FF8F8F8F" android:offset="1"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path android:fillAlpha="0.75" android:fillColor="#FF000000"
+        android:pathData="M35,35m-21.5,0a21.5,21.5 0,1 1,43 0a21.5,21.5 0,1 1,-43 0" android:strokeAlpha="0.75"/>
+</vector>
diff --git a/src/android/app/src/main/res/drawable/facebutton_screenshot_depressed.xml b/src/android/app/src/main/res/drawable/facebutton_screenshot_depressed.xml
new file mode 100644
index 000000000..fd2e44294
--- /dev/null
+++ b/src/android/app/src/main/res/drawable/facebutton_screenshot_depressed.xml
@@ -0,0 +1,8 @@
+<vector android:alpha="0.6" android:height="70dp"
+    android:viewportHeight="70" android:viewportWidth="70"
+    android:width="70dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="0.5" android:fillColor="#151515"
+        android:pathData="M10.63,0L59.37,0A10.63,10.63 0,0 1,70 10.63L70,59.37A10.63,10.63 0,0 1,59.37 70L10.63,70A10.63,10.63 0,0 1,0 59.37L0,10.63A10.63,10.63 0,0 1,10.63 0z" android:strokeAlpha="0.5"/>
+    <path android:fillAlpha="0.75" android:fillColor="#fff"
+        android:pathData="M35,35m-21.5,0a21.5,21.5 0,1 1,43 0a21.5,21.5 0,1 1,-43 0" android:strokeAlpha="0.75"/>
+</vector>
diff --git a/src/android/app/src/main/res/drawable/facebutton_x.xml b/src/android/app/src/main/res/drawable/facebutton_x.xml
new file mode 100644
index 000000000..43fdd14c4
--- /dev/null
+++ b/src/android/app/src/main/res/drawable/facebutton_x.xml
@@ -0,0 +1,22 @@
+<vector android:alpha="0.6" android:height="103.61dp"
+    android:viewportHeight="103.61" android:viewportWidth="103.61"
+    android:width="103.61dp"
+    xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="0.6"
+        android:pathData="M51.8,51.8m-51.8,0a51.8,51.8 0,1 1,103.6 0a51.8,51.8 0,1 1,-103.6 0" android:strokeAlpha="0.6">
+        <aapt:attr name="android:fillColor">
+            <gradient android:centerX="51.8" android:centerY="51.8"
+                android:gradientRadius="51.8" android:type="radial">
+                <item android:color="#FFC3C4C5" android:offset="0.58"/>
+                <item android:color="#FFC6C6C6" android:offset="0.84"/>
+                <item android:color="#FFC7C7C7" android:offset="0.88"/>
+                <item android:color="#FFC2C2C2" android:offset="0.91"/>
+                <item android:color="#FFB5B5B5" android:offset="0.94"/>
+                <item android:color="#FF9E9E9E" android:offset="0.98"/>
+                <item android:color="#FF8F8F8F" android:offset="1"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path android:fillAlpha="0.6" android:fillColor="#FF000000"
+        android:pathData="M48.39,50.91 L36.63,34.31h6.08L51.8,47.75l9,-13.44h5.93L55.07,50.86 67.92,69.3H61.69l-10,-15.17L41.57,69.3H35.69Z" android:strokeAlpha="0.6"/>
+</vector>
diff --git a/src/android/app/src/main/res/drawable/facebutton_x_depressed.xml b/src/android/app/src/main/res/drawable/facebutton_x_depressed.xml
new file mode 100644
index 000000000..a9ba49169
--- /dev/null
+++ b/src/android/app/src/main/res/drawable/facebutton_x_depressed.xml
@@ -0,0 +1,8 @@
+<vector android:alpha="0.6" android:height="103.61dp"
+    android:viewportHeight="103.61" android:viewportWidth="103.61"
+    android:width="103.61dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="0.5" android:fillColor="#151515"
+        android:pathData="M51.8,51.8m-51.8,0a51.8,51.8 0,1 1,103.6 0a51.8,51.8 0,1 1,-103.6 0" android:strokeAlpha="0.5"/>
+    <path android:fillAlpha="0.75" android:fillColor="#fff"
+        android:pathData="M48.39,50.91 L36.63,34.31h6.08L51.8,47.75l9,-13.44h5.93L55.07,50.86 67.92,69.3H61.69l-10,-15.17L41.57,69.3H35.69Z" android:strokeAlpha="0.75"/>
+</vector>
diff --git a/src/android/app/src/main/res/drawable/facebutton_y.xml b/src/android/app/src/main/res/drawable/facebutton_y.xml
new file mode 100644
index 000000000..980be3b2e
--- /dev/null
+++ b/src/android/app/src/main/res/drawable/facebutton_y.xml
@@ -0,0 +1,22 @@
+<vector android:alpha="0.6" android:height="103.61dp"
+    android:viewportHeight="103.61" android:viewportWidth="103.61"
+    android:width="103.61dp"
+    xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="0.6"
+        android:pathData="M51.8,51.8m-51.8,0a51.8,51.8 0,1 1,103.6 0a51.8,51.8 0,1 1,-103.6 0" android:strokeAlpha="0.6">
+        <aapt:attr name="android:fillColor">
+            <gradient android:centerX="51.8" android:centerY="51.8"
+                android:gradientRadius="51.8" android:type="radial">
+                <item android:color="#FFC3C4C5" android:offset="0.58"/>
+                <item android:color="#FFC6C6C6" android:offset="0.84"/>
+                <item android:color="#FFC7C7C7" android:offset="0.88"/>
+                <item android:color="#FFC2C2C2" android:offset="0.91"/>
+                <item android:color="#FFB5B5B5" android:offset="0.94"/>
+                <item android:color="#FF9E9E9E" android:offset="0.98"/>
+                <item android:color="#FF8F8F8F" android:offset="1"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path android:fillAlpha="0.6" android:fillColor="#FF000000"
+        android:pathData="M49.43,54.37l-13.23,-20h6.07L51.8,49.68l9.83,-15.36h5.78l-13.24,20V69.29H49.43Z" android:strokeAlpha="0.6"/>
+</vector>
diff --git a/src/android/app/src/main/res/drawable/facebutton_y_depressed.xml b/src/android/app/src/main/res/drawable/facebutton_y_depressed.xml
new file mode 100644
index 000000000..320d63897
--- /dev/null
+++ b/src/android/app/src/main/res/drawable/facebutton_y_depressed.xml
@@ -0,0 +1,8 @@
+<vector android:alpha="0.6" android:height="103.61dp"
+    android:viewportHeight="103.61" android:viewportWidth="103.61"
+    android:width="103.61dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="0.5" android:fillColor="#151515"
+        android:pathData="M51.8,51.8m-51.8,0a51.8,51.8 0,1 1,103.6 0a51.8,51.8 0,1 1,-103.6 0" android:strokeAlpha="0.5"/>
+    <path android:fillAlpha="0.75" android:fillColor="#fff"
+        android:pathData="M49.43,54.37l-13.23,-20h6.07L51.8,49.68l9.83,-15.36h5.78l-13.24,20V69.29H49.43Z" android:strokeAlpha="0.75"/>
+</vector>
diff --git a/src/android/app/src/main/res/drawable/joystick.xml b/src/android/app/src/main/res/drawable/joystick.xml
new file mode 100644
index 000000000..bdd071212
--- /dev/null
+++ b/src/android/app/src/main/res/drawable/joystick.xml
@@ -0,0 +1,45 @@
+<vector android:alpha="0.6" android:height="161.61dp"
+    android:viewportHeight="161.61" android:viewportWidth="161.61"
+    android:width="161.61dp"
+    xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="0.8"
+        android:pathData="M91.23,0.68a80.8,80.8 0,1 0,69.69 90.55A80.81,80.81 0,0 0,91.23 0.68ZM80.8,150.68A69.84,69.84 0,1 1,150.64 80.8,69.92 69.92,0 0,1 80.8,150.64Z" android:strokeAlpha="0.8">
+        <aapt:attr name="android:fillColor">
+            <gradient android:centerX="68.25" android:centerY="57.75"
+                android:gradientRadius="122.17" android:type="radial">
+                <item android:color="#FFD9D9D9" android:offset="0.44"/>
+                <item android:color="#FF141414" android:offset="1"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path android:fillAlpha="0.8"
+        android:pathData="M80.8,80.8m-67.05,0a67.05,67.05 0,1 1,134.1 0a67.05,67.05 0,1 1,-134.1 0" android:strokeAlpha="0.8">
+        <aapt:attr name="android:fillColor">
+            <gradient android:centerX="80.49" android:centerY="60.19"
+                android:gradientRadius="88.23" android:type="radial">
+                <item android:color="#FFBABABA" android:offset="0.15"/>
+                <item android:color="#FF9E9E9E" android:offset="0.46"/>
+                <item android:color="#FF868686" android:offset="0.63"/>
+                <item android:color="#FF575757" android:offset="1"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path android:fillAlpha="0.8"
+        android:pathData="M80.8,150.64A69.84,69.84 0,1 1,150.64 80.8,69.92 69.92,0 0,1 80.8,150.64ZM80.8,13.76a67,67 0,1 0,67.05 67A67.11,67.11 0,0 0,80.8 13.76Z" android:strokeAlpha="0.8">
+        <aapt:attr name="android:fillColor">
+            <gradient android:centerX="80.8" android:centerY="80.8"
+                android:gradientRadius="97.63" android:type="radial">
+                <item android:color="#FFC2C2C3" android:offset="0.04"/>
+                <item android:color="#FFC0C0C1" android:offset="0.35"/>
+                <item android:color="#FFB9B9BA" android:offset="0.47"/>
+                <item android:color="#FFADADAE" android:offset="0.56"/>
+                <item android:color="#FF9C9C9D" android:offset="0.63"/>
+                <item android:color="#FF868687" android:offset="0.69"/>
+                <item android:color="#FF6A6A6B" android:offset="0.74"/>
+                <item android:color="#FF4A4A4A" android:offset="0.79"/>
+                <item android:color="#FF252525" android:offset="0.83"/>
+                <item android:color="#FF000000" android:offset="0.87"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+</vector>
diff --git a/src/android/app/src/main/res/drawable/joystick_depressed.xml b/src/android/app/src/main/res/drawable/joystick_depressed.xml
new file mode 100644
index 000000000..ad51d73ce
--- /dev/null
+++ b/src/android/app/src/main/res/drawable/joystick_depressed.xml
@@ -0,0 +1,10 @@
+<vector android:alpha="0.6" android:height="161.73dp"
+    android:viewportHeight="161.73" android:viewportWidth="161.73"
+    android:width="161.73dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="0.5" android:fillColor="#FF000000"
+        android:pathData="M91.3,0.68A80.86,80.86 0,1 0,161.05 91.3,80.87 80.87,0 0,0 91.3,0.68ZM80.87,150.76a69.9,69.9 0,1 1,69.89 -69.89A70,70 0,0 1,80.87 150.76Z" android:strokeAlpha="0.5"/>
+    <path android:fillAlpha="0.5" android:fillColor="#FF000000"
+        android:pathData="M80.87,80.87m-67.1,0a67.1,67.1 0,1 1,134.2 0a67.1,67.1 0,1 1,-134.2 0" android:strokeAlpha="0.5"/>
+    <path android:fillAlpha="0.75" android:fillColor="#fff"
+        android:pathData="M80.87,150.76a69.9,69.9 0,1 1,69.89 -69.89A70,70 0,0 1,80.87 150.76ZM80.87,13.76A67.1,67.1 0,1 0,148 80.87,67.17 67.17,0 0,0 80.87,13.77Z" android:strokeAlpha="0.75"/>
+</vector>
diff --git a/src/android/app/src/main/res/drawable/joystick_range.xml b/src/android/app/src/main/res/drawable/joystick_range.xml
new file mode 100644
index 000000000..cdd5d2e50
--- /dev/null
+++ b/src/android/app/src/main/res/drawable/joystick_range.xml
@@ -0,0 +1,38 @@
+<vector android:alpha="0.6" android:height="265.64dp"
+    android:viewportHeight="265.64" android:viewportWidth="265.64"
+    android:width="265.64dp"
+    xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="0.8"
+        android:pathData="M132.82,132.82m-113.12,0a113.12,113.12 0,1 1,226.24 0a113.12,113.12 0,1 1,-226.24 0" android:strokeAlpha="0.8">
+        <aapt:attr name="android:fillColor">
+            <gradient android:centerX="132.82" android:centerY="132.82"
+                android:gradientRadius="195.71" android:type="radial">
+                <item android:color="#00000000" android:offset="0"/>
+                <item android:color="#14161515" android:offset="0.27"/>
+                <item android:color="#30333031" android:offset="0.42"/>
+                <item android:color="#42393738" android:offset="0.45"/>
+                <item android:color="#754B494A" android:offset="0.51"/>
+                <item android:color="#C6676666" android:offset="0.59"/>
+                <item android:color="#FF7A7A7A" android:offset="0.63"/>
+                <item android:color="#FF787878" android:offset="0.99"/>
+                <item android:color="#FF787878" android:offset="0.99"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path android:fillAlpha="0.6"
+        android:pathData="M18.74,64.84A132.8,132.8 0,1 0,200.8 18.74,132.8 132.8,0 0,0 18.74,64.84ZM230,190.72A113.12,113.12 0,1 1,190.72 35.64,113.12 113.12,0 0,1 230,190.72Z" android:strokeAlpha="0.6">
+        <aapt:attr name="android:fillColor">
+            <gradient android:centerX="132.84" android:centerY="132.73"
+                android:gradientRadius="132.8" android:type="radial">
+                <item android:color="#FF969696" android:offset="0"/>
+                <item android:color="#FF949494" android:offset="0.45"/>
+                <item android:color="#FF8D8D8D" android:offset="0.61"/>
+                <item android:color="#FF828282" android:offset="0.72"/>
+                <item android:color="#FF717171" android:offset="0.82"/>
+                <item android:color="#FF5B5B5B" android:offset="0.9"/>
+                <item android:color="#FF404040" android:offset="0.97"/>
+                <item android:color="#FF303030" android:offset="1"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+</vector>
diff --git a/src/android/app/src/main/res/drawable/l_shoulder.xml b/src/android/app/src/main/res/drawable/l_shoulder.xml
new file mode 100644
index 000000000..28f9a9950
--- /dev/null
+++ b/src/android/app/src/main/res/drawable/l_shoulder.xml
@@ -0,0 +1,23 @@
+<vector android:alpha="0.6" android:height="98.58dp"
+    android:viewportHeight="98.58" android:viewportWidth="244.91"
+    android:width="244.91dp"
+    xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="0.6"
+        android:pathData="M33.05,0L211.86,0A33.05,33.05 0,0 1,244.91 33.05L244.91,65.53A33.05,33.05 0,0 1,211.86 98.58L33.05,98.58A33.05,33.05 0,0 1,0 65.53L0,33.05A33.05,33.05 0,0 1,33.05 0z" android:strokeAlpha="0.6">
+        <aapt:attr name="android:fillColor">
+            <gradient android:endX="244.91" android:endY="49.29"
+                android:startX="0" android:startY="49.29" android:type="linear">
+                <item android:color="#FFC3C4C5" android:offset="0"/>
+                <item android:color="#FFC4C5C5" android:offset="0.05"/>
+                <item android:color="#FFC7C7C7" android:offset="0.47"/>
+                <item android:color="#F7C4C4C4" android:offset="0.54"/>
+                <item android:color="#E5BABABA" android:offset="0.65"/>
+                <item android:color="#C6ABABAB" android:offset="0.77"/>
+                <item android:color="#9E969696" android:offset="0.91"/>
+                <item android:color="#7F878787" android:offset="1"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path android:fillAlpha="0.75" android:fillColor="#FF000000"
+        android:pathData="M106.15,20h7.57V72.24h25v6.35h-32.6Z" android:strokeAlpha="0.75"/>
+</vector>
diff --git a/src/android/app/src/main/res/drawable/l_shoulder_depressed.xml b/src/android/app/src/main/res/drawable/l_shoulder_depressed.xml
new file mode 100644
index 000000000..2f9a1fd7e
--- /dev/null
+++ b/src/android/app/src/main/res/drawable/l_shoulder_depressed.xml
@@ -0,0 +1,8 @@
+<vector android:alpha="0.6" android:height="98.58dp"
+    android:viewportHeight="98.58" android:viewportWidth="244.91"
+    android:width="244.91dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="0.5" android:fillColor="#151515"
+        android:pathData="M33.05,0L211.86,0A33.05,33.05 0,0 1,244.91 33.05L244.91,65.53A33.05,33.05 0,0 1,211.86 98.58L33.05,98.58A33.05,33.05 0,0 1,0 65.53L0,33.05A33.05,33.05 0,0 1,33.05 0z" android:strokeAlpha="0.5"/>
+    <path android:fillAlpha="0.75" android:fillColor="#fff"
+        android:pathData="M106.15,20h7.57V72.24h25v6.35h-32.6Z" android:strokeAlpha="0.75"/>
+</vector>
diff --git a/src/android/app/src/main/res/drawable/r_shoulder.xml b/src/android/app/src/main/res/drawable/r_shoulder.xml
new file mode 100644
index 000000000..97731cad2
--- /dev/null
+++ b/src/android/app/src/main/res/drawable/r_shoulder.xml
@@ -0,0 +1,23 @@
+<vector android:alpha="0.6" android:height="98.58dp"
+    android:viewportHeight="98.58" android:viewportWidth="244.91"
+    android:width="244.91dp"
+    xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="0.6"
+        android:pathData="M211.86,98.58L33.05,98.58A33.05,33.05 0,0 1,0 65.53L0,33.05A33.05,33.05 0,0 1,33.05 0L211.86,0A33.05,33.05 0,0 1,244.91 33.05L244.91,65.53A33.05,33.05 0,0 1,211.86 98.58z" android:strokeAlpha="0.6">
+        <aapt:attr name="android:fillColor">
+            <gradient android:endX="0" android:endY="49.29"
+                android:startX="244.91" android:startY="49.29" android:type="linear">
+                <item android:color="#FFC3C4C5" android:offset="0"/>
+                <item android:color="#FFC4C5C5" android:offset="0.05"/>
+                <item android:color="#FFC7C7C7" android:offset="0.47"/>
+                <item android:color="#F7C4C4C4" android:offset="0.54"/>
+                <item android:color="#E5BABABA" android:offset="0.65"/>
+                <item android:color="#C6ABABAB" android:offset="0.77"/>
+                <item android:color="#9E969696" android:offset="0.91"/>
+                <item android:color="#7F878787" android:offset="1"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path android:fillAlpha="0.75" android:fillColor="#FF000000"
+        android:pathData="M103.37,21a78.13,78.13 0,0 1,14.52 -1.22c8.08,0 13.3,1.48 17,4.78a14.59,14.59 0,0 1,4.61 11.13c0,7.73 -4.87,12.86 -11,15v0.26c4.52,1.56 7.21,5.74 8.6,11.82 1.92,8.17 3.31,13.82 4.52,16.08h-7.82c-1,-1.65 -2.26,-6.69 -3.91,-14 -1.74,-8.09 -4.87,-11.13 -11.74,-11.39h-7.12L111.03,78.8h-7.57ZM110.94,47.68h7.73c8.09,0 13.22,-4.43 13.22,-11.12 0,-7.57 -5.48,-10.87 -13.48,-11a30.82,30.82 0,0 0,-7.47 0.7Z" android:strokeAlpha="0.75"/>
+</vector>
diff --git a/src/android/app/src/main/res/drawable/r_shoulder_depressed.xml b/src/android/app/src/main/res/drawable/r_shoulder_depressed.xml
new file mode 100644
index 000000000..e3aa46aa1
--- /dev/null
+++ b/src/android/app/src/main/res/drawable/r_shoulder_depressed.xml
@@ -0,0 +1,8 @@
+<vector android:alpha="0.6" android:height="98.58dp"
+    android:viewportHeight="98.58" android:viewportWidth="244.91"
+    android:width="244.91dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="0.5" android:fillColor="#151515"
+        android:pathData="M211.86,98.58L33.05,98.58A33.05,33.05 0,0 1,0 65.53L0,33.05A33.05,33.05 0,0 1,33.05 0L211.86,0A33.05,33.05 0,0 1,244.91 33.05L244.91,65.53A33.05,33.05 0,0 1,211.86 98.58z" android:strokeAlpha="0.5"/>
+    <path android:fillAlpha="0.75" android:fillColor="#fff"
+        android:pathData="M103.37,21a78.13,78.13 0,0 1,14.52 -1.22c8.08,0 13.3,1.48 17,4.78a14.59,14.59 0,0 1,4.61 11.13c0,7.73 -4.87,12.86 -11,15v0.26c4.52,1.56 7.21,5.74 8.6,11.82 1.92,8.17 3.31,13.82 4.52,16.08h-7.82c-1,-1.65 -2.26,-6.69 -3.91,-14 -1.74,-8.09 -4.87,-11.13 -11.74,-11.39h-7.12L111.03,78.8h-7.57ZM110.94,47.68h7.73c8.09,0 13.22,-4.43 13.22,-11.12 0,-7.57 -5.48,-10.87 -13.48,-11a30.82,30.82 0,0 0,-7.47 0.7Z" android:strokeAlpha="0.75"/>
+</vector>
diff --git a/src/android/app/src/main/res/drawable/zl_trigger.xml b/src/android/app/src/main/res/drawable/zl_trigger.xml
new file mode 100644
index 000000000..436461c3b
--- /dev/null
+++ b/src/android/app/src/main/res/drawable/zl_trigger.xml
@@ -0,0 +1,25 @@
+<vector android:alpha="0.6" android:height="98.58dp"
+    android:viewportHeight="98.58" android:viewportWidth="244.91"
+    android:width="244.91dp"
+    xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="0.6"
+        android:pathData="M84.62,0h145a15.32,15.32 0,0 1,15.32 15.32V67a31.54,31.54 0,0 1,-31.54 31.54H14a14,14 0,0 1,-14 -14v0A84.62,84.62 0,0 1,84.62 0Z" android:strokeAlpha="0.6">
+        <aapt:attr name="android:fillColor">
+            <gradient android:endX="244.91" android:endY="49.29"
+                android:startX="0" android:startY="49.29" android:type="linear">
+                <item android:color="#FFC3C4C5" android:offset="0"/>
+                <item android:color="#FFC4C5C5" android:offset="0.05"/>
+                <item android:color="#FFC7C7C7" android:offset="0.47"/>
+                <item android:color="#F7C4C4C4" android:offset="0.54"/>
+                <item android:color="#E5BABABA" android:offset="0.65"/>
+                <item android:color="#C6ABABAB" android:offset="0.77"/>
+                <item android:color="#9E969696" android:offset="0.91"/>
+                <item android:color="#7F878787" android:offset="1"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path android:fillAlpha="0.75" android:fillColor="#FF000000"
+        android:pathData="M80.12,74.15 L112.63,26.6v-0.26H82.9V20h39.56v4.6L90.12,72v0.26h32.77v6.35H80.12Z" android:strokeAlpha="0.75"/>
+    <path android:fillAlpha="0.75" android:fillColor="#FF000000"
+        android:pathData="M132.19,20h7.56V72.24h25v6.35h-32.6Z" android:strokeAlpha="0.75"/>
+</vector>
diff --git a/src/android/app/src/main/res/drawable/zl_trigger_depressed.xml b/src/android/app/src/main/res/drawable/zl_trigger_depressed.xml
new file mode 100644
index 000000000..00393c04d
--- /dev/null
+++ b/src/android/app/src/main/res/drawable/zl_trigger_depressed.xml
@@ -0,0 +1,10 @@
+<vector android:alpha="0.6" android:height="98.58dp"
+    android:viewportHeight="98.58" android:viewportWidth="244.91"
+    android:width="244.91dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="0.5" android:fillColor="#151515"
+        android:pathData="M84.62,0h145a15.32,15.32 0,0 1,15.32 15.32V67a31.54,31.54 0,0 1,-31.54 31.54H14a14,14 0,0 1,-14 -14v0A84.62,84.62 0,0 1,84.62 0Z" android:strokeAlpha="0.5"/>
+    <path android:fillAlpha="0.75" android:fillColor="#fff"
+        android:pathData="M80.12,74.15 L112.63,26.6v-0.26H82.9V20h39.56v4.6L90.12,72v0.26h32.77v6.35H80.12Z" android:strokeAlpha="0.75"/>
+    <path android:fillAlpha="0.75" android:fillColor="#fff"
+        android:pathData="M132.19,20h7.56V72.24h25v6.35h-32.6Z" android:strokeAlpha="0.75"/>
+</vector>
diff --git a/src/android/app/src/main/res/drawable/zr_trigger.xml b/src/android/app/src/main/res/drawable/zr_trigger.xml
new file mode 100644
index 000000000..2b3a92184
--- /dev/null
+++ b/src/android/app/src/main/res/drawable/zr_trigger.xml
@@ -0,0 +1,25 @@
+<vector android:alpha="0.6" android:height="98.58dp"
+    android:viewportHeight="98.58" android:viewportWidth="244.91"
+    android:width="244.91dp"
+    xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="0.6"
+        android:pathData="M230.91,98.58l-199.4,-0a31.54,31.54 135,0 1,-31.54 -31.54L-0.03,15.31a15.32,15.32 0,0 1,15.32 -15.32l145,-0A84.62,84.62 0,0 1,244.91 84.58l-0,-0A14,14 0,0 1,230.91 98.58Z" android:strokeAlpha="0.6">
+        <aapt:attr name="android:fillColor">
+            <gradient android:endX="0" android:endY="49.29"
+                android:startX="244.91" android:startY="49.29" android:type="linear">
+                <item android:color="#FFC3C4C5" android:offset="0"/>
+                <item android:color="#FFC4C5C5" android:offset="0.05"/>
+                <item android:color="#FFC7C7C7" android:offset="0.47"/>
+                <item android:color="#F7C4C4C4" android:offset="0.54"/>
+                <item android:color="#E5BABABA" android:offset="0.65"/>
+                <item android:color="#C6ABABAB" android:offset="0.77"/>
+                <item android:color="#9E969696" android:offset="0.91"/>
+                <item android:color="#7F878787" android:offset="1"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path android:fillAlpha="0.75" android:fillColor="#FF000000"
+        android:pathData="M77.34,74.37l32.51,-47.55v-0.26H80.12V20.21h39.55v4.61L87.34,72.2v0.26h32.77V78.8H77.34Z" android:strokeAlpha="0.75"/>
+    <path android:fillAlpha="0.75" android:fillColor="#FF000000"
+        android:pathData="M129.41,21a78,78 0,0 1,14.51 -1.22c8.09,0 13.3,1.48 17,4.78a14.62,14.62 0,0 1,4.6 11.13c0,7.73 -4.87,12.86 -11,15v0.26c4.52,1.56 7.22,5.74 8.61,11.82 1.91,8.17 3.3,13.82 4.52,16.08h-7.82c-1,-1.65 -2.26,-6.69 -3.92,-14C154.1,56.72 151,53.68 144.1,53.42H137V78.8h-7.56ZM137,47.68h7.74c8.08,0 13.21,-4.43 13.21,-11.12 0,-7.57 -5.48,-10.87 -13.47,-11a30.92,30.92 0,0 0,-7.48 0.7Z" android:strokeAlpha="0.75"/>
+</vector>
diff --git a/src/android/app/src/main/res/drawable/zr_trigger_depressed.xml b/src/android/app/src/main/res/drawable/zr_trigger_depressed.xml
new file mode 100644
index 000000000..8a9ee5036
--- /dev/null
+++ b/src/android/app/src/main/res/drawable/zr_trigger_depressed.xml
@@ -0,0 +1,10 @@
+<vector android:alpha="0.6" android:height="98.58dp"
+    android:viewportHeight="98.58" android:viewportWidth="244.91"
+    android:width="244.91dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="0.5" android:fillColor="#151515"
+        android:pathData="M230.91,98.58l-199.4,-0a31.54,31.54 135,0 1,-31.54 -31.54L-0.03,15.31a15.32,15.32 0,0 1,15.32 -15.32l145,-0A84.62,84.62 0,0 1,244.91 84.58l-0,-0A14,14 0,0 1,230.91 98.58Z" android:strokeAlpha="0.5"/>
+    <path android:fillAlpha="0.75" android:fillColor="#fff"
+        android:pathData="M77.34,74.37l32.51,-47.55v-0.26H80.12V20.21h39.55v4.61L87.34,72.2v0.26h32.77V78.8H77.34Z" android:strokeAlpha="0.75"/>
+    <path android:fillAlpha="0.75" android:fillColor="#fff"
+        android:pathData="M129.41,21a78,78 0,0 1,14.51 -1.22c8.09,0 13.3,1.48 17,4.78a14.62,14.62 0,0 1,4.6 11.13c0,7.73 -4.87,12.86 -11,15v0.26c4.52,1.56 7.22,5.74 8.61,11.82 1.91,8.17 3.3,13.82 4.52,16.08h-7.82c-1,-1.65 -2.26,-6.69 -3.92,-14C154.1,56.72 151,53.68 144.1,53.42H137V78.8h-7.56ZM137,47.68h7.74c8.08,0 13.21,-4.43 13.21,-11.12 0,-7.57 -5.48,-10.87 -13.47,-11a30.92,30.92 0,0 0,-7.48 0.7Z" android:strokeAlpha="0.75"/>
+</vector>
diff --git a/src/android/app/src/main/res/values/integers.xml b/src/android/app/src/main/res/values/integers.xml
index 2d750d89a..6e81215a5 100644
--- a/src/android/app/src/main/res/values/integers.xml
+++ b/src/android/app/src/main/res/values/integers.xml
@@ -17,13 +17,13 @@
     <integer name="SWITCH_STICK_R_X">715</integer>
     <integer name="SWITCH_STICK_R_Y">740</integer>
     <integer name="SWITCH_TRIGGER_L_X">13</integer>
-    <integer name="SWITCH_TRIGGER_L_Y">0</integer>
+    <integer name="SWITCH_TRIGGER_L_Y">125</integer>
     <integer name="SWITCH_TRIGGER_R_X">895</integer>
-    <integer name="SWITCH_TRIGGER_R_Y">0</integer>
+    <integer name="SWITCH_TRIGGER_R_Y">125</integer>
     <integer name="SWITCH_TRIGGER_ZL_X">13</integer>
-    <integer name="SWITCH_TRIGGER_ZL_Y">115</integer>
+    <integer name="SWITCH_TRIGGER_ZL_Y">0</integer>
     <integer name="SWITCH_TRIGGER_ZR_X">895</integer>
-    <integer name="SWITCH_TRIGGER_ZR_Y">115</integer>
+    <integer name="SWITCH_TRIGGER_ZR_Y">0</integer>
     <integer name="SWITCH_BUTTON_MINUS_X">440</integer>
     <integer name="SWITCH_BUTTON_MINUS_Y">850</integer>
     <integer name="SWITCH_BUTTON_PLUS_X">520</integer>
author	german77 <juangerman-13@hotmail.com>	2023-03-04 19:29:19 +0100
committer	bunnei <bunneidev@gmail.com>	2023-06-03 09:05:34 +0200
commit	7dd02363a3e05be1a9df7e26de70528facbf0604 (patch)
tree	abaa2f3d467e6e54ae50622d68031b2e06079d83 /src/android
parent	android: Enable Kotlin support (diff)
download	yuzu-7dd02363a3e05be1a9df7e26de70528facbf0604.tar yuzu-7dd02363a3e05be1a9df7e26de70528facbf0604.tar.gz yuzu-7dd02363a3e05be1a9df7e26de70528facbf0604.tar.bz2 yuzu-7dd02363a3e05be1a9df7e26de70528facbf0604.tar.lz yuzu-7dd02363a3e05be1a9df7e26de70528facbf0604.tar.xz yuzu-7dd02363a3e05be1a9df7e26de70528facbf0604.tar.zst yuzu-7dd02363a3e05be1a9df7e26de70528facbf0604.zip