From 882545318dfaabdf08755bc1219e77230bafea73 Mon Sep 17 00:00:00 2001
From: Pix_XL <82770059+PIXLwastaken@users.noreply.github.com>
Date: Thu, 27 Feb 2025 23:17:35 -0500
Subject: [PATCH 1/6] changes

---
 .idea/deploymentTargetSelector.xml            |   4 +-
 .../example/aquaanalyzomatic/mainPage.java    | 266 +++++++++++-------
 .../main/res/layout/activity_main_page.xml    |  63 ++---
 app/src/main/res/values/strings.xml           |   2 +-
 gradle/libs.versions.toml                     |   2 +-
 5 files changed, 201 insertions(+), 136 deletions(-)

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index b383241..ad8224e 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-02-23T03:55:31.557003100Z">
+        <DropdownSelection timestamp="2025-02-27T00:11:27.411912900Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\lepur\.android\avd\SCOUTING_TABLETS_FINAL_API_30.avd" />
+              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\janue\.android\avd\appDevTablet_API_31.avd" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/app/src/main/java/com/example/aquaanalyzomatic/mainPage.java b/app/src/main/java/com/example/aquaanalyzomatic/mainPage.java
index ff5badb..897da31 100644
--- a/app/src/main/java/com/example/aquaanalyzomatic/mainPage.java
+++ b/app/src/main/java/com/example/aquaanalyzomatic/mainPage.java
@@ -5,36 +5,32 @@
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.EditText;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
 
 import androidx.appcompat.app.AppCompatActivity;
 
+import com.google.firebase.auth.FirebaseAuth;
+import com.google.firebase.auth.FirebaseUser;
 import com.google.firebase.database.DatabaseReference;
 import com.google.firebase.database.FirebaseDatabase;
 
 public class mainPage extends AppCompatActivity {
 
-    private Button submitBtn, signOutBtn, autonFieldButton;
-    private EditText teamNum;
-    private EditText TeleNumL1;
-    private EditText TeleNumL2;
-    private EditText TeleNumL3;
-    private EditText TeleNumL4;
-    private EditText AutonNumL4;
-    private EditText AutonNumL3;
-    private EditText AutonNumL2;
-    private EditText AutonNumL1;
-    private EditText netAttemptsNum;
-    private EditText netScoredNum;
-    private EditText TeleNetAttemptsNum;
-    private EditText TeleNetScoredNum;
-    private EditText HPShotsNum;
-    private EditText HPScoredNum;
-
-    private ImageView TeleMinusL1, TeleMinusL2, TeleMinusL3, TeleMinusL4, TelePlusL1, TelePlusL2, TelePlusL3, TelePlusL4, TeleNetAttemptsMinus, TeleNetAttemptsPlus, TeleNetScoredMinus,
-            TeleNetScoredPlus, HumanPlayerAttemptsMinus, HumanPlayerAttemptsPlus, HumanPlayerScoredMinus, HumanPlayerScoredPlus, TeleProcessedMinus, TeleProcessedPlus,
-            AutonMinusL1, AutonMinusL2, AutonMinusL3, AutonMinusL4, AutonPlusL1, AutonPlusL2, AutonPlusL3, AutonPLusL4, netAttemptsMinus, netAttemptsPlus, netScoredMinus, netScoredPlus, processedMinus, processedPlus;
+    private FirebaseUser currentUser;
+    private FirebaseAuth auth;
+    private FirebaseDatabase database;
+    private DatabaseReference data;
+    private Button submitBtn, signOutBtn, autonLayoutButton, backToTeleBtn;
+    private EditText teamNum, matchNum, teleL1Num, teleL2Num, teleL3Num, teleL4Num, autonL1Num, autonL2Num, autonL3Num, autonL4Num,
+            autonNetAttemptsNum, autonNetScoredNum, teleNetAttemptsNum, teleNetScoredNum, teleProcessedNum, autonProcessedNum, HPScoredNum, HPShotsNum, username;
+
+    private ImageView teleMinusL1, teleMinusL2, teleMinusL3, teleMinusL4, telePlusL1, telePlusL2, telePlusL3, telePlusL4, teleNetAttemptsMinus, teleNetAttemptsPlus, teleNetScoredMinus,
+            teleNetScoredPlus, humanPlayerAttemptsMinus, humanPlayerAttemptsPlus, humanPlayerScoredMinus, humanPlayerScoredPlus, teleProcessedMinus, teleProcessedPlus,
+            autonMinusL1, autonMinusL2, autonMinusL3, autonMinusL4, autonPlusL1, autonPlusL2, autonPlusL3, autonPlusL4,
+            netAttemptsMinus, netAttemptsPlus, netScoredMinus, netScoredPlus, autonProcessedPlus, autonProcessedMinus;
     private CheckBox CheckHumanPlayer, CheckParking, CheckShallowClimb, CheckDeepClimb, CheckLeaveStart;
+    private FrameLayout autonLayout;
 
 
 
@@ -51,79 +47,83 @@ protected void onCreate(Bundle savedInstanceState) {
         DatabaseReference data = firebase.getReference("matchData");
 
 
-
         // -------------------- Auton Vars -------------------- //
-        View autonMinusL1 = findViewById(R.id.AutonMinusL1);
-        View autonMinusL2 = findViewById(R.id.AutonMinusL2);
-        View autonMinusL3 = findViewById(R.id.AutonMinusL3);
-        View autonMinusL4 = findViewById(R.id.AutonMinusL4);
-        View autonPlusL1 = findViewById(R.id.AutonPlusL1);
-        View autonPlusL2 = findViewById(R.id.AutonPlusL3);
-        View autonPlusL3 = findViewById(R.id.AutonPlusL3);
-        View autonPlusL4 = findViewById(R.id.AutonPlusL4);
-        View netAttemptsMinus = findViewById(R.id.netAttemptsMinus);
-        View netAttemptsPlus = findViewById(R.id.netAttemptsPlus);
-        View netScoredMinus = findViewById(R.id.netScoredMinus);
-        View netScoredPlus = findViewById(R.id.netScoredPlus);
-        View autonProcessedPlus = findViewById(R.id.processedMinus);
-        View autonProcessedMinus = findViewById(R.id.processedPlus);
-
-        // -------------------- TeleOp Vars -------------------- //
-        View teleMinusL1 = findViewById(R.id.TeleMinusL1);
-        View teleMinusL2 = findViewById(R.id.TeleMinusL2);
-        View teleMinusL3 = findViewById(R.id.TeleMinusL3);
-        View teleMinusL4 = findViewById(R.id.TeleMinusL4);
-        View telePlusL1 = findViewById(R.id.TelePlusL1);
-        View telePlusL2 = findViewById(R.id.TelePlusL2);
-        View telePlusL3 = findViewById(R.id.TelePlusL3);
-        View telePlusL4 = findViewById(R.id.TelePlusL4);
-
-        View teleNetAttemptsMinus = findViewById(R.id.TeleNetAttemptsMinus);
-        View teleNetAttemptsPlus = findViewById(R.id.TeleNetAttemptsPlus);
-        View teleNetScoredMinus = findViewById(R.id.TeleNetScoredMinus);
-        View teleNetScoredPlus = findViewById(R.id.TeleNetScoredPlus);
-
-        View humanPlayerAttemptsMinus = findViewById(R.id.HumanPlayerAttemptsMinus);
-        View humanPlayerAttemptsPlus = findViewById(R.id.HumanPlayerAttemptsPlus);
-        View humanPlayerScoredMinus = findViewById(R.id.HumanPlayerScoredMinus);
-        View humanPlayerScoredPlus = findViewById(R.id.HumanPlayerScoredPlus);
-
-        View teleProcessedPlus = findViewById(R.id.TeleProcessedPlus);
-        View teleProcessedMinus = findViewById(R.id.TeleProcessedMinus);
-
-
+        autonMinusL1 = findViewById(R.id.AutonMinusL1);
+        autonMinusL2 = findViewById(R.id.AutonMinusL2);
+        autonMinusL3 = findViewById(R.id.AutonMinusL3);
+        autonMinusL4 = findViewById(R.id.AutonMinusL4);
+        autonPlusL1 = findViewById(R.id.AutonPlusL1);
+        autonPlusL2 = findViewById(R.id.AutonPlusL2);
+        autonPlusL3 = findViewById(R.id.AutonPlusL3);
+        autonPlusL4 = findViewById(R.id.AutonPlusL4);
+        netAttemptsMinus = findViewById(R.id.netAttemptsMinus);
+        netAttemptsPlus = findViewById(R.id.netAttemptsPlus);
+        netScoredMinus = findViewById(R.id.netScoredMinus);
+        netScoredPlus = findViewById(R.id.netScoredPlus);
+        autonProcessedPlus = findViewById(R.id.processedMinus);
+        autonProcessedMinus = findViewById(R.id.processedPlus);
+        autonLayoutButton = findViewById(R.id.autonLayoutBtn);
+        backToTeleBtn = findViewById(R.id.backToTele);
 
         // -------------------- TeleOp Vars -------------------- //
-
-
-
-        // -------------------- TeleOp Vars -------------------- //
-
+        teleMinusL1 = findViewById(R.id.TeleMinusL1);
+        teleMinusL2 = findViewById(R.id.TeleMinusL2);
+        teleMinusL3 = findViewById(R.id.TeleMinusL3);
+        teleMinusL4 = findViewById(R.id.TeleMinusL4);
+        telePlusL1 = findViewById(R.id.TelePlusL1);
+        telePlusL2 = findViewById(R.id.TelePlusL2);
+        telePlusL3 = findViewById(R.id.TelePlusL3);
+        telePlusL4 = findViewById(R.id.TelePlusL4);
+
+        teleNetAttemptsMinus = findViewById(R.id.TeleNetAttemptsMinus);
+        teleNetAttemptsPlus = findViewById(R.id.TeleNetAttemptsPlus);
+        teleNetScoredMinus = findViewById(R.id.TeleNetScoredMinus);
+        teleNetScoredPlus = findViewById(R.id.TeleNetScoredPlus);
+
+        humanPlayerAttemptsMinus = findViewById(R.id.HumanPlayerAttemptsMinus);
+        humanPlayerAttemptsPlus = findViewById(R.id.HumanPlayerAttemptsPlus);
+        humanPlayerScoredMinus = findViewById(R.id.HumanPlayerScoredMinus);
+        humanPlayerScoredPlus = findViewById(R.id.HumanPlayerScoredPlus);
+
+        teleProcessedPlus = findViewById(R.id.TeleProcessedPlus);
+        teleProcessedMinus = findViewById(R.id.TeleProcessedMinus);
+
+        CheckHumanPlayer = findViewById(R.id.CheckHumanPlayer);
+        CheckDeepClimb = findViewById(R.id.CheckDeepClimb);
+        CheckParking = findViewById(R.id.CheckParking);
+        CheckShallowClimb = findViewById(R.id.CheckShallowClimb);
 
 
         // -------------------- Match Data Vars -------------------- //
-        EditText matchNum = findViewById(R.id.MatchNum);
-        EditText teamNum = findViewById(R.id.TeamNum);
+        matchNum = findViewById(R.id.MatchNum);
+        teamNum = findViewById(R.id.TeamNum);
+
+        autonL1Num = findViewById(R.id.AutonNumL1);
+        autonL2Num = findViewById(R.id.AutonNumL2);
+        autonL3Num = findViewById(R.id.AutonNumL3);
+        autonL4Num = findViewById(R.id.AutonNumL4);
 
-        EditText autonL1Num = findViewById(R.id.AutonNumL1);
-        EditText autonL2Num = findViewById(R.id.AutonNumL2);
-        EditText autonL3Num = findViewById(R.id.AutonNumL3);
-        EditText autonL4Num = findViewById(R.id.AutonNumL4);
+        teleL1Num = findViewById(R.id.TeleNumL1);
+        teleL2Num = findViewById(R.id.TeleNumL2);
+        teleL3Num = findViewById(R.id.TeleNumL3);
+        teleL4Num = findViewById(R.id.TeleNumL4);
 
-        EditText teleL1Num = findViewById(R.id.TeleNumL1);
-        EditText teleL2Num = findViewById(R.id.TeleNumL2);
-        EditText teleL3Num = findViewById(R.id.TeleNumL3);
-        EditText teleL4Num = findViewById(R.id.TeleNumL4);
 
+        autonNetAttemptsNum = findViewById(R.id.netAttemptsNum);
+        autonNetScoredNum = findViewById(R.id.netScoredNum);
 
-        EditText autonNetAttempts = findViewById(R.id.netAttemptsNum);
-        EditText autonNetScored = findViewById(R.id.netScoredNum);
+        teleNetAttemptsNum = findViewById(R.id.TeleNetAttemptsNum);
+        teleNetScoredNum = findViewById(R.id.TeleNetScoredNum);
 
-        EditText teleNetAttempts = findViewById(R.id.TeleNetAttemptsNum);
-        EditText teleNetScored = findViewById(R.id.TeleNetScoredNum);
+        teleProcessedNum = findViewById(R.id.TeleProcessedNum);
+        autonProcessedNum = findViewById(R.id.processedNum);
 
-        EditText teleProcessedNum = findViewById(R.id.TeleProcessedNum);
-        EditText autonProcessedNum = findViewById(R.id.processedNum);
+        //Misc
+        signOutBtn = findViewById(R.id.signOutBtn);
+        submitBtn = findViewById(R.id.submitBtn);
+        autonLayout = findViewById(R.id.autonLayout);
+        HPScoredNum = findViewById(R.id.HumanPlayerNum);
+        HPShotsNum = findViewById(R.id.HumanPlayerAttemptsNum);
 
 
         //TELEOP CORAL BUTTONS
@@ -186,30 +186,30 @@ public void onClick(View view) {
         teleNetAttemptsMinus.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                changeNum(teleNetAttempts, "down");
-                possibilityCheck(teleNetAttempts, teleNetScored);
+                changeNum(teleNetAttemptsNum, "down");
+                possibilityCheck(teleNetAttemptsNum, teleNetScoredNum);
             }
         });
         teleNetAttemptsPlus.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                changeNum(teleNetAttempts, "up");
