From 4a12843824420ae882850db482ca485e37d46b47 Mon Sep 17 00:00:00 2001
From: NoahLacks <77650157+NoahLacks@users.noreply.github.com>
Date: Fri, 10 Jan 2025 14:25:30 -0500
Subject: [PATCH] Worked on layout for tele and auto

---
 .../app/src/main/res/layout/activity_auto.xml |  39 ++++--
 .../app/src/main/res/layout/activity_tele.xml | 130 ++++++++++++++++++
 2 files changed, 159 insertions(+), 10 deletions(-)

diff --git a/ScoutingApp/app/src/main/res/layout/activity_auto.xml b/ScoutingApp/app/src/main/res/layout/activity_auto.xml
index f8388f8..b2c6257 100644
--- a/ScoutingApp/app/src/main/res/layout/activity_auto.xml
+++ b/ScoutingApp/app/src/main/res/layout/activity_auto.xml
@@ -13,7 +13,8 @@
         android:layout_height="100dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="8dp"
-        android:text="L4"
+        android:backgroundTint="#F94C00"
+        android:text="@string/l4"
         android:textAlignment="center"
         android:textSize="40sp"
         app:layout_constraintEnd_toEndOf="parent"
@@ -25,7 +26,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_marginBottom="8dp"
-        android:text="Algae Removed From Reef"
+        android:text="@string/can_remove_algae"
         app:layout_constraintBottom_toTopOf="@+id/cb_coralPickup"
         app:layout_constraintStart_toStartOf="parent" />
 
@@ -35,7 +36,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_marginBottom="8dp"
-        android:text="Coral Pickup"
+        android:text="@string/coral_pickup"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
@@ -44,7 +45,8 @@
         android:layout_width="100dp"
         android:layout_height="100dp"
         android:layout_marginEnd="8dp"
-        android:text="L3"
+        android:backgroundTint="#F94C00"
+        android:text="@string/l3"
         android:textSize="40sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/button_L4" />
@@ -54,7 +56,8 @@
         android:layout_width="100dp"
         android:layout_height="100dp"
         android:layout_marginEnd="8dp"
-        android:text="L2"
+        android:backgroundTint="#F94C00"
+        android:text="@string/l2"
         android:textSize="40sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/button_L3" />
@@ -64,7 +67,8 @@
         android:layout_width="100dp"
         android:layout_height="100dp"
         android:layout_marginEnd="8dp"
-        android:text="L1"
+        android:backgroundTint="#F94C00"
+        android:text="@string/l1"
         android:textSize="40sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/button_L2" />
@@ -74,7 +78,8 @@
         android:layout_width="100dp"
         android:layout_height="100dp"
         android:layout_marginEnd="8dp"
-        android:text="Net"
+        android:backgroundTint="#F94C00"
+        android:text="@string/net"
         android:textSize="20sp"
         app:layout_constraintBottom_toTopOf="@+id/button_Processor"
         app:layout_constraintEnd_toEndOf="parent" />
@@ -85,7 +90,8 @@
         android:layout_height="100dp"
         android:layout_marginEnd="8dp"
         android:layout_marginBottom="8dp"
-        android:text="Processor"
+        android:backgroundTint="#F94C00"
+        android:text="@string/processor"
         android:textSize="20sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
@@ -96,7 +102,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_marginBottom="8dp"
-        android:text="Can Leave"
+        android:text="@string/can_leave"
         app:layout_constraintBottom_toTopOf="@+id/cb_algaeReef"
         app:layout_constraintStart_toStartOf="parent" />
 
@@ -106,7 +112,8 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
-        android:text="Next (Hold)"
+        android:backgroundTint="#F94C00"
+        android:text="@string/next_hold"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -118,6 +125,7 @@
         android:layout_marginTop="64dp"
         android:layout_marginEnd="8dp"
         android:layout_marginBottom="8dp"
+        android:contentDescription="@string/image_of_field"
         app:layout_constraintBottom_toTopOf="@+id/cb_CanLeave"
         app:layout_constraintEnd_toStartOf="@+id/button_L2"
         app:layout_constraintHorizontal_bias="0.0"
@@ -126,4 +134,15 @@
         app:layout_constraintVertical_bias="0.0"
         tools:srcCompat="@tools:sample/avatars" />
 
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/auto"
+        android:textSize="40sp"
+        app:layout_constraintBottom_toTopOf="@+id/imageView"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/ScoutingApp/app/src/main/res/layout/activity_tele.xml b/ScoutingApp/app/src/main/res/layout/activity_tele.xml
index 121c226..2993828 100644
--- a/ScoutingApp/app/src/main/res/layout/activity_tele.xml
+++ b/ScoutingApp/app/src/main/res/layout/activity_tele.xml
@@ -7,4 +7,134 @@
     android:layout_height="match_parent"
     tools:context=".TeleActivity">
 
+    <Button
+        android:id="@+id/button_L4"
+        android:layout_width="100dp"
+        android:layout_height="100dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:text="L4"
+        android:textAlignment="center"
+        android:textSize="40sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <CheckBox
+        android:id="@+id/cb_algaeReef"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginBottom="8dp"
+        android:text="Can Remove Algae"
+        app:layout_constraintBottom_toTopOf="@+id/cb_coralPickup"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <CheckBox
+        android:id="@+id/cb_coralPickup"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginBottom="8dp"
+        android:text="Coral Pickup"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <Button
+        android:id="@+id/button_L3"
+        android:layout_width="100dp"
+        android:layout_height="100dp"
+        android:layout_marginEnd="8dp"
+        android:text="L3"
+        android:textSize="40sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/button_L4" />
+
+    <Button
+        android:id="@+id/button_L2"
+        android:layout_width="100dp"
+        android:layout_height="100dp"
+        android:layout_marginEnd="8dp"
+        android:text="L2"
+        android:textSize="40sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/button_L3" />
+
+    <Button
+        android:id="@+id/button_L1"
+        android:layout_width="100dp"
+        android:layout_height="100dp"
+        android:layout_marginEnd="8dp"
+        android:text="L1"
+        android:textSize="40sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/button_L2" />
+
+    <Button
+        android:id="@+id/button_Net"
+        android:layout_width="100dp"
+        android:layout_height="100dp"
+        android:layout_marginEnd="8dp"
+        android:text="Net"
+        android:textSize="20sp"
+        app:layout_constraintBottom_toTopOf="@+id/button_Processor"
+        app:layout_constraintEnd_toEndOf="parent" />
+
+    <Button
+        android:id="@+id/button_Processor"
+        android:layout_width="150sp"
+        android:layout_height="100dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
+        android:text="Processor"
+        android:textSize="20sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
+    <CheckBox
+        android:id="@+id/cb_CanLeave"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginBottom="8dp"
+        android:text="Can Leave"
+        app:layout_constraintBottom_toTopOf="@+id/cb_algaeReef"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <Button
+        android:id="@+id/button_Next"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:text="Next (Hold)"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:id="@+id/imageView"
+        android:layout_width="277dp"
+        android:layout_height="476dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="64dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
+        app:layout_constraintBottom_toTopOf="@+id/cb_CanLeave"
+        app:layout_constraintEnd_toStartOf="@+id/button_L2"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.0"
+        tools:srcCompat="@tools:sample/avatars" />
+
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Tele"
+        android:textSize="40sp"
+        app:layout_constraintBottom_toTopOf="@+id/imageView"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file