wildercayden/ScoutingApp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add files via upload

Browse Source
This commit is contained in:
wildercayden 2025-03-05 11:42:51 -05:00 committed by GitHub
parent 74f560e207
commit 46edec1967
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 178 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ScoutingApp/app/src/main/java/com/example/scoutingapp/AutoActivity.java
View File

@ -2,6 +2,7 @@ package com.example.scoutingapp;
import android.content.Context;
import android.content.Intent;
import android.graphics.Color;
import android.os.Bundle;
import android.util.Log;
import android.widget.Button;
@ -25,7 +26,7 @@ public class AutoActivity extends AppCompatActivity {
private int l1Scored = 0;
private int processorScored = 0;
private int netScored = 0;
private boolean alliance = true;
private boolean reefPickup = false;
private boolean canLeave = false;
private boolean coralPickup = false;
@ -41,6 +42,7 @@ public class AutoActivity extends AppCompatActivity {
public static final String Match_key = "MATCHCONFIRM";
public static final String Team_key = "TEAMCONFIRM";
public static final String Postion_key = "POSTIONKEY";
public static final String Alliance_key = "ALLIANCECONFIRM";
@Override
protected void onCreate(Bundle savedInstanceState) {
@ -53,10 +55,18 @@ public class AutoActivity extends AppCompatActivity {
return insets;
});
Intent intentinput = getIntent();
eventString = intentinput.getStringExtra(MainActivity.Event_Key);
matchString = intentinput.getStringExtra(MainActivity.Match_key);
TeamString = intentinput.getStringExtra(MainActivity.Team_key);
startingPostionString = intentinput.getStringExtra(MainActivity.Postion_key);
eventString = intentinput.getStringExtra(startingActivity.Event_Key);
matchString = intentinput.getStringExtra(startingActivity.Match_key);
TeamString = intentinput.getStringExtra(startingActivity.Team_key);
startingPostionString = intentinput.getStringExtra(startingActivity.Postion_key);
alliance = intentinput.getBooleanExtra(startingActivity.Alliance_key, false);
TextView textView = findViewById(R.id.teamnumber);
textView.setText(TeamString);
if (alliance == true) {
textView.setBackgroundColor(Color.parseColor("#F71000")); //red
} else {
textView.setBackgroundColor(Color.parseColor("#0084ff"));//blue
}
l4Button = (Button) findViewById(R.id.button_L4);
@ -147,6 +157,7 @@ public class AutoActivity extends AppCompatActivity {
intent.putExtra(Match_key, matchString);
intent.putExtra(Team_key, TeamString);
intent.putExtra(Postion_key, startingPostionString);
intent.putExtra(Alliance_key, alliance);
startActivity(intent);
return true;
});

24
ScoutingApp/app/src/main/java/com/example/scoutingapp/EndActivity.java
View File

@ -1,6 +1,10 @@
package com.example.scoutingapp;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
import android.content.Intent;
import android.graphics.Color;
import android.net.Uri;
import android.os.Bundle;
@ -8,6 +12,7 @@ import android.util.Log;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import android.widget.TextView;
import androidx.activity.EdgeToEdge;
@ -27,8 +32,10 @@ public class EndActivity extends AppCompatActivity {
private String eventString, matchString, TeamString, noteString;
private int climbLevel = 0;
private EditText noteText;
public static final String Team_key = "TEAMCONFIRM";
public static final String Event_Key = "EVENTCONFIRM";
public static final String Match_key = "MATCHCONFIRM";
private Boolean alliance = true; //true = red, false = blue
private Button deepClimbButton, shallowClimbButton, parkButton, noClimbButton;
@ -42,13 +49,20 @@ public class EndActivity extends AppCompatActivity {
v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom);
return insets;
});
Intent intent = new Intent(this, MainActivity.class);
noteText = (EditText) findViewById(R.id.Notes);
Intent intentinput = getIntent();
eventString = intentinput.getStringExtra(TeleActivity.Event_Key);
matchString = intentinput.getStringExtra(TeleActivity.Match_key);
TeamString = intentinput.getStringExtra(TeleActivity.Team_key);
alliance = intentinput.getBooleanExtra(TeleActivity.Alliance_key, false);
TextView textView = findViewById(R.id.teamnumber);
textView.setText(TeamString);
if (alliance == true) {
textView.setBackgroundColor(Color.parseColor("#F71000")); //red
} else {
textView.setBackgroundColor(Color.parseColor("#0084ff"));//blue
}
deepClimbButton = (Button) findViewById(R.id.RB_DeepClimb);
shallowClimbButton = (Button) findViewById(R.id.RB_ShallowClimb);
@ -102,8 +116,9 @@ public class EndActivity extends AppCompatActivity {
public void csvMake() {
//adds the strings
String timestamp = getTimestamp();
String CSVLine = String.format(
"%s, %s", climbLevel, noteString
"%s, %s, %s", climbLevel, noteString, timestamp
);
//makes the file
@ -118,5 +133,10 @@ public class EndActivity extends AppCompatActivity {
}
}
public static String getTimestamp() {
SimpleDateFormat sdf = new SimpleDateFormat("MM/dd/yy HH:mm:ss.SSS", Locale.getDefault());
return sdf.format(new Date());
}
}

