From 46edec1967fa8ce05da26261df62a41ec3191f10 Mon Sep 17 00:00:00 2001 From: wildercayden Date: Wed, 5 Mar 2025 11:42:51 -0500 Subject: [PATCH] Add files via upload --- .../com/example/scoutingapp/AutoActivity.java | 21 +++++++++--- .../com/example/scoutingapp/EndActivity.java | 24 ++++++++++++-- .../com/example/scoutingapp/MainActivity.java | 19 +++++++++-- .../com/example/scoutingapp/TeleActivity.java | 12 +++++++ .../example/scoutingapp/startingActivity.java | 13 ++++++++ .../screenshot_2025_01_16_115155.webp | Bin 0 -> 11990 bytes .../app/src/main/res/layout/activity_auto.xml | 30 ++++++++++++++---- .../app/src/main/res/layout/activity_end.xml | 13 +++++++- .../app/src/main/res/layout/activity_main.xml | 30 +++++++++++++++++- .../src/main/res/layout/activity_starting.xml | 23 ++++++++++++-- .../app/src/main/res/layout/activity_tele.xml | 15 +++++++-- .../app/src/main/res/values/strings.xml | 2 +- 12 files changed, 178 insertions(+), 24 deletions(-) create mode 100644 ScoutingApp/app/src/main/res/drawable/screenshot_2025_01_16_115155.webp diff --git a/ScoutingApp/app/src/main/java/com/example/scoutingapp/AutoActivity.java b/ScoutingApp/app/src/main/java/com/example/scoutingapp/AutoActivity.java index a77e2b9..65cc254 100644 --- a/ScoutingApp/app/src/main/java/com/example/scoutingapp/AutoActivity.java +++ b/ScoutingApp/app/src/main/java/com/example/scoutingapp/AutoActivity.java @@ -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; }); diff --git a/ScoutingApp/app/src/main/java/com/example/scoutingapp/EndActivity.java b/ScoutingApp/app/src/main/java/com/example/scoutingapp/EndActivity.java index 1e88be8..6599e45 100644 --- a/ScoutingApp/app/src/main/java/com/example/scoutingapp/EndActivity.java +++ b/ScoutingApp/app/src/main/java/com/example/scoutingapp/EndActivity.java @@ -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()); + } } diff --git a/ScoutingApp/app/src/main/java/com/example/scoutingapp/MainActivity.java b/ScoutingApp/app/src/main/java/com/example/scoutingapp/MainActivity.java index 8aebdab..82c9268 100644 --- a/ScoutingApp/app/src/main/java/com/example/scoutingapp/MainActivity.java +++ b/ScoutingApp/app/src/main/java/com/example/scoutingapp/MainActivity.java @@ -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); } } \ No newline at end of file diff --git a/ScoutingApp/app/src/main/java/com/example/scoutingapp/TeleActivity.java b/ScoutingApp/app/src/main/java/com/example/scoutingapp/TeleActivity.java index c5735fb..43034d0 100644 --- a/ScoutingApp/app/src/main/java/com/example/scoutingapp/TeleActivity.java +++ b/ScoutingApp/app/src/main/java/com/example/scoutingapp/TeleActivity.java @@ -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); diff --git a/ScoutingApp/app/src/main/java/com/example/scoutingapp/startingActivity.java b/ScoutingApp/app/src/main/java/com/example/scoutingapp/startingActivity.java index 4e5f84d..33992ff 100644 --- a/ScoutingApp/app/src/main/java/com/example/scoutingapp/startingActivity.java +++ b/ScoutingApp/app/src/main/java/com/example/scoutingapp/startingActivity.java @@ -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); } } \ No newline at end of file diff --git a/ScoutingApp/app/src/main/res/drawable/screenshot_2025_01_16_115155.webp b/ScoutingApp/app/src/main/res/drawable/screenshot_2025_01_16_115155.webp new file mode 100644 index 0000000000000000000000000000000000000000..4f2b1224ec53a3f6adf44ce434d39379feb1596a GIT binary patch literal 11990 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 oab9DB + + @@ -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" /> @@ -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" diff --git a/ScoutingApp/app/src/main/res/layout/activity_end.xml b/ScoutingApp/app/src/main/res/layout/activity_end.xml index f13d6ee..5df50ac 100644 --- a/ScoutingApp/app/src/main/res/layout/activity_end.xml +++ b/ScoutingApp/app/src/main/res/layout/activity_end.xml @@ -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" /> + + \ No newline at end of file diff --git a/ScoutingApp/app/src/main/res/layout/activity_main.xml b/ScoutingApp/app/src/main/res/layout/activity_main.xml index 851d400..131df1c 100644 --- a/ScoutingApp/app/src/main/res/layout/activity_main.xml +++ b/ScoutingApp/app/src/main/res/layout/activity_main.xml @@ -1,10 +1,12 @@ - + @@ -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" /> +