diff --git a/ScoutingApp/.gradle/8.7/executionHistory/executionHistory.bin b/ScoutingApp/.gradle/8.7/executionHistory/executionHistory.bin index 16e9299..2f67c4c 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 005a3bd..a783bee 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 0daf554..777b660 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 785a491..623c647 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 8823cd6..4b636da 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 7db43ab..4506871 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 09d300e..e98fd9f 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 ddb8653..66ead1c 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 bf3f60b..9c3be9e 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 7ab2f26..9f16467 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 2628a87..5c71f28 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 2f04e65..a8ea412 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 8a68238..f4fb053 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,6 +1,7 @@ -#Tue Feb 04 11:55:17 EST 2025 +#Tue Feb 04 12:24:47 EST 2025 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.png=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_screenshot_2025_01_16_115155.png.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 diff --git a/ScoutingApp/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/ScoutingApp/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml index bbc0f25..2c49170 100644 --- a/ScoutingApp/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml +++ b/ScoutingApp/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml @@ -11538,7 +11538,7 @@ + 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 836ead3..bad7219 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,6 +1,7 @@ -#Tue Feb 04 11:55:17 EST 2025 +#Tue Feb 04 12:24:48 EST 2025 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.png=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\screenshot_2025_01_16_115155.png 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 diff --git a/ScoutingApp/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml b/ScoutingApp/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml index 3c9d2e6..6796299 100644 --- a/ScoutingApp/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml +++ b/ScoutingApp/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml @@ -5,4 +5,4 @@ \ No newline at end of file + \ No newline at end of file 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 3217228..4e51ea0 100644 --- a/ScoutingApp/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/ScoutingApp/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Tue Feb 04 11:57:20 EST 2025 +#Tue Feb 04 12:33:53 EST 2025 base.0=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes.dex base.1=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex base.2=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\4\\classes.dex diff --git a/ScoutingApp/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/ScoutingApp/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index 29993a1..ab83e86 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 7e210da..1d1881b 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 cef97e8..53e1920 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 ac06757..e1d3123 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 1ea8900..9d1609f 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 bbd1f36..14b8fca 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 new file mode 100644 index 0000000..75dca65 Binary files /dev/null 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$AsynchronousGet.class b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$AsynchronousGet.class index f243cf3..0885afa 100644 Binary files a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$AsynchronousGet.class and b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$AsynchronousGet.class differ diff --git a/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity.class b/ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity.class index 386abd0..906c2bd 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 eb21d32..3efc955 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 391b9c7..154c631 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/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 e92ec82..0d6dd01 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 a53023e..0771ad2 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 @@ -4,8 +4,13 @@ color black color white drawable ic_launcher_background drawable ic_launcher_foreground +drawable loop drawable screenshot_2025_01_16_115155 +id Event +id Match id Submit_button +id TBATest +id TeamNumber id button_L1 id button_L2 id button_L3 @@ -21,6 +26,9 @@ id imageView2 id linearLayout id main id nextButton +id textInputLayout +id textInputLayout2 +id textInputLayout3 id textView2 id textView3 layout activity_auto 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 213b20f..d9f65c6 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 d42ed99..d640931 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 @@ -11,14 +11,6 @@ "merged": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\drawable_ic_launcher_foreground.xml.flat", "source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\drawable\\ic_launcher_foreground.xml" }, - { - "merged": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\xml_data_extraction_rules.xml.flat", - "source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\xml\\data_extraction_rules.xml" - }, - { - "merged": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-xxhdpi_ic_launcher.webp.flat", - "source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-xxhdpi\\ic_launcher.webp" - }, { "merged": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\raw_info.json.flat", "source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\raw\\info.json" @@ -27,14 +19,6 @@ "merged": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-xxhdpi_ic_launcher_round.webp.flat", "source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-xxhdpi\\ic_launcher_round.webp" }, - { - "merged": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-hdpi_ic_launcher_round.webp.flat", - "source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-hdpi\\ic_launcher_round.webp" - }, - { - "merged": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-anydpi-v26_ic_launcher.xml.flat", - "source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-anydpi-v26\\ic_launcher.xml" - }, { "merged": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-xxxhdpi_ic_launcher.webp.flat", "source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-xxxhdpi\\ic_launcher.webp" @@ -48,41 +32,21 @@ "source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-mdpi\\ic_launcher.webp" }, { - "merged": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\layout_activity_main.xml.flat", - "source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\layout\\activity_main.xml" + "merged": "com.example.scoutingapp-debug-31:/drawable_loop.png.flat", + "source": "com.example.scoutingapp-main-33:/drawable/loop.png" }, { "merged": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\drawable_screenshot_2025_01_16_115155.png.flat", "source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\drawable\\screenshot_2025_01_16_115155.png" }, - { - "merged": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-mdpi_ic_launcher_round.webp.flat", - "source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-mdpi\\ic_launcher_round.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\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-anydpi-v26_ic_launcher_round.xml.flat", - "source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-anydpi-v26\\ic_launcher_round.xml" - }, { "merged": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\layout_activity_tele.xml.flat", "source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\layout\\activity_tele.xml" }, - { - "merged": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-xhdpi_ic_launcher_round.webp.flat", - "source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-xhdpi\\ic_launcher_round.webp" - }, { "merged": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\layout_activity_auto.xml.flat", "source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\layout\\activity_auto.xml" }, - { - "merged": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\drawable_ic_launcher_background.xml.flat", - "source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\drawable\\ic_launcher_background.xml" - }, { "merged": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-xxxhdpi_ic_launcher_round.webp.flat", "source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-xxxhdpi\\ic_launcher_round.webp" @@ -90,5 +54,45 @@ { "merged": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\xml_backup_rules.xml.flat", "source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\xml\\backup_rules.xml" + }, + { + "merged": "com.example.scoutingapp-debug-31:/layout_activity_main.xml.flat", + "source": "com.example.scoutingapp-main-33:/layout/activity_main.xml" + }, + { + "merged": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\xml_data_extraction_rules.xml.flat", + "source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\xml\\data_extraction_rules.xml" + }, + { + "merged": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-xxhdpi_ic_launcher.webp.flat", + "source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-xxhdpi\\ic_launcher.webp" + }, + { + "merged": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-hdpi_ic_launcher_round.webp.flat", + "source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-hdpi\\ic_launcher_round.webp" + }, + { + "merged": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-anydpi-v26_ic_launcher.xml.flat", + "source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-anydpi-v26\\ic_launcher.xml" + }, + { + "merged": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\layout_activity_main.xml.flat", + "source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\layout\\activity_main.xml" + }, + { + "merged": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-mdpi_ic_launcher_round.webp.flat", + "source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-mdpi\\ic_launcher_round.webp" + }, + { + "merged": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-anydpi-v26_ic_launcher_round.xml.flat", + "source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-anydpi-v26\\ic_launcher_round.xml" + }, + { + "merged": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-xhdpi_ic_launcher_round.webp.flat", + "source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-xhdpi\\ic_launcher_round.webp" + }, + { + "merged": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\drawable_ic_launcher_background.xml.flat", + "source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\drawable\\ic_launcher_background.xml" } ] \ 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 ef6175a..77bc37f 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 @@ -16,4 +16,90 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> + + + + + + + + + + + + + + + + + + + + + +