diff --git a/ScoutingApp/.gradle/8.7/executionHistory/executionHistory.bin b/ScoutingApp/.gradle/8.7/executionHistory/executionHistory.bin index 2f67c4c..b9f96af 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 a783bee..10fbfda 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 777b660..4b7c986 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 623c647..83cf582 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 4b636da..6d55d2e 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 4506871..f7af58f 100644 Binary files a/ScoutingApp/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/ScoutingApp/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/ScoutingApp/app/build/intermediates/apk/debug/app-debug.apk b/ScoutingApp/app/build/intermediates/apk/debug/app-debug.apk index 66ead1c..ee5967d 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 5c71f28..5cae2c5 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 4e51ea0..bddd23e 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 @@ -#Tue Feb 04 12:33:53 EST 2025 +#Tue Feb 04 12:41:48 EST 2025 base.0=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes.dex base.1=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex base.2=C\:\\Users\\25lacorazzan\\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/TeleActivity.class b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/TeleActivity.class index 154c631..ea47e30 100644 Binary files a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/TeleActivity.class and b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/TeleActivity.class differ diff --git a/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/TeleActivity.dex b/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/TeleActivity.dex index 2b9abc1..88f4223 100644 Binary files a/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/TeleActivity.dex and b/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/TeleActivity.dex differ diff --git a/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AutoActivity.class.uniqueId2 b/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AutoActivity.class.uniqueId2 new file mode 100644 index 0000000..1d1881b Binary files /dev/null and b/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AutoActivity.class.uniqueId2 differ diff --git a/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AutoActivity.class.uniqueId3 b/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AutoActivity.class.uniqueId3 deleted file mode 100644 index 7e210da..0000000 Binary files a/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AutoActivity.class.uniqueId3 and /dev/null differ diff --git a/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/EndActivity$1.class.uniqueId0 b/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/EndActivity$1.class.uniqueId0 index cef97e8..53e1920 100644 Binary files a/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/EndActivity$1.class.uniqueId0 and b/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/EndActivity$1.class.uniqueId0 differ diff --git a/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/EndActivity$2.class.uniqueId5 b/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/EndActivity$2.class.uniqueId4 similarity index 82% rename from ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/EndActivity$2.class.uniqueId5 rename to ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/EndActivity$2.class.uniqueId4 index ac06757..e1d3123 100644 Binary files a/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/EndActivity$2.class.uniqueId5 and b/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/EndActivity$2.class.uniqueId4 differ diff --git a/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/EndActivity.class.uniqueId1 b/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/EndActivity.class.uniqueId1 index 1ea8900..9d1609f 100644 Binary files a/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/EndActivity.class.uniqueId1 and b/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/EndActivity.class.uniqueId1 differ diff --git a/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MainActivity$1.class.uniqueId2 b/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MainActivity$1.class.uniqueId2 deleted file mode 100644 index bbd1f36..0000000 Binary files a/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MainActivity$1.class.uniqueId2 and /dev/null differ diff --git a/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MainActivity$AsynchronousGet$1.class.uniqueId9 b/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MainActivity$AsynchronousGet$1.class.uniqueId9 deleted file mode 100644 index 3102d27..0000000 Binary files a/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MainActivity$AsynchronousGet$1.class.uniqueId9 and /dev/null differ diff --git a/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MainActivity$AsynchronousGet.class.uniqueId7 b/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MainActivity$AsynchronousGet.class.uniqueId7 deleted file mode 100644 index f243cf3..0000000 Binary files a/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MainActivity$AsynchronousGet.class.uniqueId7 and /dev/null differ diff --git a/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MainActivity.class.uniqueId8 b/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MainActivity.class.uniqueId8 deleted file mode 100644 index 386abd0..0000000 Binary files a/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MainActivity.class.uniqueId8 and /dev/null differ diff --git a/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Submit.class.uniqueId6 b/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Submit.class.uniqueId6 deleted file mode 100644 index eb21d32..0000000 Binary files a/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Submit.class.uniqueId6 and /dev/null differ diff --git a/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/TeleActivity.class.uniqueId3 b/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/TeleActivity.class.uniqueId3 new file mode 100644 index 0000000..154c631 Binary files /dev/null and b/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/TeleActivity.class.uniqueId3 differ diff --git a/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/TeleActivity.class.uniqueId4 b/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/TeleActivity.class.uniqueId4 deleted file mode 100644 index 391b9c7..0000000 Binary files a/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/TeleActivity.class.uniqueId4 and /dev/null differ diff --git a/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin index d6f90a3..d761093 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/TeleActivity.java b/ScoutingApp/app/src/main/java/com/example/scoutingapp/TeleActivity.java index 308bdcb..9be5c00 100644 --- a/ScoutingApp/app/src/main/java/com/example/scoutingapp/TeleActivity.java +++ b/ScoutingApp/app/src/main/java/com/example/scoutingapp/TeleActivity.java @@ -174,11 +174,11 @@ public class TeleActivity extends AppCompatActivity { } private void updateProcessorText() { - processorButton.setText(String.format(getResources().getString(R.string.coralScored), "Processor", processorScored)); + processorButton.setText(String.format(getResources().getString(R.string.coralScored), "Processor\n", processorScored)); } private void updateNetText() { - netButton.setText(String.format(getResources().getString(R.string.coralScored), "Net", netScored)); + netButton.setText(String.format(getResources().getString(R.string.coralScored), "Net\n", netScored)); } public void csvMake() {