diff --git a/ScoutingApp/.gradle/8.7/executionHistory/executionHistory.bin b/ScoutingApp/.gradle/8.7/executionHistory/executionHistory.bin index 69dff58..4df682c 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 3e06476..b697cdf 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 75f6b50..8a56686 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 1aa402d..207612c 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 e1d04bb..d3c8211 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 6287722..83400bd 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 baa8751..0764360 100644 Binary files a/ScoutingApp/.gradle/file-system.probe and b/ScoutingApp/.gradle/file-system.probe differ diff --git a/ScoutingApp/app/build/intermediates/apk/debug/app-debug.apk b/ScoutingApp/app/build/intermediates/apk/debug/app-debug.apk index 72966fc..ed62079 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/compile_and_runtime_not_namespaced_r_class_jar/debug/processDebugResources/R.jar b/ScoutingApp/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/processDebugResources/R.jar index f531f95..d4cb5e6 100644 Binary files a/ScoutingApp/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/processDebugResources/R.jar and b/ScoutingApp/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/processDebugResources/R.jar differ diff --git a/ScoutingApp/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex b/ScoutingApp/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex index 314fa92..4bcec96 100644 Binary files a/ScoutingApp/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex and b/ScoutingApp/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex 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 6d11144..6a4f0f7 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/dex_archive_input_jar_hashes/debug/dexBuilderDebug/out b/ScoutingApp/app/build/intermediates/dex_archive_input_jar_hashes/debug/dexBuilderDebug/out index 1db027e..9b364c3 100644 Binary files a/ScoutingApp/app/build/intermediates/dex_archive_input_jar_hashes/debug/dexBuilderDebug/out and b/ScoutingApp/app/build/intermediates/dex_archive_input_jar_hashes/debug/dexBuilderDebug/out differ diff --git a/ScoutingApp/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/ScoutingApp/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties index 0d031fc..5bae05e 100644 --- a/ScoutingApp/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ b/ScoutingApp/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -1,4 +1,4 @@ -#Fri Mar 07 13:54:13 EST 2025 +#Tue Mar 11 12:44:48 EDT 2025 com.example.scoutingapp-main-33\:/drawable/_025_reefscape_transparent_background.webp=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable__025_reefscape_transparent_background.webp.flat com.example.scoutingapp-main-33\:/drawable/ic_launcher_background.xml=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_ic_launcher_background.xml.flat com.example.scoutingapp-main-33\:/drawable/ic_launcher_foreground.xml=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_ic_launcher_foreground.xml.flat diff --git a/ScoutingApp/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties b/ScoutingApp/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties index 2bbfd6d..0d8e72d 100644 --- a/ScoutingApp/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties +++ b/ScoutingApp/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties @@ -1,4 +1,4 @@ -#Fri Mar 07 13:54:13 EST 2025 +#Tue Mar 11 12:44:48 EDT 2025 com.example.scoutingapp-main-5\:/drawable/_025_reefscape_transparent_background.webp=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\_025_reefscape_transparent_background.webp com.example.scoutingapp-main-5\:/drawable/ic_launcher_background.xml=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\ic_launcher_background.xml com.example.scoutingapp-main-5\:/drawable/ic_launcher_foreground.xml=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\ic_launcher_foreground.xml 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 7b22723..e5d0a8f 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 Mar 07 13:54:14 EST 2025 +#Tue Mar 11 12:44:50 EDT 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/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/ScoutingApp/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index 051ed5e..e7b6e96 100644 Binary files a/ScoutingApp/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/ScoutingApp/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/AutoActivity.class b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/AutoActivity.class index 1e20ec6..4522c6d 100644 Binary files a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/AutoActivity.class and b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/AutoActivity.class differ diff --git a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/EndActivity$1.class b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/EndActivity$1.class index 2408b3c..b2b222b 100644 Binary files a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/EndActivity$1.class and b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/EndActivity$1.class differ diff --git a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/EndActivity$2.class b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/EndActivity$2.class index fcc70f3..5ca146f 100644 Binary files a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/EndActivity$2.class and b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/EndActivity$2.class differ diff --git a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/EndActivity.class b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/EndActivity.class index 182068b..d3fc5e7 100644 Binary files a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/EndActivity.class and b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/EndActivity.class differ diff --git a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$1.class b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$1.class index 755de17..c9c7200 100644 Binary files a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$1.class and b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$1.class differ diff --git a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$2.class b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$2.class index 6d7aaf3..a98bb5c 100644 Binary files a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$2.class and b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$2.class differ diff --git a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$3.class b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$3.class index d00aa8a..a1a90ff 100644 Binary files a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$3.class and b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$3.class differ diff --git a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$4.class b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$4.class index 5917753..a20277a 100644 Binary files a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$4.class and b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$4.class differ diff --git a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$5.class b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$5.class index 27b0191..98dcce0 100644 Binary files a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$5.class and b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$5.class differ diff --git a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$6.class b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$6.class index 153f305..78808f0 100644 Binary files a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$6.class and b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$6.class differ diff --git a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$7.class b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$7.class index 8eadc6b..052ba5d 100644 Binary files a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$7.class and b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$7.class differ diff --git a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$8.class b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$8.class index f7654ab..46a2bd6 100644 Binary files a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$8.class and b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$8.class differ diff --git a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$9.class b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$9.class index 0c2ae8d..fdcbcb5 100644 Binary files a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$9.class and b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$9.class differ 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 deleted file mode 100644 index dd1706b..0000000 Binary files a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$AsynchronousGet$1.class and /dev/null 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 deleted file mode 100644 index e0e32ec..0000000 Binary files a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$AsynchronousGet.class and /dev/null 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 d0251d5..da2f83f 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/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/TeleActivity.class b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/TeleActivity.class index 80ea8f8..9b8045a 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/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity$1.class b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity$1.class index 01cf53b..d37b065 100644 Binary files a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity$1.class and b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity$1.class differ diff --git a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity$2.class b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity$2.class index a346881..9ac28f2 100644 Binary files a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity$2.class and b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity$2.class differ diff --git a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity$3.class b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity$3.class index 5e62c8d..3c37e26 100644 Binary files a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity$3.class and b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity$3.class differ diff --git a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity$4.class b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity$4.class index 50b2101..98c4596 100644 Binary files a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity$4.class and b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity$4.class differ diff --git a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity$5.class b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity$5.class index 3b04bbf..5f7809f 100644 Binary files a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity$5.class and b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity$5.class differ diff --git a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity$6.class b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity$6.class index 3000bc3..f28e280 100644 Binary files a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity$6.class and b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity$6.class differ diff --git a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity.class b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity.class index d8c3eec..cb30783 100644 Binary files a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity.class and b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity.class differ diff --git a/ScoutingApp/app/build/intermediates/linked_resources_binary_format/debug/processDebugResources/linked-resources-binary-format-debug.ap_ b/ScoutingApp/app/build/intermediates/linked_resources_binary_format/debug/processDebugResources/linked-resources-binary-format-debug.ap_ index e143a1d..c345a05 100644 Binary files a/ScoutingApp/app/build/intermediates/linked_resources_binary_format/debug/processDebugResources/linked-resources-binary-format-debug.ap_ and b/ScoutingApp/app/build/intermediates/linked_resources_binary_format/debug/processDebugResources/linked-resources-binary-format-debug.ap_ differ diff --git a/ScoutingApp/app/build/intermediates/local_only_symbol_list/debug/parseDebugLocalResources/R-def.txt b/ScoutingApp/app/build/intermediates/local_only_symbol_list/debug/parseDebugLocalResources/R-def.txt index 1a88ff7..a9e86d9 100644 --- a/ScoutingApp/app/build/intermediates/local_only_symbol_list/debug/parseDebugLocalResources/R-def.txt +++ b/ScoutingApp/app/build/intermediates/local_only_symbol_list/debug/parseDebugLocalResources/R-def.txt @@ -9,6 +9,11 @@ drawable loop drawable screenshot_2025_01_16_115155 id ButtonNext id Match +id Notes +id RB_DeepClimb +id RB_NoClimb +id RB_Park +id RB_ShallowClimb id Rbutton1 id Rbutton2 id Rbutton3 @@ -34,12 +39,15 @@ id getTeamsButton id imageView10 id imageView2 id linearLayout +id linearLayout2 id main +id matchNumber id nextButton id radioGroup id red1Button id red2Button id red3Button +id scoutNameText id teamnumber id textInputLayout2 id textInputLayout3 diff --git a/ScoutingApp/app/build/intermediates/manifest_merge_blame_file/debug/processDebugMainManifest/manifest-merger-blame-debug-report.txt b/ScoutingApp/app/build/intermediates/manifest_merge_blame_file/debug/processDebugMainManifest/manifest-merger-blame-debug-report.txt index 9f8fe86..bd55b9a 100644 --- a/ScoutingApp/app/build/intermediates/manifest_merge_blame_file/debug/processDebugMainManifest/manifest-merger-blame-debug-report.txt +++ b/ScoutingApp/app/build/intermediates/manifest_merge_blame_file/debug/processDebugMainManifest/manifest-merger-blame-debug-report.txt @@ -30,7 +30,7 @@ 19-->[androidx.core:core:1.13.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\42dfdf811721b94244c28f65a2afec29\transformed\core-1.13.0\AndroidManifest.xml:26:22-94 20 21 C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:10:5-38:19 +21-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:10:5-41:19 22 android:allowBackup="true" 22-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:11:9-35 23 android:appComponentFactory="androidx.core.app.CoreComponentFactory" @@ -54,105 +54,111 @@ 33-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:18:9-49 34 C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:20:9-22:40 -35 android:name="com.example.scoutingapp.EndActivity" -35-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:21:13-40 +35 android:name="com.example.scoutingapp.startingActivity" +35-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:21:13-45 36 android:exported="false" /> 36-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:22:13-37 37 C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:23:9-25:40 -38 android:name="com.example.scoutingapp.TeleActivity" -38-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:24:13-41 +38 android:name="com.example.scoutingapp.EndActivity" +38-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:24:13-40 39 android:exported="false" /> 39-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:25:13-37 40 C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:26:9-28:40 -41 android:name="com.example.scoutingapp.AutoActivity" +41 android:name="com.example.scoutingapp.TeleActivity" 41-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:27:13-41 42 android:exported="false" /> 42-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:28:13-37 43 C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:29:9-37:20 -44 android:name="com.example.scoutingapp.MainActivity" +43-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:29:9-31:40 +44 android:name="com.example.scoutingapp.AutoActivity" 44-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:30:13-41 -45 android:exported="true" > -45-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:31:13-36 -46 -46-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:32:13-36:29 -47 -47-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:33:17-69 -47-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:33:25-66 -48 -49 -49-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:35:17-77 -49-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:35:27-74 -50 -51 -52 -53 [androidx.emoji2:emoji2:1.3.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\51f1927f6706bb4e824223b170abb02f\transformed\emoji2-1.3.0\AndroidManifest.xml:24:9-32:20 -54 android:name="androidx.startup.InitializationProvider" -54-->[androidx.emoji2:emoji2:1.3.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\51f1927f6706bb4e824223b170abb02f\transformed\emoji2-1.3.0\AndroidManifest.xml:25:13-67 -55 android:authorities="com.example.scoutingapp.androidx-startup" -55-->[androidx.emoji2:emoji2:1.3.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\51f1927f6706bb4e824223b170abb02f\transformed\emoji2-1.3.0\AndroidManifest.xml:26:13-68 -56 android:exported="false" > -56-->[androidx.emoji2:emoji2:1.3.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\51f1927f6706bb4e824223b170abb02f\transformed\emoji2-1.3.0\AndroidManifest.xml:27:13-37 -57 [androidx.emoji2:emoji2:1.3.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\51f1927f6706bb4e824223b170abb02f\transformed\emoji2-1.3.0\AndroidManifest.xml:29:13-31:52 -58 android:name="androidx.emoji2.text.EmojiCompatInitializer" -58-->[androidx.emoji2:emoji2:1.3.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\51f1927f6706bb4e824223b170abb02f\transformed\emoji2-1.3.0\AndroidManifest.xml:30:17-75 -59 android:value="androidx.startup" /> -59-->[androidx.emoji2:emoji2:1.3.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\51f1927f6706bb4e824223b170abb02f\transformed\emoji2-1.3.0\AndroidManifest.xml:31:17-49 +45 android:exported="false" /> +45-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:31:13-37 +46 C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:32:9-40:20 +47 android:name="com.example.scoutingapp.MainActivity" +47-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:33:13-41 +48 android:exported="true" > +48-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:34:13-36 +49 +49-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:35:13-39:29 +50 +50-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:36:17-69 +50-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:36:25-66 +51 +52 +52-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:38:17-77 +52-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:38:27-74 +53 +54 +55 +56 [androidx.emoji2:emoji2:1.3.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\51f1927f6706bb4e824223b170abb02f\transformed\emoji2-1.3.0\AndroidManifest.xml:24:9-32:20 +57 android:name="androidx.startup.InitializationProvider" +57-->[androidx.emoji2:emoji2:1.3.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\51f1927f6706bb4e824223b170abb02f\transformed\emoji2-1.3.0\AndroidManifest.xml:25:13-67 +58 android:authorities="com.example.scoutingapp.androidx-startup" +58-->[androidx.emoji2:emoji2:1.3.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\51f1927f6706bb4e824223b170abb02f\transformed\emoji2-1.3.0\AndroidManifest.xml:26:13-68 +59 android:exported="false" > +59-->[androidx.emoji2:emoji2:1.3.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\51f1927f6706bb4e824223b170abb02f\transformed\emoji2-1.3.0\AndroidManifest.xml:27:13-37 60 [androidx.lifecycle:lifecycle-process:2.6.2] C:\Users\26jacquesty\.gradle\caches\transforms-4\fab565b32d1caf7d32cc0e9c5a768a04\transformed\lifecycle-process-2.6.2\AndroidManifest.xml:29:13-31:52 -61 android:name="androidx.lifecycle.ProcessLifecycleInitializer" -61-->[androidx.lifecycle:lifecycle-process:2.6.2] C:\Users\26jacquesty\.gradle\caches\transforms-4\fab565b32d1caf7d32cc0e9c5a768a04\transformed\lifecycle-process-2.6.2\AndroidManifest.xml:30:17-78 +60-->[androidx.emoji2:emoji2:1.3.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\51f1927f6706bb4e824223b170abb02f\transformed\emoji2-1.3.0\AndroidManifest.xml:29:13-31:52 +61 android:name="androidx.emoji2.text.EmojiCompatInitializer" +61-->[androidx.emoji2:emoji2:1.3.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\51f1927f6706bb4e824223b170abb02f\transformed\emoji2-1.3.0\AndroidManifest.xml:30:17-75 62 android:value="androidx.startup" /> -62-->[androidx.lifecycle:lifecycle-process:2.6.2] C:\Users\26jacquesty\.gradle\caches\transforms-4\fab565b32d1caf7d32cc0e9c5a768a04\transformed\lifecycle-process-2.6.2\AndroidManifest.xml:31:17-49 +62-->[androidx.emoji2:emoji2:1.3.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\51f1927f6706bb4e824223b170abb02f\transformed\emoji2-1.3.0\AndroidManifest.xml:31:17-49 63 [androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:29:13-31:52 -64 android:name="androidx.profileinstaller.ProfileInstallerInitializer" -64-->[androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:30:17-85 +63-->[androidx.lifecycle:lifecycle-process:2.6.2] C:\Users\26jacquesty\.gradle\caches\transforms-4\fab565b32d1caf7d32cc0e9c5a768a04\transformed\lifecycle-process-2.6.2\AndroidManifest.xml:29:13-31:52 +64 android:name="androidx.lifecycle.ProcessLifecycleInitializer" +64-->[androidx.lifecycle:lifecycle-process:2.6.2] C:\Users\26jacquesty\.gradle\caches\transforms-4\fab565b32d1caf7d32cc0e9c5a768a04\transformed\lifecycle-process-2.6.2\AndroidManifest.xml:30:17-78 65 android:value="androidx.startup" /> -65-->[androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:31:17-49 -66 -67 -68 [androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:34:9-52:20 -69 android:name="androidx.profileinstaller.ProfileInstallReceiver" -69-->[androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:35:13-76 -70 android:directBootAware="false" -70-->[androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:36:13-44 -71 android:enabled="true" -71-->[androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:37:13-35 -72 android:exported="true" -72-->[androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:38:13-36 -73 android:permission="android.permission.DUMP" > -73-->[androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:39:13-57 -74 -74-->[androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:40:13-42:29 -75 -75-->[androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:41:17-91 -75-->[androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:41:25-88 -76 +65-->[androidx.lifecycle:lifecycle-process:2.6.2] C:\Users\26jacquesty\.gradle\caches\transforms-4\fab565b32d1caf7d32cc0e9c5a768a04\transformed\lifecycle-process-2.6.2\AndroidManifest.xml:31:17-49 +66 [androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:29:13-31:52 +67 android:name="androidx.profileinstaller.ProfileInstallerInitializer" +67-->[androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:30:17-85 +68 android:value="androidx.startup" /> +68-->[androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:31:17-49 +69 +70 +71 [androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:34:9-52:20 +72 android:name="androidx.profileinstaller.ProfileInstallReceiver" +72-->[androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:35:13-76 +73 android:directBootAware="false" +73-->[androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:36:13-44 +74 android:enabled="true" +74-->[androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:37:13-35 +75 android:exported="true" +75-->[androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:38:13-36 +76 android:permission="android.permission.DUMP" > +76-->[androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:39:13-57 77 -77-->[androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:43:13-45:29 -78 -78-->[androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:44:17-85 -78-->[androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:44:25-82 +77-->[androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:40:13-42:29 +78 +78-->[androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:41:17-91 +78-->[androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:41:25-88 79 80 -80-->[androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:46:13-48:29 -81 -81-->[androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:47:17-88 -81-->[androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:47:25-85 +80-->[androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:43:13-45:29 +81 +81-->[androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:44:17-85 +81-->[androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:44:25-82 82 83 -83-->[androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:49:13-51:29 -84 -84-->[androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:50:17-95 -84-->[androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:50:25-92 +83-->[androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:46:13-48:29 +84 +84-->[androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:47:17-88 +84-->[androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:47:25-85 85 -86 -87 -88 -89 +86 +86-->[androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:49:13-51:29 +87 +87-->[androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:50:17-95 +87-->[androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:50:25-92 +88 +89 +90 +91 +92 diff --git a/ScoutingApp/app/build/intermediates/merged_manifest/debug/processDebugMainManifest/AndroidManifest.xml b/ScoutingApp/app/build/intermediates/merged_manifest/debug/processDebugMainManifest/AndroidManifest.xml index 7832d4d..66ca05c 100644 --- a/ScoutingApp/app/build/intermediates/merged_manifest/debug/processDebugMainManifest/AndroidManifest.xml +++ b/ScoutingApp/app/build/intermediates/merged_manifest/debug/processDebugMainManifest/AndroidManifest.xml @@ -31,6 +31,9 @@ android:supportsRtl="true" android:testOnly="true" android:theme="@style/Theme.ScoutingApp" > + diff --git a/ScoutingApp/app/build/intermediates/merged_manifests/debug/processDebugManifest/AndroidManifest.xml b/ScoutingApp/app/build/intermediates/merged_manifests/debug/processDebugManifest/AndroidManifest.xml index 7832d4d..66ca05c 100644 --- a/ScoutingApp/app/build/intermediates/merged_manifests/debug/processDebugManifest/AndroidManifest.xml +++ b/ScoutingApp/app/build/intermediates/merged_manifests/debug/processDebugManifest/AndroidManifest.xml @@ -31,6 +31,9 @@ android:supportsRtl="true" android:testOnly="true" android:theme="@style/Theme.ScoutingApp" > + diff --git a/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/layout_activity_auto.xml.flat b/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/layout_activity_auto.xml.flat index 7e98abb..d8e7a43 100644 Binary files a/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/layout_activity_auto.xml.flat and b/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/layout_activity_auto.xml.flat differ diff --git a/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/layout_activity_end.xml.flat b/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/layout_activity_end.xml.flat index 8eb968e..65fd6b8 100644 Binary files a/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/layout_activity_end.xml.flat and b/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/layout_activity_end.xml.flat differ diff --git a/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/layout_activity_main.xml.flat b/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/layout_activity_main.xml.flat index eda6ebe..9ad233c 100644 Binary files a/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/layout_activity_main.xml.flat and b/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/layout_activity_main.xml.flat differ diff --git a/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/layout_activity_starting.xml.flat b/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/layout_activity_starting.xml.flat index 13f68a2..f75ef13 100644 Binary files a/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/layout_activity_starting.xml.flat and b/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/layout_activity_starting.xml.flat differ diff --git a/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/layout_activity_tele.xml.flat b/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/layout_activity_tele.xml.flat index a9200c1..e8cbce3 100644 Binary files a/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/layout_activity_tele.xml.flat and b/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/layout_activity_tele.xml.flat differ diff --git a/ScoutingApp/app/build/intermediates/merged_res_blame_folder/debug/mergeDebugResources/out/single/mergeDebugResources.json b/ScoutingApp/app/build/intermediates/merged_res_blame_folder/debug/mergeDebugResources/out/single/mergeDebugResources.json index a142f23..5b3f49b 100644 --- a/ScoutingApp/app/build/intermediates/merged_res_blame_folder/debug/mergeDebugResources/out/single/mergeDebugResources.json +++ b/ScoutingApp/app/build/intermediates/merged_res_blame_folder/debug/mergeDebugResources/out/single/mergeDebugResources.json @@ -3,30 +3,30 @@ "merged": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\drawable_loop.png.flat", "source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\drawable\\loop.png" }, - { - "merged": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-xxhdpi_ic_launcher_round.webp.flat", - "source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-xxhdpi\\ic_launcher_round.webp" - }, { "merged": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-xxxhdpi_ic_launcher_round.webp.flat", "source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-xxxhdpi\\ic_launcher_round.webp" }, { - "merged": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\drawable__025_reefscape_transparent_background.webp.flat", - "source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\drawable\\_025_reefscape_transparent_background.webp" + "merged": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-xxhdpi_ic_launcher_round.webp.flat", + "source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-xxhdpi\\ic_launcher_round.webp" }, { "merged": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\xml_data_extraction_rules.xml.flat", "source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\xml\\data_extraction_rules.xml" }, { - "merged": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-anydpi-v26_ic_launcher.xml.flat", - "source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-anydpi-v26\\ic_launcher.xml" + "merged": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\drawable__025_reefscape_transparent_background.webp.flat", + "source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\drawable\\_025_reefscape_transparent_background.webp" }, { "merged": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-xxxhdpi_ic_launcher.webp.flat", "source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-xxxhdpi\\ic_launcher.webp" }, + { + "merged": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-anydpi-v26_ic_launcher.xml.flat", + "source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-anydpi-v26\\ic_launcher.xml" + }, { "merged": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-mdpi_ic_launcher_round.webp.flat", "source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-mdpi\\ic_launcher_round.webp" diff --git a/ScoutingApp/app/build/intermediates/packaged_manifests/debug/processDebugManifestForPackage/AndroidManifest.xml b/ScoutingApp/app/build/intermediates/packaged_manifests/debug/processDebugManifestForPackage/AndroidManifest.xml index 7832d4d..66ca05c 100644 --- a/ScoutingApp/app/build/intermediates/packaged_manifests/debug/processDebugManifestForPackage/AndroidManifest.xml +++ b/ScoutingApp/app/build/intermediates/packaged_manifests/debug/processDebugManifestForPackage/AndroidManifest.xml @@ -31,6 +31,9 @@ android:supportsRtl="true" android:testOnly="true" android:theme="@style/Theme.ScoutingApp" > + diff --git a/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/layout/activity_auto.xml b/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/layout/activity_auto.xml index 660a03b..946c572 100644 --- a/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/layout/activity_auto.xml +++ b/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/layout/activity_auto.xml @@ -5,8 +5,33 @@ android:id="@+id/main" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="#000000" tools:context=".AutoActivity"> + + + + @@ -102,16 +128,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/matchNumber" 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 +145,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 +173,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:text="@string/can_leave" + android:textColor="#FFFFFF" tools:ignore="VisualLintButtonSize" /> @@ -174,6 +203,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/build/intermediates/packaged_res/debug/packageDebugResources/layout/activity_end.xml b/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/layout/activity_end.xml index 46ca7a7..56777e5 100644 --- a/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/layout/activity_end.xml +++ b/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/layout/activity_end.xml @@ -5,25 +5,115 @@ android:id="@+id/main" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="#000000" tools:context=".EndActivity"> -