From a75f5b7afd1645c4da219a722deab08e40e3e073 Mon Sep 17 00:00:00 2001
From: amwatson <contact@fewerwrong.org>
Date: Wed, 20 Mar 2024 00:17:20 -0500
Subject: [PATCH] [VR Ribbon] transitioning between two menus

---
 .../citra/citra_emu/vr/ui/VrRibbonLayer.kt    |  27 ++++-
 .../app/src/main/res/layout/vr_ribbon.xml     |   7 +-
 .../main/res/layout/vr_ribbon_main_panel.xml  | 111 +++++++++---------
 .../res/layout/vr_ribbon_position_panel.xml   |  16 +++
 4 files changed, 101 insertions(+), 60 deletions(-)
 create mode 100644 src/android/app/src/main/res/layout/vr_ribbon_position_panel.xml

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 100d584c4..5b390d182 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
@@ -1,19 +1,33 @@
 package org.citra.citra_emu.vr.ui
 
 import android.view.KeyEvent
-import android.view.MotionEvent
+import android.view.View
 import android.widget.Button
-import android.widget.ImageButton
 import org.citra.citra_emu.NativeLibrary
 import org.citra.citra_emu.R
 import org.citra.citra_emu.vr.VrActivity
 
 class VrRibbonLayer(activity: VrActivity) : VrUILayer(activity, R.layout.vr_ribbon) {
+
+    enum class MenuType(val resId: Int) {
+        MAIN( R.id.main_panel),
+        POSITION(R.id.position_panel)
+    }
+    private var menuTypeCurrent : MenuType = MenuType.MAIN
+
        override fun onSurfaceCreated() {
         super.onSurfaceCreated()
         initializeMainView()
     }
 
+    fun switchMenus(menuTypeNew: MenuType) {
+        if (menuTypeNew == menuTypeCurrent)
+            return
+        window?.findViewById<View>(menuTypeCurrent.resId)?.visibility = View.GONE
+        menuTypeCurrent = menuTypeNew
+        window?.findViewById<View>(menuTypeCurrent.resId)?.visibility = View.VISIBLE
+    }
+
     fun initializeMainView() {
         window?.findViewById<Button>(R.id.buttonSelect)?.setOnTouchListener { _, motionEvent ->
             val action: Int = when (motionEvent.action) {
@@ -48,8 +62,15 @@ class VrRibbonLayer(activity: VrActivity) : VrUILayer(activity, R.layout.vr_ribb
             false
         }
 
-        window?.findViewById<Button>(R.id.buttonNextMenu)?.setOnTouchListener { _, motionEvent ->
+        window?.findViewById<Button>(R.id.buttonNextMenu)?.setOnClickListener{ _ ->
+            val nextIdx = (menuTypeCurrent.ordinal + 1) % MenuType.values().size
+            switchMenus(MenuType.values()[nextIdx])
+            false
+        }
 
+        window?.findViewById<Button>(R.id.buttonPrevMenu)?.setOnClickListener { _ ->
+            val prevIdx = (menuTypeCurrent.ordinal - 1 + MenuType.values().size) % MenuType.values().size
+            switchMenus(MenuType.values()[prevIdx])
             false
         }
     }
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 33b0cfe75..f53f788c9 100644
--- a/src/android/app/src/main/res/layout/vr_ribbon.xml
+++ b/src/android/app/src/main/res/layout/vr_ribbon.xml
@@ -36,11 +36,14 @@
                 android:id="@+id/panelHolder"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:minWidth="1050dp"
+                android:minHeight="685dp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent">
 
                 <include layout="@layout/vr_ribbon_main_panel" />
+                <include layout="@layout/vr_ribbon_position_panel" android:visibility="gone" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -69,7 +72,7 @@
                         android:layout_weight="1"
                         android:minHeight="0dp"
                         android:padding="0dp"
-                        android:paddingVertical="8dp"
+                        android:paddingVertical="12dp"
                         android:text="&lt;" />
 
                     <Button
@@ -80,7 +83,7 @@
                         android:layout_weight="1"
                         android:minHeight="0dp"
                         android:padding="0dp"
-                        android:paddingVertical="8dp"
+                        android:paddingVertical="12dp"
                         android:text="&gt;" />
                 </LinearLayout>
             </LinearLayout>
diff --git a/src/android/app/src/main/res/layout/vr_ribbon_main_panel.xml b/src/android/app/src/main/res/layout/vr_ribbon_main_panel.xml
index 630b9675c..5e6fca3c9 100644
--- a/src/android/app/src/main/res/layout/vr_ribbon_main_panel.xml
+++ b/src/android/app/src/main/res/layout/vr_ribbon_main_panel.xml
@@ -1,68 +1,69 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/main_panel"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content">
 
-        <FrameLayout
-            android:layout_width="1000dp"
-            android:layout_height="0dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+    <FrameLayout
+        android:layout_width="1000dp"
+        android:layout_height="0dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
-        <FrameLayout
-            android:id="@+id/lowerPanelPlaceHolder"
-            android:layout_width="900dp"
-            android:layout_height="675dp"
-            android:layout_marginTop="18dp"
-            android:background="#093A60"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+    <FrameLayout
+        android:id="@+id/lowerPanelPlaceHolder"
+        android:layout_width="900dp"
+        android:layout_height="675dp"
+        android:layout_marginTop="18dp"
+        android:background="#093A60"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <LinearLayout
+        android:layout_width="100dp"
+        android:layout_height="400dp"
+        android:layout_gravity="center"
+        android:layout_marginStart="50dp"
+        android:gravity="center"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="@+id/lowerPanelPlaceHolder"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/lowerPanelPlaceHolder"
+        app:layout_constraintTop_toTopOf="@+id/lowerPanelPlaceHolder">
+
+        <Button
+            android:id="@+id/buttonSelect"
+            style="@style/VrRibbonButtonStyle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:text="@string/button_select" />
 
         <LinearLayout
-            android:layout_width="100dp"
-            android:layout_height="400dp"
-            android:layout_gravity="center"
-            android:layout_marginStart="50dp"
-            android:gravity="center"
-            android:orientation="vertical"
-            app:layout_constraintBottom_toBottomOf="@+id/lowerPanelPlaceHolder"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/lowerPanelPlaceHolder"
-            app:layout_constraintTop_toTopOf="@+id/lowerPanelPlaceHolder">
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1" />
 
-            <Button
-                android:id="@+id/buttonSelect"
-                style="@style/VrRibbonButtonStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="10dp"
-                android:text="@string/button_select" />
+        <Button
+            android:id="@+id/buttonStart"
+            style="@style/VrRibbonButtonStyle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/button_start" />
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1" />
 
-            <Button
-                android:id="@+id/buttonStart"
-                style="@style/VrRibbonButtonStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/button_start" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1" />
-
-            <Button
-                android:id="@+id/buttonExit"
-                style="@style/VrRibbonButtonStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/emulation_close_game" />
-        </LinearLayout>
+        <Button
+            android:id="@+id/buttonExit"
+            style="@style/VrRibbonButtonStyle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/emulation_close_game" />
+    </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/src/android/app/src/main/res/layout/vr_ribbon_position_panel.xml b/src/android/app/src/main/res/layout/vr_ribbon_position_panel.xml
new file mode 100644
index 000000000..3ea65b389
--- /dev/null
+++ b/src/android/app/src/main/res/layout/vr_ribbon_position_panel.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/position_panel"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <FrameLayout
+        android:layout_width="1000dp"
+        android:layout_height="0dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file