diff --git a/ScoutingApp/.gradle/8.7/executionHistory/executionHistory.bin b/ScoutingApp/.gradle/8.7/executionHistory/executionHistory.bin index 386d88b..34f774a 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 32814ed..c4352ab 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 c0cf272..862e4e2 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 d0d15da..89d65b5 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 c2e3bb9..94d7bc4 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 1a134d3..0d8c6f4 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 6b2e61c..b40d928 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 0e1c909..cf0c66b 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 00e5872..f0aa4fc 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 6b16e59..6de6a7d 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 4f2e2e2..8154d44 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 e814807..03cf8fa 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 @@ -#Thu Mar 13 13:32:40 EDT 2025 +#Thu Mar 13 14:27:36 EDT 2025 com.example.scoutingapp-main-33\:/drawable/_025_reefscape_transparent_background.webp=C\:\\Users\\cayde\\Desktop\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable__025_reefscape_transparent_background.webp.flat com.example.scoutingapp-main-33\:/drawable/_025_reefscape_transparent_background_blue.webp=C\:\\Users\\cayde\\Desktop\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable__025_reefscape_transparent_background_blue.webp.flat com.example.scoutingapp-main-33\:/drawable/ic_launcher_background.xml=C\:\\Users\\cayde\\Desktop\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_ic_launcher_background.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 635a340..d210b16 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 @@ -#Thu Mar 13 13:32:40 EDT 2025 +#Thu Mar 13 14:27:36 EDT 2025 com.example.scoutingapp-main-5\:/drawable/_025_reefscape_transparent_background.webp=C\:\\Users\\cayde\\Desktop\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\_025_reefscape_transparent_background.webp com.example.scoutingapp-main-5\:/drawable/_025_reefscape_transparent_background_blue.webp=C\:\\Users\\cayde\\Desktop\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\_025_reefscape_transparent_background_blue.webp com.example.scoutingapp-main-5\:/drawable/ic_launcher_background.xml=C\:\\Users\\cayde\\Desktop\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\ic_launcher_background.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 dba8b38..842b95a 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 @@ -#Thu Mar 13 13:40:06 EDT 2025 +#Thu Mar 13 14:42:41 EDT 2025 base.0=C\:\\Users\\cayde\\Desktop\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes.dex base.1=C\:\\Users\\cayde\\Desktop\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex base.2=C\:\\Users\\cayde\\Desktop\\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 d1de1f9..c4edf3e 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 4522c6d..e4e6a61 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$2.class b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/EndActivity$2.class index 5ca146f..2c2905a 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 d3fc5e7..cb3f5d2 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$2.class b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$2.class index a98bb5c..0656ccd 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 094403d..9751740 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 a20277a..0ca7de5 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 98dcce0..f5cee96 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 78808f0..97f8f02 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 052ba5d..c813305 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 46a2bd6..5472eb1 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 deleted file mode 100644 index fdcbcb5..0000000 Binary files a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$9.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 da2f83f..b6761fd 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/Submit.class b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/Submit.class index eeda8be..6be88aa 100644 Binary files a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/Submit.class and b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/Submit.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 9b8045a..788edbf 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$2.class b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity$2.class index 9e86412..76b0596 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 c4ded69..e7a5e75 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 323b994..4507d54 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 b6a492c..39a24e6 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 74da330..52588eb 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 4f7be3e..d82c2e2 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 4956486..ef9d448 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 8c88b12..b8b3e24 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 @@ -8,6 +8,7 @@ drawable ic_launcher_background drawable ic_launcher_foreground drawable loop drawable screenshot_2025_01_16_115155 +id BackButton id ButtonNext id Match id Notes 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 d8e7a43..7d3858b 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 65fd6b8..6f3f227 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 6385dc0..4f61e47 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 a1c3f08..2f8d8b7 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 e8cbce3..c72447a 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 abd366f..6c1d7fb 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,6 +3,10 @@ "merged": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\layout_activity_main.xml.flat", "source": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\layout\\activity_main.xml" }, + { + "merged": "com.example.scoutingapp-debug-31:/layout_activity_auto.xml.flat", + "source": "com.example.scoutingapp-main-33:/layout/activity_auto.xml" + }, { "merged": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\layout_activity_starting.xml.flat", "source": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\layout\\activity_starting.xml" @@ -15,6 +19,10 @@ "merged": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\drawable__025_reefscape_transparent_background.webp.flat", "source": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\drawable\\_025_reefscape_transparent_background.webp" }, + { + "merged": "com.example.scoutingapp-debug-31:/layout_activity_starting.xml.flat", + "source": "com.example.scoutingapp-main-33:/layout/activity_starting.xml" + }, { "merged": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\drawable_loop.png.flat", "source": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\drawable\\loop.png" @@ -43,6 +51,10 @@ "merged": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\drawable_ic_launcher_foreground.xml.flat", "source": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\drawable\\ic_launcher_foreground.xml" }, + { + "merged": "com.example.scoutingapp-debug-31:/layout_activity_end.xml.flat", + "source": "com.example.scoutingapp-main-33:/layout/activity_end.xml" + }, { "merged": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\layout_activity_tele.xml.flat", "source": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\layout\\activity_tele.xml" @@ -59,10 +71,6 @@ "merged": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-xhdpi_ic_launcher_round.webp.flat", "source": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-xhdpi\\ic_launcher_round.webp" }, - { - "merged": "com.example.scoutingapp-debug-31:/layout_activity_main.xml.flat", - "source": "com.example.scoutingapp-main-33:/layout/activity_main.xml" - }, { "merged": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\xml_backup_rules.xml.flat", "source": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\xml\\backup_rules.xml" @@ -103,6 +111,10 @@ "merged": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-hdpi_ic_launcher.webp.flat", "source": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-hdpi\\ic_launcher.webp" }, + { + "merged": "com.example.scoutingapp-debug-31:/layout_activity_tele.xml.flat", + "source": "com.example.scoutingapp-main-33:/layout/activity_tele.xml" + }, { "merged": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\xml_data_extraction_rules.xml.flat", "source": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\xml\\data_extraction_rules.xml" 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 946c572..e98bcce 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 @@ -163,7 +163,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="horizontal" - app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintBottom_toTopOf="@+id/button_Next" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"> @@ -211,15 +211,28 @@