archive/CitraVR
1
0
Fork 0
mirror of https://github.com/amwatson/CitraVR.git synced 2024-09-20 03:11:40 +02:00
Code Issues Projects Releases Packages Wiki Activity

[VR Ribbon] transitioning between two menus

Browse source
This commit is contained in:
amwatson 2024-03-20 00:17:20 -05:00
parent a70a7a4290
commit a75f5b7afd
4 changed files with 101 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/android/app/src/main/java/org/citra/citra_emu/vr/ui/VrRibbonLayer.kt
View file

@ -1,19 +1,33 @@
package org.citra.citra_emu.vr.ui package org.citra.citra_emu.vr.ui
import android.view.KeyEvent import android.view.KeyEvent
import android.view.MotionEvent import android.view.View
import android.widget.Button import android.widget.Button
import android.widget.ImageButton
import org.citra.citra_emu.NativeLibrary import org.citra.citra_emu.NativeLibrary
import org.citra.citra_emu.R import org.citra.citra_emu.R
import org.citra.citra_emu.vr.VrActivity import org.citra.citra_emu.vr.VrActivity
class VrRibbonLayer(activity: VrActivity) : VrUILayer(activity, R.layout.vr_ribbon) { 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() { override fun onSurfaceCreated() {
super.onSurfaceCreated() super.onSurfaceCreated()
initializeMainView() 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() { fun initializeMainView() {
window?.findViewById<Button>(R.id.buttonSelect)?.setOnTouchListener { _, motionEvent -> window?.findViewById<Button>(R.id.buttonSelect)?.setOnTouchListener { _, motionEvent ->
val action: Int = when (motionEvent.action) { val action: Int = when (motionEvent.action) {
@ -48,8 +62,15 @@ class VrRibbonLayer(activity: VrActivity) : VrUILayer(activity, R.layout.vr_ribb
false 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 false
} }
} }

7
src/android/app/src/main/res/layout/vr_ribbon.xml
View file

@ -36,11 +36,14 @@
android:id="@+id/panelHolder" android:id="@+id/panelHolder"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minWidth="1050dp"
android:minHeight="685dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<include layout="@layout/vr_ribbon_main_panel" /> <include layout="@layout/vr_ribbon_main_panel" />
<include layout="@layout/vr_ribbon_position_panel" android:visibility="gone" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
@ -69,7 +72,7 @@
android:layout_weight="1" android:layout_weight="1"
android:minHeight="0dp" android:minHeight="0dp"
android:padding="0dp" android:padding="0dp"
android:paddingVertical="8dp" android:paddingVertical="12dp"
android:text="&lt;" /> android:text="&lt;" />
<Button <Button
@ -80,7 +83,7 @@
android:layout_weight="1" android:layout_weight="1"
android:minHeight="0dp" android:minHeight="0dp"
android:padding="0dp" android:padding="0dp"
android:paddingVertical="8dp" android:paddingVertical="12dp"
android:text="&gt;" /> android:text="&gt;" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

111
src/android/app/src/main/res/layout/vr_ribbon_main_panel.xml
View file

@ -1,68 +1,69 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/main_panel"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<FrameLayout <FrameLayout
android:layout_width="1000dp" android:layout_width="1000dp"
android:layout_height="0dp" android:layout_height="0dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<FrameLayout <FrameLayout
android:id="@+id/lowerPanelPlaceHolder" android:id="@+id/lowerPanelPlaceHolder"
android:layout_width="900dp" android:layout_width="900dp"
android:layout_height="675dp" android:layout_height="675dp"
android:layout_marginTop="18dp" android:layout_marginTop="18dp"
android:background="#093A60" android:background="#093A60"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="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 <LinearLayout
android:layout_width="100dp" android:layout_width="match_parent"
android:layout_height="400dp" android:layout_height="0dp"
android:layout_gravity="center" android:layout_weight="1" />
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 <Button
android:id="@+id/buttonSelect" android:id="@+id/buttonStart"
style="@style/VrRibbonButtonStyle" style="@style/VrRibbonButtonStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="10dp" android:text="@string/button_start" />
android:text="@string/button_select" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1" /> android:layout_weight="1" />
<Button <Button
android:id="@+id/buttonStart" android:id="@+id/buttonExit"
style="@style/VrRibbonButtonStyle" style="@style/VrRibbonButtonStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/button_start" /> android:text="@string/emulation_close_game" />
</LinearLayout>
<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>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

16
src/android/app/src/main/res/layout/vr_ribbon_position_panel.xml Normal file
View file

@ -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>