From 0e5a9eb8cfaced1e66fdb8f9e9bc489fb8db0c17 Mon Sep 17 00:00:00 2001
From: Pix_XL <janueljmarquez@gmail.com>
Date: Thu, 6 Feb 2025 16:17:44 -0500
Subject: [PATCH 1/6] lets get it done, fr this time

---
 .idea/material_theme_project_new.xml          |  10 ++
 app/src/main/AndroidManifest.xml              |  16 +--
 .../example/aquaanalyzomatic/AutonPage.java   |  24 ----
 .../example/aquaanalyzomatic/TeleopPage.java  |  24 ----
 .../main/res/layout/activity_auton_page.xml   | 125 ------------------
 .../main/res/layout/activity_teleop_page.xml  |  10 --
 6 files changed, 11 insertions(+), 198 deletions(-)
 create mode 100644 .idea/material_theme_project_new.xml
 delete mode 100644 app/src/main/java/com/example/aquaanalyzomatic/AutonPage.java
 delete mode 100644 app/src/main/java/com/example/aquaanalyzomatic/TeleopPage.java
 delete mode 100644 app/src/main/res/layout/activity_auton_page.xml
 delete mode 100644 app/src/main/res/layout/activity_teleop_page.xml

diff --git a/.idea/material_theme_project_new.xml b/.idea/material_theme_project_new.xml
new file mode 100644
index 0000000..16b970d
--- /dev/null
+++ b/.idea/material_theme_project_new.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MaterialThemeProjectNewConfig">
+    <option name="metadata">
+      <MTProjectMetadataState>
+        <option name="userId" value="40c3b92c:194dd1e4dee:-7ffa" />
+      </MTProjectMetadataState>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e869354..e7c7de5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,30 +12,16 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.AquaAnalyzomatic"
         tools:targetApi="31">
-<<<<<<< Updated upstream
-=======
-        <activity
-            android:name=".TeleopPage"
-            android:exported="false" />
-        <activity
-            android:name=".AutonPage"
-            android:exported="false" />
->>>>>>> Stashed changes
         <activity
         android:name=".mainPage"
         android:exported="false" />
         <activity
-<<<<<<< Updated upstream
         android:name=".CreateUser"
         android:exported="false" />
-=======
+        <activity
             android:name=".offlinePage"
             android:exported="false"
             android:theme="@style/Theme.Design.NoActionBar" />
-        <activity
-            android:name=".CreateUser"
-            android:exported="false" />
->>>>>>> Stashed changes
         <activity
             android:name=".SignInScreen"
             android:theme="@style/Theme.Design.NoActionBar"
diff --git a/app/src/main/java/com/example/aquaanalyzomatic/AutonPage.java b/app/src/main/java/com/example/aquaanalyzomatic/AutonPage.java
deleted file mode 100644
index 746a8ca..0000000
--- a/app/src/main/java/com/example/aquaanalyzomatic/AutonPage.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.example.aquaanalyzomatic;
-
-import android.os.Bundle;
-
-import androidx.activity.EdgeToEdge;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.graphics.Insets;
-import androidx.core.view.ViewCompat;
-import androidx.core.view.WindowInsetsCompat;
-
-public class AutonPage extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        EdgeToEdge.enable(this);
-        setContentView(R.layout.activity_auton_page);
-        ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> {
-            Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
-            v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom);
-            return insets;
-        });
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/aquaanalyzomatic/TeleopPage.java b/app/src/main/java/com/example/aquaanalyzomatic/TeleopPage.java
deleted file mode 100644
index 7cfd2f8..0000000
--- a/app/src/main/java/com/example/aquaanalyzomatic/TeleopPage.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.example.aquaanalyzomatic;
-
-import android.os.Bundle;
-
-import androidx.activity.EdgeToEdge;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.graphics.Insets;
-import androidx.core.view.ViewCompat;
-import androidx.core.view.WindowInsetsCompat;
-
-public class TeleopPage extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        EdgeToEdge.enable(this);
-        setContentView(R.layout.activity_teleop_page);
-        ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> {
-            Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
-            v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom);
-            return insets;
-        });
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_auton_page.xml b/app/src/main/res/layout/activity_auton_page.xml
deleted file mode 100644
index ed86452..0000000
--- a/app/src/main/res/layout/activity_auton_page.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/main"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".AutonPage"
-    android:background="#09070E"
-
-
-
-
-
-    >
-
-
-    <LinearLayout
-        android:id="@+id/TopOrangeBox"
-        android:layout_width="1280dp"
-        android:layout_height="150dp"
-        android:background="#EFB821"
-        android:orientation="horizontal"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.0">
-
-        <TextView
-            android:id="@+id/TeamNum"
-            android:layout_width="296dp"
-            android:layout_height="154dp"
-            android:gravity="center"
-            android:text="Team #:"
-            android:textAppearance="@style/TextAppearance.AppCompat.Large"
-            android:textSize="45sp"
-            android:translationX="500dp" />
-
-        <EditText
-            android:id="@+id/TeamNumInput"
-            android:layout_width="180dp"
-            android:layout_height="wrap_content"
-            android:ems="10"
-            android:gravity="center"
-            android:inputType="number"
-            android:text="#"
-            android:textSize="45sp"
-            android:translationX="425dp" />
-
-        <TextView
-            android:id="@+id/MatchNum"
-            android:layout_width="296dp"
-            android:layout_height="154dp"
-            android:gravity="center"
-            android:text="Match #:"
-            android:textAppearance="@style/TextAppearance.AppCompat.Large"
-            android:textSize="45sp"
-            android:translationX="375dp" />
-
-        <EditText
-            android:id="@+id/MatchNumInput"
-            android:layout_width="180dp"
-            android:layout_height="wrap_content"
-            android:ems="10"
-            android:gravity="center"
-            android:inputType="number"
-            android:text="#"
-            android:textSize="45sp"
-            android:translationX="300dp" />
-
-        <Button
-            android:id="@+id/AutonButton"
-            android:layout_width="174dp"
-            android:layout_height="match_parent"
-            android:background="#7DBBE7"
-            android:text="Auton"
-            android:textSize="35sp"
-            android:translationX="-825dp" />
-
-        <Button
-            android:id="@+id/TeleOpButton"
-            android:layout_width="174dp"
-            android:layout_height="match_parent"
-            android:background="#EFB821"
-            android:text="Tele-Op"
-            android:textSize="35sp"
-            android:translationX="-800dp" />
-    </LinearLayout>
-    <!--top orange box - Text Team #:, Enter #,-->
-
-
-    <LinearLayout
-        android:id="@+id/LeftOrangeLine"
-        android:layout_width="20dp"
-        android:layout_height="800dp"
-        android:background="#EFB821"
-        android:orientation="vertical"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.986" />
-    <!-- left orange box-->
-
-    <LinearLayout
-        android:id="@+id/RightOrangeLine"
-        android:layout_width="20dp"
-        android:layout_height="800dp"
-        android:background="#EFB821"
-        android:orientation="vertical"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="1.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.0">
-        <!--// right orange box-->
-    </LinearLayout>
-
-
-    <!-- team # text-->
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_teleop_page.xml b/app/src/main/res/layout/activity_teleop_page.xml
deleted file mode 100644
index e636cd0..0000000
--- a/app/src/main/res/layout/activity_teleop_page.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/main"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".TeleopPage">
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From e07d8453eb15403ead7b74e12bc48f5a25d07cce Mon Sep 17 00:00:00 2001
From: Pix_XL <janueljmarquez@gmail.com>
Date: Thu, 6 Feb 2025 21:59:59 -0500
Subject: [PATCH 2/6] changing stuff

