mirror of
https://github.com/amwatson/CitraVR.git
synced 2024-09-20 03:11:40 +02:00
update position panel placement and text
This commit is contained in:
parent
3421fcf661
commit
55ab245edb
1 changed files with 108 additions and 106 deletions
|
@ -23,171 +23,173 @@
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent">
|
app:layout_constraintTop_toTopOf="parent">
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:padding="16dp">
|
android:padding="16dp">
|
||||||
|
|
||||||
|
|
||||||
<!-- Header for instructions -->
|
<!-- Header for instructions -->
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/header_instructions"
|
android:id="@+id/header_instructions"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:padding="8dp"
|
||||||
android:text="To Move a Panel:"
|
android:text="To Move a Panel:"
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Large"
|
android:textAppearance="@style/TextAppearance.AppCompat.Large"
|
||||||
android:textColor="@color/citra_onPrimary"
|
android:textColor="@color/citra_onPrimary"
|
||||||
android:textSize="18sp"
|
android:textSize="28sp" />
|
||||||
android:padding="8dp"/>
|
|
||||||
|
|
||||||
<!-- Vertical Movement Section -->
|
<!-- Vertical Movement Section -->
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/vertical_header"
|
android:id="@+id/vertical_header"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:padding="8dp"
|
||||||
android:text="Vertical Movement"
|
android:text="Vertical Movement"
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Large"
|
android:textAppearance="@style/TextAppearance.AppCompat.Large"
|
||||||
android:textColor="@color/citra_onPrimary"
|
android:textColor="@color/citra_onPrimary"
|
||||||
android:textSize="18sp"
|
android:textSize="18sp" />
|
||||||
android:padding="8dp"/>
|
|
||||||
|
|
||||||
<LinearLayout
|
<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_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:drawableStart="@drawable/ic_touch_app"
|
android:orientation="vertical"
|
||||||
android:drawablePadding="8dp"
|
android:paddingStart="18dp">
|
||||||
android:text="Press and hold the index trigger while targeting the panel."
|
<!-- Activate vertical movement -->
|
||||||
android:textColor="@color/citra_onPrimary"
|
<TextView
|
||||||
android:textSize="18sp"
|
android:layout_width="wrap_content"
|
||||||
android:padding="8dp"/>
|
android:layout_height="wrap_content"
|
||||||
|
android:drawableStart="@drawable/ic_touch_app"
|
||||||
|
android:drawablePadding="8dp"
|
||||||
|
android:padding="8dp"
|
||||||
|
android:text="Press and hold the index trigger while targeting the panel."
|
||||||
|
android:textColor="@color/citra_onPrimary"
|
||||||
|
android:textSize="18sp" />
|
||||||
|
|
||||||
<!-- Move vertically -->
|
<!-- Move vertically -->
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:drawableStart="@drawable/ic_swap_vert"
|
android:drawableStart="@drawable/ic_swap_vert"
|
||||||
android:drawablePadding="8dp"
|
android:drawablePadding="8dp"
|
||||||
android:text="Slide the motion controller up or down to adjust the panel's vertical position."
|
android:padding="8dp"
|
||||||
android:textColor="@color/citra_onPrimary"
|
android:text="Slide the motion controller up or down to adjust the panel's vertical position."
|
||||||
android:textSize="18sp"
|
android:textColor="@color/citra_onPrimary"
|
||||||
android:padding="8dp"/>
|
android:textSize="18sp" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<!-- Depth Movement Section -->
|
<!-- Depth Movement Section -->
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/depth_header"
|
android:id="@+id/depth_header"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:padding="8dp"
|
||||||
android:text="Depth Adjustment"
|
android:text="Depth Adjustment"
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Large"
|
android:textAppearance="@style/TextAppearance.AppCompat.Large"
|
||||||
android:textColor="@color/citra_onPrimary"
|
android:textColor="@color/citra_onPrimary"
|
||||||
android:textSize="18sp"
|
android:textSize="18sp" />
|
||||||
android:padding="8dp"/>
|
|
||||||
|
|
||||||
<!-- Adjust panel depth -->
|
<!-- Adjust panel depth -->
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:paddingStart="18dp">
|
android:paddingStart="18dp">
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
<TextView
|
||||||
android:layout_height="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:drawableStart="@drawable/ic_settings_ethernet"
|
android:layout_height="wrap_content"
|
||||||
android:drawablePadding="8dp"
|
android:drawableStart="@drawable/ic_settings_ethernet"
|
||||||
android:text="Move the thumbstick forward to extend deeper or pull backward to bring closer."
|
android:drawablePadding="8dp"
|
||||||
android:textColor="@color/citra_onPrimary"
|
android:padding="8dp"
|
||||||
android:textSize="18sp"
|
android:text="Move the thumbstick forward to extend deeper or pull backward to bring closer."
|
||||||
android:padding="8dp"/>
|
android:textColor="@color/citra_onPrimary"
|
||||||
</LinearLayout>
|
android:textSize="18sp" />
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
<!-- Horizontal Movement Section -->
|
<!-- Horizontal Movement Section -->
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/horizontal_header"
|
android:id="@+id/horizontal_header"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:padding="8dp"
|
||||||
android:text="Horizontal Movement"
|
android:text="Horizontal Movement"
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Large"
|
android:textAppearance="@style/TextAppearance.AppCompat.Large"
|
||||||
android:textColor="@color/citra_onPrimary"
|
android:textColor="@color/citra_onPrimary"
|
||||||
android:textSize="18sp"
|
android:textSize="18sp" />
|
||||||
android:padding="8dp"/>
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:paddingStart="18dp"
|
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
>
|
android:paddingStart="18dp">
|
||||||
|
|
||||||
|
<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:padding="8dp"
|
||||||
|
android:text="Use the toggle to enable or disable horizontal movement."
|
||||||
|
android:textColor="@color/citra_onPrimary"
|
||||||
|
android:textSize="18sp" />
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<!-- Move horizontally -->
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:drawableStart="@drawable/ic_swap_horiz"
|
||||||
|
android:drawablePadding="8dp"
|
||||||
|
android:padding="8dp"
|
||||||
|
android:text="With horizontal movement enabled, slide left or right to adjust horizontally."
|
||||||
|
android:textColor="@color/citra_onPrimary"
|
||||||
|
android:textSize="18sp" />
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/reset_header"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:padding="8dp"
|
||||||
|
android:text="Reset"
|
||||||
|
android:textAppearance="@style/TextAppearance.AppCompat.Large"
|
||||||
|
android:textColor="@color/citra_onPrimary"
|
||||||
|
android:textSize="18sp" />
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:orientation="horizontal">
|
android:paddingStart="18dp">
|
||||||
|
|
||||||
<ToggleButton
|
<Button
|
||||||
android:id="@+id/horizontalAxisToggle"
|
android:id="@+id/btnReset"
|
||||||
android:layout_width="wrap_content"
|
style="@style/VrRibbonButtonStyle"
|
||||||
android:layout_height="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:background="@drawable/vr_toggle_background"
|
android:layout_height="wrap_content"
|
||||||
android:textColor="@color/citra_onPrimary" />
|
android:layout_marginBottom="10dp"
|
||||||
|
android:text="Reset" />
|
||||||
<!-- 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"/>
|
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:drawablePadding="8dp"
|
||||||
|
android:padding="8dp"
|
||||||
|
android:text="Press this button to reset position."
|
||||||
|
android:textColor="@color/citra_onPrimary"
|
||||||
|
android:textSize="18sp" />
|
||||||
</LinearLayout>
|
</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>
|
</LinearLayout>
|
||||||
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
|
||||||
<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_constraintTop_toTopOf="@+id/lowerPanelPlaceHolder">
|
|
||||||
|
|
||||||
<Button
|
|
||||||
android:id="@+id/btnReset"
|
|
||||||
style="@style/VrRibbonButtonStyle"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginBottom="10dp"
|
|
||||||
android:text="Reset" />
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="0dp"
|
|
||||||
android:layout_weight="1"
|
|
||||||
android:orientation="horizontal" />
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
Loading…
Reference in a new issue