From 21ac233d06e0346117a4752bd30ae0bae2292fda Mon Sep 17 00:00:00 2001 From: Pix_XL <82770059+PIXLwastaken@users.noreply.github.com> Date: Wed, 19 Feb 2025 13:54:44 -0500 Subject: [PATCH 1/2] :/ --- .../example/aquaanalyzomatic/mainPage.java | 13 +- .../main/res/layout/activity_main_page.xml | 503 ++++++++++-------- app/src/main/res/values/strings.xml | 1 + 3 files changed, 284 insertions(+), 233 deletions(-) diff --git a/app/src/main/java/com/example/aquaanalyzomatic/mainPage.java b/app/src/main/java/com/example/aquaanalyzomatic/mainPage.java index 0fc5f65..808da8f 100644 --- a/app/src/main/java/com/example/aquaanalyzomatic/mainPage.java +++ b/app/src/main/java/com/example/aquaanalyzomatic/mainPage.java @@ -10,7 +10,10 @@ public class mainPage extends AppCompatActivity { private Button submitBtn, signOutBtn, autonFieldBtn; - private EditText matchNum, teamNum, L1Num, L2Num, L3Num, L4Num, netAttemptsNum, netScoredNum, humanPlayerAttemptsNum, humanPlayerScoredNum; + private EditText matchNum, teamNum, L1Num, L2Num, L3Num, L4Num, netAttemptsNum, netScoredNum, HPShotsNum, HPScoredNum; + + private ImageView L1Minus, L1Plus, L2Minus, L2Plus, L3Minus, L3Plus, L4Minus, L4Plus, netShotsMinus, netShotsPlus, netScoredMinus, + netScoredPlus, HPShotMinus, HPShotPlus, HPScoredMinus, HPScoredPlus, processedMinus, processedPlus; @Override protected void onCreate(Bundle savedInstanceState) { @@ -22,5 +25,13 @@ protected void onCreate(Bundle savedInstanceState) { String username = intent.getStringExtra("username"); + // -------------------- Auton Vars -------------------- // + + + // -------------------- TeleOp Vars -------------------- // + + + // -------------------- Match Data Vars -------------------- // + } } \ 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 b598250..700121d 100644 --- a/app/src/main/res/layout/activity_main_page.xml +++ b/app/src/main/res/layout/activity_main_page.xml @@ -120,90 +120,6 @@ app:layout_constraintTop_toTopOf="parent" app:srcCompat="@drawable/finalminusbutton" /> - - - - - - - - - - - - - - + app:layout_constraintTop_toTopOf="parent" + app:srcCompat="@drawable/finalminusbutton" /> + + - - - - - -