-                possibilityCheck(teleNetAttempts, teleNetScored);
+                changeNum(teleNetAttemptsNum, "up");
+                possibilityCheck(teleNetAttemptsNum, teleNetScoredNum);
             }
         });
 
         teleNetScoredMinus.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                changeNum(teleNetScored, "down");
-                possibilityCheck(teleNetAttempts, teleNetScored);
+                changeNum(teleNetScoredNum, "down");
+                possibilityCheck(teleNetAttemptsNum, teleNetScoredNum);
             }
         });
         teleNetScoredPlus.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                changeNum(teleNetScored, "up");
-                possibilityCheck(teleNetAttempts, teleNetScored);
+                changeNum(teleNetScoredNum, "up");
+                possibilityCheck(teleNetAttemptsNum, teleNetScoredNum);
             }
         });
 
@@ -228,7 +228,6 @@ public void onClick(View view) {
 
             }
         });
-
         //TELEOP HUMAN PLAYERS
 
         humanPlayerAttemptsMinus.setOnClickListener(new View.OnClickListener() {
@@ -317,30 +316,30 @@ public void onClick(View view) {
         netAttemptsMinus.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                changeNum(autonNetAttempts, "down");
-                possibilityCheck(autonNetAttempts, autonNetScored);
+                changeNum(autonNetAttemptsNum, "down");
+                possibilityCheck(autonNetAttemptsNum, autonNetScoredNum);
             }
         });
         netAttemptsPlus.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                changeNum(autonNetAttempts, "up");
-                possibilityCheck(teleNetAttempts, teleNetScored);
+                changeNum(autonNetAttemptsNum, "up");
+                possibilityCheck(autonNetAttemptsNum, autonNetScoredNum);
             }
         });
 
         netScoredMinus.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                changeNum(autonNetScored, "down");
-                possibilityCheck(autonNetAttempts, autonNetScored);
+                changeNum(autonNetScoredNum, "down");
+                possibilityCheck(autonNetAttemptsNum, autonNetScoredNum);
             }
         });
         netScoredPlus.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                changeNum(autonNetScored, "up");
-                possibilityCheck(autonNetAttempts, autonNetScored);
+                changeNum(autonNetScoredNum, "up");
+                possibilityCheck(autonNetAttemptsNum, autonNetScoredNum);
             }
         });
 
@@ -358,10 +357,79 @@ public void onClick(View view) {
             }
         });
 
+        autonLayoutButton.setOnClickListener((new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+            }
+        }));
 