19
ScoutingApp/app/src/main/java/com/example/scoutingapp/MainActivity.java
View File

@ -31,6 +31,7 @@ import okhttp3.Response;
import okhttp3.ResponseBody;
public class MainActivity extends AppCompatActivity {
private Boolean alliance = true; //true = red, false = blue
private EditText Match_number;
private EditText Event;
private EditText Team;
@ -41,6 +42,7 @@ public class MainActivity extends AppCompatActivity {
public static final String Event_Key = "EVENTCONFIRM";
public static final String Match_key = "MATCHCONFIRM";
public static final String Team_key = "TEAMCONFIRM";
public static final String Alliance_key = "ALLIANCECONFIRM";
public String fein;
AsynchronousGet getTBAInfo;
@ -65,7 +67,7 @@ public class MainActivity extends AppCompatActivity {
public void onClick(View view) {
Match_numberString = Match_number.getText().toString();
//EventString = Event.getText().toString();
EventString = "Southern Maine";
EventString = "Pine Tree";
TeamString = Team.getText().toString();
if ((Match_numberString == null || Match_numberString.isEmpty()) ||
(EventString == null || EventString.isEmpty()) ||
@ -85,8 +87,18 @@ public class MainActivity extends AppCompatActivity {
submit.uploadSheets(MainActivity.this, EventString+Match_number+TeamString+".csv");
}
});
Button red = (Button) findViewById(R.id.Red);
red.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
alliance = true;
}
});
Button blue = (Button) findViewById(R.id.Blue);
blue.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
alliance = false;
}
});
//TextView TBAView = (TextView)findViewById(R.id.TBATest);
// getTBAInfo = new AsynchronousGet();
@ -173,6 +185,7 @@ public class MainActivity extends AppCompatActivity {
intent.putExtra(Event_Key, EventString);
intent.putExtra(Match_key, Match_numberString);
intent.putExtra(Team_key, TeamString);
intent.putExtra(Alliance_key, alliance);
startActivity(intent);
}
}

12
ScoutingApp/app/src/main/java/com/example/scoutingapp/TeleActivity.java
View File

