Skip to content

merge main to branch #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pix-xl merged 5 commits into from
Feb 26, 2025
Merged

merge main to branch #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a190083
something something merge (im sick of this app)
pix-xl Feb 24, 2025
4e6d923
pull from main
pix-xl Feb 24, 2025
890357d
ID updates
pix-xl Feb 25, 2025
f7a4a3d
ID Updates
pix-xl Feb 25, 2025
42f2b16
Merge pull request #23 from CrevolutionRoboticsProgramming/shilas-branch
pix-xl Feb 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions app/src/main/java/com/example/aquaanalyzomatic/mainPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ public class mainPage extends AppCompatActivity {
private CheckBox CheckHumanPlayer, CheckParking, CheckShallowClimb, CheckDeepClimb, CheckLeaveStart;



@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Expand Down Expand Up @@ -91,9 +92,15 @@ protected void onCreate(Bundle savedInstanceState) {
View teleProcessedMinus = findViewById(R.id.TeleProcessedMinus);



// -------------------- TeleOp Vars -------------------- //



// -------------------- TeleOp Vars -------------------- //



// -------------------- Match Data Vars -------------------- //
EditText matchNum = findViewById(R.id.MatchNum);
EditText teamNum = findViewById(R.id.TeamNum);
Expand Down Expand Up @@ -351,6 +358,8 @@ public void onClick(View view) {
}
});



}

public void changeNum(EditText item, String direction) {
Expand Down
5 changes: 5 additions & 0 deletions app/src/main/java/com/example/aquaanalyzomatic/matchData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package com.example.aquaanalyzomatic;

public class matchData {

}
64 changes: 28 additions & 36 deletions app/src/main/res/layout/activity_main_page.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
android:foregroundTint="#EFB821">

<Button
android:id="@+id/autonLayoutBtn2"
android:id="@+id/autonLayoutBtn"
android:layout_width="243dp"
android:layout_height="166dp"
android:backgroundTint="#EFB821"
Expand Down Expand Up @@ -68,7 +68,7 @@
android:fontFamily="@font/montserrat_extralight"
android:foregroundTint="#000000"
android:text="@string/SignOutBtn"
android:textSize="30sp"
android:textSize="25sp"
app:iconTint="#000000"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/textView"
Expand Down Expand Up @@ -522,7 +522,7 @@
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.351"
app:layout_constraintVertical_bias="0.37"
app:srcCompat="@drawable/finalplusbutton"
app:tint="#7DBBE7" />

Expand Down Expand Up @@ -835,7 +835,7 @@
app:layout_constraintTop_toTopOf="parent" />

<CheckBox
android:id="@+id/checkBox"
android:id="@+id/CheckHumanPlayer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/montserrat_semibold"
Expand All @@ -849,11 +849,22 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.992" />

<androidx.constraintlayout.widget.Group
android:id="@+id/group"
<EditText
android:id="@+id/Username"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:visibility="gone" />
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"
Expand All @@ -864,10 +875,9 @@
android:background="#2C2929"
android:backgroundTint="#000000"
android:foregroundTint="#000000"
android:visibility="gone"
android:visibility=""
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
tools:visibility="gone">
app:layout_constraintEnd_toEndOf="parent">

<ImageView
android:id="@+id/AutonPlusL1"
Expand Down Expand Up @@ -1085,18 +1095,18 @@
android:layout_marginBottom="387dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintHorizontal_bias="0.481"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.548"
app:layout_constraintVertical_bias="0.412"
app:srcCompat="@drawable/finalplusbutton"
app:tint="#7DBBE7" />

<EditText
android:id="@+id/AutonNumL4"
android:layout_width="70dp"
android:layout_height="75dp"
android:layout_marginStart="154dp"
android:layout_marginStart="160dp"
android:layout_marginTop="113dp"
android:layout_marginBottom="387dp"
android:clickable="false"
Expand All @@ -1113,7 +1123,8 @@
android:textSize="40dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.452" />

<ImageView
android:id="@+id/AutonMinusL4"
Expand All @@ -1125,10 +1136,10 @@
android:layout_marginBottom="387dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintHorizontal_bias="0.518"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.451"
app:layout_constraintVertical_bias="0.428"
app:srcCompat="@drawable/finalminusbutton"
app:tint="#7DBBE7" />

Expand Down Expand Up @@ -1419,28 +1430,9 @@
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.677"
app:layout_constraintVertical_bias="0.015"
tools:text=" Leaves start?" />

<CheckBox
android:id="@+id/CheckAuton"
android:layout_width="225dp"
android:layout_height="75dp"
android:layout_marginTop="494dp"
android:layout_marginEnd="766dp"
android:layout_marginBottom="3dp"
android:fontFamily="@font/montserrat_semibold"
android:text="@string/CheckAuton"
android:textAlignment="center"
android:textColor="#7DBBE7"
android:textSize="30sp"
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="1.0" />

</androidx.constraintlayout.widget.ConstraintLayout>

<androidx.constraintlayout.widget.ConstraintLayout
Expand Down
Loading