mirror of
https://github.com/amwatson/CitraVR.git
synced 2024-09-19 19:01:38 +02:00
update resources for position panel
This commit is contained in:
amwatson
parent
15b41d8421
commit
b5b2d6889c
7 changed files with 198 additions and 14 deletions
|
|
@ -0,0 +1,9 @@
|
|||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="40dp"
|
||||
android:height="40dp"
|
||||
android:viewportWidth="960"
|
||||
android:viewportHeight="960">
|
||||
<path
|
||||
android:pathData="M186.67,840q-27,0 -46.84,-19.83Q120,800.33 120,773.33v-168h66.67v168h168L354.67,840h-168ZM605.33,840v-66.67h168v-168L840,605.33v168q0,27 -19.83,46.84Q800.33,840 773.33,840h-168ZM120,354.67v-168q0,-27 19.83,-46.84Q159.67,120 186.67,120h168v66.67h-168v168L120,354.67ZM773.33,354.67v-168h-168L605.33,120h168q27,0 46.84,19.83Q840,159.67 840,186.67v168h-66.67ZM480,671.33q-79.4,0 -135.37,-55.96Q288.67,559.4 288.67,480t55.96,-135.37Q400.6,288.67 480,288.67t135.37,55.96Q671.33,400.6 671.33,480t-55.96,135.37Q559.4,671.33 480,671.33ZM480,604.67q52.67,0 88.67,-36t36,-88.67q0,-52.67 -36,-88.67t-88.67,-36q-52.67,0 -88.67,36t-36,88.67q0,52.67 36,88.67t88.67,36ZM480,480Z"
|
||||
android:fillColor="@color/citra_onPrimary"/>
|
||||
</vector>
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="40dp"
|
||||
android:height="40dp"
|
||||
android:viewportWidth="960"
|
||||
android:viewportHeight="960">
|
||||
<path
|
||||
android:pathData="m680,720 l-46.67,-46.67L824.67,480 633.33,286.67 680,240l240,240 -240,240ZM280,720L40,480l240,-240 46.67,46.67L135.33,480l191.34,193.33L280,720ZM320,516.67q-15,0 -25.83,-10.84Q283.33,495 283.33,480q0,-15 10.84,-25.83Q305,443.33 320,443.33q15,0 25.83,10.84Q356.67,465 356.67,480q0,15 -10.84,25.83Q335,516.67 320,516.67ZM480,516.67q-15,0 -25.83,-10.84Q443.33,495 443.33,480q0,-15 10.84,-25.83Q465,443.33 480,443.33q15,0 25.83,10.84Q516.67,465 516.67,480q0,15 -10.84,25.83Q495,516.67 480,516.67ZM640,516.67q-15,0 -25.83,-10.84Q603.33,495 603.33,480q0,-15 10.84,-25.83Q625,443.33 640,443.33q15,0 25.83,10.84Q676.67,465 676.67,480q0,15 -10.84,25.83Q655,516.67 640,516.67Z"
|
||||
android:fillColor="@color/citra_onPrimary"/>
|
||||
</vector>
|
||||
9
src/android/app/src/main/res/drawable/ic_swap_horiz.xml
Normal file
9
src/android/app/src/main/res/drawable/ic_swap_horiz.xml
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="40dp"
|
||||
android:height="40dp"
|
||||
android:viewportWidth="960"
|
||||
android:viewportHeight="960">
|
||||
<path
|
||||
android:pathData="M275.33,800 L80,604.67l195.33,-195.34 46.67,47 -115,115h306.33L513.33,638L207,638l115,115 -46.67,47ZM684.67,550.67 L638,503.67 753,388.67L446.67,388.67L446.67,322L753,322L638,207l46.67,-47L880,355.33 684.67,550.67Z"
|
||||
android:fillColor="@color/citra_onPrimary"/>
|
||||
</vector>
|
||||
9
src/android/app/src/main/res/drawable/ic_swap_vert.xml
Normal file
9
src/android/app/src/main/res/drawable/ic_swap_vert.xml
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="40dp"
|
||||
android:height="40dp"
|
||||
android:viewportWidth="960"
|
||||
android:viewportHeight="960">
|
||||
<path
|
||||
android:pathData="M322,513.33L322,207L207,322l-47,-46.67L355.33,80l195.34,195.33 -47,46.67 -115,-115v306.33L322,513.33ZM604.67,880 L409.33,684.67l47,-46.67 115,115v-306.33L638,446.67L638,753l115,-115 47,46.67L604.67,880Z"
|
||||
android:fillColor="@color/citra_onPrimary"/>
|
||||
</vector>
|
||||
9
src/android/app/src/main/res/drawable/ic_touch_app.xml
Normal file
9
src/android/app/src/main/res/drawable/ic_touch_app.xml
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="40dp"
|
||||
android:height="40dp"
|
||||
android:viewportWidth="960"
|
||||
android:viewportHeight="960">
|
||||
<path
|
||||
android:pathData="M436.33,880q-28.66,0 -54.83,-12 -26.17,-12 -43.83,-34.67L120.33,557l20.34,-22q16,-17 39,-20.67 23,-3.66 43,8l90.66,50.34L313.33,220q0,-14.17 9.62,-23.75t23.83,-9.58q14.22,0 23.89,9.58 9.66,9.58 9.66,23.75v467.33L252,616l138.67,176.33q8.66,10.34 20.5,15.67t25.16,5.33h210.34q36.33,0 61.5,-25.16 25.16,-25.17 25.16,-61.5L733.33,560q0,-22.67 -15.33,-38 -15.33,-15.33 -38,-15.33L460.33,506.67L460.33,440h219.43q50.1,0 85.17,35T800,560v166.67q0,64 -44.67,108.66Q710.67,880 646.67,880L436.33,880ZM191,310q-11.72,-19.84 -18.02,-42.83 -6.31,-22.99 -6.31,-47.33 0,-74.84 52.65,-127.34T346.67,40q74.7,0 127.35,52.66 52.65,52.66 52.65,127.37 0,24.3 -6.31,47.24T502.33,310l-57.66,-33.33Q452,264 456,249.83q4,-14.16 4,-30.15 0,-47.01 -33.08,-80.01 -33.08,-33 -80.33,-33 -47.26,0 -80.26,33.05 -33,33.06 -33,80.28 0,15.67 4,29.83 4,14.17 11.34,26.84L191,310ZM492.67,626.67Z"
|
||||
android:fillColor="@color/citra_onPrimary"/>
|
||||
</vector>
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_checked="true" android:drawable="@drawable/vr_ribbon_button_pressed"/>
|
||||
<!-- Default state -->
|
||||
<item android:drawable="@drawable/vr_ribbon_button_default"/>
|
||||
</selector>
|
||||
|
|
@ -4,8 +4,7 @@
|
|||
android:id="@+id/position_panel"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:theme="@style/Theme.Material3.DayNight"
|
||||
>
|
||||
android:theme="@style/Theme.Material3.DayNight">
|
||||
|
||||
<FrameLayout
|
||||
android:layout_width="1000dp"
|
||||
|
|
@ -14,15 +13,156 @@
|
|||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<FrameLayout
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:id="@+id/lowerPanelPlaceHolder"
|
||||
android:layout_width="900dp"
|
||||
android:layout_height="675dp"
|
||||
android:layout_gravity="center"
|
||||
android:layout_marginTop="18dp"
|
||||
android:background="#093A60"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
app:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
<LinearLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:padding="16dp">
|
||||
|
||||
|
||||
<!-- Header for instructions -->
|
||||
<TextView
|
||||
android:id="@+id/header_instructions"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="To Move a Panel:"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Large"
|
||||
android:textColor="@color/citra_onPrimary"
|
||||
android:textSize="18sp"
|
||||
android:padding="8dp"/>
|
||||
|
||||
<!-- Vertical Movement Section -->
|
||||
<TextView
|
||||
android:id="@+id/vertical_header"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Vertical Movement"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Large"
|
||||
android:textColor="@color/citra_onPrimary"
|
||||
android:textSize="18sp"
|
||||
android:padding="8dp"/>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingStart="18dp"
|
||||
android:orientation="vertical">
|
||||
<!-- Activate vertical movement -->
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:drawableStart="@drawable/ic_touch_app"
|
||||
android:drawablePadding="8dp"
|
||||
android:text="Press and hold the index trigger while targeting the panel."
|
||||
android:textColor="@color/citra_onPrimary"
|
||||
android:textSize="18sp"
|
||||
android:padding="8dp"/>
|
||||
|
||||
<!-- Move vertically -->
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:drawableStart="@drawable/ic_swap_vert"
|
||||
android:drawablePadding="8dp"
|
||||
android:text="Slide the motion controller up or down to adjust the panel's vertical position."
|
||||
android:textColor="@color/citra_onPrimary"
|
||||
android:textSize="18sp"
|
||||
android:padding="8dp"/>
|
||||
</LinearLayout>
|
||||
|
||||
<!-- Depth Movement Section -->
|
||||
<TextView
|
||||
android:id="@+id/depth_header"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Depth Adjustment"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Large"
|
||||
android:textColor="@color/citra_onPrimary"
|
||||
android:textSize="18sp"
|
||||
android:padding="8dp"/>
|
||||
|
||||
<!-- Adjust panel depth -->
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingStart="18dp">
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:drawableStart="@drawable/ic_settings_ethernet"
|
||||
android:drawablePadding="8dp"
|
||||
android:text="Move the thumbstick forward to extend deeper or pull backward to bring closer."
|
||||
android:textColor="@color/citra_onPrimary"
|
||||
android:textSize="18sp"
|
||||
android:padding="8dp"/>
|
||||
</LinearLayout>
|
||||
|
||||
<!-- Horizontal Movement Section -->
|
||||
<TextView
|
||||
android:id="@+id/horizontal_header"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Horizontal Movement"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Large"
|
||||
android:textColor="@color/citra_onPrimary"
|
||||
android:textSize="18sp"
|
||||
android:padding="8dp"/>
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingStart="18dp"
|
||||
android:orientation="vertical"
|
||||
>
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ToggleButton
|
||||
android:id="@+id/horizontalAxisToggle"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/vr_toggle_background"
|
||||
android:textColor="@color/citra_onPrimary" />
|
||||
|
||||
<!-- Toggle horizontal movement -->
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:drawablePadding="8dp"
|
||||
android:text="Toggle Horizontal Movement: Use the toggle to enable or disable horizontal movement."
|
||||
android:textColor="@color/citra_onPrimary"
|
||||
android:textSize="18sp"
|
||||
android:padding="8dp"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<!-- Move horizontally -->
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:drawableStart="@drawable/ic_swap_horiz"
|
||||
android:drawablePadding="8dp"
|
||||
android:text="With horizontal movement enabled, slide left or right to adjust horizontally."
|
||||
android:textColor="@color/citra_onPrimary"
|
||||
android:textSize="18sp"
|
||||
android:padding="8dp"/>
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="100dp"
|
||||
|
|
@ -33,7 +173,6 @@
|
|||
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
|
||||
|
|
@ -47,14 +186,8 @@
|
|||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="1" />
|
||||
|
||||
<ToggleButton
|
||||
android:id="@+id/horizontalAxisToggle"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Lock Horizontal Axis"
|
||||
/>
|
||||
android:layout_weight="1"
|
||||
android:orientation="horizontal" />
|
||||
|
||||
</LinearLayout>
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
Loading…
Reference in a new issue