+        autonLayoutButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                autonPage(true);
+            }
+        });
+
+        backToTeleBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                autonPage(false);
+            }
+        });
 
     }
 
+    public void autonPage(Boolean Switch){
+        if (Switch){
+            autonLayout.setVisibility(View.VISIBLE);
+            submitBtn.setEnabled(false);
+            signOutBtn.setEnabled(false);
+            autonLayoutButton.setVisibility(View.GONE);
+            backToTeleBtn.setVisibility(View.VISIBLE);
+            //teleop buttons
+            teleMinusL1.setEnabled(false);
+            teleMinusL2.setEnabled(false);
+            teleMinusL3.setEnabled(false);
+            teleMinusL4.setEnabled(false);
+            telePlusL1.setEnabled(false);
+            telePlusL2.setEnabled(false);
+            telePlusL3.setEnabled(false);
+            telePlusL4.setEnabled(false);
+            teleNetAttemptsMinus.setEnabled(false);
+            teleNetAttemptsPlus.setEnabled(false);
+            teleNetScoredMinus.setEnabled(false);
+            teleNetScoredPlus.setEnabled(false);
+            CheckHumanPlayer.setEnabled(false);
+            CheckParking.setEnabled(false);
+            CheckShallowClimb.setEnabled(false);
+            CheckDeepClimb.setEnabled(false);
+        } else {
+            autonLayout.setVisibility(View.GONE);
+            submitBtn.setEnabled(true);
+            signOutBtn.setEnabled(true);
+            autonLayoutButton.setVisibility(View.VISIBLE);
+            backToTeleBtn.setVisibility(View.GONE);
+            //teleop buttons
+            teleMinusL1.setEnabled(true);
+            teleMinusL2.setEnabled(true);
+            teleMinusL3.setEnabled(true);
+            teleMinusL4.setEnabled(true);
+            telePlusL1.setEnabled(true);
+            telePlusL2.setEnabled(true);
+            telePlusL3.setEnabled(true);
+            telePlusL4.setEnabled(true);
+            teleNetAttemptsMinus.setEnabled(true);
+            teleNetAttemptsPlus.setEnabled(true);
+            teleNetScoredMinus.setEnabled(true);
+            teleNetScoredPlus.setEnabled(true);
+            CheckHumanPlayer.setEnabled(true);
+            CheckParking.setEnabled(true);
+            CheckShallowClimb.setEnabled(true);
+            CheckDeepClimb.setEnabled(true);
+        }
+    }
+
     public void changeNum(EditText item, String direction) {
         // Method to change the numbers for the textboxes
         if (direction.equals("up")) {
@@ -387,7 +455,5 @@ public void possibilityCheck(EditText shots, EditText scored){
             shots.setText(Integer.toString(i));
         }
     }
-
-
 }
 
diff --git a/app/src/main/res/layout/activity_main_page.xml b/app/src/main/res/layout/activity_main_page.xml
index b0594f7..270cfe5 100644
--- a/app/src/main/res/layout/activity_main_page.xml
+++ b/app/src/main/res/layout/activity_main_page.xml
@@ -28,7 +28,7 @@
         app:layout_constraintVertical_bias="0.318"
         app:strokeColor="#7DBBE7"
         app:strokeWidth="4dp"
-        tools:text="AUTON FIELD" />
+        tools:text="AUTON PAGE" />
 
     <ImageButton
         android:id="@+id/imageButton3"
@@ -827,7 +827,7 @@
         android:layout_marginBottom="15dp"
         android:ems="10"
         android:inputType="text"
-        android:text="Name"
+        android:clickable="false"
         android:textColor="@color/white"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -849,33 +849,15 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.992" />
 
-    <EditText
-        android:id="@+id/Username"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="167dp"
-        android:layout_marginTop="539dp"
-        android:layout_marginEnd="647dp"
-        android:layout_marginBottom="15dp"
-        android:ems="10"
-        android:inputType="text"
-        android:text="Name"
-        android:textColor="@color/white"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/constraintLayout"
-        android:layout_width="1007dp"
-        android:layout_height="502dp"
-        android:layout_marginEnd="8dp"
+        android:id="@+id/autonLayout"
+        android:layout_width="1019dp"
+        android:layout_height="501dp"
         android:layout_marginBottom="4dp"
         android:background="#2C2929"
         android:backgroundTint="#000000"
         android:foregroundTint="#000000"
-        android:visibility=""
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent">
 
@@ -1433,15 +1415,30 @@
             app:layout_constraintVertical_bias="0.015"
             tools:text=" Leaves start?" />
 
+        <Button
+            android:id="@+id/backToTele"
+            android:layout_width="240dp"
+            android:layout_height="144dp"
+            android:layout_marginStart="347dp"
+            android:layout_marginTop="57dp"
+            android:layout_marginEnd="420dp"
+            android:layout_marginBottom="301dp"
+            android:text="@string/BackBtn"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/frameLayout2"
-        android:layout_width="400dp"
-        android:layout_height="200dp"
-        android:layout_marginStart="612dp"
-        android:layout_marginTop="413dp"
-        android:layout_marginEnd="12dp"
+        android:id="@+id/humanPlayerLayout"
+        android:layout_width="410dp"
+        android:layout_height="137dp"
+        android:layout_marginStart="606dp"
+        android:layout_marginTop="416dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="47dp"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -1452,8 +1449,10 @@
             android:id="@+id/textView16"
             android:layout_width="175dp"
             android:layout_height="75dp"
-            android:layout_marginEnd="225dp"
-            android:layout_marginBottom="75dp"
+            android:layout_marginStart="5dp"
+            android:layout_marginTop="7dp"
+            android:layout_marginEnd="230dp"
+            android:layout_marginBottom="55dp"
             android:text="@string/NetHumanScored"
             android:textAlignment="center"
             android:textColor="@color/white"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 615197b..6291130 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -19,7 +19,7 @@
     <string name="AutonCoralL2">L2</string>
     <string name="AutonCoralL3">L3</string>
     <string name="AutonCoralL4">L4</string>
-    <string name="BackBtn">Back</string>
+    <string name="BackBtn">Back To Teleop</string>
 
     <!-- Tele-Op Strings -->
     <string name="CheckHumanPlayer">Human Player?</string>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 01b225e..290602a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.8.0"
+agp = "8.8.2"
 firebaseBom = "33.8.0"
 junit = "4.13.2"
 junitVersion = "1.2.1"

From e53d819312b628b43474c6c7859a41f53fe07b90 Mon Sep 17 00:00:00 2001
From: dellthePROgrammer <delpierobatou@gmail.com>
Date: Thu, 27 Feb 2025 23:45:48 -0500
Subject: [PATCH 2/6] Add matchData

---
 .idea/misc.xml                                |   3 +-
 .../example/aquaanalyzomatic/mainPage.java    |  26 +--
 .../example/aquaanalyzomatic/matchData.java   | 168 ++++++++++++++++++
 3 files changed, 183 insertions(+), 14 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index b2c751a..a4f09e2 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/java/com/example/aquaanalyzomatic/mainPage.java b/app/src/main/java/com/example/aquaanalyzomatic/mainPage.java
