From 55ab245edb149d03b9339649f9e814aa0e96f1a8 Mon Sep 17 00:00:00 2001
From: amwatson <contact@fewerwrong.org>
Date: Mon, 13 May 2024 23:27:40 -0500
Subject: [PATCH] update position panel placement and text

---
 .../res/layout/vr_ribbon_position_panel.xml   | 214 +++++++++---------
 1 file changed, 108 insertions(+), 106 deletions(-)

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
index 6d60a8bc6..a6ab15e7d 100644
--- 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
@@ -23,171 +23,173 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <LinearLayout
-            xmlns:android="http://schemas.android.com/apk/res/android"
+        <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:padding="8dp"
                 android:text="To Move a Panel:"
                 android:textAppearance="@style/TextAppearance.AppCompat.Large"
                 android:textColor="@color/citra_onPrimary"
-                android:textSize="18sp"
-                android:padding="8dp"/>
+                android:textSize="28sp" />
 
             <!-- Vertical Movement Section -->
             <TextView
                 android:id="@+id/vertical_header"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:padding="8dp"
                 android:text="Vertical Movement"
                 android:textAppearance="@style/TextAppearance.AppCompat.Large"
                 android:textColor="@color/citra_onPrimary"
-                android:textSize="18sp"
-                android:padding="8dp"/>
+                android:textSize="18sp" />
 
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingStart="18dp"
-            android:orientation="vertical">
-            <!-- Activate vertical movement -->
-            <TextView
+            <LinearLayout
                 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"/>
+                android:orientation="vertical"
+                android:paddingStart="18dp">
+                <!-- Activate vertical movement -->
+                <TextView
+                    android:layout_width="wrap_content"
+                    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 -->
-            <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>
+                <!-- Move vertically -->
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:drawableStart="@drawable/ic_swap_vert"
+                    android:drawablePadding="8dp"
+                    android:padding="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" />
+            </LinearLayout>
 
             <!-- Depth Movement Section -->
             <TextView
                 android:id="@+id/depth_header"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:padding="8dp"
                 android:text="Depth Adjustment"
                 android:textAppearance="@style/TextAppearance.AppCompat.Large"
                 android:textColor="@color/citra_onPrimary"
-                android:textSize="18sp"
-                android:padding="8dp"/>
+                android:textSize="18sp" />
 
             <!-- 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>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:drawableStart="@drawable/ic_settings_ethernet"
+                    android:drawablePadding="8dp"
+                    android:padding="8dp"
+                    android:text="Move the thumbstick forward to extend deeper or pull backward to bring closer."
+                    android:textColor="@color/citra_onPrimary"
+                    android:textSize="18sp" />
+            </LinearLayout>
 
             <!-- Horizontal Movement Section -->
             <TextView
                 android:id="@+id/horizontal_header"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:padding="8dp"
                 android:text="Horizontal Movement"
                 android:textAppearance="@style/TextAppearance.AppCompat.Large"
                 android:textColor="@color/citra_onPrimary"
-                android:textSize="18sp"
-                android:padding="8dp"/>
+                android:textSize="18sp" />
+
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingStart="18dp"
                 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
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal">
+                android:paddingStart="18dp">
 
-            <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"/>
+                <Button
+                    android:id="@+id/btnReset"
+                    style="@style/VrRibbonButtonStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="10dp"
+                    android:text="Reset" />
 
+                <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>
-
-            <!-- 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"
-        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>
\ No newline at end of file