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" />
+
+
-
-
-
-
-
-
-
-
-
-
+ tools:layout_editor_absoluteX="353dp"
+ tools:layout_editor_absoluteY="190dp" />
+ tools:layout_editor_absoluteX="353dp"
+ tools:layout_editor_absoluteY="268dp" />
+ tools:layout_editor_absoluteX="353dp"
+ tools:layout_editor_absoluteY="343dp" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 62a5fe4..615197b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -19,6 +19,7 @@
L2
L3
L4
+ Back
Human Player?
From 7293027376a913511da9a047827817ae992fbdf3 Mon Sep 17 00:00:00 2001
From: Pix_XL
Date: Wed, 19 Feb 2025 14:49:07 -0500
Subject: [PATCH 2/2] finsihed main page layouts
TODO:
- make UI pretty
- implement button functionality
- implement backend (firebase connection)
---
.../main/res/layout/activity_main_page.xml | 672 ++++++++++++++++--
1 file changed, 601 insertions(+), 71 deletions(-)
diff --git a/app/src/main/res/layout/activity_main_page.xml b/app/src/main/res/layout/activity_main_page.xml
index 700121d..6963688 100644
--- a/app/src/main/res/layout/activity_main_page.xml
+++ b/app/src/main/res/layout/activity_main_page.xml
@@ -6,7 +6,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
-
+
+
+ app:layout_constraintTop_toTopOf="parent" />
-
-
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />