merge of a bunch of files
This commit is contained in:
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,24 +1,24 @@
|
||||
#Tue Feb 04 12:24:07 EST 2025
|
||||
com.example.scoutingapp-main-33\:/drawable/ic_launcher_background.xml=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_ic_launcher_background.xml.flat
|
||||
com.example.scoutingapp-main-33\:/drawable/ic_launcher_foreground.xml=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_ic_launcher_foreground.xml.flat
|
||||
com.example.scoutingapp-main-33\:/drawable/loop.png=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_loop.png.flat
|
||||
com.example.scoutingapp-main-33\:/drawable/screenshot_2025_01_16_115155.png=C\:\\Users\\26jacquesty\\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\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_activity_auto.xml.flat
|
||||
com.example.scoutingapp-main-33\:/layout/activity_end.xml=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_activity_end.xml.flat
|
||||
com.example.scoutingapp-main-33\:/layout/activity_main.xml=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_activity_main.xml.flat
|
||||
com.example.scoutingapp-main-33\:/layout/activity_tele.xml=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_activity_tele.xml.flat
|
||||
com.example.scoutingapp-main-33\:/mipmap-anydpi-v26/ic_launcher.xml=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-anydpi-v26_ic_launcher.xml.flat
|
||||
com.example.scoutingapp-main-33\:/mipmap-anydpi-v26/ic_launcher_round.xml=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-anydpi-v26_ic_launcher_round.xml.flat
|
||||
com.example.scoutingapp-main-33\:/mipmap-hdpi/ic_launcher.webp=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-hdpi_ic_launcher.webp.flat
|
||||
com.example.scoutingapp-main-33\:/mipmap-hdpi/ic_launcher_round.webp=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-hdpi_ic_launcher_round.webp.flat
|
||||
com.example.scoutingapp-main-33\:/mipmap-mdpi/ic_launcher.webp=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-mdpi_ic_launcher.webp.flat
|
||||
com.example.scoutingapp-main-33\:/mipmap-mdpi/ic_launcher_round.webp=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-mdpi_ic_launcher_round.webp.flat
|
||||
com.example.scoutingapp-main-33\:/mipmap-xhdpi/ic_launcher.webp=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-xhdpi_ic_launcher.webp.flat
|
||||
com.example.scoutingapp-main-33\:/mipmap-xhdpi/ic_launcher_round.webp=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-xhdpi_ic_launcher_round.webp.flat
|
||||
com.example.scoutingapp-main-33\:/mipmap-xxhdpi/ic_launcher.webp=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-xxhdpi_ic_launcher.webp.flat
|
||||
com.example.scoutingapp-main-33\:/mipmap-xxhdpi/ic_launcher_round.webp=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-xxhdpi_ic_launcher_round.webp.flat
|
||||
com.example.scoutingapp-main-33\:/mipmap-xxxhdpi/ic_launcher.webp=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-xxxhdpi_ic_launcher.webp.flat
|
||||
com.example.scoutingapp-main-33\:/mipmap-xxxhdpi/ic_launcher_round.webp=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-xxxhdpi_ic_launcher_round.webp.flat
|
||||
com.example.scoutingapp-main-33\:/raw/info.json=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\raw_info.json.flat
|
||||
com.example.scoutingapp-main-33\:/xml/backup_rules.xml=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\xml_backup_rules.xml.flat
|
||||
com.example.scoutingapp-main-33\:/xml/data_extraction_rules.xml=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\xml_data_extraction_rules.xml.flat
|
||||
#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
|
||||
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_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
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -1,24 +1,24 @@
|
||||
#Tue Feb 04 12:24:07 EST 2025
|
||||
com.example.scoutingapp-main-5\:/drawable/ic_launcher_background.xml=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\ic_launcher_background.xml
|
||||
com.example.scoutingapp-main-5\:/drawable/ic_launcher_foreground.xml=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\ic_launcher_foreground.xml
|
||||
com.example.scoutingapp-main-5\:/drawable/loop.png=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\loop.png
|
||||
com.example.scoutingapp-main-5\:/drawable/screenshot_2025_01_16_115155.png=C\:\\Users\\26jacquesty\\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\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\activity_auto.xml
|
||||
com.example.scoutingapp-main-5\:/layout/activity_end.xml=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\activity_end.xml
|
||||
com.example.scoutingapp-main-5\:/layout/activity_main.xml=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\activity_main.xml
|
||||
com.example.scoutingapp-main-5\:/layout/activity_tele.xml=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\activity_tele.xml
|
||||
com.example.scoutingapp-main-5\:/mipmap-anydpi-v26/ic_launcher.xml=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-anydpi-v26\\ic_launcher.xml
|
||||
com.example.scoutingapp-main-5\:/mipmap-anydpi-v26/ic_launcher_round.xml=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-anydpi-v26\\ic_launcher_round.xml
|
||||
com.example.scoutingapp-main-5\:/mipmap-hdpi/ic_launcher.webp=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-hdpi-v4\\ic_launcher.webp
|
||||
com.example.scoutingapp-main-5\:/mipmap-hdpi/ic_launcher_round.webp=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-hdpi-v4\\ic_launcher_round.webp
|
||||
com.example.scoutingapp-main-5\:/mipmap-mdpi/ic_launcher.webp=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-mdpi-v4\\ic_launcher.webp
|
||||
com.example.scoutingapp-main-5\:/mipmap-mdpi/ic_launcher_round.webp=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-mdpi-v4\\ic_launcher_round.webp
|
||||
com.example.scoutingapp-main-5\:/mipmap-xhdpi/ic_launcher.webp=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-xhdpi-v4\\ic_launcher.webp
|
||||
com.example.scoutingapp-main-5\:/mipmap-xhdpi/ic_launcher_round.webp=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-xhdpi-v4\\ic_launcher_round.webp
|
||||
com.example.scoutingapp-main-5\:/mipmap-xxhdpi/ic_launcher.webp=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-xxhdpi-v4\\ic_launcher.webp
|
||||
com.example.scoutingapp-main-5\:/mipmap-xxhdpi/ic_launcher_round.webp=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-xxhdpi-v4\\ic_launcher_round.webp
|
||||
com.example.scoutingapp-main-5\:/mipmap-xxxhdpi/ic_launcher.webp=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-xxxhdpi-v4\\ic_launcher.webp
|
||||
com.example.scoutingapp-main-5\:/mipmap-xxxhdpi/ic_launcher_round.webp=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-xxxhdpi-v4\\ic_launcher_round.webp
|
||||
com.example.scoutingapp-main-5\:/raw/info.json=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\raw\\info.json
|
||||
com.example.scoutingapp-main-5\:/xml/backup_rules.xml=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\xml\\backup_rules.xml
|
||||
com.example.scoutingapp-main-5\:/xml/data_extraction_rules.xml=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\xml\\data_extraction_rules.xml
|
||||
#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
|
||||
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_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
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -1,8 +1,8 @@
|
||||
#Tue Feb 04 13:37:43 EST 2025
|
||||
base.0=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes.dex
|
||||
base.1=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex
|
||||
base.2=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\4\\classes.dex
|
||||
base.3=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes2.dex
|
||||
#Tue Feb 04 12:41:48 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
|
||||
base.3=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes2.dex
|
||||
path.0=classes.dex
|
||||
path.1=0/classes.dex
|
||||
path.2=4/classes.dex
|
||||
|
||||
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.
@@ -22,20 +22,15 @@ id cb_CanLeave
|
||||
id cb_algaeReef
|
||||
id cb_coralPickup
|
||||
id deleteButton
|
||||
id imageView
|
||||
id imageView2
|
||||
id linearLayout
|
||||
id main
|
||||
id nextButton
|
||||
id textInputLayout
|
||||
id textInputLayout2
|
||||
id textInputLayout3
|
||||
id textView
|
||||
id textView2
|
||||
id textView3
|
||||
id tv_L1
|
||||
id tv_L2
|
||||
id tv_L3
|
||||
id tv_L4
|
||||
id tv_Net
|
||||
id tv_Net2
|
||||
layout activity_auto
|
||||
layout activity_end
|
||||
layout activity_main
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -1,98 +1,98 @@
|
||||
[
|
||||
{
|
||||
"merged": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\drawable_loop.png.flat",
|
||||
"source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\drawable\\loop.png"
|
||||
"merged": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-hdpi_ic_launcher.webp.flat",
|
||||
"source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-hdpi\\ic_launcher.webp"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-xxhdpi_ic_launcher_round.webp.flat",
|
||||
"source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-xxhdpi\\ic_launcher_round.webp"
|
||||
"merged": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-xhdpi_ic_launcher.webp.flat",
|
||||
"source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-xhdpi\\ic_launcher.webp"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-xxxhdpi_ic_launcher_round.webp.flat",
|
||||
"source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-xxxhdpi\\ic_launcher_round.webp"
|
||||
"merged": "C:\\Users\\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\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\xml_data_extraction_rules.xml.flat",
|
||||
"source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\xml\\data_extraction_rules.xml"
|
||||
"merged": "C:\\Users\\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"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-anydpi-v26_ic_launcher.xml.flat",
|
||||
"source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-anydpi-v26\\ic_launcher.xml"
|
||||
"merged": "C:\\Users\\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\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-xxxhdpi_ic_launcher.webp.flat",
|
||||
"source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-xxxhdpi\\ic_launcher.webp"
|
||||
"merged": "C:\\Users\\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"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-mdpi_ic_launcher_round.webp.flat",
|
||||
"source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-mdpi\\ic_launcher_round.webp"
|
||||
"merged": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\layout_activity_end.xml.flat",
|
||||
"source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\layout\\activity_end.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-anydpi-v26_ic_launcher_round.xml.flat",
|
||||
"source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-anydpi-v26\\ic_launcher_round.xml"
|
||||
"merged": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-mdpi_ic_launcher.webp.flat",
|
||||
"source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-mdpi\\ic_launcher.webp"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-hdpi_ic_launcher_round.webp.flat",
|
||||
"source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-hdpi\\ic_launcher_round.webp"
|
||||
"merged": "com.example.scoutingapp-debug-31:/drawable_loop.png.flat",
|
||||
"source": "com.example.scoutingapp-main-33:/drawable/loop.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\raw_info.json.flat",
|
||||
"source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\raw\\info.json"
|
||||
"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:\\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:\\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:\\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"
|
||||
},
|
||||
{
|
||||
"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\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-xhdpi_ic_launcher_round.webp.flat",
|
||||
"source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-xhdpi\\ic_launcher_round.webp"
|
||||
"merged": "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\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-mdpi_ic_launcher.webp.flat",
|
||||
"source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-mdpi\\ic_launcher.webp"
|
||||
"merged": "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\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\layout_activity_end.xml.flat",
|
||||
"source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\layout\\activity_end.xml"
|
||||
"merged": "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\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\drawable_screenshot_2025_01_16_115155.png.flat",
|
||||
"source": "C:\\Users\\26jacquesty\\.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-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\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-xhdpi_ic_launcher.webp.flat",
|
||||
"source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-xhdpi\\ic_launcher.webp"
|
||||
"merged": "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\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\drawable_ic_launcher_background.xml.flat",
|
||||
"source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\drawable\\ic_launcher_background.xml"
|
||||
"merged": "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\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\xml_backup_rules.xml.flat",
|
||||
"source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\xml\\backup_rules.xml"
|
||||
"merged": "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\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\drawable_ic_launcher_foreground.xml.flat",
|
||||
"source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\drawable\\ic_launcher_foreground.xml"
|
||||
"merged": "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\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\layout_activity_main.xml.flat",
|
||||
"source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\layout\\activity_main.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-xxhdpi_ic_launcher.webp.flat",
|
||||
"source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-xxhdpi\\ic_launcher.webp"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\layout_activity_tele.xml.flat",
|
||||
"source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\layout\\activity_tele.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\layout_activity_auto.xml.flat",
|
||||
"source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\layout\\activity_auto.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-hdpi_ic_launcher.webp.flat",
|
||||
"source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-hdpi\\ic_launcher.webp"
|
||||
"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"
|
||||
}
|
||||
]
|
||||
@@ -7,104 +7,167 @@
|
||||
android:layout_height="match_parent"
|
||||
tools:context=".AutoActivity">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/imageView2"
|
||||
android:layout_width="264dp"
|
||||
android:layout_height="423dp"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/textView2"
|
||||
app:srcCompat="@drawable/screenshot_2025_01_16_115155" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/button_L4"
|
||||
android:layout_width="100dp"
|
||||
android:layout_height="100dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:backgroundTint="#F94C00"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginBottom="-5dp"
|
||||
android:backgroundTint="#40FF5722"
|
||||
android:text="@string/l4"
|
||||
android:textAlignment="center"
|
||||
android:textSize="40sp"
|
||||
android:textColor="#000000"
|
||||
android:textSize="60sp"
|
||||
app:cornerRadius="0dp"
|
||||
app:layout_constraintBottom_toTopOf="@+id/button_L3"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<CheckBox
|
||||
android:id="@+id/cb_algaeReef"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:text="@string/can_remove_algae"
|
||||
app:layout_constraintBottom_toTopOf="@+id/cb_coralPickup"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
<CheckBox
|
||||
android:id="@+id/cb_coralPickup"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:text="@string/coral_pickup"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
app:layout_constraintHorizontal_bias="0.0"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="@+id/imageView2"
|
||||
app:strokeColor="#FF5722"
|
||||
app:strokeWidth="5dp" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/button_L3"
|
||||
android:layout_width="100dp"
|
||||
android:layout_height="100dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:backgroundTint="#F94C00"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:backgroundTint="#40FF5722"
|
||||
android:text="@string/l3"
|
||||
android:textSize="40sp"
|
||||
android:textColor="#000000"
|
||||
android:textSize="60sp"
|
||||
app:cornerRadius="0dp"
|
||||
app:layout_constraintBottom_toTopOf="@+id/button_L2"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/button_L4" />
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/button_L4"
|
||||
app:strokeColor="#FF5722"
|
||||
app:strokeWidth="5dp" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/button_L2"
|
||||
android:layout_width="100dp"
|
||||
android:layout_height="100dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:backgroundTint="#F94C00"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:backgroundTint="#40FF5722"
|
||||
android:text="@string/l2"
|
||||
android:textSize="40sp"
|
||||
android:textColor="#000000"
|
||||
android:textSize="60sp"
|
||||
app:cornerRadius="0dp"
|
||||
app:layout_constraintBottom_toTopOf="@+id/button_L1"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/button_L3" />
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/button_L3"
|
||||
app:strokeColor="#FF5722"
|
||||
app:strokeWidth="5dp" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/button_L1"
|
||||
android:layout_width="100dp"
|
||||
android:layout_height="100dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:backgroundTint="#F94C00"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:backgroundTint="#40FF5722"
|
||||
android:text="@string/l1"
|
||||
android:textSize="40sp"
|
||||
android:textColor="#000000"
|
||||
android:textSize="60sp"
|
||||
app:cornerRadius="0dp"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/imageView2"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/button_L2" />
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/button_L2"
|
||||
app:strokeColor="#FF5722"
|
||||
app:strokeWidth="5dp" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/button_Net"
|
||||
android:layout_width="100dp"
|
||||
android:layout_height="100dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:backgroundTint="#F94C00"
|
||||
android:text="@string/net"
|
||||
android:textSize="20sp"
|
||||
app:layout_constraintBottom_toTopOf="@+id/button_Processor"
|
||||
app:layout_constraintEnd_toEndOf="parent" />
|
||||
<TextView
|
||||
android:id="@+id/textView2"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="8dp"
|
||||
android:text="@string/auto"
|
||||
android:textSize="48sp"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/button_Processor"
|
||||
android:layout_width="150sp"
|
||||
android:layout_height="100dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:backgroundTint="#F94C00"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:backgroundTint="#402196F3"
|
||||
android:text="@string/processor"
|
||||
android:textSize="20sp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent" />
|
||||
android:textColor="#000000"
|
||||
android:textSize="34sp"
|
||||
app:cornerRadius="0dp"
|
||||
app:layout_constraintBottom_toTopOf="@+id/linearLayout"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@+id/button_Net"
|
||||
app:layout_constraintTop_toBottomOf="@+id/imageView2"
|
||||
app:strokeColor="#2196F3"
|
||||
app:strokeWidth="5dp" />
|
||||
|
||||
<CheckBox
|
||||
android:id="@+id/cb_CanLeave"
|
||||
<Button
|
||||
android:id="@+id/button_Net"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:backgroundTint="#402196F3"
|
||||
android:text="@string/net"
|
||||
android:textColor="#000000"
|
||||
android:textSize="34sp"
|
||||
app:cornerRadius="0dp"
|
||||
app:layout_constraintBottom_toTopOf="@+id/linearLayout"
|
||||
app:layout_constraintEnd_toStartOf="@+id/button_Processor"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/imageView2"
|
||||
app:strokeColor="#2196F3"
|
||||
app:strokeWidth="5dp" />
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/linearLayout"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent">
|
||||
|
||||
<CheckBox
|
||||
android:id="@+id/cb_CanLeave"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="@string/can_leave" />
|
||||
|
||||
<CheckBox
|
||||
android:id="@+id/cb_algaeReef"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="@string/can_remove_algae" />
|
||||
|
||||
<CheckBox
|
||||
android:id="@+id/cb_coralPickup"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="@string/coral_pickup" />
|
||||
</LinearLayout>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/textView3"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:text="@string/can_leave"
|
||||
app:layout_constraintBottom_toTopOf="@+id/cb_algaeReef"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:text="Hold button to \ndecrement"
|
||||
app:layout_constraintBottom_toTopOf="@+id/imageView2"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@+id/textView2"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/button_Next"
|
||||
@@ -112,102 +175,11 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:backgroundTint="#F94C00"
|
||||
android:backgroundTint="#FF5722"
|
||||
android:text="@string/next_hold"
|
||||
android:textColor="#000000"
|
||||
app:cornerRadius="0dp"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/imageView"
|
||||
android:layout_width="150dp"
|
||||
android:layout_height="450dp"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:contentDescription="@string/image_of_field"
|
||||
android:src="@drawable/screenshot_2025_01_16_115155"
|
||||
app:layout_constraintBottom_toTopOf="@+id/cb_CanLeave"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/button_Next" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/textView"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/auto"
|
||||
android:textSize="40sp"
|
||||
app:layout_constraintBottom_toTopOf="@+id/imageView"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_L4"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="32dp"
|
||||
android:text="@string/coralScored"
|
||||
android:textSize="34sp"
|
||||
app:layout_constraintEnd_toStartOf="@+id/button_L3"
|
||||
app:layout_constraintHorizontal_bias="0.0"
|
||||
app:layout_constraintStart_toEndOf="@+id/imageView"
|
||||
app:layout_constraintTop_toBottomOf="@+id/textView" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_L3"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="156dp"
|
||||
android:text="@string/coralScored"
|
||||
android:textSize="34sp"
|
||||
app:layout_constraintEnd_toStartOf="@+id/button_L3"
|
||||
app:layout_constraintHorizontal_bias="0.0"
|
||||
app:layout_constraintStart_toEndOf="@+id/imageView"
|
||||
app:layout_constraintTop_toBottomOf="@+id/textView" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_L2"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="264dp"
|
||||
android:text="@string/coralScored"
|
||||
android:textSize="34sp"
|
||||
app:layout_constraintEnd_toStartOf="@+id/button_L3"
|
||||
app:layout_constraintHorizontal_bias="0.0"
|
||||
app:layout_constraintStart_toEndOf="@+id/imageView"
|
||||
app:layout_constraintTop_toBottomOf="@+id/textView" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_L1"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="364dp"
|
||||
android:text="@string/coralScored"
|
||||
android:textSize="34sp"
|
||||
app:layout_constraintEnd_toStartOf="@+id/button_L3"
|
||||
app:layout_constraintHorizontal_bias="0.0"
|
||||
app:layout_constraintStart_toEndOf="@+id/imageView"
|
||||
app:layout_constraintTop_toBottomOf="@+id/textView" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_Net"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:text="@string/coralScored"
|
||||
android:textSize="34sp"
|
||||
app:layout_constraintBottom_toTopOf="@+id/button_Processor"
|
||||
app:layout_constraintEnd_toStartOf="@+id/button_Net"
|
||||
app:layout_constraintTop_toTopOf="@+id/button_Net" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_Net2"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:text="@string/coralScored"
|
||||
android:textSize="34sp"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/button_Processor"
|
||||
app:layout_constraintEnd_toStartOf="@+id/button_Processor"
|
||||
app:layout_constraintTop_toTopOf="@+id/button_Processor" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
@@ -5,100 +5,169 @@
|
||||
android:id="@+id/main"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
tools:context=".TeleActivity">
|
||||
tools:context=".AutoActivity">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/imageView2"
|
||||
android:layout_width="264dp"
|
||||
android:layout_height="423dp"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/textView2"
|
||||
app:srcCompat="@drawable/screenshot_2025_01_16_115155" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/button_L4"
|
||||
android:layout_width="100dp"
|
||||
android:layout_height="100dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:text="L4"
|
||||
android:textAlignment="center"
|
||||
android:textSize="40sp"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginBottom="-5dp"
|
||||
android:backgroundTint="#40FF5722"
|
||||
android:text="@string/l4"
|
||||
android:textColor="#000000"
|
||||
android:textSize="60sp"
|
||||
app:cornerRadius="0dp"
|
||||
app:layout_constraintBottom_toTopOf="@+id/button_L3"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<CheckBox
|
||||
android:id="@+id/cb_algaeReef"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:text="Can Remove Algae"
|
||||
app:layout_constraintBottom_toTopOf="@+id/cb_coralPickup"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
<CheckBox
|
||||
android:id="@+id/cb_coralPickup"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:text="Coral Pickup"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
app:layout_constraintHorizontal_bias="0.0"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="@+id/imageView2"
|
||||
app:strokeColor="#FF5722"
|
||||
app:strokeWidth="5dp" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/button_L3"
|
||||
android:layout_width="100dp"
|
||||
android:layout_height="100dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:text="L3"
|
||||
android:textSize="40sp"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:backgroundTint="#40FF5722"
|
||||
android:text="@string/l3"
|
||||
android:textColor="#000000"
|
||||
android:textSize="60sp"
|
||||
app:cornerRadius="0dp"
|
||||
app:layout_constraintBottom_toTopOf="@+id/button_L2"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/button_L4" />
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/button_L4"
|
||||
app:strokeColor="#FF5722"
|
||||
app:strokeWidth="5dp" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/button_L2"
|
||||
android:layout_width="100dp"
|
||||
android:layout_height="100dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:text="L2"
|
||||
android:textSize="40sp"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:backgroundTint="#40FF5722"
|
||||
android:text="@string/l2"
|
||||
android:textColor="#000000"
|
||||
android:textSize="60sp"
|
||||
app:cornerRadius="0dp"
|
||||
app:layout_constraintBottom_toTopOf="@+id/button_L1"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/button_L3" />
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/button_L3"
|
||||
app:strokeColor="#FF5722"
|
||||
app:strokeWidth="5dp" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/button_L1"
|
||||
android:layout_width="100dp"
|
||||
android:layout_height="100dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:text="L1"
|
||||
android:textSize="40sp"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:backgroundTint="#40FF5722"
|
||||
android:text="@string/l1"
|
||||
android:textColor="#000000"
|
||||
android:textSize="60sp"
|
||||
app:cornerRadius="0dp"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/imageView2"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/button_L2" />
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/button_L2"
|
||||
app:strokeColor="#FF5722"
|
||||
app:strokeWidth="5dp" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/button_Net"
|
||||
android:layout_width="100dp"
|
||||
android:layout_height="100dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:text="Net"
|
||||
android:textSize="20sp"
|
||||
app:layout_constraintBottom_toTopOf="@+id/button_Processor"
|
||||
app:layout_constraintEnd_toEndOf="parent" />
|
||||
<TextView
|
||||
android:id="@+id/textView2"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="8dp"
|
||||
android:text="Tele"
|
||||
android:textSize="48sp"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/button_Processor"
|
||||
android:layout_width="150sp"
|
||||
android:layout_height="100dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:text="Processor"
|
||||
android:textSize="20sp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent" />
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:backgroundTint="#402196F3"
|
||||
android:text="@string/processor"
|
||||
android:textColor="#000000"
|
||||
android:textSize="34sp"
|
||||
app:cornerRadius="0dp"
|
||||
app:layout_constraintBottom_toTopOf="@+id/linearLayout"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@+id/button_Net"
|
||||
app:layout_constraintTop_toBottomOf="@+id/imageView2"
|
||||
app:strokeColor="#2196F3"
|
||||
app:strokeWidth="5dp" />
|
||||
|
||||
<CheckBox
|
||||
android:id="@+id/cb_CanLeave"
|
||||
<Button
|
||||
android:id="@+id/button_Net"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:backgroundTint="#402196F3"
|
||||
android:text="@string/net"
|
||||
android:textColor="#000000"
|
||||
android:textSize="34sp"
|
||||
app:cornerRadius="0dp"
|
||||
app:layout_constraintBottom_toTopOf="@+id/linearLayout"
|
||||
app:layout_constraintEnd_toStartOf="@+id/button_Processor"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/imageView2"
|
||||
app:strokeColor="#2196F3"
|
||||
app:strokeWidth="5dp" />
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/linearLayout"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent">
|
||||
|
||||
<CheckBox
|
||||
android:id="@+id/cb_CanLeave"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="@string/can_leave" />
|
||||
|
||||
<CheckBox
|
||||
android:id="@+id/cb_algaeReef"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="@string/can_remove_algae" />
|
||||
|
||||
<CheckBox
|
||||
android:id="@+id/cb_coralPickup"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="@string/coral_pickup" />
|
||||
</LinearLayout>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/textView3"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:text="Can Leave"
|
||||
app:layout_constraintBottom_toTopOf="@+id/cb_algaeReef"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:text="Hold button to \ndecrement"
|
||||
app:layout_constraintBottom_toTopOf="@+id/imageView2"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@+id/textView2"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/button_Next"
|
||||
@@ -106,34 +175,10 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:text="Next (Hold)"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/imageView"
|
||||
android:layout_width="277dp"
|
||||
android:layout_height="476dp"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginTop="64dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
app:layout_constraintBottom_toTopOf="@+id/cb_CanLeave"
|
||||
app:layout_constraintEnd_toStartOf="@+id/button_L2"
|
||||
app:layout_constraintHorizontal_bias="0.0"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintVertical_bias="0.0"
|
||||
tools:srcCompat="@tools:sample/avatars" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/textView"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Tele"
|
||||
android:textSize="40sp"
|
||||
app:layout_constraintBottom_toTopOf="@+id/imageView"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
android:backgroundTint="#FF5722"
|
||||
android:text="@string/next_hold"
|
||||
android:textColor="#000000"
|
||||
app:cornerRadius="0dp"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
<string name="auto">Auto</string>
|
||||
<string name="can_leave">Can Leave</string>
|
||||
<string name="can_remove_algae">Can Remove Algae</string>
|
||||
<string name="coralScored">%dx</string>
|
||||
<string name="coralScored">%s%dx</string>
|
||||
<string name="coral_pickup">Coral Pickup</string>
|
||||
<string name="image_of_field">Image of field</string>
|
||||
<string name="l1">L1</string>
|
||||
|
||||
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.
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -3351,7 +3351,7 @@ id ifRoom
|
||||
id ignore
|
||||
id ignoreRequest
|
||||
id image
|
||||
id imageView
|
||||
id imageView2
|
||||
id immediateStop
|
||||
id included
|
||||
id indeterminate
|
||||
@@ -3370,6 +3370,7 @@ id legacy
|
||||
id line1
|
||||
id line3
|
||||
id linear
|
||||
id linearLayout
|
||||
id listMode
|
||||
id list_item
|
||||
id m3_side_sheet
|
||||
@@ -3585,7 +3586,7 @@ id textSpacerNoButtons
|
||||
id textSpacerNoTitle
|
||||
id textStart
|
||||
id textTop
|
||||
id textView
|
||||
id textView2
|
||||
id textView3
|
||||
id text_input_end_icon
|
||||
id text_input_error_icon
|
||||
@@ -3615,12 +3616,6 @@ id transition_position
|
||||
id transition_scene_layoutid_cache
|
||||
id transition_transform
|
||||
id triangle
|
||||
id tv_L1
|
||||
id tv_L2
|
||||
id tv_L3
|
||||
id tv_L4
|
||||
id tv_Net
|
||||
id tv_Net2
|
||||
id unchecked
|
||||
id uniform
|
||||
id unlabeled
|
||||
|
||||
Reference in New Issue
Block a user