index 897da31..ee162af 100644
--- a/app/src/main/java/com/example/aquaanalyzomatic/mainPage.java
+++ b/app/src/main/java/com/example/aquaanalyzomatic/mainPage.java
@@ -29,7 +29,7 @@ public class mainPage extends AppCompatActivity {
             teleNetScoredPlus, humanPlayerAttemptsMinus, humanPlayerAttemptsPlus, humanPlayerScoredMinus, humanPlayerScoredPlus, teleProcessedMinus, teleProcessedPlus,
             autonMinusL1, autonMinusL2, autonMinusL3, autonMinusL4, autonPlusL1, autonPlusL2, autonPlusL3, autonPlusL4,
             netAttemptsMinus, netAttemptsPlus, netScoredMinus, netScoredPlus, autonProcessedPlus, autonProcessedMinus;
-    private CheckBox CheckHumanPlayer, CheckParking, CheckShallowClimb, CheckDeepClimb, CheckLeaveStart;
+    private CheckBox checkHumanPlayer, checkParking, checkShallowClimb, checkDeepClimb, checkLeaveStart;
     private FrameLayout autonLayout;
 
 
@@ -88,10 +88,10 @@ protected void onCreate(Bundle savedInstanceState) {
         teleProcessedPlus = findViewById(R.id.TeleProcessedPlus);
         teleProcessedMinus = findViewById(R.id.TeleProcessedMinus);
 
-        CheckHumanPlayer = findViewById(R.id.CheckHumanPlayer);
-        CheckDeepClimb = findViewById(R.id.CheckDeepClimb);
-        CheckParking = findViewById(R.id.CheckParking);
-        CheckShallowClimb = findViewById(R.id.CheckShallowClimb);
+        checkHumanPlayer = findViewById(R.id.CheckHumanPlayer);
+        checkDeepClimb = findViewById(R.id.CheckDeepClimb);
+        checkParking = findViewById(R.id.CheckParking);
+        checkShallowClimb = findViewById(R.id.CheckShallowClimb);
 
 
         // -------------------- Match Data Vars -------------------- //
@@ -400,10 +400,10 @@ public void autonPage(Boolean Switch){
             teleNetAttemptsPlus.setEnabled(false);
             teleNetScoredMinus.setEnabled(false);
             teleNetScoredPlus.setEnabled(false);
-            CheckHumanPlayer.setEnabled(false);
-            CheckParking.setEnabled(false);
-            CheckShallowClimb.setEnabled(false);
-            CheckDeepClimb.setEnabled(false);
+            checkHumanPlayer.setEnabled(false);
+            checkParking.setEnabled(false);
+            checkShallowClimb.setEnabled(false);
+            checkDeepClimb.setEnabled(false);
         } else {
             autonLayout.setVisibility(View.GONE);
             submitBtn.setEnabled(true);
@@ -423,10 +423,10 @@ public void autonPage(Boolean Switch){
             teleNetAttemptsPlus.setEnabled(true);
             teleNetScoredMinus.setEnabled(true);
             teleNetScoredPlus.setEnabled(true);
-            CheckHumanPlayer.setEnabled(true);
-            CheckParking.setEnabled(true);
-            CheckShallowClimb.setEnabled(true);
-            CheckDeepClimb.setEnabled(true);
+            checkHumanPlayer.setEnabled(true);
+            checkParking.setEnabled(true);
+            checkShallowClimb.setEnabled(true);
+            checkDeepClimb.setEnabled(true);
         }
     }
 
diff --git a/app/src/main/java/com/example/aquaanalyzomatic/matchData.java b/app/src/main/java/com/example/aquaanalyzomatic/matchData.java
index 152a9c2..fc1333d 100644
--- a/app/src/main/java/com/example/aquaanalyzomatic/matchData.java
+++ b/app/src/main/java/com/example/aquaanalyzomatic/matchData.java
@@ -1,5 +1,173 @@
 package com.example.aquaanalyzomatic;
+import com.google.firebase.database.Exclude;
+
+import java.util.HashMap;
+import java.util.Map;
 
 public class matchData {
+    private String uid, currentDate;
+
+    private int teamNum, matchNum, teleL1Num, teleL2Num, teleL3Num, teleL4Num, autonL1Num, autonL2Num, autonL3Num, autonL4Num,
+            autonNetAttemptsNum, autonNetScoredNum, teleNetAttemptsNum, teleNetScoredNum, teleProcessedNum, autonProcessedNum, HPScoredNum, HPShotsNum, checkHumanPlayer, checkParking, checkShallowClimb, checkDeepClimb, checkLeaveStart;
+
+
+    public matchData(String uid, String currentDate, int teamNum, int matchNum, int teleL1Num, int teleL2Num, int teleL3Num, int teleL4Num, int autonL1Num, int autonL2Num, int autonL3Num, int autonL4Num, int autonNetAttemptsNum, int autonNetScoredNum, int teleNetAttemptsNum, int teleNetScoredNum, int teleProcessedNum, int autonProcessedNum, int HPScoredNum, int HPShotsNum, int checkHumanPlayer, int checkParking, int checkShallowClimb, int checkDeepClimb, int checkLeaveStart) {
+        this.uid = uid;
+        this.currentDate = currentDate;
+        this.teamNum = teamNum;
+        this.matchNum = matchNum;
+        this.teleL1Num = teleL1Num;
+        this.teleL2Num = teleL2Num;
+        this.teleL3Num = teleL3Num;
+        this.teleL4Num = teleL4Num;
+        this.autonL1Num = autonL1Num;
+        this.autonL2Num = autonL2Num;
+        this.autonL3Num = autonL3Num;
+        this.autonL4Num = autonL4Num;
+        this.autonNetAttemptsNum = autonNetAttemptsNum;
+        this.autonNetScoredNum = autonNetScoredNum;
+        this.teleNetAttemptsNum = teleNetAttemptsNum;
+        this.teleNetScoredNum = teleNetScoredNum;
+        this.teleProcessedNum = teleProcessedNum;
+        this.autonProcessedNum = autonProcessedNum;
+        this.HPScoredNum = HPScoredNum;
+        this.HPShotsNum = HPShotsNum;
+        this.checkHumanPlayer = checkHumanPlayer;
+        this.checkParking = checkParking;
+        this.checkShallowClimb = checkShallowClimb;
+        this.checkDeepClimb = checkDeepClimb;
+        this.checkLeaveStart = checkLeaveStart;
+    }
+
+    @Exclude
+    public Map<String, Object> toMap() {
+        HashMap<String, Object> result = new HashMap<>();
+        result.put("uid", uid);
+        result.put("currentDate", currentDate);
+        result.put("teamNum", teamNum);
+        result.put("matchNum", matchNum);
+        result.put("teleL1Num", teleL1Num);
+        result.put("teleL2Num", teleL2Num);
+        result.put("teleL3Num", teleL3Num);
+        result.put("teleL4Num", teleL4Num);
+        result.put("autonL1Num", autonL1Num);
+        result.put("autonL2Num", autonL2Num);
+        result.put("autonL3Num", autonL3Num);
+        result.put("autonL4Num", autonL4Num);
+        result.put("autonNetAttemptsNum", autonNetAttemptsNum);
+        result.put("autonNetScoredNum", autonNetScoredNum);
+        result.put("teleNetAttemptsNum", teleNetAttemptsNum);
+        result.put("teleNetScoredNum", teleNetScoredNum);
+        result.put("teleProcessedNum", teleProcessedNum);
+        result.put("autonProcessedNum", autonProcessedNum);
+        result.put("HPScoredNum", HPScoredNum);
+        result.put("HPShotsNum", HPShotsNum);
+        result.put("CheckHumanPlayer", checkHumanPlayer);
+        result.put("CheckParking", checkParking);
+        result.put("CheckShallowClimb", checkShallowClimb);
+        result.put("CheckDeepClimb", checkDeepClimb);
+        result.put("CheckLeaveStart", checkLeaveStart);
+
+        return result;
+    }
+
+    public void setUid(String uid) {
+        this.uid = uid;
+    }
+
+    public void setCurrentDate(String currentDate) {
+        this.currentDate = currentDate;
+    }
+
+    public void setTeamNum(int teamNum) {
+        this.teamNum = teamNum;
+    }
+
+    public void setMatchNum(int matchNum) {
+        this.matchNum = matchNum;
+    }
+
+    public void setTeleL1Num(int teleL1Num) {
+        this.teleL1Num = teleL1Num;
+    }
+
+    public void setTeleL2Num(int teleL2Num) {
+        this.teleL2Num = teleL2Num;
+    }
+
+    public void setTeleL3Num(int teleL3Num) {
+        this.teleL3Num = teleL3Num;
+    }
+
+    public void setTeleL4Num(int teleL4Num) {
+        this.teleL4Num = teleL4Num;
+    }
+
+    public void setAutonL1Num(int autonL1Num) {
+        this.autonL1Num = autonL1Num;
+    }
+
+    public void setAutonL2Num(int autonL2Num) {
+        this.autonL2Num = autonL2Num;
+    }
+
+    public void setAutonL3Num(int autonL3Num) {
+        this.autonL3Num = autonL3Num;
+    }
+
+    public void setAutonL4Num(int autonL4Num) {
+        this.autonL4Num = autonL4Num;
+    }
+
+    public void setAutonNetAttemptsNum(int autonNetAttemptsNum) {
+        this.autonNetAttemptsNum = autonNetAttemptsNum;
+    }
+
+    public void setAutonNetScoredNum(int autonNetScoredNum) {
+        this.autonNetScoredNum = autonNetScoredNum;
+    }
+
+    public void setTeleNetAttemptsNum(int teleNetAttemptsNum) {
+        this.teleNetAttemptsNum = teleNetAttemptsNum;
+    }
+
+    public void setTeleNetScoredNum(int teleNetScoredNum) {
+        this.teleNetScoredNum = teleNetScoredNum;
+    }
+
+    public void setTeleProcessedNum(int teleProcessedNum) {
+        this.teleProcessedNum = teleProcessedNum;
+    }
+
+    public void setAutonProcessedNum(int autonProcessedNum) {
+        this.autonProcessedNum = autonProcessedNum;
+    }
+
+    public void setHPScoredNum(int HPScoredNum) {
+        this.HPScoredNum = HPScoredNum;
+    }
+
+    public void setHPShotsNum(int HPShotsNum) {
+        this.HPShotsNum = HPShotsNum;
+    }
+
+    public void setCheckHumanPlayer(int checkHumanPlayer) {
+        checkHumanPlayer = checkHumanPlayer;
+    }
+
+    public void setCheckParking(int checkParking) {
+        checkParking = checkParking;
+    }
+
+    public void setCheckShallowClimb(int checkShallowClimb) {
+        checkShallowClimb = checkShallowClimb;
+    }
+
+    public void setCheckDeepClimb(int checkDeepClimb) {
+        checkDeepClimb = checkDeepClimb;
+    }
 
+    public void setCheckLeaveStart(int checkLeaveStart) {
+        checkLeaveStart = checkLeaveStart;
+    }
 }

From db4c14c73dd851ebfd80c68588492347d93c3b9c Mon Sep 17 00:00:00 2001
From: dellthePROgrammer <delpierobatou@gmail.com>
Date: Fri, 28 Feb 2025 00:44:15 -0500
Subject: [PATCH 3/6] It's ALIVE!!!!!!

---
 .idea/deploymentTargetSelector.xml            |  4 +-
 .idea/misc.xml                                |  2 +-
 app/build.gradle                              |  3 +-
 .../example/aquaanalyzomatic/mainPage.java    | 42 +++++++++++++++++--
 .../main/res/layout/activity_main_page.xml    |  4 +-
 5 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index ad8224e..c88de23 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-02-27T00:11:27.411912900Z">
+        <DropdownSelection timestamp="2025-02-28T05:07:21.156760Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\janue\.android\avd\appDevTablet_API_31.avd" />
+              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\dbatou\.android\avd\Scouting_Tablets_API_30.avd" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index a4f09e2..74dd639 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index b26df2c..3b1e4c0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,7 +9,8 @@ android {
 
     defaultConfig {
         applicationId "com.example.aquaanalyzomatic"
-        minSdk 26
+        minSdk 28
+        //noinspection ExpiredTargetSdkVersion
         targetSdk 34
         versionCode 1
         versionName "1.0"
diff --git a/app/src/main/java/com/example/aquaanalyzomatic/mainPage.java b/app/src/main/java/com/example/aquaanalyzomatic/mainPage.java
index ee162af..dbe5502 100644
--- a/app/src/main/java/com/example/aquaanalyzomatic/mainPage.java
+++ b/app/src/main/java/com/example/aquaanalyzomatic/mainPage.java
@@ -1,5 +1,8 @@
 package com.example.aquaanalyzomatic;
+import android.content.Context;
 import android.content.Intent;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
@@ -9,6 +12,8 @@
 import android.widget.ImageView;
 
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.constraintlayout.widget.ConstraintSet;
 
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseUser;
@@ -30,7 +35,7 @@ public class mainPage extends AppCompatActivity {
             autonMinusL1, autonMinusL2, autonMinusL3, autonMinusL4, autonPlusL1, autonPlusL2, autonPlusL3, autonPlusL4,
             netAttemptsMinus, netAttemptsPlus, netScoredMinus, netScoredPlus, autonProcessedPlus, autonProcessedMinus;
     private CheckBox checkHumanPlayer, checkParking, checkShallowClimb, checkDeepClimb, checkLeaveStart;
-    private FrameLayout autonLayout;
+    private ConstraintLayout autonLayout;
 
 
 
@@ -43,8 +48,11 @@ protected void onCreate(Bundle savedInstanceState) {
         Intent intent = getIntent();
         String username = intent.getStringExtra("username");
 
-        FirebaseDatabase firebase = FirebaseDatabase.getInstance();
-        DatabaseReference data = firebase.getReference("matchData");
+        database = FirebaseDatabase.getInstance();
+        data = database.getReference("matchData");
+
+        auth = FirebaseAuth.getInstance();
+        auth.addAuthStateListener(authStateListener);
 
 
         // -------------------- Auton Vars -------------------- //
@@ -380,6 +388,14 @@ public void onClick(View v) {
 
     }
 
+    public void onStart(){
+        super.onStart();
+        FirebaseUser currentuser = auth.getCurrentUser();
+        if(currentuser != null){
+
+        }
+    }
+
     public void autonPage(Boolean Switch){
         if (Switch){
             autonLayout.setVisibility(View.VISIBLE);
@@ -455,5 +471,25 @@ public void possibilityCheck(EditText shots, EditText scored){
             shots.setText(Integer.toString(i));
         }
     }
+
+    FirebaseAuth.AuthStateListener authStateListener = firebaseAuth -> {
+        if (auth.getCurrentUser() == null){
+            signOutComplete();
+        }
+    };
+    public void signOutComplete(){
+        ConnectivityManager cm = (ConnectivityManager)getSystemService(Context.CONNECTIVITY_SERVICE);
+        NetworkInfo activeNetwork = cm.getActiveNetworkInfo();
+        boolean isConnected = activeNetwork != null && activeNetwork.isConnectedOrConnecting();
+        if(isConnected) {
+            Intent changeScreen = new Intent(mainPage.this, SignInScreen.class);
+            startActivity(changeScreen);
+        }
+    }
+
+    public void reload(){
+        Intent resetScreen = new Intent(mainPage.this, mainPage.class);
+        startActivity(resetScreen);
+    }
 }
 
diff --git a/app/src/main/res/layout/activity_main_page.xml b/app/src/main/res/layout/activity_main_page.xml
index 270cfe5..884bf57 100644
--- a/app/src/main/res/layout/activity_main_page.xml
+++ b/app/src/main/res/layout/activity_main_page.xml
@@ -820,14 +820,14 @@
     <EditText
         android:id="@+id/Username"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="48dp"
         android:layout_marginStart="167dp"
         android:layout_marginTop="539dp"
         android:layout_marginEnd="647dp"
         android:layout_marginBottom="15dp"
+        android:clickable="false"
         android:ems="10"
         android:inputType="text"
-        android:clickable="false"
         android:textColor="@color/white"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"

From 766660c59958d971d27a5b93b19b6aa557d2bdcc Mon Sep 17 00:00:00 2001
From: dellthePROgrammer <delpierobatou@gmail.com>
Date: Fri, 28 Feb 2025 23:04:42 -0500
Subject: [PATCH 4/6] It's ALIVE!!!!!!... so far

---
 .../example/aquaanalyzomatic/mainPage.java    | 109 +++++++++++++++++-
 .../main/res/layout/activity_main_page.xml    |  45 ++++----
 2 files changed, 128 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/com/example/aquaanalyzomatic/mainPage.java b/app/src/main/java/com/example/aquaanalyzomatic/mainPage.java
index dbe5502..4d4ef82 100644
--- a/app/src/main/java/com/example/aquaanalyzomatic/mainPage.java
+++ b/app/src/main/java/com/example/aquaanalyzomatic/mainPage.java
@@ -1,4 +1,5 @@
 package com.example.aquaanalyzomatic;
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
 import android.net.ConnectivityManager;
@@ -11,15 +12,24 @@
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.ConstraintSet;
 
+import com.google.android.gms.tasks.OnCompleteListener;
+import com.google.android.gms.tasks.Task;
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseUser;
 import com.google.firebase.database.DatabaseReference;
 import com.google.firebase.database.FirebaseDatabase;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
 public class mainPage extends AppCompatActivity {
 
     private FirebaseUser currentUser;
@@ -28,7 +38,7 @@ public class mainPage extends AppCompatActivity {
     private DatabaseReference data;
     private Button submitBtn, signOutBtn, autonLayoutButton, backToTeleBtn;
     private EditText teamNum, matchNum, teleL1Num, teleL2Num, teleL3Num, teleL4Num, autonL1Num, autonL2Num, autonL3Num, autonL4Num,
-            autonNetAttemptsNum, autonNetScoredNum, teleNetAttemptsNum, teleNetScoredNum, teleProcessedNum, autonProcessedNum, HPScoredNum, HPShotsNum, username;
+            autonNetAttemptsNum, autonNetScoredNum, teleNetAttemptsNum, teleNetScoredNum, teleProcessedNum, autonProcessedNum, HPScoredNum, HPShotsNum, usernameE;
 
     private ImageView teleMinusL1, teleMinusL2, teleMinusL3, teleMinusL4, telePlusL1, telePlusL2, telePlusL3, telePlusL4, teleNetAttemptsMinus, teleNetAttemptsPlus, teleNetScoredMinus,
             teleNetScoredPlus, humanPlayerAttemptsMinus, humanPlayerAttemptsPlus, humanPlayerScoredMinus, humanPlayerScoredPlus, teleProcessedMinus, teleProcessedPlus,
@@ -39,14 +49,15 @@ public class mainPage extends AppCompatActivity {
 
 
 
+    @SuppressLint("MissingInflatedId")
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main_page);
 
         // Retrieve the data passed from SignInScreen
-        Intent intent = getIntent();
-        String username = intent.getStringExtra("username");
+        //Intent intent = getIntent();
+        //String username = intent.getStringExtra("username");
 
         database = FirebaseDatabase.getInstance();
         data = database.getReference("matchData");
@@ -54,6 +65,7 @@ protected void onCreate(Bundle savedInstanceState) {
         auth = FirebaseAuth.getInstance();
         auth.addAuthStateListener(authStateListener);
 
+        usernameE = findViewById(R.id.Username);
 
         // -------------------- Auton Vars -------------------- //
         autonMinusL1 = findViewById(R.id.AutonMinusL1);
@@ -68,8 +80,8 @@ protected void onCreate(Bundle savedInstanceState) {
         netAttemptsPlus = findViewById(R.id.netAttemptsPlus);
         netScoredMinus = findViewById(R.id.netScoredMinus);
         netScoredPlus = findViewById(R.id.netScoredPlus);
-        autonProcessedPlus = findViewById(R.id.processedMinus);
-        autonProcessedMinus = findViewById(R.id.processedPlus);
+        autonProcessedPlus = findViewById(R.id.processedPlus);
+        autonProcessedMinus = findViewById(R.id.processedMinus);
         autonLayoutButton = findViewById(R.id.autonLayoutBtn);
         backToTeleBtn = findViewById(R.id.backToTele);
 
@@ -392,7 +404,7 @@ public void onStart(){
         super.onStart();
         FirebaseUser currentuser = auth.getCurrentUser();
         if(currentuser != null){
-
+            usernameE.setText(currentuser.getDisplayName());
         }
     }
 
@@ -446,6 +458,91 @@ public void autonPage(Boolean Switch){
         }
     }
 
+    public void submitData(){
+        // Code to push data to FireBase
+        if(matchNum.getText().toString().equals("")){
+            matchNum.setError("You must enter a Match Number!");
+            //loading(false);
+        }else if(teamNum.getText().toString().equals("")) {
+            teamNum.setError("You must enter a team number!");
+            //loading(false);
+        } else {
+            String currentDate = new SimpleDateFormat("MM-dd-yyyy", Locale.getDefault()).format(new Date());
+            int checkHumanPlayerVal = 0;
+            int checkParkingVal = 0;
+            int checkShallowClimbVal = 0;
+            int checkDeepClimbVal = 0;
+            int checkLeaveStartVal = 0;
+
+            String key = data.child("matchData").push().getKey();
+
+            if (checkHumanPlayer.isChecked()){
+                checkHumanPlayerVal = 1;
+            }
+            if (checkParking.isChecked()){
+                checkParkingVal = 1;
+            }
+            if (checkShallowClimb.isChecked()){
+                checkShallowClimbVal = 1;
+            }
+            if (checkDeepClimb.isChecked()){
+                checkDeepClimbVal = 1;
+            }
+            if (checkLeaveStart.isChecked()){
+                checkLeaveStartVal = 1;
+            }
+
+            matchData match = new matchData(
+                    auth.getUid(),
+                    currentDate,
+                    Integer.parseInt(teamNum.getText().toString()),
+                    Integer.parseInt(matchNum.getText().toString()),
+                    Integer.parseInt(teleL1Num.getText().toString()),
+                    Integer.parseInt(teleL2Num.getText().toString()),
+                    Integer.parseInt(teleL3Num.getText().toString()),
+                    Integer.parseInt(teleL4Num.getText().toString()),
+                    Integer.parseInt(autonL1Num.getText().toString()),
+                    Integer.parseInt(autonL2Num.getText().toString()),
+                    Integer.parseInt(autonL3Num.getText().toString()),
+                    Integer.parseInt(autonL4Num.getText().toString()),
+                    Integer.parseInt(autonNetAttemptsNum.getText().toString()),
+                    Integer.parseInt(autonNetScoredNum.getText().toString()),
+                    Integer.parseInt(teleNetAttemptsNum.getText().toString()),
+                    Integer.parseInt(teleNetScoredNum.getText().toString()),
+                    Integer.parseInt(teleProcessedNum.getText().toString()),
+                    Integer.parseInt(autonProcessedNum.getText().toString()),
+                    Integer.parseInt(HPScoredNum.getText().toString()),
+                    Integer.parseInt(HPShotsNum.getText().toString()),
+                    checkHumanPlayerVal,
+                    checkParkingVal,
+                    checkShallowClimbVal,
+                    checkDeepClimbVal,
+                    checkLeaveStartVal
+                    );
+            Map<String, Object> matchValues = match.toMap();
+
+            Map<String, Object> childUpdates = new HashMap<>();
+            childUpdates.put("/" + key, matchValues);
+
+            ConnectivityManager cm = (ConnectivityManager)getSystemService(Context.CONNECTIVITY_SERVICE);
+            NetworkInfo activeNetwork = cm.getActiveNetworkInfo();
+            boolean isConnected = activeNetwork != null && activeNetwork.isConnectedOrConnecting();
+
+            if(isConnected) {
+                data.updateChildren(childUpdates).addOnCompleteListener(new OnCompleteListener<Void>() {
+                    @Override
+                    public void onComplete(@NonNull Task<Void> task) {
+                        reload();
+
+                    }
+                });
+            }else {
+                data.updateChildren(childUpdates);
+                reload();
+            }
+        }
+    }
+
     public void changeNum(EditText item, String direction) {
         // Method to change the numbers for the textboxes
         if (direction.equals("up")) {
diff --git a/app/src/main/res/layout/activity_main_page.xml b/app/src/main/res/layout/activity_main_page.xml
index 884bf57..fb937de 100644
--- a/app/src/main/res/layout/activity_main_page.xml
+++ b/app/src/main/res/layout/activity_main_page.xml
@@ -82,7 +82,7 @@
         android:id="@+id/TeleNetScoredMinus"
         android:layout_width="65dp"
         android:layout_height="65dp"
-        android:layout_marginStart="787dp"
+        android:layout_marginStart="790dp"
         android:layout_marginTop="263dp"
         android:layout_marginEnd="162dp"
         android:layout_marginBottom="262dp"
@@ -119,7 +119,7 @@
         android:id="@+id/TeleProcessedPlus"
         android:layout_width="65dp"
         android:layout_height="65dp"
-        android:layout_marginStart="932dp"
+        android:layout_marginStart="900dp"
         android:layout_marginTop="343dp"
         android:layout_marginEnd="17dp"
         android:layout_marginBottom="182dp"
@@ -136,7 +136,7 @@
         android:id="@+id/TeleNetScoredNum"
         android:layout_width="72dp"
         android:layout_height="75dp"
-        android:layout_marginStart="862dp"
+        android:layout_marginStart="825dp"
         android:layout_marginTop="265dp"
         android:layout_marginEnd="90dp"
         android:layout_marginBottom="260dp"
@@ -163,7 +163,7 @@
         android:id="@+id/TeleProcessedNum"
         android:layout_width="68dp"
         android:layout_height="75dp"
-        android:layout_marginStart="862dp"
+        android:layout_marginStart="825dp"
         android:layout_marginTop="343dp"
         android:layout_marginEnd="94dp"
         android:layout_marginBottom="182dp"
@@ -190,7 +190,7 @@
         android:id="@+id/TeleNetAttemptsMinus"
         android:layout_width="65dp"
         android:layout_height="65dp"
-        android:layout_marginStart="787dp"
+        android:layout_marginStart="790dp"
         android:layout_marginTop="188dp"
         android:layout_marginEnd="162dp"
         android:layout_marginBottom="337dp"
@@ -209,7 +209,7 @@
         android:id="@+id/TeleNetAttemptsNum"
         android:layout_width="73dp"
         android:layout_height="77dp"
-        android:layout_marginStart="862dp"
+        android:layout_marginStart="825dp"
         android:layout_marginTop="188dp"
         android:layout_marginEnd="89dp"
         android:layout_marginBottom="335dp"
@@ -256,7 +256,7 @@
         android:id="@+id/TeleProcessedMinus"
         android:layout_width="65dp"
         android:layout_height="65dp"
-        android:layout_marginStart="785dp"
+        android:layout_marginStart="790dp"
         android:layout_marginTop="343dp"
         android:layout_marginEnd="164dp"
         android:layout_marginBottom="182dp"
@@ -273,7 +273,7 @@
         android:id="@+id/TeleNetScoredPlus"
         android:layout_width="65dp"
         android:layout_height="65dp"
-        android:layout_marginStart="933dp"
+        android:layout_marginStart="900dp"
         android:layout_marginTop="263dp"
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="262dp"
@@ -290,7 +290,7 @@
         android:id="@+id/TeleNetAttemptsPlus"
         android:layout_width="65dp"
         android:layout_height="65dp"
-        android:layout_marginStart="933dp"
+        android:layout_marginStart="900dp"
         android:layout_marginTop="188dp"
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="337dp"
@@ -324,7 +324,7 @@
         android:id="@+id/textView8"
         android:layout_width="75dp"
         android:layout_height="75dp"
-        android:layout_marginStart="28dp"
+        android:layout_marginStart="25dp"
         android:layout_marginTop="415dp"
         android:layout_marginEnd="921dp"
         android:layout_marginBottom="110dp"
@@ -415,7 +415,7 @@
         android:id="@+id/textView2"
         android:layout_width="75dp"
         android:layout_height="75dp"
-        android:layout_marginStart="28dp"
+        android:layout_marginStart="25dp"
         android:layout_marginTop="190dp"
         android:layout_marginEnd="921dp"
         android:layout_marginBottom="335dp"
@@ -514,6 +514,7 @@
         android:layout_width="65dp"
         android:layout_height="65dp"
         android:layout_marginStart="249dp"
+        android:layout_marginTop="37dp"
         android:layout_marginEnd="700dp"
         android:backgroundTint="#7DBBE7"
         android:foregroundTint="#7DBBE7"
@@ -521,8 +522,8 @@
         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.37"
+        app:layout_constraintTop_toBottomOf="@+id/textView9"
+        app:layout_constraintVertical_bias="0.0"
         app:srcCompat="@drawable/finalplusbutton"
         app:tint="#7DBBE7" />
 
@@ -530,7 +531,7 @@
         android:id="@+id/textView7"
         android:layout_width="75dp"
         android:layout_height="75dp"
-        android:layout_marginStart="28dp"
+        android:layout_marginStart="25dp"
         android:layout_marginTop="338dp"
         android:layout_marginEnd="921dp"
         android:layout_marginBottom="187dp"
@@ -550,7 +551,7 @@
         android:id="@+id/textView6"
         android:layout_width="75dp"
         android:layout_height="75dp"
-        android:layout_marginStart="28dp"
+        android:layout_marginStart="25dp"
         android:layout_marginTop="263dp"
         android:layout_marginEnd="921dp"
         android:layout_marginBottom="262dp"
@@ -757,8 +758,8 @@
         android:layout_marginStart="401dp"
         android:layout_marginEnd="531dp"
         android:fontFamily="sans-serif-light"
+        android:hint="##"
         android:inputType="number"
-        android:text="##"
         android:textAlignment="center"
         android:textColor="@color/white"
         android:textSize="30sp"
@@ -775,8 +776,8 @@
         android:layout_height="75dp"
         android:layout_marginStart="655dp"
         android:layout_marginEnd="277dp"
+        android:hint="####"
         android:inputType="number"
-        android:text="####"
         android:textAlignment="center"
         android:textColor="@color/white"
         android:textSize="30sp"
@@ -812,10 +813,10 @@
         android:textSize="30sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.726"
+        app:layout_constraintHorizontal_bias="0.71"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.634" />
+        app:layout_constraintVertical_bias="0.71000004" />
 
     <EditText
         android:id="@+id/Username"
@@ -828,6 +829,7 @@
         android:clickable="false"
         android:ems="10"
         android:inputType="text"
+        android:text="Anonymous"
         android:textColor="@color/white"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -853,13 +855,16 @@
         android:id="@+id/autonLayout"
         android:layout_width="1019dp"
         android:layout_height="501dp"
+        android:layout_marginStart="45dp"
         android:layout_marginBottom="4dp"
         android:background="#2C2929"
         android:backgroundTint="#000000"
         android:foregroundTint="#000000"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent">
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
         <ImageView
             android:id="@+id/AutonPlusL1"

From 52e6029d4a1cbf9763e1c2f2eef1ae06d9163817 Mon Sep 17 00:00:00 2001
From: dellthePROgrammer <delpierobatou@gmail.com>
Date: Sat, 1 Mar 2025 00:52:51 -0500
Subject: [PATCH 5/6] It's ALIVE!!!!!!... so far

---
 app/build.gradle                                   |  2 +-
 .../com/example/aquaanalyzomatic/mainPage.java     | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3b1e4c0..f1174ba 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,7 +9,7 @@ android {
 
     defaultConfig {
         applicationId "com.example.aquaanalyzomatic"
-        minSdk 28
+        minSdk 26
         //noinspection ExpiredTargetSdkVersion
         targetSdk 34
         versionCode 1
diff --git a/app/src/main/java/com/example/aquaanalyzomatic/mainPage.java b/app/src/main/java/com/example/aquaanalyzomatic/mainPage.java
index 4d4ef82..7479b2e 100644
--- a/app/src/main/java/com/example/aquaanalyzomatic/mainPage.java
+++ b/app/src/main/java/com/example/aquaanalyzomatic/mainPage.java
@@ -146,6 +146,14 @@ protected void onCreate(Bundle savedInstanceState) {
         HPShotsNum = findViewById(R.id.HumanPlayerAttemptsNum);
 
 
+        submitBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                submitData();
+            }
+        });
+
+
         //TELEOP CORAL BUTTONS
 
         teleMinusL1.setOnClickListener(new View.OnClickListener() {
@@ -488,9 +496,9 @@ public void submitData(){
             if (checkDeepClimb.isChecked()){
                 checkDeepClimbVal = 1;
             }
-            if (checkLeaveStart.isChecked()){
-                checkLeaveStartVal = 1;
-            }
+//            if (checkLeaveStart.isChecked()){
+//                checkLeaveStartVal = 1;
+//            }
 
             matchData match = new matchData(
                     auth.getUid(),

From 4e814a83811b92260295e5cfde4cc7ebc9c32dba Mon Sep 17 00:00:00 2001
From: Pix_XL <82770059+PIXLwastaken@users.noreply.github.com>
Date: Sat, 1 Mar 2025 01:57:45 -0500
Subject: [PATCH 6/6] APP V1 FINALLY

---
 .idea/misc.xml                                |  1 -
 .../example/aquaanalyzomatic/mainPage.java    | 63 +++++++++++++++++--
 .../main/res/layout/activity_main_page.xml    | 45 ++++++-------
 3 files changed, 81 insertions(+), 28 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 74dd639..b2c751a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
diff --git a/app/src/main/java/com/example/aquaanalyzomatic/mainPage.java b/app/src/main/java/com/example/aquaanalyzomatic/mainPage.java
index 7479b2e..3cc109e 100644
--- a/app/src/main/java/com/example/aquaanalyzomatic/mainPage.java
+++ b/app/src/main/java/com/example/aquaanalyzomatic/mainPage.java
@@ -45,7 +45,7 @@ public class mainPage extends AppCompatActivity {
             autonMinusL1, autonMinusL2, autonMinusL3, autonMinusL4, autonPlusL1, autonPlusL2, autonPlusL3, autonPlusL4,
             netAttemptsMinus, netAttemptsPlus, netScoredMinus, netScoredPlus, autonProcessedPlus, autonProcessedMinus;
     private CheckBox checkHumanPlayer, checkParking, checkShallowClimb, checkDeepClimb, checkLeaveStart;
-    private ConstraintLayout autonLayout;
+    private ConstraintLayout autonLayout, humanPlayerLayout;
 
 
 
@@ -76,6 +76,7 @@ protected void onCreate(Bundle savedInstanceState) {
         autonPlusL2 = findViewById(R.id.AutonPlusL2);
         autonPlusL3 = findViewById(R.id.AutonPlusL3);
         autonPlusL4 = findViewById(R.id.AutonPlusL4);
+        checkLeaveStart = findViewById(R.id.CheckLeaveStart);
         netAttemptsMinus = findViewById(R.id.netAttemptsMinus);
         netAttemptsPlus = findViewById(R.id.netAttemptsPlus);
         netScoredMinus = findViewById(R.id.netScoredMinus);
@@ -104,6 +105,7 @@ protected void onCreate(Bundle savedInstanceState) {
         humanPlayerAttemptsPlus = findViewById(R.id.HumanPlayerAttemptsPlus);
         humanPlayerScoredMinus = findViewById(R.id.HumanPlayerScoredMinus);
         humanPlayerScoredPlus = findViewById(R.id.HumanPlayerScoredPlus);
+        humanPlayerLayout = findViewById(R.id.humanPlayerLayout);
 
         teleProcessedPlus = findViewById(R.id.TeleProcessedPlus);
         teleProcessedMinus = findViewById(R.id.TeleProcessedMinus);
@@ -153,6 +155,13 @@ public void onClick(View v) {
             }
         });
 
+        signOutBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                auth.signOut();
+            }
+        });
+
 
         //TELEOP CORAL BUTTONS
 
@@ -262,24 +271,28 @@ public void onClick(View view) {
             @Override
             public void onClick(View view) {
                 changeNum(HPShotsNum, "down");
+                possibilityCheck(HPScoredNum, HPShotsNum);
             }
         });
         humanPlayerAttemptsPlus.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 changeNum(HPShotsNum, "up");
+                possibilityCheck(HPShotsNum, HPScoredNum);
             }
         });
         humanPlayerScoredMinus.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 changeNum(HPScoredNum, "down");
+                possibilityCheck(HPShotsNum, HPScoredNum);
             }
         });
         humanPlayerScoredPlus.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 changeNum(HPScoredNum, "up");
+                possibilityCheck(HPShotsNum, HPScoredNum);
             }
         });
 
@@ -406,6 +419,37 @@ public void onClick(View v) {
             }
         });
 