@ -2,6 +2,7 @@ package com.example.scoutingapp;
import android.content.Context;
import android.content.Intent;
import android.graphics.Color;
import android.os.Bundle;
import android.util.Log;
import android.widget.Button;
@ -29,6 +30,7 @@ public class TeleActivity extends AppCompatActivity {
private boolean reefPickup = false;
private boolean canLeave = false;
private boolean coralPickup = false;
private boolean alliance = true;
private Button l4Button;
private Button l3Button;
@ -41,6 +43,7 @@ public class TeleActivity extends AppCompatActivity {
public static final String Match_key = "MATCHCONFIRM";
public static final String Team_key = "TEAMCONFIRM";
public static final String Postion_key = "POSTIONKEY";
public static final String Alliance_key= "ALLIANCECONFIRM";
@Override
protected void onCreate(Bundle savedInstanceState) {
@ -57,6 +60,15 @@ public class TeleActivity extends AppCompatActivity {
matchString = intentinput.getStringExtra(AutoActivity.Match_key);
TeamString = intentinput.getStringExtra(AutoActivity.Team_key);
startingPostionString = intentinput.getStringExtra(AutoActivity.Postion_key);
alliance = intentinput.getBooleanExtra(AutoActivity.Alliance_key, false);
TextView textView = findViewById(R.id.teamnumber);
textView.setText(TeamString);
if (alliance == true) {
textView.setBackgroundColor(Color.parseColor("#F71000")); //red
} else {
textView.setBackgroundColor(Color.parseColor("#0084ff"));//blue
}
l4Button = (Button) findViewById(R.id.button_L4);

13
ScoutingApp/app/src/main/java/com/example/scoutingapp/startingActivity.java
View File

@ -1,10 +1,12 @@
package com.example.scoutingapp;
import android.content.Intent;
import android.graphics.Color;
import android.os.Bundle;
import android.view.View;
import android.widget.Button;
import android.widget.RadioButton;
import android.widget.TextView;
import android.widget.Toast;
import androidx.activity.EdgeToEdge;
@ -15,10 +17,12 @@ import androidx.core.view.WindowInsetsCompat;
public class startingActivity extends AppCompatActivity {
private String eventString, matchString, TeamString, startingPostionString;
private Boolean alliance = true; //true = red, false = blue
public static final String Event_Key = "EVENTCONFIRM";
public static final String Match_key = "MATCHCONFIRM";
public static final String Team_key = "TEAMCONFIRM";
public static final String Postion_key = "POSTIONKEY";
public static final String Alliance_key = "ALLIANCECONFIRM";
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@ -33,6 +37,14 @@ public class startingActivity extends AppCompatActivity {
eventString = intentinput.getStringExtra(MainActivity.Event_Key);
matchString = intentinput.getStringExtra(MainActivity.Match_key);
TeamString = intentinput.getStringExtra(MainActivity.Team_key);
alliance = intentinput.getBooleanExtra(MainActivity.Alliance_key, false);
TextView textView = findViewById(R.id.teamnumber);
textView.setText(TeamString);
if (alliance == true) {
textView.setBackgroundColor(Color.parseColor("#F71000")); //red
} else {
textView.setBackgroundColor(Color.parseColor("#0084ff"));//blue
}
Button nextButton = (Button) findViewById(R.id.nextButton);
nextButton.setOnClickListener(new View.OnClickListener() {
@ -90,6 +102,7 @@ public class startingActivity extends AppCompatActivity {
intent.putExtra(Match_key, matchString);
intent.putExtra(Team_key, TeamString);
intent.putExtra(Postion_key, startingPostionString);
intent.putExtra(Alliance_key, alliance);
startActivity(intent);
}
}

BIN
ScoutingApp/app/src/main/res/drawable/screenshot_2025_01_16_115155.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

30
ScoutingApp/app/src/main/res/layout/activity_auto.xml
View File

@ -5,8 +5,21 @@
android:id="@+id/main"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#000000"
tools:context=".AutoActivity">
<TextView
android:id="@+id/teamnumber"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="2648"
android:textSize="34sp"
android:textColor="#FFFFFF"
app:layout_constraintBottom_toTopOf="@+id/linearLayout"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.498"
app:layout_constraintStart_toStartOf="parent" />
<ImageView
android:id="@+id/imageView2"
android:layout_width="264dp"
@ -94,6 +107,7 @@
android:layout_marginTop="8dp"
android:text="@string/auto"
android:textSize="48sp"
android:textColor="#FFFFFF"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@ -102,16 +116,16 @@
android:id="@+id/button_Processor"
android:layout_width="0dp"
android:layout_height="0dp"
android:backgroundTint="#402196F3"
android:backgroundTint="#6B0EE906"
android:text="@string/processor"
android:textColor="#000000"
android:textSize="34sp"
app:cornerRadius="0dp"
app:layout_constraintBottom_toTopOf="@+id/linearLayout"
app:layout_constraintBottom_toTopOf="@+id/teamnumber"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/button_Net"
app:layout_constraintTop_toBottomOf="@+id/imageView2"
app:strokeColor="#2196F3"
app:strokeColor="#0EE906"
app:strokeWidth="5dp"
tools:ignore="VisualLintButtonSize" />
@ -119,16 +133,16 @@
android:id="@+id/button_Net"
android:layout_width="0dp"
android:layout_height="0dp"
android:backgroundTint="#402196F3"
android:backgroundTint="#6B0EE906"
android:text="@string/net"
android:textColor="#000000"
android:textSize="34sp"
app:cornerRadius="0dp"
app:layout_constraintBottom_toTopOf="@+id/linearLayout"
app:layout_constraintBottom_toTopOf="@+id/teamnumber"
app:layout_constraintEnd_toStartOf="@+id/button_Processor"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView2"
app:strokeColor="#2196F3"
app:strokeColor="#0EE906"
app:strokeWidth="5dp"
tools:ignore="VisualLintButtonSize" />
@ -147,6 +161,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/can_leave"
android:textColor="#FFFFFF"
tools:ignore="VisualLintButtonSize" />
<CheckBox
@ -155,6 +170,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/can_remove_algae"
android:textColor="#FFFFFF"
tools:ignore="VisualLintButtonSize" />
<CheckBox
@ -163,6 +179,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/coral_pickup"
android:textColor="#FFFFFF"
tools:ignore="VisualLintButtonSize" />
</LinearLayout>
@ -174,6 +191,7 @@
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:text="@string/hold_button_to_ndecrement"
android:textColor="#FFFFFF"
app:layout_constraintBottom_toTopOf="@+id/imageView2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/textView2"

13
ScoutingApp/app/src/main/res/layout/activity_end.xml
View File

@ -70,8 +70,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/submit"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintBottom_toTopOf="@+id/teamnumber"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="parent" />
<com.google.android.material.textfield.TextInputEditText
@ -83,4 +84,14 @@
app:layout_constraintTop_toBottomOf="@+id/linearLayout2"
tools:layout_editor_absoluteX="1dp" />
<TextView
android:id="@+id/teamnumber"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="2648"
android:textSize="34sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

30
ScoutingApp/app/src/main/res/layout/activity_main.xml
View File

@ -1,10 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<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/Match"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#000000"
tools:context=".MainActivity">
<TextView
@ -15,6 +17,7 @@
android:layout_marginEnd="100dp"
android:layout_marginBottom="100dp"
android:text="To upload old data please enter the match data at the top to upload old data"
android:textColor="#FFFFFF"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -50,16 +53,22 @@
android:ems="10"
android:hint="Team Number"
android:inputType="number"
android:textColor="#FFFFFF"
android:textColorHint="#AAAAAA"
android:backgroundTint="#FFFFFF"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textInputLayout2" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/textInputLayout2"
android:layout_width="409dp"
android:layout_height="wrap_content"
android:textColor="#FFFFFF"
android:textColorHint="#AAAAAA"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
@ -71,6 +80,8 @@
android:id="@+id/Matchedit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="#FFFFFF"
android:textColorHint="#AAAAAA"
android:hint="Match"
app:layout_constraintBottom_toTopOf="@+id/TeamNumber"
app:layout_constraintEnd_toEndOf="parent"
@ -83,9 +94,26 @@
android:layout_height="wrap_content"
android:text="@string/Event"
android:textSize="34sp"
android:textColor="#FFFFFF"
app:layout_constraintBottom_toTopOf="@+id/Matchedit"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/nextButton" />
<Button
android:id="@+id/Red"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Red"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<Button
android:id="@+id/Blue"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Blue"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

23
ScoutingApp/app/src/main/res/layout/activity_starting.xml
View File

@ -5,8 +5,20 @@
android:id="@+id/Match"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#000000"
tools:context=".startingActivity">
<TextView
android:id="@+id/teamnumber"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="2648"
android:textSize="34sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.498"
app:layout_constraintStart_toStartOf="parent" />
<RadioGroup
android:id="@+id/radioGroup"
android:layout_width="0dp"
@ -24,30 +36,36 @@
android:id="@+id/Rbutton1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Starting Postion 1" />
android:checked="true"
android:text="Starting Postion 1"
android:textColor="@android:color/white" />
<RadioButton
android:id="@+id/Rbutton2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@android:color/white"
android:text="Starting Postion 2" />
<RadioButton
android:id="@+id/Rbutton3"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@android:color/white"
android:text="Starting Postion 3" />
<RadioButton
android:id="@+id/Rbutton4"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@android:color/white"
android:text="Starting Postion 4" />
<RadioButton
android:id="@+id/Rbutton5"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@android:color/white"
android:text="Starting Postion 5" />
</RadioGroup>
@ -68,9 +86,8 @@
android:id="@+id/imageView10"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="5dp"
android:src="@drawable/_025_reefscape_transparent_background"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintBottom_toTopOf="@+id/teamnumber"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/radioGroup" />

15
ScoutingApp/app/src/main/res/layout/activity_tele.xml
View File

@ -7,6 +7,17 @@
android:layout_height="match_parent"
tools:context=".AutoActivity">
<TextView
android:id="@+id/teamnumber"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="2648"
android:textSize="34sp"
app:layout_constraintBottom_toTopOf="@+id/linearLayout"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.498"
app:layout_constraintStart_toStartOf="parent" />
<ImageView
android:id="@+id/imageView2"
android:layout_width="264dp"
@ -107,7 +118,7 @@
android:textColor="#000000"
android:textSize="34sp"
app:cornerRadius="0dp"
app:layout_constraintBottom_toTopOf="@+id/linearLayout"
app:layout_constraintBottom_toTopOf="@+id/teamnumber"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/button_Net"
app:layout_constraintTop_toBottomOf="@+id/imageView2"
@ -124,7 +135,7 @@
android:textColor="#000000"
android:textSize="34sp"
app:cornerRadius="0dp"
app:layout_constraintBottom_toTopOf="@+id/linearLayout"
app:layout_constraintBottom_toTopOf="@+id/teamnumber"
app:layout_constraintEnd_toStartOf="@+id/button_Processor"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView2"

2
ScoutingApp/app/src/main/res/values/strings.xml
View File

@ -16,5 +16,5 @@
<string name="coralScored">%s%dx</string>
<string name="tele">Tele</string>
<string name="hold_button_to_ndecrement">Hold button to \ndecrement</string>
<string name="Event">Southern Maine</string>
<string name="Event">Pine Tree</string>
</resources>