From dde7d9f3ca75c93f9441ebcf29750683a69a7a14 Mon Sep 17 00:00:00 2001
From: amwatson <contact@fewerwrong.org>
Date: Thu, 22 Feb 2024 20:38:47 -0600
Subject: [PATCH] add quit and next buttons

---
 .../citra/citra_emu/vr/ui/VrRibbonLayer.kt    | 13 ---------
 .../app/src/main/res/layout/vr_ribbon.xml     | 29 ++++++++++++++-----
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/src/android/app/src/main/java/org/citra/citra_emu/vr/ui/VrRibbonLayer.kt b/src/android/app/src/main/java/org/citra/citra_emu/vr/ui/VrRibbonLayer.kt
index 67f4b6530..7bd82d425 100644
--- a/src/android/app/src/main/java/org/citra/citra_emu/vr/ui/VrRibbonLayer.kt
+++ b/src/android/app/src/main/java/org/citra/citra_emu/vr/ui/VrRibbonLayer.kt
@@ -18,19 +18,6 @@ class VrRibbonLayer(activity: VrActivity) : VrUILayer(activity, R.layout.vr_ribb
                 else NativeLibrary.ButtonState.RELEASED)
             false
         }
-        window?.findViewById<ImageButton>(R.id.buttonHome)?.setOnTouchListener { view, motionEvent ->
-            if (motionEvent.action == MotionEvent.ACTION_DOWN) {
-                (view as ImageButton).setImageResource(R.drawable.button_home_pressed)
-            } else {
-                (view as ImageButton).setImageResource(R.drawable.button_home)
-            }
-            NativeLibrary.onGamePadEvent(NativeLibrary.TouchScreenDevice,
-                NativeLibrary.ButtonType.BUTTON_HOME,
-                if (motionEvent.action == MotionEvent.ACTION_DOWN)
-                    NativeLibrary.ButtonState.PRESSED
-                else NativeLibrary.ButtonState.RELEASED)
-            false
-        }
         window?.findViewById<Button>(R.id.buttonStart)?.setOnTouchListener { _, motionEvent ->
             NativeLibrary.onGamePadEvent(NativeLibrary.TouchScreenDevice,
                 NativeLibrary.ButtonType.BUTTON_START,
diff --git a/src/android/app/src/main/res/layout/vr_ribbon.xml b/src/android/app/src/main/res/layout/vr_ribbon.xml
index 1b887384a..4a360afd2 100644
--- a/src/android/app/src/main/res/layout/vr_ribbon.xml
+++ b/src/android/app/src/main/res/layout/vr_ribbon.xml
@@ -73,13 +73,12 @@
                     android:layout_height="0dp"
                     android:layout_weight="1" />
 
-                <ImageButton
-                    android:id="@+id/buttonHome"
+                <Button
+                    android:id="@+id/buttonStart"
+                    style="@style/VrRibbonButtonStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="10dp"
-                    android:background="@null"
-                    android:src="@drawable/button_home" />
+                    android:text="@string/button_start" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -87,11 +86,27 @@
                     android:layout_weight="1" />
 
                 <Button
-                    android:id="@+id/buttonStart"
+                    android:id="@+id/buttonExit"
                     style="@style/VrRibbonButtonStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/button_start" />
+                  android:text="@string/emulation_close_game" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="3" />
+
+
+                <Button
+                    android:id="@+id/buttonNextMenu"
+                    style="@style/VrRibbonButtonStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                  android:text=">" />
+
+
+
             </LinearLayout>
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>