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 0000000..4f2b122 Binary files /dev/null and b/ScoutingApp/app/src/main/res/drawable/screenshot_2025_01_16_115155.webp differ diff --git a/ScoutingApp/app/src/main/res/layout/activity_auto.xml b/ScoutingApp/app/src/main/res/layout/activity_auto.xml index 660a03b..0497661 100644 --- a/ScoutingApp/app/src/main/res/layout/activity_auto.xml +++ b/ScoutingApp/app/src/main/res/layout/activity_auto.xml @@ -5,8 +5,21 @@ android:id="@+id/main" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="#000000" tools:context=".AutoActivity"> + + @@ -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" /> +