+        checkParking.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                checkDeepClimb.setChecked(false);
+                checkShallowClimb.setChecked(false);
+            }
+        });
+
+        checkShallowClimb.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                checkParking.setChecked(false);
+                checkDeepClimb.setChecked(false);
+            }
+        });
+
+        checkDeepClimb.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                checkParking.setChecked(false);
+                checkShallowClimb.setChecked(false);
+            }
+        });
+
+        checkHumanPlayer.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                checkHPBox();
+            }
+        });
+
     }
 
     public void onStart(){
@@ -415,7 +459,14 @@ public void onStart(){
             usernameE.setText(currentuser.getDisplayName());
         }
     }
-
+    
+    public void checkHPBox(){
+        if (checkHumanPlayer.isChecked()){
+            humanPlayerLayout.setVisibility(View.VISIBLE);
+        } else {
+            humanPlayerLayout.setVisibility(View.GONE);
+        }
+    }
     public void autonPage(Boolean Switch){
         if (Switch){
             autonLayout.setVisibility(View.VISIBLE);
@@ -423,6 +474,7 @@ public void autonPage(Boolean Switch){
             signOutBtn.setEnabled(false);
             autonLayoutButton.setVisibility(View.GONE);
             backToTeleBtn.setVisibility(View.VISIBLE);
+            humanPlayerLayout.setVisibility(View.GONE);
             //teleop buttons
             teleMinusL1.setEnabled(false);
             teleMinusL2.setEnabled(false);
@@ -446,6 +498,7 @@ public void autonPage(Boolean Switch){
             signOutBtn.setEnabled(true);
             autonLayoutButton.setVisibility(View.VISIBLE);
             backToTeleBtn.setVisibility(View.GONE);
+            checkHPBox();
             //teleop buttons
             teleMinusL1.setEnabled(true);
             teleMinusL2.setEnabled(true);
@@ -496,9 +549,9 @@ public void submitData(){
             if (checkDeepClimb.isChecked()){
                 checkDeepClimbVal = 1;
             }
-//            if (checkLeaveStart.isChecked()){
-//                checkLeaveStartVal = 1;
-//            }
+            if (checkLeaveStart.isChecked()){
+                checkLeaveStartVal = 1;
+            }
 
             matchData match = new matchData(
                     auth.getUid(),
diff --git a/app/src/main/res/layout/activity_main_page.xml b/app/src/main/res/layout/activity_main_page.xml
index fb937de..992378b 100644
--- a/app/src/main/res/layout/activity_main_page.xml
+++ b/app/src/main/res/layout/activity_main_page.xml
@@ -30,10 +30,11 @@
         app:strokeWidth="4dp"
         tools:text="AUTON PAGE" />
 
-    <ImageButton
-        android:id="@+id/imageButton3"
-        android:layout_width="1041dp"
-        android:layout_height="93dp"
+    <ImageView
+        android:id="@+id/image3"
+        android:layout_width="1039dp"
+        android:layout_height="86dp"
+        android:contentDescription="TODO"
         android:src="@drawable/headline_yellow"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -256,16 +257,14 @@
         android:id="@+id/TeleProcessedMinus"
         android:layout_width="65dp"
         android:layout_height="65dp"
-        android:layout_marginStart="790dp"
-        android:layout_marginTop="343dp"
-        android:layout_marginEnd="164dp"
-        android:layout_marginBottom="182dp"
+        android:layout_marginStart="775dp"
+        android:layout_marginTop="363dp"
+        android:layout_marginEnd="184dp"
+        android:layout_marginBottom="172dp"
         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"
         app:srcCompat="@drawable/finalminusbutton"
         app:tint="#7DBBE7" />
 
@@ -816,7 +815,7 @@
         app:layout_constraintHorizontal_bias="0.71"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.71000004" />
+        app:layout_constraintVertical_bias="0.668" />
 
     <EditText
         android:id="@+id/Username"
@@ -829,6 +828,7 @@
         android:clickable="false"
         android:ems="10"
         android:inputType="text"
+        android:longClickable="false"
         android:text="Anonymous"
         android:textColor="@color/white"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -847,7 +847,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="1.0"
-        app:layout_constraintStart_toStartOf="@+id/imageButton3"
+        app:layout_constraintStart_toStartOf="@+id/image3"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.992" />
 
@@ -1438,12 +1438,12 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/humanPlayerLayout"
-        android:layout_width="410dp"
-        android:layout_height="137dp"
-        android:layout_marginStart="606dp"
-        android:layout_marginTop="416dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginBottom="47dp"
+        android:layout_width="403dp"
+        android:layout_height="176dp"
+        android:layout_marginStart="583dp"
+        android:layout_marginTop="405dp"
+        android:layout_marginEnd="38dp"
+        android:layout_marginBottom="19dp"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -1458,7 +1458,7 @@
             android:layout_marginTop="7dp"
             android:layout_marginEnd="230dp"
             android:layout_marginBottom="55dp"
-            android:text="@string/NetHumanScored"
+            android:text="@string/NetHumanAttempts"
             android:textAlignment="center"
             android:textColor="@color/white"
             android:textSize="25sp"
@@ -1472,15 +1472,16 @@
             android:layout_width="175dp"
             android:layout_height="75dp"
             android:layout_marginTop="76dp"
-            android:layout_marginEnd="225dp"
-            android:text="@string/NetHumanAttempts"
+            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_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="1.0" />
 
         <ImageView
             android:id="@+id/HumanPlayerAttemptsMinus"