diff --git a/ScoutingApp/.gradle/8.7/executionHistory/executionHistory.bin b/ScoutingApp/.gradle/8.7/executionHistory/executionHistory.bin
index 282d398..d8a5549 100644
Binary files a/ScoutingApp/.gradle/8.7/executionHistory/executionHistory.bin and b/ScoutingApp/.gradle/8.7/executionHistory/executionHistory.bin differ
diff --git a/ScoutingApp/.gradle/8.7/executionHistory/executionHistory.lock b/ScoutingApp/.gradle/8.7/executionHistory/executionHistory.lock
index 95564e7..940b742 100644
Binary files a/ScoutingApp/.gradle/8.7/executionHistory/executionHistory.lock and b/ScoutingApp/.gradle/8.7/executionHistory/executionHistory.lock differ
diff --git a/ScoutingApp/.gradle/8.7/fileHashes/fileHashes.bin b/ScoutingApp/.gradle/8.7/fileHashes/fileHashes.bin
index 18164fd..33278df 100644
Binary files a/ScoutingApp/.gradle/8.7/fileHashes/fileHashes.bin and b/ScoutingApp/.gradle/8.7/fileHashes/fileHashes.bin differ
diff --git a/ScoutingApp/.gradle/8.7/fileHashes/fileHashes.lock b/ScoutingApp/.gradle/8.7/fileHashes/fileHashes.lock
index 8debaaa..f4d53f0 100644
Binary files a/ScoutingApp/.gradle/8.7/fileHashes/fileHashes.lock and b/ScoutingApp/.gradle/8.7/fileHashes/fileHashes.lock differ
diff --git a/ScoutingApp/.gradle/8.7/fileHashes/resourceHashesCache.bin b/ScoutingApp/.gradle/8.7/fileHashes/resourceHashesCache.bin
index ea706bc..5c6c227 100644
Binary files a/ScoutingApp/.gradle/8.7/fileHashes/resourceHashesCache.bin and b/ScoutingApp/.gradle/8.7/fileHashes/resourceHashesCache.bin differ
diff --git a/ScoutingApp/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/ScoutingApp/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 5f151b9..2bd2e22 100644
Binary files a/ScoutingApp/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/ScoutingApp/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/ScoutingApp/.gradle/file-system.probe b/ScoutingApp/.gradle/file-system.probe
index 2f6bfe0..0350ef2 100644
Binary files a/ScoutingApp/.gradle/file-system.probe and b/ScoutingApp/.gradle/file-system.probe differ
diff --git a/ScoutingApp/.idea/caches/deviceStreaming.xml b/ScoutingApp/.idea/caches/deviceStreaming.xml
index c8e7a25..e227ca0 100644
--- a/ScoutingApp/.idea/caches/deviceStreaming.xml
+++ b/ScoutingApp/.idea/caches/deviceStreaming.xml
@@ -58,6 +58,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -256,17 +267,6 @@
-
-
-
-
-
-
-
-
-
-
-
@@ -422,6 +422,17 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ScoutingApp/app/build/intermediates/apk/debug/app-debug.apk b/ScoutingApp/app/build/intermediates/apk/debug/app-debug.apk
index 2e2872c..249bbd3 100644
Binary files a/ScoutingApp/app/build/intermediates/apk/debug/app-debug.apk and b/ScoutingApp/app/build/intermediates/apk/debug/app-debug.apk differ
diff --git a/ScoutingApp/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex b/ScoutingApp/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex
index 33cf820..9327c58 100644
Binary files a/ScoutingApp/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex and b/ScoutingApp/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/ScoutingApp/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
index 0db86cf..713174a 100644
--- a/ScoutingApp/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+++ b/ScoutingApp/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@@ -1,4 +1,4 @@
-#Fri Feb 14 13:39:16 EST 2025
+#Tue Feb 25 11:52:55 EST 2025
base.0=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes.dex
base.1=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex
base.2=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\4\\classes.dex
diff --git a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$AsynchronousGet$1.class b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$AsynchronousGet$1.class
index d12655b..223ff8e 100644
Binary files a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$AsynchronousGet$1.class and b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$AsynchronousGet$1.class differ
diff --git a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$AsynchronousGet.class b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$AsynchronousGet.class
index 2e338b7..2f12d3d 100644
Binary files a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$AsynchronousGet.class and b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$AsynchronousGet.class differ
diff --git a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$SychronousGet.class b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$SychronousGet.class
index 4f0d356..89e5e46 100644
Binary files a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$SychronousGet.class and b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$SychronousGet.class differ
diff --git a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity.class b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity.class
index b9543cd..428fcea 100644
Binary files a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity.class and b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity.class differ
diff --git a/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/MainActivity$AsynchronousGet$1.dex b/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/MainActivity$AsynchronousGet$1.dex
index 9e8d0cf..a5bc503 100644
Binary files a/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/MainActivity$AsynchronousGet$1.dex and b/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/MainActivity$AsynchronousGet$1.dex differ
diff --git a/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/MainActivity$AsynchronousGet.dex b/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/MainActivity$AsynchronousGet.dex
index 82510f3..bcc48e1 100644
Binary files a/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/MainActivity$AsynchronousGet.dex and b/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/MainActivity$AsynchronousGet.dex differ
diff --git a/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/MainActivity$SychronousGet.dex b/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/MainActivity$SychronousGet.dex
index 97586d5..85a4f2c 100644
Binary files a/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/MainActivity$SychronousGet.dex and b/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/MainActivity$SychronousGet.dex differ
diff --git a/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/MainActivity.dex b/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/MainActivity.dex
index 97b3038..9174ce1 100644
Binary files a/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/MainActivity.dex and b/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/MainActivity.dex differ
diff --git a/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MainActivity$AsynchronousGet$1.class.uniqueId3 b/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MainActivity$AsynchronousGet$1.class.uniqueId3
index 9363e26..d12655b 100644
Binary files a/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MainActivity$AsynchronousGet$1.class.uniqueId3 and b/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MainActivity$AsynchronousGet$1.class.uniqueId3 differ
diff --git a/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MainActivity$AsynchronousGet.class.uniqueId1 b/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MainActivity$AsynchronousGet.class.uniqueId1
index 29e3421..2e338b7 100644
Binary files a/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MainActivity$AsynchronousGet.class.uniqueId1 and b/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MainActivity$AsynchronousGet.class.uniqueId1 differ
diff --git a/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MainActivity$SychronousGet.class.uniqueId5 b/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MainActivity$SychronousGet.class.uniqueId5
index e6657ab..4f0d356 100644
Binary files a/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MainActivity$SychronousGet.class.uniqueId5 and b/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MainActivity$SychronousGet.class.uniqueId5 differ
diff --git a/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MainActivity.class.uniqueId0 b/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MainActivity.class.uniqueId0
index 98da712..b9543cd 100644
Binary files a/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MainActivity.class.uniqueId0 and b/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MainActivity.class.uniqueId0 differ
diff --git a/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
index b679501..312abb5 100644
Binary files a/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ
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 de9bc9d..eec872c 100644
--- a/ScoutingApp/app/src/main/java/com/example/scoutingapp/MainActivity.java
+++ b/ScoutingApp/app/src/main/java/com/example/scoutingapp/MainActivity.java
@@ -97,12 +97,12 @@ public class MainActivity extends AppCompatActivity {
StrictMode.setThreadPolicy(policy);
stream = getJSON("https://www.thebluealliance.com/api/v3/match/2024melew_qm1");
-
-
JsonElement jsonElement = JsonParser.parseReader(new InputStreamReader(stream));
JsonObject teamsJSON = jsonElement.getAsJsonObject();
String blueTeams = teamsJSON.get("alliances").getAsJsonObject().get("blue").getAsJsonObject().get("team_keys").toString();
TBAView.setText(blueTeams);
+ String redTeams = teamsJSON.get("alliances").getAsJsonObject().get("blue").getAsJsonObject().get("team_keys").toString();
+ TBAView.setText(redTeams);
// JSONArray blueTeamsJSON = teamsJSON.getJSONObject("alliances").getJSONObject("blue").getJSONArray("team_keys");
// JSONArray redTeamsJSON = teamsJSON.getJSONObject("alliances").getJSONObject("blue").getJSONArray("team_keys");
@@ -115,98 +115,6 @@ public class MainActivity extends AppCompatActivity {
}
- public final class AsynchronousGet {
- private final OkHttpClient client = new OkHttpClient();
-
- public String[][] getMatchTeams(String eventKey, int qualMatchNum) throws Exception {
- // https://www.thebluealliance.com/api/v3/event/2024melew/teams?X-TBA-Auth-Key=0zxxGYSvY7xI2onqcWg0NT0sEtmtR6hCpmYJ29nwfxvqrP3Mf1M3lRZO5x6Kc3kt
- // https://www.thebluealliance.com/api/v3/match/2024melew_qm1?X-TBA-Auth-Key=0zxxGYSvY7xI2onqcWg0NT0sEtmtR6hCpmYJ29nwfxvqrP3Mf1M3lRZO5x6Kc3kt
-
- Request request = new Request.Builder()
- .url("https://www.thebluealliance.com/api/v3/match/2024melew_qm1")
- .header("X-TBA-Auth-Key", "0zxxGYSvY7xI2onqcWg0NT0sEtmtR6hCpmYJ29nwfxvqrP3Mf1M3lRZO5x6Kc3kt")
- .build();
-/*
- try(Response response = client.newCall(request).enqueue(new Callback())){
- if(!response.isSuccessful()) throw new IOException("unexpected code " + response);
- Log.d("test", "inside if statement");
- Headers responseHeaders = response.headers();
- for(int i = 0; i < responseHeaders.size(); i++){
- System.out.println(responseHeaders.name(i) + ": " + responseHeaders.value(i));
- }
- fein = response.body().string();
- }
-*/
- Log.d("test", "before enqueue");
- client.newCall(request).enqueue(new Callback() {
- @Override
- public void onResponse(@NonNull Call call, @NonNull Response response) throws IOException {
- Log.d("test", "before try");
- ResponseBody responseBody = response.body();
- Log.d("test", responseBody.string());
- //try (ResponseBody responseBody1 = response.body()) {
- // if (!response.isSuccessful()) throw new IOException("Unexpected code " + response);
-
- Headers responseHeaders = response.headers();
- for (int i = 0, size = responseHeaders.size(); i < size; i++) {
- System.out.println(responseHeaders.name(i) + ": " + responseHeaders.value(i));
- }
-
- fein = responseBody.string();
- responseBody.close();
- Log.d("test", "hehehehaw");
-
- }
-
- @Override
- public void onFailure(@NonNull okhttp3.Call call, @NonNull IOException e) {
- e.printStackTrace();
- Log.d("test", "on fail");
- }
-
- });
-
- JSONObject teamsJSON = new JSONObject();
- JSONArray blueTeamsJSON = teamsJSON.getJSONObject("alliances").getJSONObject("blue").getJSONArray("team_keys");
- JSONArray redTeamsJSON = teamsJSON.getJSONObject("alliances").getJSONObject("blue").getJSONArray("team_keys");
-
- //String[] blueTeams = {blueTeamsJSON.getString(0), blueTeamsJSON.getString(1), blueTeamsJSON.getString(2)};
- //String[] redTeams = {redTeamsJSON.getString(0), redTeamsJSON.getString(1), redTeamsJSON.getString(2)};
-
- Log.d("test", "before return");
-
- return new String[][]{{""}, {""}};
- }
-
-
- }
-
- public final class SychronousGet{
- private final OkHttpClient client = new OkHttpClient();
-
- public void run() throws Exception{
-
- Log.d( "test", "before");
- Request request = new Request.Builder()
- .url("https://www.thebluealliance.com/api/v3/match/2024melew_qm1")
- .header("X-TBA-Auth-Key", "0zxxGYSvY7xI2onqcWg0NT0sEtmtR6hCpmYJ29nwfxvqrP3Mf1M3lRZO5x6Kc3kt")
- .build();
-
-
- try(Response response = client.newCall(request).execute()){
- Log.d("test", String.valueOf(response.isSuccessful()));
- if(!response.isSuccessful()) throw new IOException("bruh moment" + response);
-
- Headers responseHeaders = response.headers();
- for(int i = 0; i < responseHeaders.size(); i++){
- Log.d("test", responseHeaders.name(i) + ": " + responseHeaders.value(i));
- }
-
- Log.d("test", response.body().string());
- }
- }
- }
-
public InputStream getJSON(String path){
InputStream stream = null;
diff --git a/ScoutingApp/app/src/main/res/layout/activity_main.xml b/ScoutingApp/app/src/main/res/layout/activity_main.xml
index 7d2da98..9d3c93b 100644
--- a/ScoutingApp/app/src/main/res/layout/activity_main.xml
+++ b/ScoutingApp/app/src/main/res/layout/activity_main.xml
@@ -7,32 +7,6 @@
android:layout_height="match_parent"
tools:context=".MainActivity">
-
-
-
-
-
-
-
-
+ app:layout_constraintVertical_bias="0.902"
+ tools:layout_editor_absoluteX="0dp" />
+
+
+
+
+ app:layout_constraintTop_toTopOf="parent" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file