diff --git a/ScoutingApp/.gradle/8.7/executionHistory/executionHistory.bin b/ScoutingApp/.gradle/8.7/executionHistory/executionHistory.bin index 4c347b1..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 2de0ecd..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 a369e26..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 917bc15..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 a4c401c..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 555eac5..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 552cf22..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 d84fcd8..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 e33f47b..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 98d8c7b..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 759e899..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 edad2bd..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 8108df4..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,26 +1,26 @@ -#Thu Mar 13 11:58:27 EDT 2025 -com.example.scoutingapp-main-33\:/drawable/_025_reefscape_transparent_background.webp=C\:\\Users\\25lacorazzan\\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\\25lacorazzan\\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\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_ic_launcher_foreground.xml.flat -com.example.scoutingapp-main-33\:/drawable/loop.png=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_loop.png.flat -com.example.scoutingapp-main-33\:/drawable/screenshot_2025_01_16_115155.webp=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_screenshot_2025_01_16_115155.webp.flat -com.example.scoutingapp-main-33\:/layout/activity_auto.xml=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_activity_auto.xml.flat -com.example.scoutingapp-main-33\:/layout/activity_end.xml=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_activity_end.xml.flat -com.example.scoutingapp-main-33\:/layout/activity_main.xml=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_activity_main.xml.flat -com.example.scoutingapp-main-33\:/layout/activity_starting.xml=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_activity_starting.xml.flat -com.example.scoutingapp-main-33\:/layout/activity_tele.xml=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_activity_tele.xml.flat -com.example.scoutingapp-main-33\:/mipmap-anydpi-v26/ic_launcher.xml=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-anydpi-v26_ic_launcher.xml.flat -com.example.scoutingapp-main-33\:/mipmap-anydpi-v26/ic_launcher_round.xml=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-anydpi-v26_ic_launcher_round.xml.flat -com.example.scoutingapp-main-33\:/mipmap-hdpi/ic_launcher.webp=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-hdpi_ic_launcher.webp.flat -com.example.scoutingapp-main-33\:/mipmap-hdpi/ic_launcher_round.webp=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-hdpi_ic_launcher_round.webp.flat -com.example.scoutingapp-main-33\:/mipmap-mdpi/ic_launcher.webp=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-mdpi_ic_launcher.webp.flat -com.example.scoutingapp-main-33\:/mipmap-mdpi/ic_launcher_round.webp=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-mdpi_ic_launcher_round.webp.flat -com.example.scoutingapp-main-33\:/mipmap-xhdpi/ic_launcher.webp=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-xhdpi_ic_launcher.webp.flat -com.example.scoutingapp-main-33\:/mipmap-xhdpi/ic_launcher_round.webp=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-xhdpi_ic_launcher_round.webp.flat -com.example.scoutingapp-main-33\:/mipmap-xxhdpi/ic_launcher.webp=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-xxhdpi_ic_launcher.webp.flat -com.example.scoutingapp-main-33\:/mipmap-xxhdpi/ic_launcher_round.webp=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-xxhdpi_ic_launcher_round.webp.flat -com.example.scoutingapp-main-33\:/mipmap-xxxhdpi/ic_launcher.webp=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-xxxhdpi_ic_launcher.webp.flat -com.example.scoutingapp-main-33\:/mipmap-xxxhdpi/ic_launcher_round.webp=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-xxxhdpi_ic_launcher_round.webp.flat -com.example.scoutingapp-main-33\:/raw/info.json=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\raw_info.json.flat -com.example.scoutingapp-main-33\:/xml/backup_rules.xml=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\xml_backup_rules.xml.flat -com.example.scoutingapp-main-33\:/xml/data_extraction_rules.xml=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\xml_data_extraction_rules.xml.flat +#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 +com.example.scoutingapp-main-33\:/drawable/loop.png=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_loop.png.flat +com.example.scoutingapp-main-33\:/drawable/screenshot_2025_01_16_115155.webp=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_screenshot_2025_01_16_115155.webp.flat +com.example.scoutingapp-main-33\:/layout/activity_auto.xml=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_activity_auto.xml.flat +com.example.scoutingapp-main-33\:/layout/activity_end.xml=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_activity_end.xml.flat +com.example.scoutingapp-main-33\:/layout/activity_main.xml=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_activity_main.xml.flat +com.example.scoutingapp-main-33\:/layout/activity_starting.xml=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_activity_starting.xml.flat +com.example.scoutingapp-main-33\:/layout/activity_tele.xml=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_activity_tele.xml.flat +com.example.scoutingapp-main-33\:/mipmap-anydpi-v26/ic_launcher.xml=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-anydpi-v26_ic_launcher.xml.flat +com.example.scoutingapp-main-33\:/mipmap-anydpi-v26/ic_launcher_round.xml=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-anydpi-v26_ic_launcher_round.xml.flat +com.example.scoutingapp-main-33\:/mipmap-hdpi/ic_launcher.webp=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-hdpi_ic_launcher.webp.flat +com.example.scoutingapp-main-33\:/mipmap-hdpi/ic_launcher_round.webp=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-hdpi_ic_launcher_round.webp.flat +com.example.scoutingapp-main-33\:/mipmap-mdpi/ic_launcher.webp=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-mdpi_ic_launcher.webp.flat +com.example.scoutingapp-main-33\:/mipmap-mdpi/ic_launcher_round.webp=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-mdpi_ic_launcher_round.webp.flat +com.example.scoutingapp-main-33\:/mipmap-xhdpi/ic_launcher.webp=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-xhdpi_ic_launcher.webp.flat +com.example.scoutingapp-main-33\:/mipmap-xhdpi/ic_launcher_round.webp=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-xhdpi_ic_launcher_round.webp.flat +com.example.scoutingapp-main-33\:/mipmap-xxhdpi/ic_launcher.webp=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-xxhdpi_ic_launcher.webp.flat +com.example.scoutingapp-main-33\:/mipmap-xxhdpi/ic_launcher_round.webp=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-xxhdpi_ic_launcher_round.webp.flat +com.example.scoutingapp-main-33\:/mipmap-xxxhdpi/ic_launcher.webp=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-xxxhdpi_ic_launcher.webp.flat +com.example.scoutingapp-main-33\:/mipmap-xxxhdpi/ic_launcher_round.webp=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-xxxhdpi_ic_launcher_round.webp.flat +com.example.scoutingapp-main-33\:/raw/info.json=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\raw_info.json.flat +com.example.scoutingapp-main-33\:/xml/backup_rules.xml=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\xml_backup_rules.xml.flat +com.example.scoutingapp-main-33\:/xml/data_extraction_rules.xml=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\xml_data_extraction_rules.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 f973b87..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,26 +1,26 @@ -#Thu Mar 13 11:58:28 EDT 2025 -com.example.scoutingapp-main-5\:/drawable/_025_reefscape_transparent_background.webp=C\:\\Users\\25lacorazzan\\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\\25lacorazzan\\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\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\ic_launcher_foreground.xml -com.example.scoutingapp-main-5\:/drawable/loop.png=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\loop.png -com.example.scoutingapp-main-5\:/drawable/screenshot_2025_01_16_115155.webp=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\screenshot_2025_01_16_115155.webp -com.example.scoutingapp-main-5\:/layout/activity_auto.xml=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\activity_auto.xml -com.example.scoutingapp-main-5\:/layout/activity_end.xml=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\activity_end.xml -com.example.scoutingapp-main-5\:/layout/activity_main.xml=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\activity_main.xml -com.example.scoutingapp-main-5\:/layout/activity_starting.xml=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\activity_starting.xml -com.example.scoutingapp-main-5\:/layout/activity_tele.xml=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\activity_tele.xml -com.example.scoutingapp-main-5\:/mipmap-anydpi-v26/ic_launcher.xml=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-anydpi-v26\\ic_launcher.xml -com.example.scoutingapp-main-5\:/mipmap-anydpi-v26/ic_launcher_round.xml=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-anydpi-v26\\ic_launcher_round.xml -com.example.scoutingapp-main-5\:/mipmap-hdpi/ic_launcher.webp=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-hdpi-v4\\ic_launcher.webp -com.example.scoutingapp-main-5\:/mipmap-hdpi/ic_launcher_round.webp=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-hdpi-v4\\ic_launcher_round.webp -com.example.scoutingapp-main-5\:/mipmap-mdpi/ic_launcher.webp=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-mdpi-v4\\ic_launcher.webp -com.example.scoutingapp-main-5\:/mipmap-mdpi/ic_launcher_round.webp=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-mdpi-v4\\ic_launcher_round.webp -com.example.scoutingapp-main-5\:/mipmap-xhdpi/ic_launcher.webp=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-xhdpi-v4\\ic_launcher.webp -com.example.scoutingapp-main-5\:/mipmap-xhdpi/ic_launcher_round.webp=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-xhdpi-v4\\ic_launcher_round.webp -com.example.scoutingapp-main-5\:/mipmap-xxhdpi/ic_launcher.webp=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-xxhdpi-v4\\ic_launcher.webp -com.example.scoutingapp-main-5\:/mipmap-xxhdpi/ic_launcher_round.webp=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-xxhdpi-v4\\ic_launcher_round.webp -com.example.scoutingapp-main-5\:/mipmap-xxxhdpi/ic_launcher.webp=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-xxxhdpi-v4\\ic_launcher.webp -com.example.scoutingapp-main-5\:/mipmap-xxxhdpi/ic_launcher_round.webp=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-xxxhdpi-v4\\ic_launcher_round.webp -com.example.scoutingapp-main-5\:/raw/info.json=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\raw\\info.json -com.example.scoutingapp-main-5\:/xml/backup_rules.xml=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\xml\\backup_rules.xml -com.example.scoutingapp-main-5\:/xml/data_extraction_rules.xml=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\xml\\data_extraction_rules.xml +#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 +com.example.scoutingapp-main-5\:/drawable/loop.png=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\loop.png +com.example.scoutingapp-main-5\:/drawable/screenshot_2025_01_16_115155.webp=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\screenshot_2025_01_16_115155.webp +com.example.scoutingapp-main-5\:/layout/activity_auto.xml=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\activity_auto.xml +com.example.scoutingapp-main-5\:/layout/activity_end.xml=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\activity_end.xml +com.example.scoutingapp-main-5\:/layout/activity_main.xml=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\activity_main.xml +com.example.scoutingapp-main-5\:/layout/activity_starting.xml=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\activity_starting.xml +com.example.scoutingapp-main-5\:/layout/activity_tele.xml=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\activity_tele.xml +com.example.scoutingapp-main-5\:/mipmap-anydpi-v26/ic_launcher.xml=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-anydpi-v26\\ic_launcher.xml +com.example.scoutingapp-main-5\:/mipmap-anydpi-v26/ic_launcher_round.xml=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-anydpi-v26\\ic_launcher_round.xml +com.example.scoutingapp-main-5\:/mipmap-hdpi/ic_launcher.webp=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-hdpi-v4\\ic_launcher.webp +com.example.scoutingapp-main-5\:/mipmap-hdpi/ic_launcher_round.webp=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-hdpi-v4\\ic_launcher_round.webp +com.example.scoutingapp-main-5\:/mipmap-mdpi/ic_launcher.webp=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-mdpi-v4\\ic_launcher.webp +com.example.scoutingapp-main-5\:/mipmap-mdpi/ic_launcher_round.webp=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-mdpi-v4\\ic_launcher_round.webp +com.example.scoutingapp-main-5\:/mipmap-xhdpi/ic_launcher.webp=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-xhdpi-v4\\ic_launcher.webp +com.example.scoutingapp-main-5\:/mipmap-xhdpi/ic_launcher_round.webp=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-xhdpi-v4\\ic_launcher_round.webp +com.example.scoutingapp-main-5\:/mipmap-xxhdpi/ic_launcher.webp=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-xxhdpi-v4\\ic_launcher.webp +com.example.scoutingapp-main-5\:/mipmap-xxhdpi/ic_launcher_round.webp=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-xxhdpi-v4\\ic_launcher_round.webp +com.example.scoutingapp-main-5\:/mipmap-xxxhdpi/ic_launcher.webp=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-xxxhdpi-v4\\ic_launcher.webp +com.example.scoutingapp-main-5\:/mipmap-xxxhdpi/ic_launcher_round.webp=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-xxxhdpi-v4\\ic_launcher_round.webp +com.example.scoutingapp-main-5\:/raw/info.json=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\raw\\info.json +com.example.scoutingapp-main-5\:/xml/backup_rules.xml=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\xml\\backup_rules.xml +com.example.scoutingapp-main-5\:/xml/data_extraction_rules.xml=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\xml\\data_extraction_rules.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 ecc87f9..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,8 +1,8 @@ -#Thu Mar 13 13:03:42 EDT 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 -base.3=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes2.dex +#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 +base.3=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes2.dex path.0=classes.dex path.1=0/classes.dex path.2=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 866d8be..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 280b1f8..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 a009636..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 e609eaf..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 39273ab..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 a31fd28..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 4f63804..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 635bab1..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 3cd6525..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 8041e29..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 a896f1d..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 4a84bce..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 87a0a42..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 new file mode 100644 index 0000000..fdcbcb5 Binary files /dev/null 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.class b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity.class index 3291edd..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 5f459c6..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 709b55d..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 e5b1af1..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 719f903..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 b78921f..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 5e1ed3b..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 6a9afd3..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 75b041f..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 b438aa9..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 9162179..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 @@ -47,6 +47,7 @@ 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 a0fbe45..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 @@ -9,154 +9,154 @@ 9 android:targetSdkVersion="34" /> 10 11 -11-->C:\Users\25lacorazzan\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:5:5-79 -11-->C:\Users\25lacorazzan\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:5:22-76 +11-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:5:5-79 +11-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:5:22-76 12 -12-->C:\Users\25lacorazzan\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:6:5-67 -12-->C:\Users\25lacorazzan\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:6:22-64 +12-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:6:5-67 +12-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:6:22-64 13 -13-->C:\Users\25lacorazzan\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:8:5-66 -13-->C:\Users\25lacorazzan\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:8:22-63 +13-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:8:5-66 +13-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:8:22-63 14 15 [androidx.core:core:1.13.0] C:\Users\25lacorazzan\.gradle\caches\transforms-4\42dfdf811721b94244c28f65a2afec29\transformed\core-1.13.0\AndroidManifest.xml:22:5-24:47 +15-->[androidx.core:core:1.13.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\42dfdf811721b94244c28f65a2afec29\transformed\core-1.13.0\AndroidManifest.xml:22:5-24:47 16 android:name="com.example.scoutingapp.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION" -16-->[androidx.core:core:1.13.0] C:\Users\25lacorazzan\.gradle\caches\transforms-4\42dfdf811721b94244c28f65a2afec29\transformed\core-1.13.0\AndroidManifest.xml:23:9-81 +16-->[androidx.core:core:1.13.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\42dfdf811721b94244c28f65a2afec29\transformed\core-1.13.0\AndroidManifest.xml:23:9-81 17 android:protectionLevel="signature" /> -17-->[androidx.core:core:1.13.0] C:\Users\25lacorazzan\.gradle\caches\transforms-4\42dfdf811721b94244c28f65a2afec29\transformed\core-1.13.0\AndroidManifest.xml:24:9-44 +17-->[androidx.core:core:1.13.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\42dfdf811721b94244c28f65a2afec29\transformed\core-1.13.0\AndroidManifest.xml:24:9-44 18 19 -19-->[androidx.core:core:1.13.0] C:\Users\25lacorazzan\.gradle\caches\transforms-4\42dfdf811721b94244c28f65a2afec29\transformed\core-1.13.0\AndroidManifest.xml:26:5-97 -19-->[androidx.core:core:1.13.0] C:\Users\25lacorazzan\.gradle\caches\transforms-4\42dfdf811721b94244c28f65a2afec29\transformed\core-1.13.0\AndroidManifest.xml:26:22-94 +19-->[androidx.core:core:1.13.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\42dfdf811721b94244c28f65a2afec29\transformed\core-1.13.0\AndroidManifest.xml:26:5-97 +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\25lacorazzan\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:10:5-41: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\25lacorazzan\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:11:9-35 +22-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:11:9-35 23 android:appComponentFactory="androidx.core.app.CoreComponentFactory" -23-->[androidx.core:core:1.13.0] C:\Users\25lacorazzan\.gradle\caches\transforms-4\42dfdf811721b94244c28f65a2afec29\transformed\core-1.13.0\AndroidManifest.xml:28:18-86 +23-->[androidx.core:core:1.13.0] C:\Users\26jacquesty\.gradle\caches\transforms-4\42dfdf811721b94244c28f65a2afec29\transformed\core-1.13.0\AndroidManifest.xml:28:18-86 24 android:dataExtractionRules="@xml/data_extraction_rules" -24-->C:\Users\25lacorazzan\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:12:9-65 +24-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:12:9-65 25 android:debuggable="true" 26 android:extractNativeLibs="false" 27 android:fullBackupContent="@xml/backup_rules" -27-->C:\Users\25lacorazzan\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:13:9-54 +27-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:13:9-54 28 android:icon="@mipmap/ic_launcher" -28-->C:\Users\25lacorazzan\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:14:9-43 +28-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:14:9-43 29 android:label="@string/app_name" -29-->C:\Users\25lacorazzan\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:15:9-41 +29-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:15:9-41 30 android:roundIcon="@mipmap/ic_launcher_round" -30-->C:\Users\25lacorazzan\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:16:9-54 +30-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:16:9-54 31 android:supportsRtl="true" -31-->C:\Users\25lacorazzan\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:17:9-35 +31-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:17:9-35 32 android:testOnly="true" 33 android:theme="@style/Theme.ScoutingApp" > -33-->C:\Users\25lacorazzan\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:18:9-49 +33-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:18:9-49 34 C:\Users\25lacorazzan\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:20:9-22:40 +34-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:20:9-22:40 35 android:name="com.example.scoutingapp.startingActivity" -35-->C:\Users\25lacorazzan\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:21:13-45 +35-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:21:13-45 36 android:exported="false" /> -36-->C:\Users\25lacorazzan\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:22:13-37 +36-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:22:13-37 37 C:\Users\25lacorazzan\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:23:9-25:40 +37-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:23:9-25:40 38 android:name="com.example.scoutingapp.EndActivity" -38-->C:\Users\25lacorazzan\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:24:13-40 +38-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:24:13-40 39 android:exported="false" /> -39-->C:\Users\25lacorazzan\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:25:13-37 +39-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:25:13-37 40 C:\Users\25lacorazzan\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:26:9-28:40 +40-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:26:9-28:40 41 android:name="com.example.scoutingapp.TeleActivity" -41-->C:\Users\25lacorazzan\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:27:13-41 +41-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:27:13-41 42 android:exported="false" /> -42-->C:\Users\25lacorazzan\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:28:13-37 +42-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:28:13-37 43 C:\Users\25lacorazzan\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:29:9-31:40 +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\25lacorazzan\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:30:13-41 +44-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:30:13-41 45 android:exported="false" /> -45-->C:\Users\25lacorazzan\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:31:13-37 +45-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:31:13-37 46 C:\Users\25lacorazzan\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:32:9-40:20 +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\25lacorazzan\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:33:13-41 +47-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:33:13-41 48 android:exported="true" > -48-->C:\Users\25lacorazzan\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:34:13-36 +48-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:34:13-36 49 -49-->C:\Users\25lacorazzan\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:35:13-39:29 +49-->C:\Users\26jacquesty\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:35:13-39:29 50 -50-->C:\Users\25lacorazzan\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:36:17-69 -50-->C:\Users\25lacorazzan\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:36:25-66 +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\25lacorazzan\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:38:17-77 -52-->C:\Users\25lacorazzan\AndroidStudioProjects\Reefscape-Scouting-App\ScoutingApp\app\src\main\AndroidManifest.xml:38:27-74 +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\25lacorazzan\.gradle\caches\transforms-4\51f1927f6706bb4e824223b170abb02f\transformed\emoji2-1.3.0\AndroidManifest.xml:24:9-32:20 +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\25lacorazzan\.gradle\caches\transforms-4\51f1927f6706bb4e824223b170abb02f\transformed\emoji2-1.3.0\AndroidManifest.xml:25:13-67 +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\25lacorazzan\.gradle\caches\transforms-4\51f1927f6706bb4e824223b170abb02f\transformed\emoji2-1.3.0\AndroidManifest.xml:26:13-68 +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\25lacorazzan\.gradle\caches\transforms-4\51f1927f6706bb4e824223b170abb02f\transformed\emoji2-1.3.0\AndroidManifest.xml:27:13-37 +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.emoji2:emoji2:1.3.0] C:\Users\25lacorazzan\.gradle\caches\transforms-4\51f1927f6706bb4e824223b170abb02f\transformed\emoji2-1.3.0\AndroidManifest.xml:29:13-31:52 +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\25lacorazzan\.gradle\caches\transforms-4\51f1927f6706bb4e824223b170abb02f\transformed\emoji2-1.3.0\AndroidManifest.xml:30:17-75 +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.emoji2:emoji2:1.3.0] C:\Users\25lacorazzan\.gradle\caches\transforms-4\51f1927f6706bb4e824223b170abb02f\transformed\emoji2-1.3.0\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.lifecycle:lifecycle-process:2.6.2] C:\Users\25lacorazzan\.gradle\caches\transforms-4\fab565b32d1caf7d32cc0e9c5a768a04\transformed\lifecycle-process-2.6.2\AndroidManifest.xml:29:13-31:52 +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\25lacorazzan\.gradle\caches\transforms-4\fab565b32d1caf7d32cc0e9c5a768a04\transformed\lifecycle-process-2.6.2\AndroidManifest.xml:30:17-78 +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.lifecycle:lifecycle-process:2.6.2] C:\Users\25lacorazzan\.gradle\caches\transforms-4\fab565b32d1caf7d32cc0e9c5a768a04\transformed\lifecycle-process-2.6.2\AndroidManifest.xml:31:17-49 +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\25lacorazzan\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:29:13-31:52 +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\25lacorazzan\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:30:17-85 +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\25lacorazzan\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:31:17-49 +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\25lacorazzan\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:34:9-52:20 +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\25lacorazzan\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:35:13-76 +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\25lacorazzan\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:36:13-44 +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\25lacorazzan\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:37:13-35 +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\25lacorazzan\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:38:13-36 +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\25lacorazzan\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:39:13-57 +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\25lacorazzan\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:40:13-42:29 +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\25lacorazzan\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:41:17-91 -78-->[androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\25lacorazzan\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:41:25-88 +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\25lacorazzan\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:43:13-45:29 +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\25lacorazzan\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:44:17-85 -81-->[androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\25lacorazzan\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:44:25-82 +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\25lacorazzan\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:46:13-48:29 +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\25lacorazzan\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:47:17-88 -84-->[androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\25lacorazzan\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:47:25-85 +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 -86-->[androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\25lacorazzan\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:49:13-51:29 +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\25lacorazzan\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:50:17-95 -87-->[androidx.profileinstaller:profileinstaller:1.4.0] C:\Users\25lacorazzan\.gradle\caches\transforms-4\28b3eccffae349a783eb226d2c3ee0a7\transformed\profileinstaller-1.4.0\AndroidManifest.xml:50:25-92 +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 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 f846458..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_blame_folder/debug/mergeDebugResources/out/single/mergeDebugResources.json b/ScoutingApp/app/build/intermediates/merged_res_blame_folder/debug/mergeDebugResources/out/single/mergeDebugResources.json index 3667700..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 @@ -1,102 +1,106 @@ [ { - "merged": "com.example.scoutingapp-debug-31:/drawable_screenshot_2025_01_16_115155.webp.flat", - "source": "com.example.scoutingapp-main-33:/drawable/screenshot_2025_01_16_115155.webp" + "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": "com.example.scoutingapp-debug-31:/layout_activity_auto.xml.flat", - "source": "com.example.scoutingapp-main-33:/layout/activity_auto.xml" + "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": "com.example.scoutingapp-debug-31:/mipmap-xxhdpi_ic_launcher_round.webp.flat", - "source": "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-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": "com.example.scoutingapp-debug-31:/layout_activity_starting.xml.flat", - "source": "com.example.scoutingapp-main-33:/layout/activity_starting.xml" + "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": "com.example.scoutingapp-debug-31:/mipmap-hdpi_ic_launcher.webp.flat", - "source": "com.example.scoutingapp-main-33:/mipmap-hdpi/ic_launcher.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": "com.example.scoutingapp-debug-31:/mipmap-xxxhdpi_ic_launcher.webp.flat", - "source": "com.example.scoutingapp-main-33:/mipmap-xxxhdpi/ic_launcher.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": "com.example.scoutingapp-debug-31:/mipmap-xhdpi_ic_launcher.webp.flat", - "source": "com.example.scoutingapp-main-33:/mipmap-xhdpi/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": "com.example.scoutingapp-debug-31:/mipmap-anydpi-v26_ic_launcher.xml.flat", - "source": "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" }, { - "merged": "com.example.scoutingapp-debug-31:/drawable_loop.png.flat", - "source": "com.example.scoutingapp-main-33:/drawable/loop.png" + "merged": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-anydpi-v26_ic_launcher_round.xml.flat", + "source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-anydpi-v26\\ic_launcher_round.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\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-hdpi_ic_launcher_round.webp.flat", + "source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-hdpi\\ic_launcher_round.webp" }, { - "merged": "com.example.scoutingapp-debug-31:/mipmap-xxxhdpi_ic_launcher_round.webp.flat", - "source": "com.example.scoutingapp-main-33:/mipmap-xxxhdpi/ic_launcher_round.webp" + "merged": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\raw_info.json.flat", + "source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\raw\\info.json" + }, + { + "merged": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\layout_activity_starting.xml.flat", + "source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\layout\\activity_starting.xml" }, { "merged": "com.example.scoutingapp-debug-31:/layout_activity_main.xml.flat", "source": "com.example.scoutingapp-main-33:/layout/activity_main.xml" }, { - "merged": "com.example.scoutingapp-debug-31:/mipmap-mdpi_ic_launcher.webp.flat", - "source": "com.example.scoutingapp-main-33:/mipmap-mdpi/ic_launcher.webp" + "merged": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-xhdpi_ic_launcher_round.webp.flat", + "source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-xhdpi\\ic_launcher_round.webp" }, { - "merged": "com.example.scoutingapp-debug-31:/mipmap-mdpi_ic_launcher_round.webp.flat", - "source": "com.example.scoutingapp-main-33:/mipmap-mdpi/ic_launcher_round.webp" + "merged": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\layout_activity_end.xml.flat", + "source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\layout\\activity_end.xml" }, { - "merged": "com.example.scoutingapp-debug-31:/raw_info.json.flat", - "source": "com.example.scoutingapp-main-33:/raw/info.json" + "merged": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-mdpi_ic_launcher.webp.flat", + "source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-mdpi\\ic_launcher.webp" }, { - "merged": "com.example.scoutingapp-debug-31:/drawable__025_reefscape_transparent_background.webp.flat", - "source": "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-xhdpi_ic_launcher.webp.flat", + "source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-xhdpi\\ic_launcher.webp" }, { - "merged": "com.example.scoutingapp-debug-31:/xml_backup_rules.xml.flat", - "source": "com.example.scoutingapp-main-33:/xml/backup_rules.xml" + "merged": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\drawable_ic_launcher_background.xml.flat", + "source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\drawable\\ic_launcher_background.xml" }, { - "merged": "com.example.scoutingapp-debug-31:/xml_data_extraction_rules.xml.flat", - "source": "com.example.scoutingapp-main-33:/xml/data_extraction_rules.xml" + "merged": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\drawable_screenshot_2025_01_16_115155.webp.flat", + "source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\drawable\\screenshot_2025_01_16_115155.webp" }, { - "merged": "com.example.scoutingapp-debug-31:/mipmap-xhdpi_ic_launcher_round.webp.flat", - "source": "com.example.scoutingapp-main-33:/mipmap-xhdpi/ic_launcher_round.webp" + "merged": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\xml_backup_rules.xml.flat", + "source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\xml\\backup_rules.xml" }, { - "merged": "com.example.scoutingapp-debug-31:/mipmap-hdpi_ic_launcher_round.webp.flat", - "source": "com.example.scoutingapp-main-33:/mipmap-hdpi/ic_launcher_round.webp" + "merged": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\drawable_ic_launcher_foreground.xml.flat", + "source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\drawable\\ic_launcher_foreground.xml" }, { - "merged": "com.example.scoutingapp-debug-31:/mipmap-anydpi-v26_ic_launcher_round.xml.flat", - "source": "com.example.scoutingapp-main-33:/mipmap-anydpi-v26/ic_launcher_round.xml" + "merged": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\layout_activity_main.xml.flat", + "source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\layout\\activity_main.xml" }, { - "merged": "com.example.scoutingapp-debug-31:/layout_activity_tele.xml.flat", - "source": "com.example.scoutingapp-main-33:/layout/activity_tele.xml" + "merged": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-xxhdpi_ic_launcher.webp.flat", + "source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-xxhdpi\\ic_launcher.webp" }, { - "merged": "com.example.scoutingapp-debug-31:/drawable_ic_launcher_background.xml.flat", - "source": "com.example.scoutingapp-main-33:/drawable/ic_launcher_background.xml" + "merged": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\layout_activity_tele.xml.flat", + "source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\layout\\activity_tele.xml" }, { - "merged": "com.example.scoutingapp-debug-31:/drawable_ic_launcher_foreground.xml.flat", - "source": "com.example.scoutingapp-main-33:/drawable/ic_launcher_foreground.xml" + "merged": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\layout_activity_auto.xml.flat", + "source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\layout\\activity_auto.xml" }, { - "merged": "com.example.scoutingapp-debug-31:/mipmap-xxhdpi_ic_launcher.webp.flat", - "source": "com.example.scoutingapp-main-33:/mipmap-xxhdpi/ic_launcher.webp" + "merged": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-hdpi_ic_launcher.webp.flat", + "source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-hdpi\\ic_launcher.webp" } ] \ No newline at end of file diff --git a/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/layout/activity_main.xml b/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/layout/activity_main.xml index c76b1c0..23f4e21 100644 --- a/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/layout/activity_main.xml +++ b/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/layout/activity_main.xml @@ -41,8 +41,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="40dp" - android:text="Submit" android:backgroundTint="#FF5722" + android:text="Submit" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> @@ -52,9 +52,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="24dp" + android:hint="Match Number" + android:numeric="integer" + android:textAlignment="center" android:textColor="#FFFFFF" android:textColorHint="#AAAAAA" - android:hint="Match Number" app:layout_constraintTop_toBottomOf="@+id/editTextText" tools:layout_editor_absoluteX="-1dp" /> @@ -78,21 +80,21 @@ android:layout_width="match_parent" android:layout_height="100dp" android:text="0" - android:textColor="@android:color/white"/> + android:textColor="@android:color/white" /> + android:textColor="@android:color/white" /> + android:textColor="@android:color/white" /> + android:textColor="@android:color/white" /> + android:textColor="@android:color/white" /> + android:textColor="@android:color/white" /> @@ -129,7 +131,7 @@ android:id="@+id/editTextText" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginTop="5dp" + android:layout_marginTop="50dp" android:ems="10" android:inputType="text" android:text="Pine Tree District Event" @@ -137,14 +139,14 @@ android:textColor="#FFFFFF" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/ButtonNext" /> + app:layout_constraintTop_toTopOf="parent" />