From 53ea3d037fc31965849519844cd2f4633a3b946d Mon Sep 17 00:00:00 2001
From: amwatson <contact@fewerwrong.org>
Date: Wed, 21 Feb 2024 17:15:59 -0600
Subject: [PATCH] restructure ribbon

---
 .../app/src/main/res/layout/vr_ribbon.xml     | 125 ++++++++++--------
 1 file changed, 68 insertions(+), 57 deletions(-)

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 dac418b75..a284f6699 100644
--- a/src/android/app/src/main/res/layout/vr_ribbon.xml
+++ b/src/android/app/src/main/res/layout/vr_ribbon.xml
@@ -5,84 +5,95 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content">
 
-    <FrameLayout
-        android:layout_width="1300dp"
-        android:layout_height="0dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@drawable/vr_menu_background"
-        android:padding="50dp"
+        android:background="@android:color/transparent"
+        android:layout_margin="5dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
         <FrameLayout
-            android:layout_width="1000dp"
+            android:layout_width="1300dp"
             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="10dp"
-            android:background="#FFFF00"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/vr_menu_background"
+            android:backgroundTint="#011627"
+            android:padding="50dp"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <LinearLayout
-            android:layout_width="100dp"
-            android:layout_height="675dp"
-            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">
+            app:layout_constraintTop_toTopOf="parent">
 
-            <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" />
+            <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="10dp"
+                android:background="@android:color/transparent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
             <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1" />
+                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">
 
-            <ImageButton
-                android:id="@+id/buttonHome"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="10dp"
-                android:background="@null"
-                android:src="@drawable/button_home" />
+                <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="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>
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="1" />
+
+                <ImageButton
+                    android:id="@+id/buttonHome"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="10dp"
+                    android:background="@null"
+                    android:src="@drawable/button_home" />
+
+                <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>
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>