worked on my pc, gonna switch to the laptop so i gotta push
---
 .idea/appInsightsSettings.xml                 | 26 ++++++++++++++
 .../example/aquaanalyzomatic/mainPage.java    |  4 ---
 .../main/res/layout/activity_main_page.xml    | 34 +++++++++++++------
 app/src/main/res/values/strings.xml           | 20 +++++++++++
 4 files changed, 69 insertions(+), 15 deletions(-)
 create mode 100644 .idea/appInsightsSettings.xml

diff --git a/.idea/appInsightsSettings.xml b/.idea/appInsightsSettings.xml
new file mode 100644
index 0000000..68363d0
--- /dev/null
+++ b/.idea/appInsightsSettings.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AppInsightsSettings">
+    <option name="tabSettings">
+      <map>
+        <entry key="Firebase Crashlytics">
+          <value>
+            <InsightsFilterSettings>
+              <option name="connection">
+                <ConnectionSetting>
+                  <option name="appId" value="com.example.aquaanalyzomatic" />
+                  <option name="mobileSdkAppId" value="1:829329113011:android:258a0ce82cd8497aaf15c6" />
+                  <option name="projectId" value="scouting-app-d23c8" />
+                  <option name="projectNumber" value="829329113011" />
+                </ConnectionSetting>
+              </option>
+              <option name="signal" value="SIGNAL_UNSPECIFIED" />
+              <option name="timeIntervalDays" value="THIRTY_DAYS" />
+              <option name="visibilityType" value="ALL" />
+            </InsightsFilterSettings>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/src/main/java/com/example/aquaanalyzomatic/mainPage.java b/app/src/main/java/com/example/aquaanalyzomatic/mainPage.java
index d2ac3eb..03678f7 100644
--- a/app/src/main/java/com/example/aquaanalyzomatic/mainPage.java
+++ b/app/src/main/java/com/example/aquaanalyzomatic/mainPage.java
@@ -13,9 +13,5 @@ protected void onCreate(Bundle savedInstanceState) {
         // Retrieve the data passed from SignInScreen
         Intent intent = getIntent();
         String username = intent.getStringExtra("username");
-
-        // Use the username to customize the UI or perform actions
-        TextView usernameTextView = findViewById(R.id.usernameTextView);
-        usernameTextView.setText("Welcome, " + username);
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main_page.xml b/app/src/main/res/layout/activity_main_page.xml
index 1f391db..419bdac 100644
--- a/app/src/main/res/layout/activity_main_page.xml
+++ b/app/src/main/res/layout/activity_main_page.xml
@@ -2,20 +2,32 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <TextView
-        android:id="@+id/usernameTextView"
-        android:layout_width="63dp"
-        android:layout_height="17dp"
-        android:layout_marginStart="136dp"
-        android:layout_marginTop="202dp"
-        android:layout_marginEnd="213dp"
-        android:layout_marginBottom="512dp"
-        android:text="TextView"
+    <Button
+        android:id="@+id/button"
+        android:layout_width="290dp"
+        android:layout_height="144dp"
+        android:layout_marginStart="890dp"
+        android:layout_marginTop="556dp"
+        android:layout_marginEnd="50dp"
+        android:layout_marginBottom="50dp"
+        android:text="@string/QRCodeBtn"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="1.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="1.0" />
+
+    <CheckBox
+        android:id="@+id/checkBox"
+        android:layout_width="140dp"
+        android:layout_height="93dp"
+        android:text="CheckBox"
+        tools:layout_editor_absoluteX="1090dp"
+        tools:layout_editor_absoluteY="53dp" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 11978ad..ba58f4a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,23 @@
 <resources>
+    <!-- Text View Strings -->
     <string name="app_name">AquaAnalyzomatic</string>
+    <string name="QRCodeBtn">Generate Qr Code</string>
+    <string name="Processor"></string>
+    
+    <!-- Auton Strings -->
+    <string name="AutonCheck"></string>
+    <string name="LeaveStart"></string>
+    <string name="AutonAlgaeAttempts"></string>
+    <string name="AutonCoralL1"></string>
+    <string name="AutonCoralL2"></string>
+    <string name="AutonCoralL3"></string>
+    <string name="AutonCoralL4"></string>
+    <!-- Tele-Op Strings -->
+    <string name="ProcessedTele"></string>
+    <string name="NetHuman"></string>
+    <string name="NetBot"></string>
+    <string name="Parking"></string>
+    <string name="ClimbShallow"></string>
+    <string name="ClimbDeep"></string>
+    <string name="Username"></string>
 </resources>
\ No newline at end of file

From dcadca6d870dc9a4871cf1f98492770eac09c811 Mon Sep 17 00:00:00 2001
From: Pix_XL <82770059+PIXLwastaken@users.noreply.github.com>
Date: Fri, 7 Feb 2025 14:11:32 -0500
Subject: [PATCH 3/6] more UI changes (im getting the hang of this fr fr)

---
 app/src/main/res/drawable/black_back.jpg      | Bin 0 -> 27774 bytes
 .../main/res/drawable/finalminusbutton.png    | Bin 0 -> 472 bytes
 app/src/main/res/drawable/finalplusbutton.png | Bin 0 -> 816 bytes
 .../main/res/layout/activity_main_page.xml    |  86 ++++++++++++++----
 app/src/main/res/values/strings.xml           |  39 ++++----
 5 files changed, 92 insertions(+), 33 deletions(-)
 create mode 100644 app/src/main/res/drawable/black_back.jpg
 create mode 100644 app/src/main/res/drawable/finalminusbutton.png
 create mode 100644 app/src/main/res/drawable/finalplusbutton.png

diff --git a/app/src/main/res/drawable/black_back.jpg b/app/src/main/res/drawable/black_back.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..2aca59dffe97467ce1d0a3f37313f22a86bc5fcc
GIT binary patch
literal 27774
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
L=f%Hy_Tc{m#+(a_

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/finalminusbutton.png b/app/src/main/res/drawable/finalminusbutton.png
new file mode 100644
index 0000000000000000000000000000000000000000..e73ac1cb0fbaad1fc4762eebfbc6666cdbfb6ad3
GIT binary patch
literal 472
zcmV;}0Vn=aNk&G{0RRA3MM6+kP&iD)0RR9mkHKRQPhcQzoA@`q?Kd(1^Dhuc;UL`u
zlwp7mAl261Mv~O20-HR$EIvRE#U`L(&Grn-!EEzxv7ybnPtCYmFD&wx{#~Ys{!f5}
z|3jfizt-ya;`aSuyy?~ZG#Q3VW$@z=oGXVP@y?aS0`2vh2AzOCDvzgFUzN!cs;8nw
z`l?)(Ks^~P&Rp4?!E|&qFiPiQ1aiiQ79brVPeC#v3FEagI)ON&q<~mb@)V*orET&1
zO*S<U*^)-$`9`+15Ne%@?*|q|cx^cm?;k8<fCEe6-kD_zaAp~~w_%w9d^IHTKO0Jb
zdqYD&XQ%*{hNlFq3^i0uz%u+7{tN$w|H6O&9_nQHFSO-z_%Hky{tN#_1fCMGg1R>}
z1ayW9;Hx1KkPRik+@K@(Hq=-E99RnX&MZ@aXO<K99xM|8vFOyf1GNfbZ%HH9HnJr_
zbQVq9j=jlhZ6H=A9&3m*N(zYAluRHb6OsgTMMwj3Mo0m&vF1ZiJ31PeIUO??>B(pX
z_bVACkn~ivg8Y?=5=tJ4I2G*IJS-+)az?|Rz+aNECj)p%!ABXy*V(;xTZZ!Z_u8?=
Omsb-05C4b%|9=Cfx7f!3

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/finalplusbutton.png b/app/src/main/res/drawable/finalplusbutton.png
new file mode 100644
index 0000000000000000000000000000000000000000..3acf706baa52ffa028df5921f7eb2835a0bda13c
GIT binary patch
literal 816
zcmV-01JC?YNk&E}0{{S5MM6+kP&iB*0{{RokHKRQC!wHi8^-)ecbCKb&%fffZR1>y
zw(QI6fXd*)#{&Q~9vTn?ISn-Y5rCp?O<Cj$1_d2^lAttBf<X)G{hzazv6{-yy+rhX
z0#x&V^MCXIfA_w1y&J|VADr#XtD%h>zsyVgOjZ6F!|X?EUI=3+AJfnMC?{6=Szym8
z_|clzKwBTST(J5fr{JyOPunSEKp})2yyeckhYe5=A&1eh*83lT!U)OtjJYMBD35t@
zY`J)#NFLEK<zhjhEYY##VnMMi(J|D=f`VCM&yHCNie_01H~v83JicjOY)0|i23AZ!
z`8=PRlLrV0!oY}GQAD4Hj|a#IJos2qNLS5;0W!#2s_-oX8T4E{kQlb$r?J8(A2uMu
zuUxD|dzh@zs=~FgQ`m{VGhu*cpRHEauI;?jls6vUkrd`mRed)D2@X8WG|x^|e)pvD
zJVX*0RP_%)5_s51R$YI3B}qISBp*ruKS&N9PLf^%dXkd|B-Ik2Nsuokg3W);f4}y4
zT`^176*IhU^I!8{^I!8{^I!8{^WXpa8t?c*<L%Z#y5kF_+pPnv%I3f3zvjRHEtT&0
zLg{wvV7%iCjkj9|w|pVRYx7_8U-Mt{U-Mt{U-MrBP`a*|jn@^kSGD=?FB2^Rny-_j
zmw=w+<l!Lskbn=8gNH=2>iW|w$;Lw<fua5eAc;J95`1>G*FBMR=3$_LxvRTw2AX#s
z-U<osv(@#c?Ytu?7#`Gj8r;KVjjl0m>=bsST@{mGi4eBnr?J8(A2vYZ2NyjMAwu3#
zg>M;<8VnbDB@@S0vH1WQfd?PvDI=@lLk%Dy@KB8E=P4k;aH57yKC)G;>Tid199}VN
zmLeNvG2Ey=7Re~FSNytI<f25UICil}MTt)F?BXF4M|6s7w`74h^WqfWy-y$w@Wc0t
zb2Ekvk^ozHH;Q@dLk1~;944z3`^Nf^GSpwmTkuw^m(bYJhm?0HXPuqp*ng(zCu`K}
uXzb|c5I<9uf5v70GCHHxi)lLRhOx>A*LQEK`M>$U`M>$U`M>%94{!k4LzXK5

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/activity_main_page.xml b/app/src/main/res/layout/activity_main_page.xml
index 419bdac..4765685 100644
--- a/app/src/main/res/layout/activity_main_page.xml
+++ b/app/src/main/res/layout/activity_main_page.xml
@@ -6,28 +6,80 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+
+    <ImageView
+        android:id="@+id/imageView"
+        android:layout_width="1108dp"
+        android:layout_height="712dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.5"
+        app:srcCompat="@drawable/black_back" />
+
     <Button
-        android:id="@+id/button"
-        android:layout_width="290dp"
-        android:layout_height="144dp"
-        android:layout_marginStart="890dp"
-        android:layout_marginTop="556dp"
-        android:layout_marginEnd="50dp"
-        android:layout_marginBottom="50dp"
+        android:id="@+id/submitBtn"
+        android:layout_width="210dp"
+        android:layout_height="77dp"
+        android:layout_marginStart="798dp"
+        android:layout_marginTop="507dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="16dp"
         android:text="@string/QRCodeBtn"
+        android:textSize="15sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/textView2"
+        android:layout_width="170dp"
+        android:layout_height="36dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="551dp"
+        android:layout_marginEnd="838dp"
+        android:layout_marginBottom="13dp"
+        android:text="@string/Username"
+        android:textSize="30sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:textColor="@color/white"/>
+
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="142dp"
+        android:layout_height="44dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="866dp"
+        android:layout_marginBottom="540dp"
+        android:text="@string/MatchNum"
+        android:textSize="30sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:textColor="@color/white"/>
+
+    <TextView
+        android:id="@+id/textView3"
+        android:layout_width="142dp"
+        android:layout_height="44dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="60dp"
+        android:layout_marginEnd="866dp"
+        android:layout_marginBottom="496dp"
+        android:text="@string/TeamNum"
+        android:textSize="30sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="1.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="1.0" />
-
-    <CheckBox
-        android:id="@+id/checkBox"
-        android:layout_width="140dp"
-        android:layout_height="93dp"
-        android:text="CheckBox"
-        tools:layout_editor_absoluteX="1090dp"
-        tools:layout_editor_absoluteY="53dp" />
+        android:textColor="@color/white"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ba58f4a..b77ad0d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,22 +2,29 @@
     <!-- Text View Strings -->
     <string name="app_name">AquaAnalyzomatic</string>
     <string name="QRCodeBtn">Generate Qr Code</string>
-    <string name="Processor"></string>
-    
+    <string name="Coral">Coral</string>
+    <string name="Algae">Algae</string>
+    <string name="Username">Username:</string>
+    <string name="TeamNum">Team #:</string>
+    <string name="MatchNum">Match #:</string>
+
     <!-- Auton Strings -->
-    <string name="AutonCheck"></string>
-    <string name="LeaveStart"></string>
-    <string name="AutonAlgaeAttempts"></string>
-    <string name="AutonCoralL1"></string>
-    <string name="AutonCoralL2"></string>
-    <string name="AutonCoralL3"></string>
-    <string name="AutonCoralL4"></string>
+    <string name="CheckAuton">Has Auton?</string>
+    <string name="CheckLeaveStart">Leaves start?</string>
+    <string name="AutonAlgaeAttempts">Attempts</string>
+    <string name="AutonNetScored">Scored</string>
+    <string name="AutonCoralL1">L1</string>
+    <string name="AutonCoralL2">L2</string>
+    <string name="AutonCoralL3">L3</string>
+    <string name="AutonCoralL4">L4</string>
+
     <!-- Tele-Op Strings -->
-    <string name="ProcessedTele"></string>
-    <string name="NetHuman"></string>
-    <string name="NetBot"></string>
-    <string name="Parking"></string>
-    <string name="ClimbShallow"></string>
-    <string name="ClimbDeep"></string>
-    <string name="Username"></string>
+    <string name="CheckHumanPlayer">Human Player?</string>
+    <string name="ProcessedTele">Processed</string>
+    <string name="NetHumanAttempts">Human-Player Net Attempts</string>
+    <string name="NetBotAttempts">Algae Net Attempts</string>
+    <string name="NetBotScored">Algae Net Scored</string>
+    <string name="Parking">Parked</string>
+    <string name="ClimbShallow">Shallow</string>
+    <string name="ClimbDeep">Deep</string>
 </resources>
\ No newline at end of file

From a72928c174d812f3ffd25f9adcf26cd460994fdd Mon Sep 17 00:00:00 2001
From: Pix_XL <janueljmarquez@gmail.com>
Date: Fri, 7 Feb 2025 22:11:14 -0500
Subject: [PATCH 4/6] im going insane (progress)

---
 .idea/material_theme_project_new.xml          |   4 +-
 .../main/res/layout/activity_main_page.xml    | 358 ++++++++++++++++--
 gradle/libs.versions.toml                     |   2 +-
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 4 files changed, 339 insertions(+), 27 deletions(-)

diff --git a/.idea/material_theme_project_new.xml b/.idea/material_theme_project_new.xml
index 16b970d..dd9eb9c 100644
--- a/.idea/material_theme_project_new.xml
+++ b/.idea/material_theme_project_new.xml
@@ -3,7 +3,9 @@
   <component name="MaterialThemeProjectNewConfig">
     <option name="metadata">
       <MTProjectMetadataState>
-        <option name="userId" value="40c3b92c:194dd1e4dee:-7ffa" />
+        <option name="migrated" value="true" />
+        <option name="pristineConfig" value="false" />
+        <option name="userId" value="-41d3b338:192cfc7d3f3:-7ffd" />
       </MTProjectMetadataState>
     </option>
   </component>
diff --git a/app/src/main/res/layout/activity_main_page.xml b/app/src/main/res/layout/activity_main_page.xml
index 4765685..98ac136 100644
--- a/app/src/main/res/layout/activity_main_page.xml
+++ b/app/src/main/res/layout/activity_main_page.xml
@@ -8,17 +8,264 @@
 
 
     <ImageView
-        android:id="@+id/imageView"
+        android:id="@+id/black_back"
         android:layout_width="1108dp"
         android:layout_height="712dp"
+        android:contentDescription="TODO"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.5"
         app:srcCompat="@drawable/black_back" />
 
+    <ImageView
+        android:id="@+id/imageView18"
+        android:layout_width="75dp"
+        android:layout_height="75dp"
+        app:srcCompat="@drawable/finalplusbutton"
+        tools:layout_editor_absoluteX="933dp"
+        tools:layout_editor_absoluteY="263dp" />
+
+    <ImageView
+        android:id="@+id/imageView12"
+        android:layout_width="75dp"
+        android:layout_height="75dp"
+        app:srcCompat="@drawable/finalminusbutton"
+        tools:layout_editor_absoluteX="787dp"
+        tools:layout_editor_absoluteY="188dp" />
+
+    <ImageView
+        android:id="@+id/imageView13"
+        android:layout_width="75dp"
+        android:layout_height="75dp"
+        app:srcCompat="@drawable/finalminusbutton"
+        tools:layout_editor_absoluteX="787dp"
+        tools:layout_editor_absoluteY="263dp" />
+
+    <ImageView
+        android:id="@+id/imageView14"
+        android:layout_width="75dp"
+        android:layout_height="75dp"
+        app:srcCompat="@drawable/finalminusbutton"
+        tools:layout_editor_absoluteX="787dp"
+        tools:layout_editor_absoluteY="338dp" />
+
+    <ImageView
+        android:id="@+id/imageView15"
+        android:layout_width="75dp"
+        android:layout_height="75dp"
+        app:srcCompat="@drawable/finalminusbutton"
+        tools:layout_editor_absoluteX="787dp"
+        tools:layout_editor_absoluteY="413dp" />
+
+    <ImageView
+        android:id="@+id/imageView16"
+        android:layout_width="75dp"
+        android:layout_height="75dp"
+        app:srcCompat="@drawable/finalplusbutton"
+        tools:layout_editor_absoluteX="933dp"
+        tools:layout_editor_absoluteY="413dp" />
+
+    <ImageView
+        android:id="@+id/imageView17"
+        android:layout_width="75dp"
+        android:layout_height="75dp"
+        app:srcCompat="@drawable/finalplusbutton"
+        tools:layout_editor_absoluteX="933dp"
+        tools:layout_editor_absoluteY="338dp" />
+
+    <ImageView
+        android:id="@+id/imageView19"
+        android:layout_width="75dp"
+        android:layout_height="75dp"
+        app:srcCompat="@drawable/finalplusbutton"
+        tools:layout_editor_absoluteX="933dp"
+        tools:layout_editor_absoluteY="188dp" />
+
+    <ImageView
+        android:id="@+id/PlusL4"
+        android:layout_width="75dp"
+        android:layout_height="75dp"
+        android:layout_marginStart="249dp"
+        android:layout_marginTop="190dp"
+        android:layout_marginEnd="700dp"
+        android:layout_marginBottom="335dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/finalplusbutton" />
+
+    <ImageView
+        android:id="@+id/PlusL1"
+        android:layout_width="75dp"
+        android:layout_height="75dp"
+        android:layout_marginStart="249dp"
+        android:layout_marginTop="415dp"
+        android:layout_marginEnd="700dp"
+        android:layout_marginBottom="110dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/finalplusbutton" />
+
+    <EditText
+        android:id="@+id/editTextText4"
+        android:layout_width="75dp"
+        android:layout_height="75dp"
+        android:clickable="false"
+        android:ems="10"
+        android:focusable="false"
+        android:focusableInTouchMode="false"
+        android:inputType="number"
+        android:linksClickable="false"
+        android:longClickable="false"
+        android:text="0"
+        android:textAlignment="center"
+        android:textColor="@color/white"
+        android:textSize="40dp"
+        tools:layout_editor_absoluteX="178dp"
+        tools:layout_editor_absoluteY="415dp" />
+
+    <ImageView
+        android:id="@+id/MinusL1"
+        android:layout_width="75dp"
+        android:layout_height="75dp"
+        android:layout_marginStart="103dp"
+        android:layout_marginTop="415dp"
+        android:layout_marginEnd="846dp"
+        android:layout_marginBottom="110dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/finalminusbutton" />
+
+    <ImageView
+        android:id="@+id/MinusL2"
+        android:layout_width="75dp"
+        android:layout_height="75dp"
+        android:layout_marginStart="103dp"
+        android:layout_marginTop="340dp"
+        android:layout_marginEnd="846dp"
+        android:layout_marginBottom="185dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/finalminusbutton" />
+
+    <EditText
+        android:id="@+id/editTextText3"
+        android:layout_width="75dp"
+        android:layout_height="75dp"
+        android:clickable="false"
+        android:ems="10"
+        android:focusable="false"
+        android:focusableInTouchMode="false"
+        android:inputType="number"
+        android:linksClickable="false"
+        android:longClickable="false"
+        android:text="0"
+        android:textAlignment="center"
+        android:textColor="@color/white"
+        android:textSize="40dp"
+        tools:layout_editor_absoluteX="178dp"
+        tools:layout_editor_absoluteY="340dp" />
+
+    <ImageView
+        android:id="@+id/PlusL2"
+        android:layout_width="75dp"
+        android:layout_height="75dp"
+        android:layout_marginStart="249dp"
+        android:layout_marginTop="340dp"
+        android:layout_marginEnd="700dp"
+        android:layout_marginBottom="185dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/finalplusbutton" />
+
+    <ImageView
+        android:id="@+id/PlusL3"
+        android:layout_width="75dp"
+        android:layout_height="75dp"
+        android:layout_marginStart="249dp"
+        android:layout_marginTop="265dp"
+        android:layout_marginEnd="700dp"
+        android:layout_marginBottom="260dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/finalplusbutton" />
+
+    <EditText
+        android:id="@+id/editTextText2"
+        android:layout_width="75dp"
+        android:layout_height="75dp"
+        android:clickable="false"
+        android:ems="10"
+        android:focusable="false"
+        android:focusableInTouchMode="false"
+        android:inputType="number"
+        android:linksClickable="false"
+        android:longClickable="false"
+        android:text="0"
+        android:textAlignment="center"
+        android:textColor="@color/white"
+        android:textSize="40dp"
+        tools:layout_editor_absoluteX="178dp"
+        tools:layout_editor_absoluteY="265dp" />
+
+    <ImageView
+        android:id="@+id/MinusL4"
+        android:layout_width="75dp"
+        android:layout_height="75dp"
+        android:layout_marginStart="103dp"
+        android:layout_marginTop="190dp"
+        android:layout_marginEnd="846dp"
+        android:layout_marginBottom="335dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/finalminusbutton" />
+
+    <EditText
+        android:id="@+id/editTextText"
+        android:layout_width="75dp"
+        android:layout_height="75dp"
+        android:clickable="false"
+        android:ems="10"
+        android:focusable="false"
+        android:focusableInTouchMode="false"
+        android:inputType="number"
+        android:linksClickable="false"
+        android:longClickable="false"
+        android:text="0"
+        android:textAlignment="center"
+        android:textColor="@color/white"
+        android:textSize="40dp"
+        tools:layout_editor_absoluteX="178dp"
+        tools:layout_editor_absoluteY="190dp" />
+
+    <ImageView
+        android:id="@+id/MinusL3"
+        android:layout_width="75dp"
+        android:layout_height="75dp"
+        android:layout_marginStart="103dp"
+        android:layout_marginTop="265dp"
+        android:layout_marginEnd="846dp"
+        android:layout_marginBottom="260dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/finalminusbutton" />
+
     <Button
         android:id="@+id/submitBtn"
         android:layout_width="210dp"
@@ -34,22 +281,6 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
-        android:id="@+id/textView2"
-        android:layout_width="170dp"
-        android:layout_height="36dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="551dp"
-        android:layout_marginEnd="838dp"
-        android:layout_marginBottom="13dp"
-        android:text="@string/Username"
-        android:textSize="30sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:textColor="@color/white"/>
-
     <TextView
         android:id="@+id/textView"
         android:layout_width="142dp"
@@ -59,27 +290,106 @@
         android:layout_marginEnd="866dp"
         android:layout_marginBottom="540dp"
         android:text="@string/MatchNum"
+        android:textColor="@color/white"
         android:textSize="30sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:textColor="@color/white"/>
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/textView3"
         android:layout_width="142dp"
-        android:layout_height="44dp"
+        android:layout_height="45dp"
         android:layout_marginStart="16dp"
         android:layout_marginTop="60dp"
         android:layout_marginEnd="866dp"
         android:layout_marginBottom="496dp"
         android:text="@string/TeamNum"
+        android:textColor="@color/white"
         android:textSize="30sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:textColor="@color/white"/>
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/textView5"
+        android:layout_width="225dp"
+        android:layout_height="70dp"
+        android:text="@string/Coral"
+        android:textAlignment="center"
+        android:textColor="@color/white"
+        android:textSize="50dp"
+        tools:layout_editor_absoluteX="103dp"
+        tools:layout_editor_absoluteY="118dp" />
+
+    <TextView
+        android:id="@+id/textView2"
+        android:layout_width="75dp"
+        android:layout_height="75dp"
+        android:layout_marginStart="28dp"
+        android:layout_marginTop="190dp"
+        android:layout_marginEnd="921dp"
+        android:layout_marginBottom="335dp"
+        android:text="@string/AutonCoralL4"
+        android:textAlignment="center"
+        android:textColor="@color/white"
+        android:textSize="50dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/textView6"
+        android:layout_width="75dp"
+        android:layout_height="75dp"
+        android:layout_marginStart="28dp"
+        android:layout_marginTop="263dp"
+        android:layout_marginEnd="921dp"
+        android:layout_marginBottom="262dp"
+        android:text="@string/AutonCoralL3"
+        android:textAlignment="center"
+        android:textColor="@color/white"
+        android:textSize="50dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/textView7"
+        android:layout_width="75dp"
+        android:layout_height="75dp"
+        android:layout_marginStart="28dp"
+        android:layout_marginTop="338dp"
+        android:layout_marginEnd="921dp"
+        android:layout_marginBottom="187dp"
+        android:text="@string/AutonCoralL2"
+        android:textAlignment="center"
+        android:textColor="@color/white"
+        android:textSize="50dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/textView8"
+        android:layout_width="75dp"
+        android:layout_height="75dp"
+        android:layout_marginStart="28dp"
+        android:layout_marginTop="415dp"
+        android:layout_marginEnd="921dp"
+        android:layout_marginBottom="110dp"
+        android:text="@string/AutonCoralL1"
+        android:textAlignment="center"
+        android:textColor="@color/white"
+        android:textSize="50dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3f33ed2..01b225e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.7.3"
+agp = "8.8.0"
 firebaseBom = "33.8.0"
 junit = "4.13.2"
 junitVersion = "1.2.1"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 13b47bd..2553629 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sat Jan 11 14:47:41 EST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From afc98f4b1c9c27614349a57d4ac0d5a2dd39245d Mon Sep 17 00:00:00 2001
From: Pix_XL <82770059+PIXLwastaken@users.noreply.github.com>
Date: Sat, 8 Feb 2025 14:39:32 -0500
Subject: [PATCH 5/6] teleop finished, shila can pretty it up later bleh :p

---
 .../example/aquaanalyzomatic/mainPage.java    |   8 +
 .../main/res/layout/activity_main_page.xml    | 649 ++++++++++++++++--
 app/src/main/res/values/strings.xml           |  10 +-
 3 files changed, 589 insertions(+), 78 deletions(-)

diff --git a/app/src/main/java/com/example/aquaanalyzomatic/mainPage.java b/app/src/main/java/com/example/aquaanalyzomatic/mainPage.java
index 03678f7..2d237c8 100644
--- a/app/src/main/java/com/example/aquaanalyzomatic/mainPage.java
+++ b/app/src/main/java/com/example/aquaanalyzomatic/mainPage.java
@@ -1,10 +1,16 @@
 package com.example.aquaanalyzomatic;
 import android.content.Intent;
 import android.os.Bundle;
+import android.widget.Button;
+import android.widget.EditText;
 import android.widget.TextView;
 import androidx.appcompat.app.AppCompatActivity;
 
 public class mainPage extends AppCompatActivity {
+
+    private Button submitBtn, signOutBtn, autonFieldBtn;
+    private EditText matchNum, teamNum, L1Num, L2Num, L3Num, L4Num, netAttemptsNum, netScoredNum, humanPlayerAttemptsNum, humanPlayerScoredNum;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -13,5 +19,7 @@ protected void onCreate(Bundle savedInstanceState) {
         // Retrieve the data passed from SignInScreen
         Intent intent = getIntent();
         String username = intent.getStringExtra("username");
+
+
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main_page.xml b/app/src/main/res/layout/activity_main_page.xml
index 98ac136..22d03a3 100644
--- a/app/src/main/res/layout/activity_main_page.xml
+++ b/app/src/main/res/layout/activity_main_page.xml
@@ -18,69 +18,205 @@
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/black_back" />
 
+    <TextView
+        android:id="@+id/textView9"
+        android:layout_width="225dp"
+        android:layout_height="70dp"
+        android:layout_marginStart="99dp"
+        android:layout_marginTop="118dp"
+        android:layout_marginEnd="700dp"
+        android:layout_marginBottom="412dp"
+        android:text="@string/Coral"
+        android:textAlignment="center"
+        android:textColor="@color/white"
+        android:textSize="50sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="1.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.0" />
+
+    <TextView
+        android:id="@+id/textView5"
+        android:layout_width="225dp"
+        android:layout_height="70dp"
+        android:layout_marginStart="787dp"
+        android:layout_marginTop="118dp"
+        android:layout_marginEnd="12dp"
+        android:layout_marginBottom="412dp"
+        android:text="@string/Algae"
+        android:textAlignment="center"
+        android:textColor="@color/white"
+        android:textSize="50sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <EditText
+        android:id="@+id/NetAttemptsNum"
+        android:layout_width="73dp"
+        android:layout_height="77dp"
+        android:layout_marginStart="862dp"
+        android:layout_marginTop="188dp"
+        android:layout_marginEnd="89dp"
+        android:layout_marginBottom="335dp"
+        android:clickable="false"
+        android:ems="10"
+        android:focusable="false"
+        android:focusableInTouchMode="false"
+        android:inputType="number"
+        android:linksClickable="false"
+        android:longClickable="false"
+        android:text="0"
+        android:textAlignment="center"
+        android:textColor="@color/white"
+        android:textSize="40dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <ImageView
-        android:id="@+id/imageView18"
+        android:id="@+id/NetScoredPlus"
         android:layout_width="75dp"
         android:layout_height="75dp"
-        app:srcCompat="@drawable/finalplusbutton"
-        tools:layout_editor_absoluteX="933dp"
-        tools:layout_editor_absoluteY="263dp" />
+        android:layout_marginStart="933dp"
+        android:layout_marginTop="263dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="262dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/finalplusbutton" />
 
     <ImageView
-        android:id="@+id/imageView12"
+        android:id="@+id/NetAttemptsMinus"
         android:layout_width="75dp"
         android:layout_height="75dp"
-        app:srcCompat="@drawable/finalminusbutton"
-        tools:layout_editor_absoluteX="787dp"
-        tools:layout_editor_absoluteY="188dp" />
+        android:layout_marginStart="787dp"
+        android:layout_marginTop="188dp"
+        android:layout_marginEnd="162dp"
+        android:layout_marginBottom="337dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/finalminusbutton" />
 
     <ImageView
-        android:id="@+id/imageView13"
+        android:id="@+id/NetScoredMinus"
         android:layout_width="75dp"
         android:layout_height="75dp"
-        app:srcCompat="@drawable/finalminusbutton"
-        tools:layout_editor_absoluteX="787dp"
-        tools:layout_editor_absoluteY="263dp" />
+        android:layout_marginStart="787dp"
+        android:layout_marginTop="263dp"
+        android:layout_marginEnd="162dp"
+        android:layout_marginBottom="262dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/finalminusbutton" />
 
     <ImageView
-        android:id="@+id/imageView14"
+        android:id="@+id/HumanPlayerAttemptsMinus"
         android:layout_width="75dp"
         android:layout_height="75dp"
-        app:srcCompat="@drawable/finalminusbutton"
-        tools:layout_editor_absoluteX="787dp"
-        tools:layout_editor_absoluteY="338dp" />
+        android:layout_marginStart="787dp"
+        android:layout_marginTop="338dp"
+        android:layout_marginEnd="162dp"
+        android:layout_marginBottom="187dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/finalminusbutton" />
 
     <ImageView
-        android:id="@+id/imageView15"
+        android:id="@+id/ProcessedMinus"
         android:layout_width="75dp"
         android:layout_height="75dp"
-        app:srcCompat="@drawable/finalminusbutton"
-        tools:layout_editor_absoluteX="787dp"
-        tools:layout_editor_absoluteY="413dp" />
+        android:layout_marginStart="785dp"
+        android:layout_marginTop="491dp"
+        android:layout_marginEnd="164dp"
+        android:layout_marginBottom="34dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/finalminusbutton" />
+
+    <ImageView
+        android:id="@+id/HumanPlayerScoredMinus"
+        android:layout_width="75dp"
+        android:layout_height="75dp"
+        android:layout_marginStart="787dp"
+        android:layout_marginTop="416dp"
+        android:layout_marginEnd="162dp"
+        android:layout_marginBottom="109dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/finalminusbutton" />
 
     <ImageView
-        android:id="@+id/imageView16"
+        android:id="@+id/ProcessedPlus"
         android:layout_width="75dp"
         android:layout_height="75dp"
-        app:srcCompat="@drawable/finalplusbutton"
-        tools:layout_editor_absoluteX="933dp"
-        tools:layout_editor_absoluteY="413dp" />
+        android:layout_marginStart="932dp"
+        android:layout_marginTop="491dp"
+        android:layout_marginEnd="17dp"
+        android:layout_marginBottom="34dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/finalplusbutton" />
+
+    <ImageView
+        android:id="@+id/HumanPlayerScoredPlus"
+        android:layout_width="75dp"
+        android:layout_height="75dp"
+        android:layout_marginStart="934dp"
+        android:layout_marginTop="416dp"
+        android:layout_marginEnd="15dp"
+        android:layout_marginBottom="109dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/finalplusbutton" />
 
     <ImageView
-        android:id="@+id/imageView17"
+        android:id="@+id/HumanPlayerAttemptsPlus"
         android:layout_width="75dp"
         android:layout_height="75dp"
-        app:srcCompat="@drawable/finalplusbutton"
-        tools:layout_editor_absoluteX="933dp"
-        tools:layout_editor_absoluteY="338dp" />
+        android:layout_marginStart="933dp"
+        android:layout_marginTop="338dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="187dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/finalplusbutton" />
 
     <ImageView
-        android:id="@+id/imageView19"
+        android:id="@+id/NetAttemptsPlus"
         android:layout_width="75dp"
         android:layout_height="75dp"
-        app:srcCompat="@drawable/finalplusbutton"
-        tools:layout_editor_absoluteX="933dp"
-        tools:layout_editor_absoluteY="188dp" />
+        android:layout_marginStart="933dp"
+        android:layout_marginTop="188dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="337dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/finalplusbutton" />
 
     <ImageView
         android:id="@+id/PlusL4"
@@ -111,9 +247,13 @@
         app:srcCompat="@drawable/finalplusbutton" />
 
     <EditText
-        android:id="@+id/editTextText4"
-        android:layout_width="75dp"
+        android:id="@+id/NumL1"
+        android:layout_width="70dp"
         android:layout_height="75dp"
+        android:layout_marginStart="178dp"
+        android:layout_marginTop="415dp"
+        android:layout_marginEnd="776dp"
+        android:layout_marginBottom="110dp"
         android:clickable="false"
         android:ems="10"
         android:focusable="false"
@@ -125,8 +265,10 @@
         android:textAlignment="center"
         android:textColor="@color/white"
         android:textSize="40dp"
-        tools:layout_editor_absoluteX="178dp"
-        tools:layout_editor_absoluteY="415dp" />
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <ImageView
         android:id="@+id/MinusL1"
@@ -157,9 +299,13 @@
         app:srcCompat="@drawable/finalminusbutton" />
 
     <EditText
-        android:id="@+id/editTextText3"
-        android:layout_width="75dp"
-        android:layout_height="75dp"
+        android:id="@+id/NumL2"
+        android:layout_width="70dp"
+        android:layout_height="76dp"
+        android:layout_marginStart="178dp"
+        android:layout_marginTop="340dp"
+        android:layout_marginEnd="776dp"
+        android:layout_marginBottom="184dp"
         android:clickable="false"
         android:ems="10"
         android:focusable="false"
@@ -171,8 +317,10 @@
         android:textAlignment="center"
         android:textColor="@color/white"
         android:textSize="40dp"
-        tools:layout_editor_absoluteX="178dp"
-        tools:layout_editor_absoluteY="340dp" />
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <ImageView
         android:id="@+id/PlusL2"
@@ -203,9 +351,13 @@
         app:srcCompat="@drawable/finalplusbutton" />
 
     <EditText
-        android:id="@+id/editTextText2"
-        android:layout_width="75dp"
+        android:id="@+id/NumL3"
+        android:layout_width="70dp"
         android:layout_height="75dp"
+        android:layout_marginStart="178dp"
+        android:layout_marginTop="265dp"
+        android:layout_marginEnd="776dp"
+        android:layout_marginBottom="260dp"
         android:clickable="false"
         android:ems="10"
         android:focusable="false"
@@ -217,8 +369,10 @@
         android:textAlignment="center"
         android:textColor="@color/white"
         android:textSize="40dp"
-        tools:layout_editor_absoluteX="178dp"
-        tools:layout_editor_absoluteY="265dp" />
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <ImageView
         android:id="@+id/MinusL4"
@@ -235,9 +389,13 @@
         app:srcCompat="@drawable/finalminusbutton" />
 
     <EditText
-        android:id="@+id/editTextText"
-        android:layout_width="75dp"
+        android:id="@+id/NumL4"
+        android:layout_width="70dp"
         android:layout_height="75dp"
+        android:layout_marginStart="178dp"
+        android:layout_marginTop="190dp"
+        android:layout_marginEnd="776dp"
+        android:layout_marginBottom="335dp"
         android:clickable="false"
         android:ems="10"
         android:focusable="false"
@@ -249,8 +407,106 @@
         android:textAlignment="center"
         android:textColor="@color/white"
         android:textSize="40dp"
-        tools:layout_editor_absoluteX="178dp"
-        tools:layout_editor_absoluteY="190dp" />
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <EditText
+        android:id="@+id/ProcessedNum"
+        android:layout_width="68dp"
+        android:layout_height="75dp"
+        android:layout_marginStart="862dp"
+        android:layout_marginTop="491dp"
+        android:layout_marginEnd="94dp"
+        android:layout_marginBottom="34dp"
+        android:clickable="false"
+        android:ems="10"
+        android:focusable="false"
+        android:focusableInTouchMode="false"
+        android:inputType="number"
+        android:linksClickable="false"
+        android:longClickable="false"
+        android:text="0"
+        android:textAlignment="center"
+        android:textColor="@color/white"
+        android:textSize="40dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <EditText
+        android:id="@+id/HumanPlayerNum"
+        android:layout_width="68dp"
+        android:layout_height="75dp"
+        android:layout_marginStart="864dp"
+        android:layout_marginTop="416dp"
+        android:layout_marginEnd="92dp"
+        android:layout_marginBottom="109dp"
+        android:clickable="false"
+        android:ems="10"
+        android:focusable="false"
+        android:focusableInTouchMode="false"
+        android:inputType="number"
+        android:linksClickable="false"
+        android:longClickable="false"
+        android:text="0"
+        android:textAlignment="center"
+        android:textColor="@color/white"
+        android:textSize="40dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <EditText
+        android:id="@+id/HumanPlayerAttemptsNum"
+        android:layout_width="70dp"
+        android:layout_height="74dp"
+        android:layout_marginStart="862dp"
+        android:layout_marginTop="340dp"
+        android:layout_marginEnd="92dp"
+        android:layout_marginBottom="186dp"
+        android:clickable="false"
+        android:ems="10"
+        android:focusable="false"
+        android:focusableInTouchMode="false"
+        android:inputType="number"
+        android:linksClickable="false"
+        android:longClickable="false"
+        android:text="0"
+        android:textAlignment="center"
+        android:textColor="@color/white"
+        android:textSize="40dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <EditText
+        android:id="@+id/NetScoredNum"
+        android:layout_width="72dp"
+        android:layout_height="75dp"
+        android:layout_marginStart="862dp"
+        android:layout_marginTop="265dp"
+        android:layout_marginEnd="90dp"
+        android:layout_marginBottom="260dp"
+        android:clickable="false"
+        android:ems="10"
+        android:focusable="false"
+        android:focusableInTouchMode="false"
+        android:inputType="number"
+        android:linksClickable="false"
+        android:longClickable="false"
+        android:text="0"
+        android:textAlignment="center"
+        android:textColor="@color/white"
+        android:textSize="40dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <ImageView
         android:id="@+id/MinusL3"
@@ -268,12 +524,12 @@
 
     <Button
         android:id="@+id/submitBtn"
-        android:layout_width="210dp"
-        android:layout_height="77dp"
-        android:layout_marginStart="798dp"
-        android:layout_marginTop="507dp"
+        android:layout_width="225dp"
+        android:layout_height="75dp"
+        android:layout_marginStart="783dp"
+        android:layout_marginTop="15dp"
         android:layout_marginEnd="16dp"
-        android:layout_marginBottom="16dp"
+        android:layout_marginBottom="510dp"
         android:text="@string/QRCodeBtn"
         android:textSize="15sp"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -283,11 +539,11 @@
 
     <TextView
         android:id="@+id/textView"
-        android:layout_width="142dp"
-        android:layout_height="44dp"
-        android:layout_marginStart="16dp"
+        android:layout_width="120dp"
+        android:layout_height="48dp"
+        android:layout_marginStart="270dp"
         android:layout_marginTop="16dp"
-        android:layout_marginEnd="866dp"
+        android:layout_marginEnd="612dp"
         android:layout_marginBottom="540dp"
         android:text="@string/MatchNum"
         android:textColor="@color/white"
@@ -299,12 +555,12 @@
 
     <TextView
         android:id="@+id/textView3"
-        android:layout_width="142dp"
-        android:layout_height="45dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="60dp"
-        android:layout_marginEnd="866dp"
-        android:layout_marginBottom="496dp"
+        android:layout_width="115dp"
+        android:layout_height="40dp"
+        android:layout_marginStart="526dp"
+        android:layout_marginTop="15dp"
+        android:layout_marginEnd="356dp"
+        android:layout_marginBottom="540dp"
         android:text="@string/TeamNum"
         android:textColor="@color/white"
         android:textSize="30sp"
@@ -313,17 +569,6 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
-        android:id="@+id/textView5"
-        android:layout_width="225dp"
-        android:layout_height="70dp"
-        android:text="@string/Coral"
-        android:textAlignment="center"
-        android:textColor="@color/white"
-        android:textSize="50dp"
-        tools:layout_editor_absoluteX="103dp"
-        tools:layout_editor_absoluteY="118dp" />
-
     <TextView
         android:id="@+id/textView2"
         android:layout_width="75dp"
@@ -392,4 +637,258 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <TextView
+        android:id="@+id/textView10"
+        android:layout_width="130dp"
+        android:layout_height="30dp"
+        android:layout_marginStart="28dp"
+        android:layout_marginTop="554dp"
+        android:layout_marginEnd="866dp"
+        android:layout_marginBottom="16dp"
+        android:text="@string/Username"
+        android:textColor="@color/white"
+        android:textSize="25sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/textView11"
+        android:layout_width="142dp"
+        android:layout_height="77dp"
+        android:layout_marginStart="645dp"
+        android:layout_marginTop="188dp"
+        android:layout_marginEnd="237dp"
+        android:layout_marginBottom="335dp"
+        android:text="@string/NetBotAttempts"
+        android:textAlignment="center"
+        android:textColor="@color/white"
+        android:textSize="30sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/textView14"
+        android:layout_width="142dp"
+        android:layout_height="70dp"
+        android:layout_marginStart="643dp"
+        android:layout_marginTop="505dp"
+        android:layout_marginEnd="239dp"
+        android:layout_marginBottom="25dp"
+        android:text="@string/ProcessedTele"
+        android:textAlignment="center"
+        android:textColor="@color/white"
+        android:textSize="30sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/textView12"
+        android:layout_width="144dp"
+        android:layout_height="74dp"
+        android:layout_marginStart="643dp"
+        android:layout_marginTop="265dp"
+        android:layout_marginEnd="237dp"
+        android:layout_marginBottom="261dp"
+        android:text="@string/NetBotScored"
+        android:textAlignment="center"
+        android:textColor="@color/white"
+        android:textSize="30sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/textView13"
+        android:layout_width="165dp"
+        android:layout_height="73dp"
+        android:layout_marginStart="622dp"
+        android:layout_marginTop="343dp"
+        android:layout_marginEnd="237dp"
+        android:layout_marginBottom="184dp"
+        android:text="@string/NetHumanAttempts"
+        android:textAlignment="center"
+        android:textColor="@color/white"
+        android:textSize="25sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/textView16"
+        android:layout_width="165dp"
+        android:layout_height="73dp"
+        android:layout_marginStart="622dp"
+        android:layout_marginTop="418dp"
+        android:layout_marginEnd="237dp"
+        android:layout_marginBottom="109dp"
+        android:text="@string/NetHumanScored"
+        android:textAlignment="center"
+        android:textColor="@color/white"
+        android:textSize="25sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <Button
+        android:id="@+id/signOutBtn"
+        android:layout_width="225dp"
+        android:layout_height="100dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="15dp"
+        android:layout_marginEnd="783dp"
+        android:layout_marginBottom="485dp"
+        android:text="@string/SignOutBtn"
+        android:textSize="30sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <CheckBox
+        android:id="@+id/CheckLeaveStart"
+        android:layout_width="225dp"
+        android:layout_height="75dp"
+        android:layout_marginStart="353dp"
+        android:layout_marginTop="190dp"
+        android:layout_marginEnd="446dp"
+        android:layout_marginBottom="335dp"
+        android:text="@string/CheckLeaveStart"
+        android:textAlignment="center"
+        android:textColor="@color/white"
+        android:textSize="30sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <CheckBox
+        android:id="@+id/CheckAuton"
+        android:layout_width="225dp"
+        android:layout_height="75dp"
+        android:layout_marginStart="353dp"
+        android:layout_marginTop="268dp"
+        android:layout_marginEnd="446dp"
+        android:layout_marginBottom="257dp"
+        android:text="@string/CheckAuton"
+        android:textAlignment="center"
+        android:textColor="@color/white"
+        android:textSize="30sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <CheckBox
+        android:id="@+id/CheckParking"
+        android:layout_width="225dp"
+        android:layout_height="75dp"
+        android:layout_marginStart="353dp"
+        android:layout_marginTop="343dp"
+        android:layout_marginEnd="446dp"
+        android:layout_marginBottom="182dp"
+        android:text="@string/Parking"
+        android:textAlignment="center"
+        android:textColor="@color/white"
+        android:textSize="30sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <CheckBox
+        android:id="@+id/CheckShallowClimb"
+        android:layout_width="225dp"
+        android:layout_height="75dp"
+        android:layout_marginStart="353dp"
+        android:layout_marginTop="418dp"
+        android:layout_marginEnd="446dp"
+        android:layout_marginBottom="107dp"
+        android:text="@string/ClimbShallow"
+        android:textAlignment="center"
+        android:textColor="@color/white"
+        android:textSize="30sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <CheckBox
+        android:id="@+id/CheckDeepClimb"
+        android:layout_width="225dp"
+        android:layout_height="75dp"
+        android:layout_marginStart="353dp"
+        android:layout_marginTop="493dp"
+        android:layout_marginEnd="446dp"
+        android:layout_marginBottom="32dp"
+        android:text="@string/ClimbDeep"
+        android:textAlignment="center"
+        android:textColor="@color/white"
+        android:textSize="30sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <Button
+        android:id="@+id/AutonLayoutBtn"
+        android:layout_width="225dp"
+        android:layout_height="75dp"
+        android:layout_marginStart="353dp"
+        android:layout_marginTop="115dp"
+        android:layout_marginEnd="446dp"
+        android:layout_marginBottom="410dp"
+        android:text="@string/AutonLayout"
+        android:textAlignment="center"
+        android:textColor="@color/white"
+        android:textSize="20sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="1.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.0" />
+
+    <EditText
+        android:id="@+id/MatchNum"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="401dp"
+        android:layout_marginTop="13dp"
+        android:layout_marginEnd="531dp"
+        android:layout_marginBottom="538dp"
+        android:text="##"
+        android:textAlignment="center"
+        android:textColor="@color/white"
+        android:textSize="20sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <EditText
+        android:id="@+id/TeamNum"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="655dp"
+        android:layout_marginTop="15dp"
+        android:layout_marginEnd="277dp"
+        android:layout_marginBottom="536dp"
+        android:text="####"
+        android:textAlignment="center"
+        android:textColor="@color/white"
+        android:textSize="20sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b77ad0d..cb167c0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -7,6 +7,8 @@
     <string name="Username">Username:</string>
     <string name="TeamNum">Team #:</string>
     <string name="MatchNum">Match #:</string>
+    <string name="SignOutBtn">Sign Out</string>
+    <string name="AutonLayout">Auton Field</string>
 
     <!-- Auton Strings -->
     <string name="CheckAuton">Has Auton?</string>
@@ -22,9 +24,11 @@
     <string name="CheckHumanPlayer">Human Player?</string>
     <string name="ProcessedTele">Processed</string>
     <string name="NetHumanAttempts">Human-Player Net Attempts</string>
+    <string name="NetHumanScored">Human-Player Net Scored</string>
     <string name="NetBotAttempts">Algae Net Attempts</string>
     <string name="NetBotScored">Algae Net Scored</string>
-    <string name="Parking">Parked</string>
-    <string name="ClimbShallow">Shallow</string>
-    <string name="ClimbDeep">Deep</string>
+    <string name="CheckClimb">Climb?</string>
+    <string name="Parking">Parked?</string>
+    <string name="ClimbShallow">Shallow Climb?</string>
+    <string name="ClimbDeep">Deep Climb?</string>
 </resources>
\ No newline at end of file

From 6ccff7d909f67deb5a4ab0b8490fa72161461de6 Mon Sep 17 00:00:00 2001
From: Pix_XL <82770059+PIXLwastaken@users.noreply.github.com>
Date: Mon, 10 Feb 2025 20:21:29 -0500
Subject: [PATCH 6/6] Teleop page prototype finished, missing auton fragmented
 view

---
 .../example/aquaanalyzomatic/mainPage.java    |  1 +
 .../main/res/layout/activity_main_page.xml    | 30 ++++++++++++-------
 app/src/main/res/values/strings.xml           |  2 +-
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/example/aquaanalyzomatic/mainPage.java b/app/src/main/java/com/example/aquaanalyzomatic/mainPage.java
index 2d237c8..0fc5f65 100644
--- a/app/src/main/java/com/example/aquaanalyzomatic/mainPage.java
+++ b/app/src/main/java/com/example/aquaanalyzomatic/mainPage.java
@@ -3,6 +3,7 @@
 import android.os.Bundle;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.appcompat.app.AppCompatActivity;
 
diff --git a/app/src/main/res/layout/activity_main_page.xml b/app/src/main/res/layout/activity_main_page.xml
index 22d03a3..b598250 100644
--- a/app/src/main/res/layout/activity_main_page.xml
+++ b/app/src/main/res/layout/activity_main_page.xml
@@ -531,7 +531,7 @@
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="510dp"
         android:text="@string/QRCodeBtn"
-        android:textSize="15sp"
+        android:textSize="30sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -741,7 +741,7 @@
     <Button
         android:id="@+id/signOutBtn"
         android:layout_width="225dp"
-        android:layout_height="100dp"
+        android:layout_height="75dp"
         android:layout_marginStart="16dp"
         android:layout_marginTop="15dp"
         android:layout_marginEnd="783dp"
@@ -750,8 +750,10 @@
         android:textSize="30sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="1.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.12" />
 
     <CheckBox
         android:id="@+id/CheckLeaveStart"
@@ -859,36 +861,42 @@
 
     <EditText
         android:id="@+id/MatchNum"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="48dp"
+        android:layout_height="75dp"
         android:layout_marginStart="401dp"
         android:layout_marginTop="13dp"
         android:layout_marginEnd="531dp"
         android:layout_marginBottom="538dp"
+        android:inputType="number"
         android:text="##"
         android:textAlignment="center"
         android:textColor="@color/white"
-        android:textSize="20sp"
+        android:textSize="30sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.541"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.423" />
 
     <EditText
         android:id="@+id/TeamNum"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="150dp"
+        android:layout_height="75dp"
         android:layout_marginStart="655dp"
         android:layout_marginTop="15dp"
         android:layout_marginEnd="277dp"
         android:layout_marginBottom="536dp"
+        android:inputType="number"
         android:text="####"
         android:textAlignment="center"
         android:textColor="@color/white"
-        android:textSize="20sp"
+        android:textSize="30sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.379"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.461" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cb167c0..62a5fe4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,7 +1,7 @@
 <resources>
     <!-- Text View Strings -->
     <string name="app_name">AquaAnalyzomatic</string>
-    <string name="QRCodeBtn">Generate Qr Code</string>
+    <string name="QRCodeBtn">Submit</string>
     <string name="Coral">Coral</string>
     <string name="Algae">Algae</string>
     <string name="Username">Username:</string>