Merge branch 'refs/heads/main' into MatchDataImplementation
# Conflicts: # ScoutingApp/.gradle/8.7/executionHistory/executionHistory.bin # ScoutingApp/.gradle/8.7/executionHistory/executionHistory.lock # ScoutingApp/.gradle/8.7/fileHashes/fileHashes.bin # ScoutingApp/.gradle/8.7/fileHashes/fileHashes.lock # ScoutingApp/.gradle/8.7/fileHashes/resourceHashesCache.bin # ScoutingApp/.gradle/buildOutputCleanup/buildOutputCleanup.lock # ScoutingApp/app/build/intermediates/apk/debug/app-debug.apk # ScoutingApp/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/processDebugResources/R.jar # ScoutingApp/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex # ScoutingApp/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex # ScoutingApp/app/build/intermediates/dex_archive_input_jar_hashes/debug/dexBuilderDebug/out # ScoutingApp/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties # ScoutingApp/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml # ScoutingApp/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties # ScoutingApp/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml # ScoutingApp/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt # ScoutingApp/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources # ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/AutoActivity.class # ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/EndActivity$2.class # ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/EndActivity.class # ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$2.class # ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$3.class # ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$4.class # ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$5.class # ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$6.class # ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$7.class # ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$8.class # ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity.class # ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/Submit.class # ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/TeleActivity.class # ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity$2.class # ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity$3.class # ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity$4.class # ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity$5.class # ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity$6.class # ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity.class # ScoutingApp/app/build/intermediates/linked_resources_binary_format/debug/processDebugResources/linked-resources-binary-format-debug.ap_ # ScoutingApp/app/build/intermediates/merged_res_blame_folder/debug/mergeDebugResources/out/multi-v2/mergeDebugResources.json # ScoutingApp/app/build/intermediates/merged_res_blame_folder/debug/mergeDebugResources/out/single/mergeDebugResources.json # ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/AutoActivity.dex # ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/EndActivity$2.dex # ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/EndActivity.dex # ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/MainActivity$2.dex # ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/MainActivity$3.dex # ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/MainActivity$4.dex # ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/MainActivity$5.dex # ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/MainActivity$6.dex # ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/MainActivity$7.dex # ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/MainActivity$8.dex # ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/MainActivity.dex # ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/Submit.dex # ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/TeleActivity.dex # ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/startingActivity$2.dex # ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/startingActivity$3.dex # ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/startingActivity$4.dex # ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/startingActivity$5.dex # ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/startingActivity$6.dex # ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/startingActivity.dex # ScoutingApp/app/build/intermediates/stable_resource_ids_file/debug/processDebugResources/stableIds.txt # ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin # ScoutingApp/app/src/main/java/com/example/scoutingapp/MainActivity.java # ScoutingApp/app/src/main/java/com/example/scoutingapp/TeleActivity.java
This commit is contained in:
commit
f6605cf0f8
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,26 +1,28 @@
|
||||
#Thu Mar 13 13:52:39 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
|
||||
#Thu Mar 13 14:56:43 EDT 2025
|
||||
com.example.scoutingapp-main-33\:/drawable/_025_reefscape_transparent_background.png=C\:\\Users\\cayde\\Desktop\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable__025_reefscape_transparent_background.png.flat
|
||||
com.example.scoutingapp-main-33\:/drawable/_025_reefscape_transparent_background.webp=C\:\\Users\\cayde\\Desktop\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable__025_reefscape_transparent_background.webp.flat
|
||||
com.example.scoutingapp-main-33\:/drawable/_025_reefscape_transparent_background_blue.webp=C\:\\Users\\cayde\\Desktop\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable__025_reefscape_transparent_background_blue.webp.flat
|
||||
com.example.scoutingapp-main-33\:/drawable/ic_launcher_background.xml=C\:\\Users\\cayde\\Desktop\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_ic_launcher_background.xml.flat
|
||||
com.example.scoutingapp-main-33\:/drawable/ic_launcher_foreground.xml=C\:\\Users\\cayde\\Desktop\\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\\cayde\\Desktop\\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\\cayde\\Desktop\\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\\cayde\\Desktop\\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\\cayde\\Desktop\\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\\cayde\\Desktop\\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\\cayde\\Desktop\\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\\cayde\\Desktop\\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\\cayde\\Desktop\\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\\cayde\\Desktop\\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\\cayde\\Desktop\\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\\cayde\\Desktop\\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\\cayde\\Desktop\\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\\cayde\\Desktop\\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\\cayde\\Desktop\\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\\cayde\\Desktop\\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\\cayde\\Desktop\\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\\cayde\\Desktop\\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\\cayde\\Desktop\\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\\cayde\\Desktop\\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\\cayde\\Desktop\\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\\cayde\\Desktop\\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\\cayde\\Desktop\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\xml_data_extraction_rules.xml.flat
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -1,26 +1,28 @@
|
||||
#Thu Mar 13 13:52:39 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
|
||||
#Thu Mar 13 14:56:43 EDT 2025
|
||||
com.example.scoutingapp-main-5\:/drawable/_025_reefscape_transparent_background.png=C\:\\Users\\cayde\\Desktop\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\_025_reefscape_transparent_background.png
|
||||
com.example.scoutingapp-main-5\:/drawable/_025_reefscape_transparent_background.webp=C\:\\Users\\cayde\\Desktop\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\_025_reefscape_transparent_background.webp
|
||||
com.example.scoutingapp-main-5\:/drawable/_025_reefscape_transparent_background_blue.webp=C\:\\Users\\cayde\\Desktop\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\_025_reefscape_transparent_background_blue.webp
|
||||
com.example.scoutingapp-main-5\:/drawable/ic_launcher_background.xml=C\:\\Users\\cayde\\Desktop\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\ic_launcher_background.xml
|
||||
com.example.scoutingapp-main-5\:/drawable/ic_launcher_foreground.xml=C\:\\Users\\cayde\\Desktop\\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\\cayde\\Desktop\\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\\cayde\\Desktop\\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\\cayde\\Desktop\\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\\cayde\\Desktop\\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\\cayde\\Desktop\\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\\cayde\\Desktop\\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\\cayde\\Desktop\\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\\cayde\\Desktop\\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\\cayde\\Desktop\\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\\cayde\\Desktop\\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\\cayde\\Desktop\\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\\cayde\\Desktop\\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\\cayde\\Desktop\\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\\cayde\\Desktop\\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\\cayde\\Desktop\\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\\cayde\\Desktop\\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\\cayde\\Desktop\\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\\cayde\\Desktop\\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\\cayde\\Desktop\\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\\cayde\\Desktop\\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\\cayde\\Desktop\\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\\cayde\\Desktop\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\xml\\data_extraction_rules.xml
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -1,8 +1,8 @@
|
||||
#Thu Mar 13 14:50:21 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
|
||||
#Thu Mar 13 14:56:47 EDT 2025
|
||||
base.0=C\:\\Users\\cayde\\Desktop\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes.dex
|
||||
base.1=C\:\\Users\\cayde\\Desktop\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex
|
||||
base.2=C\:\\Users\\cayde\\Desktop\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\4\\classes.dex
|
||||
base.3=C\:\\Users\\cayde\\Desktop\\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
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -7,6 +7,7 @@ drawable ic_launcher_background
|
||||
drawable ic_launcher_foreground
|
||||
drawable loop
|
||||
drawable screenshot_2025_01_16_115155
|
||||
id BackButton
|
||||
id ButtonNext
|
||||
id Match
|
||||
id Notes
|
||||
@ -21,6 +22,7 @@ id Rbutton4
|
||||
id Rbutton5
|
||||
id Sheet
|
||||
id Submit_button
|
||||
id TextPine
|
||||
id blue1Button
|
||||
id blue2Button
|
||||
id blue3Button
|
||||
@ -34,7 +36,6 @@ id button_Processor
|
||||
id cb_CanLeave
|
||||
id cb_algaeReef
|
||||
id cb_coralPickup
|
||||
id editTextText
|
||||
id getTeamsButton
|
||||
id imageView10
|
||||
id imageView2
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because one or more lines are too long
@ -1,102 +1,114 @@
|
||||
[
|
||||
{
|
||||
"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\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\layout_activity_main.xml.flat",
|
||||
"source": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\layout\\activity_main.xml"
|
||||
},
|
||||
{
|
||||
"merged": "com.example.scoutingapp-debug-31:/layout_activity_auto.xml.flat",
|
||||
"source": "com.example.scoutingapp-main-33:/layout/activity_auto.xml"
|
||||
"merged": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\layout_activity_starting.xml.flat",
|
||||
"source": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\layout\\activity_starting.xml"
|
||||
},
|
||||
{
|
||||
"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\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\drawable__025_reefscape_transparent_background_blue.webp.flat",
|
||||
"source": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\drawable\\_025_reefscape_transparent_background_blue.webp"
|
||||
},
|
||||
{
|
||||
"merged": "com.example.scoutingapp-debug-31:/layout_activity_starting.xml.flat",
|
||||
"source": "com.example.scoutingapp-main-33:/layout/activity_starting.xml"
|
||||
"merged": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\drawable__025_reefscape_transparent_background.webp.flat",
|
||||
"source": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\drawable\\_025_reefscape_transparent_background.webp"
|
||||
},
|
||||
{
|
||||
"merged": "com.example.scoutingapp-debug-31:/mipmap-hdpi_ic_launcher.webp.flat",
|
||||
"source": "com.example.scoutingapp-main-33:/mipmap-hdpi/ic_launcher.webp"
|
||||
"merged": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\drawable_loop.png.flat",
|
||||
"source": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\drawable\\loop.png"
|
||||
},
|
||||
{
|
||||
"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\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-anydpi-v26_ic_launcher_round.xml.flat",
|
||||
"source": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-anydpi-v26\\ic_launcher_round.xml"
|
||||
},
|
||||
{
|
||||
"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\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\raw_info.json.flat",
|
||||
"source": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\raw\\info.json"
|
||||
},
|
||||
{
|
||||
"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\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-anydpi-v26_ic_launcher.xml.flat",
|
||||
"source": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-anydpi-v26\\ic_launcher.xml"
|
||||
},
|
||||
{
|
||||
"merged": "com.example.scoutingapp-debug-31:/drawable_loop.png.flat",
|
||||
"source": "com.example.scoutingapp-main-33:/drawable/loop.png"
|
||||
"merged": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-xxhdpi_ic_launcher.webp.flat",
|
||||
"source": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-xxhdpi\\ic_launcher.webp"
|
||||
},
|
||||
{
|
||||
"merged": "com.example.scoutingapp-debug-31:/layout_activity_end.xml.flat",
|
||||
"source": "com.example.scoutingapp-main-33:/layout/activity_end.xml"
|
||||
"merged": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\layout_activity_auto.xml.flat",
|
||||
"source": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\layout\\activity_auto.xml"
|
||||
},
|
||||
{
|
||||
"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\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\drawable_ic_launcher_foreground.xml.flat",
|
||||
"source": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\drawable\\ic_launcher_foreground.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\layout_activity_tele.xml.flat",
|
||||
"source": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\layout\\activity_tele.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-xxhdpi_ic_launcher_round.webp.flat",
|
||||
"source": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-xxhdpi\\ic_launcher_round.webp"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\drawable_ic_launcher_background.xml.flat",
|
||||
"source": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\drawable\\ic_launcher_background.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-xhdpi_ic_launcher_round.webp.flat",
|
||||
"source": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-xhdpi\\ic_launcher_round.webp"
|
||||
},
|
||||
{
|
||||
"merged": "com.example.scoutingapp-debug-31:/layout_activity_main.xml.flat",
|
||||
"source": "com.example.scoutingapp-main-33:/layout/activity_main.xml"
|
||||
},
|
||||
{
|
||||
"merged": "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\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\xml_backup_rules.xml.flat",
|
||||
"source": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\xml\\backup_rules.xml"
|
||||
},
|
||||
{
|
||||
"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\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-mdpi_ic_launcher_round.webp.flat",
|
||||
"source": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-mdpi\\ic_launcher_round.webp"
|
||||
},
|
||||
{
|
||||
"merged": "com.example.scoutingapp-debug-31:/raw_info.json.flat",
|
||||
"source": "com.example.scoutingapp-main-33:/raw/info.json"
|
||||
"merged": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\layout_activity_end.xml.flat",
|
||||
"source": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\layout\\activity_end.xml"
|
||||
},
|
||||
{
|
||||
"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\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\drawable_screenshot_2025_01_16_115155.webp.flat",
|
||||
"source": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\drawable\\screenshot_2025_01_16_115155.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\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-xhdpi_ic_launcher.webp.flat",
|
||||
"source": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-xhdpi\\ic_launcher.webp"
|
||||
},
|
||||
{
|
||||
"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\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-mdpi_ic_launcher.webp.flat",
|
||||
"source": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-mdpi\\ic_launcher.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\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-xxxhdpi_ic_launcher_round.webp.flat",
|
||||
"source": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-xxxhdpi\\ic_launcher_round.webp"
|
||||
},
|
||||
{
|
||||
"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\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-hdpi_ic_launcher_round.webp.flat",
|
||||
"source": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-hdpi\\ic_launcher_round.webp"
|
||||
},
|
||||
{
|
||||
"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\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-xxxhdpi_ic_launcher.webp.flat",
|
||||
"source": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-xxxhdpi\\ic_launcher.webp"
|
||||
},
|
||||
{
|
||||
"merged": "com.example.scoutingapp-debug-31:/layout_activity_tele.xml.flat",
|
||||
"source": "com.example.scoutingapp-main-33:/layout/activity_tele.xml"
|
||||
"merged": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-hdpi_ic_launcher.webp.flat",
|
||||
"source": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-hdpi\\ic_launcher.webp"
|
||||
},
|
||||
{
|
||||
"merged": "com.example.scoutingapp-debug-31:/drawable_ic_launcher_background.xml.flat",
|
||||
"source": "com.example.scoutingapp-main-33:/drawable/ic_launcher_background.xml"
|
||||
"merged": "com.example.scoutingapp-debug-31:/drawable__025_reefscape_transparent_background.png.flat",
|
||||
"source": "com.example.scoutingapp-main-33:/drawable/_025_reefscape_transparent_background.png"
|
||||
},
|
||||
{
|
||||
"merged": "com.example.scoutingapp-debug-31:/drawable_ic_launcher_foreground.xml.flat",
|
||||
"source": "com.example.scoutingapp-main-33:/drawable/ic_launcher_foreground.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\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\xml_data_extraction_rules.xml.flat",
|
||||
"source": "C:\\Users\\cayde\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\xml\\data_extraction_rules.xml"
|
||||
}
|
||||
]
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 31 KiB |
@ -163,7 +163,7 @@
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintBottom_toTopOf="@+id/button_Next"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent">
|
||||
|
||||
@ -211,15 +211,28 @@
|
||||
|
||||
<Button
|
||||
android:id="@+id/button_Next"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="4dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:backgroundTint="#FF5722"
|
||||
android:text="Next(Hold)"
|
||||
app:cornerRadius="0dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@+id/BackButton" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/BackButton"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginEnd="4dp"
|
||||
android:backgroundTint="#FF5722"
|
||||
android:text="@string/next_hold"
|
||||
android:textColor="#000000"
|
||||
android:text="Back(Hold)"
|
||||
app:cornerRadius="0dp"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@+id/button_Next"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
@ -73,13 +73,28 @@
|
||||
|
||||
<Button
|
||||
android:id="@+id/Submit_button"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/submit"
|
||||
android:layout_marginStart="4dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:backgroundTint="#FF5722"
|
||||
app:layout_constraintBottom_toTopOf="@+id/teamnumber"
|
||||
android:text="Submit Data"
|
||||
app:cornerRadius="0dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintHorizontal_bias="1.0"
|
||||
app:layout_constraintStart_toEndOf="@+id/BackButton" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/BackButton"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginEnd="4dp"
|
||||
android:backgroundTint="#FF5722"
|
||||
android:text="Back(Hold)"
|
||||
app:cornerRadius="0dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@+id/Submit_button"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
@ -97,23 +112,23 @@
|
||||
android:id="@+id/teamnumber"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
android:text="2648"
|
||||
android:textSize="34sp"
|
||||
android:textColor="#FFFFFF"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
android:textSize="34sp"
|
||||
app:layout_constraintBottom_toTopOf="@+id/BackButton"
|
||||
app:layout_constraintEnd_toStartOf="@+id/matchNumber"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
android:gravity="center"/>
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/matchNumber"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
android:text="01"
|
||||
android:textSize="34sp"
|
||||
android:textColor="#FFFFFF"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
android:textSize="34sp"
|
||||
app:layout_constraintBottom_toTopOf="@+id/Submit_button"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@+id/teamnumber"
|
||||
android:gravity="center"/>
|
||||
app:layout_constraintStart_toEndOf="@+id/teamnumber" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
@ -35,18 +35,6 @@
|
||||
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
|
||||
|
||||
<Button
|
||||
android:id="@+id/Submit_button"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="40dp"
|
||||
android:backgroundTint="#FF5722"
|
||||
android:text="Submit"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:id="@+id/Match"
|
||||
android:layout_width="match_parent"
|
||||
@ -57,7 +45,7 @@
|
||||
android:textAlignment="center"
|
||||
android:textColor="#FFFFFF"
|
||||
android:textColorHint="#AAAAAA"
|
||||
app:layout_constraintTop_toBottomOf="@+id/editTextText"
|
||||
app:layout_constraintTop_toBottomOf="@+id/TextPine"
|
||||
tools:layout_editor_absoluteX="-1dp" />
|
||||
|
||||
<LinearLayout
|
||||
@ -128,16 +116,16 @@
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
<EditText
|
||||
android:id="@+id/editTextText"
|
||||
<TextView
|
||||
android:id="@+id/TextPine"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="50dp"
|
||||
android:ems="10"
|
||||
android:inputType="text"
|
||||
android:text="Pine Tree District Event"
|
||||
android:text="Pine Tree District Event 2025"
|
||||
android:textAlignment="center"
|
||||
android:textColor="#FFFFFF"
|
||||
android:textSize="24sp"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
@ -154,15 +142,17 @@
|
||||
|
||||
<Button
|
||||
android:id="@+id/ButtonNext"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="24dp"
|
||||
android:layout_marginBottom="40dp"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:backgroundTint="#FF5722"
|
||||
android:text="Next"
|
||||
app:cornerRadius="@null"
|
||||
app:cornerRadius="0dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent" />
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
|
||||
<EditText
|
||||
android:id="@+id/scoutNameText"
|
||||
@ -172,9 +162,9 @@
|
||||
android:hint="Input Scout Name"
|
||||
android:inputType="text"
|
||||
android:textAlignment="center"
|
||||
android:textColorHint="#AAAAAA"
|
||||
android:textColor="#FFFFFF"
|
||||
app:layout_constraintBottom_toTopOf="@+id/Submit_button"
|
||||
android:textColorHint="#AAAAAA"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/linearLayout3" />
|
||||
|
||||
@ -12,41 +12,39 @@
|
||||
android:id="@+id/teamnumber"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
android:text="2648"
|
||||
android:textSize="34sp"
|
||||
android:textColor="#FFFFFF"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
android:textSize="34sp"
|
||||
app:layout_constraintBottom_toTopOf="@+id/nextButton"
|
||||
app:layout_constraintEnd_toStartOf="@+id/matchNumber"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
android:gravity="center"/>
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/matchNumber"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
android:text="01"
|
||||
android:textSize="34sp"
|
||||
android:textColor="#FFFFFF"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
android:textSize="34sp"
|
||||
app:layout_constraintBottom_toTopOf="@+id/BackButton"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@+id/teamnumber"
|
||||
android:gravity="center"/>
|
||||
app:layout_constraintStart_toEndOf="@+id/teamnumber" />
|
||||
|
||||
<RadioGroup
|
||||
android:id="@+id/radioGroup"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="405dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintBottom_toTopOf="@+id/imageView10"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/nextButton">
|
||||
app:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
<RadioButton
|
||||
android:id="@+id/Rbutton1"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:checked="true"
|
||||
android:text="Starting Postion 1"
|
||||
android:textColor="@android:color/white" />
|
||||
|
||||
@ -82,15 +80,29 @@
|
||||
|
||||
<Button
|
||||
android:id="@+id/nextButton"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginStart="4dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:backgroundTint="#FF5722"
|
||||
android:text="Next"
|
||||
app:cornerRadius="0dp"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@+id/BackButton" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/BackButton"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginEnd="4dp"
|
||||
android:backgroundTint="#FF5722"
|
||||
android:text="Back(Hold)"
|
||||
app:cornerRadius="0dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@+id/nextButton"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/imageView10"
|
||||
|
||||
@ -163,7 +163,7 @@
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintBottom_toTopOf="@+id/button_Next"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent">
|
||||
|
||||
@ -211,15 +211,28 @@
|
||||
|
||||
<Button
|
||||
android:id="@+id/button_Next"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="4dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:backgroundTint="#FF5722"
|
||||
android:text="Next(Hold)"
|
||||
app:cornerRadius="0dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@+id/BackButton" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/BackButton"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginEnd="4dp"
|
||||
android:backgroundTint="#FF5722"
|
||||
android:text="@string/next_hold"
|
||||
android:textColor="#000000"
|
||||
android:text="Back(Hold)"
|
||||
app:cornerRadius="0dp"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@+id/button_Next"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -3113,6 +3113,7 @@ int drawable tooltip_frame_light 0x7f0700e9
|
||||
int id ALT 0x7f080000
|
||||
int id BOTTOM_END 0x7f080001
|
||||
int id BOTTOM_START 0x7f080002
|
||||
int id BackButton 0x7f080228
|
||||
int id ButtonNext 0x7f080003
|
||||
int id CTRL 0x7f080004
|
||||
int id FUNCTION 0x7f080005
|
||||
@ -3138,6 +3139,7 @@ int id Sheet 0x7f080018
|
||||
int id Submit_button 0x7f080019
|
||||
int id TOP_END 0x7f08001a
|
||||
int id TOP_START 0x7f08001b
|
||||
int id TextPine 0x7f08022a
|
||||
int id above 0x7f08001c
|
||||
int id accelerate 0x7f08001d
|
||||
int id accessibility_action_clickable_span 0x7f08001e
|
||||
@ -3311,7 +3313,6 @@ int id easeInOut 0x7f0800c5
|
||||
int id easeOut 0x7f0800c6
|
||||
int id east 0x7f0800c7
|
||||
int id edge 0x7f0800c8
|
||||
int id editTextText 0x7f0800c9
|
||||
int id edit_query 0x7f0800ca
|
||||
int id edit_text_id 0x7f0800cb
|
||||
int id elastic 0x7f0800cc
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -3114,6 +3114,7 @@ drawable tooltip_frame_light
|
||||
id ALT
|
||||
id BOTTOM_END
|
||||
id BOTTOM_START
|
||||
id BackButton
|
||||
id ButtonNext
|
||||
id CTRL
|
||||
id FUNCTION
|
||||
@ -3139,6 +3140,7 @@ id Sheet
|
||||
id Submit_button
|
||||
id TOP_END
|
||||
id TOP_START
|
||||
id TextPine
|
||||
id above
|
||||
id accelerate
|
||||
id accessibility_action_clickable_span
|
||||
@ -3312,7 +3314,6 @@ id easeInOut
|
||||
id easeOut
|
||||
id east
|
||||
id edge
|
||||
id editTextText
|
||||
id edit_query
|
||||
id edit_text_id
|
||||
id elastic
|
||||
|
||||
Binary file not shown.
@ -63,6 +63,7 @@ public class AutoActivity extends AppCompatActivity {
|
||||
processorButton = (Button) findViewById(R.id.button_Processor);
|
||||
netButton = (Button) findViewById(R.id.button_Net);
|
||||
Button nextButton = (Button) findViewById(R.id.button_Next);
|
||||
Button backButton = (Button) findViewById(R.id.BackButton);
|
||||
|
||||
CheckBox coralPickupBox = (CheckBox) findViewById(R.id.cb_coralPickup);
|
||||
CheckBox reefPickupBox = (CheckBox) findViewById(R.id.cb_algaeReef);
|
||||
@ -144,6 +145,11 @@ public class AutoActivity extends AppCompatActivity {
|
||||
return true;
|
||||
});
|
||||
|
||||
backButton.setOnLongClickListener((v) -> {
|
||||
Intent intent = new Intent(this, startingActivity.class);
|
||||
return true;
|
||||
});
|
||||
|
||||
//sets all text boxes to 0
|
||||
updateL4Text();
|
||||
updateL3Text();
|
||||
|
||||
@ -82,6 +82,13 @@ public class EndActivity extends AppCompatActivity {
|
||||
|
||||
}
|
||||
});
|
||||
Button backButton = (Button) findViewById(R.id.BackButton);
|
||||
|
||||
backButton.setOnLongClickListener((v) -> {
|
||||
Intent backIntent = new Intent(EndActivity.this, MainActivity.class);
|
||||
startActivity(backIntent);
|
||||
return true;
|
||||
});
|
||||
|
||||
Button Sheet = (Button) findViewById(R.id.Sheet);
|
||||
Sheet.setOnClickListener(new View.OnClickListener() {
|
||||
|
||||
@ -63,6 +63,7 @@ public class TeleActivity extends AppCompatActivity {
|
||||
processorButton = (Button) findViewById(R.id.button_Processor);
|
||||
netButton = (Button) findViewById(R.id.button_Net);
|
||||
Button nextButton = (Button) findViewById(R.id.button_Next);
|
||||
Button backButton = (Button) findViewById(R.id.BackButton);
|
||||
|
||||
CheckBox coralPickupBox = (CheckBox) findViewById(R.id.cb_coralPickup);
|
||||
CheckBox reefPickupBox = (CheckBox) findViewById(R.id.cb_algaeReef);
|
||||
@ -144,6 +145,11 @@ public class TeleActivity extends AppCompatActivity {
|
||||
return true;
|
||||
});
|
||||
|
||||
backButton.setOnLongClickListener((v) -> {
|
||||
Intent intent = new Intent(this, startingActivity.class);
|
||||
return true;
|
||||
});
|
||||
|
||||
//sets all text boxes to 0
|
||||
updateL4Text();
|
||||
updateL3Text();
|
||||
|
||||
@ -57,6 +57,16 @@ public class startingActivity extends AppCompatActivity {
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
|
||||
Button backButton = (Button) findViewById(R.id.BackButton);
|
||||
|
||||
backButton.setOnLongClickListener((v) -> {
|
||||
Intent backIntent = new Intent(startingActivity.this, MainActivity.class);
|
||||
startActivity(backIntent);
|
||||
return true;
|
||||
});
|
||||
|
||||
RadioButton Rbutton1 = findViewById(R.id.Rbutton1);
|
||||
Rbutton1.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 33 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 31 KiB |
@ -163,7 +163,7 @@
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintBottom_toTopOf="@+id/button_Next"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent">
|
||||
|
||||
@ -211,15 +211,28 @@
|
||||
|
||||
<Button
|
||||
android:id="@+id/button_Next"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="4dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:backgroundTint="#FF5722"
|
||||
android:text="Next(Hold)"
|
||||
app:cornerRadius="0dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@+id/BackButton" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/BackButton"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginEnd="4dp"
|
||||
android:backgroundTint="#FF5722"
|
||||
android:text="@string/next_hold"
|
||||
android:textColor="#000000"
|
||||
android:text="Back(Hold)"
|
||||
app:cornerRadius="0dp"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@+id/button_Next"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
@ -73,13 +73,28 @@
|
||||
|
||||
<Button
|
||||
android:id="@+id/Submit_button"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/submit"
|
||||
android:layout_marginStart="4dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:backgroundTint="#FF5722"
|
||||
app:layout_constraintBottom_toTopOf="@+id/teamnumber"
|
||||
android:text="Submit Data"
|
||||
app:cornerRadius="0dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintHorizontal_bias="1.0"
|
||||
app:layout_constraintStart_toEndOf="@+id/BackButton" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/BackButton"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginEnd="4dp"
|
||||
android:backgroundTint="#FF5722"
|
||||
android:text="Back(Hold)"
|
||||
app:cornerRadius="0dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@+id/Submit_button"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
@ -97,23 +112,23 @@
|
||||
android:id="@+id/teamnumber"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
android:text="2648"
|
||||
android:textSize="34sp"
|
||||
android:textColor="#FFFFFF"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
android:textSize="34sp"
|
||||
app:layout_constraintBottom_toTopOf="@+id/BackButton"
|
||||
app:layout_constraintEnd_toStartOf="@+id/matchNumber"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
android:gravity="center"/>
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/matchNumber"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
android:text="01"
|
||||
android:textSize="34sp"
|
||||
android:textColor="#FFFFFF"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
android:textSize="34sp"
|
||||
app:layout_constraintBottom_toTopOf="@+id/Submit_button"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@+id/teamnumber"
|
||||
android:gravity="center"/>
|
||||
app:layout_constraintStart_toEndOf="@+id/teamnumber" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
@ -35,18 +35,6 @@
|
||||
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
|
||||
|
||||
<Button
|
||||
android:id="@+id/Submit_button"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="40dp"
|
||||
android:backgroundTint="#FF5722"
|
||||
android:text="Submit"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:id="@+id/Match"
|
||||
android:layout_width="match_parent"
|
||||
@ -57,7 +45,7 @@
|
||||
android:textAlignment="center"
|
||||
android:textColor="#FFFFFF"
|
||||
android:textColorHint="#AAAAAA"
|
||||
app:layout_constraintTop_toBottomOf="@+id/editTextText"
|
||||
app:layout_constraintTop_toBottomOf="@+id/TextPine"
|
||||
tools:layout_editor_absoluteX="-1dp" />
|
||||
|
||||
<LinearLayout
|
||||
@ -128,16 +116,16 @@
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
<EditText
|
||||
android:id="@+id/editTextText"
|
||||
<TextView
|
||||
android:id="@+id/TextPine"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="50dp"
|
||||
android:ems="10"
|
||||
android:inputType="text"
|
||||
android:text="Pine Tree District Event"
|
||||
android:text="Pine Tree District Event 2025"
|
||||
android:textAlignment="center"
|
||||
android:textColor="#FFFFFF"
|
||||
android:textSize="24sp"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
@ -154,15 +142,17 @@
|
||||
|
||||
<Button
|
||||
android:id="@+id/ButtonNext"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="24dp"
|
||||
android:layout_marginBottom="40dp"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:backgroundTint="#FF5722"
|
||||
android:text="Next"
|
||||
app:cornerRadius="@null"
|
||||
app:cornerRadius="0dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent" />
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
|
||||
<EditText
|
||||
android:id="@+id/scoutNameText"
|
||||
@ -172,9 +162,9 @@
|
||||
android:hint="Input Scout Name"
|
||||
android:inputType="text"
|
||||
android:textAlignment="center"
|
||||
android:textColorHint="#AAAAAA"
|
||||
android:textColor="#FFFFFF"
|
||||
app:layout_constraintBottom_toTopOf="@+id/Submit_button"
|
||||
android:textColorHint="#AAAAAA"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/linearLayout3" />
|
||||
|
||||
@ -12,41 +12,39 @@
|
||||
android:id="@+id/teamnumber"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
android:text="2648"
|
||||
android:textSize="34sp"
|
||||
android:textColor="#FFFFFF"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
android:textSize="34sp"
|
||||
app:layout_constraintBottom_toTopOf="@+id/nextButton"
|
||||
app:layout_constraintEnd_toStartOf="@+id/matchNumber"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
android:gravity="center"/>
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/matchNumber"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
android:text="01"
|
||||
android:textSize="34sp"
|
||||
android:textColor="#FFFFFF"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
android:textSize="34sp"
|
||||
app:layout_constraintBottom_toTopOf="@+id/BackButton"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@+id/teamnumber"
|
||||
android:gravity="center"/>
|
||||
app:layout_constraintStart_toEndOf="@+id/teamnumber" />
|
||||
|
||||
<RadioGroup
|
||||
android:id="@+id/radioGroup"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="405dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintBottom_toTopOf="@+id/imageView10"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/nextButton">
|
||||
app:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
<RadioButton
|
||||
android:id="@+id/Rbutton1"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:checked="true"
|
||||
android:text="Starting Postion 1"
|
||||
android:textColor="@android:color/white" />
|
||||
|
||||
@ -82,15 +80,29 @@
|
||||
|
||||
<Button
|
||||
android:id="@+id/nextButton"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginStart="4dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:backgroundTint="#FF5722"
|
||||
android:text="Next"
|
||||
app:cornerRadius="0dp"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@+id/BackButton" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/BackButton"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginEnd="4dp"
|
||||
android:backgroundTint="#FF5722"
|
||||
android:text="Back(Hold)"
|
||||
app:cornerRadius="0dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@+id/nextButton"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/imageView10"
|
||||
|
||||
@ -163,7 +163,7 @@
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintBottom_toTopOf="@+id/button_Next"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent">
|
||||
|
||||
@ -211,15 +211,28 @@
|
||||
|
||||
<Button
|
||||
android:id="@+id/button_Next"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="4dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:backgroundTint="#FF5722"
|
||||
android:text="Next(Hold)"
|
||||
app:cornerRadius="0dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@+id/BackButton" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/BackButton"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginEnd="4dp"
|
||||
android:backgroundTint="#FF5722"
|
||||
android:text="@string/next_hold"
|
||||
android:textColor="#000000"
|
||||
android:text="Back(Hold)"
|
||||
app:cornerRadius="0dp"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@+id/button_Next"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
Loading…
Reference in New Issue
Block a user