This commit is contained in:
2025-10-20 09:38:00 -04:00
parent 1a0cfa27f0
commit d14b8705ac
165 changed files with 2586 additions and 2580 deletions

View File

@@ -1,33 +1,33 @@
#Sat Dec 13 19:34:44 EST 2025 #Sat Oct 18 21:31:30 EDT 2025
com.example.scoutingapp-main-33\:/drawable/_025_reefscape_transparent_background.png=C\:\\Users\\cayde\\Desktop\\ScoutingApp\\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.png=C\:\\Users\\cayde\\Desktop\\Scouting\\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_blue.webp=C\:\\Users\\cayde\\Desktop\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable__025_reefscape_transparent_background_blue.webp.flat com.example.scoutingapp-main-33\:/drawable/_025_reefscape_transparent_background_blue.webp=C\:\\Users\\cayde\\Desktop\\Scouting\\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\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_ic_launcher_background.xml.flat com.example.scoutingapp-main-33\:/drawable/ic_launcher_background.xml=C\:\\Users\\cayde\\Desktop\\Scouting\\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\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_ic_launcher_foreground.xml.flat com.example.scoutingapp-main-33\:/drawable/ic_launcher_foreground.xml=C\:\\Users\\cayde\\Desktop\\Scouting\\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\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_loop.png.flat com.example.scoutingapp-main-33\:/drawable/loop.png=C\:\\Users\\cayde\\Desktop\\Scouting\\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\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_screenshot_2025_01_16_115155.webp.flat com.example.scoutingapp-main-33\:/drawable/screenshot_2025_01_16_115155.webp=C\:\\Users\\cayde\\Desktop\\Scouting\\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\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_activity_auto.xml.flat com.example.scoutingapp-main-33\:/layout/activity_auto.xml=C\:\\Users\\cayde\\Desktop\\Scouting\\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\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_activity_end.xml.flat com.example.scoutingapp-main-33\:/layout/activity_end.xml=C\:\\Users\\cayde\\Desktop\\Scouting\\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\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_activity_main.xml.flat com.example.scoutingapp-main-33\:/layout/activity_main.xml=C\:\\Users\\cayde\\Desktop\\Scouting\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_activity_main.xml.flat
com.example.scoutingapp-main-33\:/layout/activity_settings.xml=C\:\\Users\\cayde\\Desktop\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_activity_settings.xml.flat com.example.scoutingapp-main-33\:/layout/activity_settings.xml=C\:\\Users\\cayde\\Desktop\\Scouting\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_activity_settings.xml.flat
com.example.scoutingapp-main-33\:/layout/activity_starting.xml=C\:\\Users\\cayde\\Desktop\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_activity_starting.xml.flat com.example.scoutingapp-main-33\:/layout/activity_starting.xml=C\:\\Users\\cayde\\Desktop\\Scouting\\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\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_activity_tele.xml.flat com.example.scoutingapp-main-33\:/layout/activity_tele.xml=C\:\\Users\\cayde\\Desktop\\Scouting\\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\\ScoutingApp\\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.xml=C\:\\Users\\cayde\\Desktop\\Scouting\\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\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-anydpi-v26_ic_launcher_round.xml.flat com.example.scoutingapp-main-33\:/mipmap-anydpi-v26/ic_launcher_round.xml=C\:\\Users\\cayde\\Desktop\\Scouting\\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\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-hdpi_ic_launcher.webp.flat com.example.scoutingapp-main-33\:/mipmap-hdpi/ic_launcher.webp=C\:\\Users\\cayde\\Desktop\\Scouting\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-hdpi_ic_launcher.webp.flat
com.example.scoutingapp-main-33\:/mipmap-hdpi/ic_launcher_foreground.webp=C\:\\Users\\cayde\\Desktop\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-hdpi_ic_launcher_foreground.webp.flat com.example.scoutingapp-main-33\:/mipmap-hdpi/ic_launcher_foreground.webp=C\:\\Users\\cayde\\Desktop\\Scouting\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-hdpi_ic_launcher_foreground.webp.flat
com.example.scoutingapp-main-33\:/mipmap-hdpi/ic_launcher_round.webp=C\:\\Users\\cayde\\Desktop\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-hdpi_ic_launcher_round.webp.flat com.example.scoutingapp-main-33\:/mipmap-hdpi/ic_launcher_round.webp=C\:\\Users\\cayde\\Desktop\\Scouting\\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\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-mdpi_ic_launcher.webp.flat com.example.scoutingapp-main-33\:/mipmap-mdpi/ic_launcher.webp=C\:\\Users\\cayde\\Desktop\\Scouting\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-mdpi_ic_launcher.webp.flat
com.example.scoutingapp-main-33\:/mipmap-mdpi/ic_launcher_foreground.webp=C\:\\Users\\cayde\\Desktop\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-mdpi_ic_launcher_foreground.webp.flat com.example.scoutingapp-main-33\:/mipmap-mdpi/ic_launcher_foreground.webp=C\:\\Users\\cayde\\Desktop\\Scouting\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-mdpi_ic_launcher_foreground.webp.flat
com.example.scoutingapp-main-33\:/mipmap-mdpi/ic_launcher_round.webp=C\:\\Users\\cayde\\Desktop\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-mdpi_ic_launcher_round.webp.flat com.example.scoutingapp-main-33\:/mipmap-mdpi/ic_launcher_round.webp=C\:\\Users\\cayde\\Desktop\\Scouting\\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\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-xhdpi_ic_launcher.webp.flat com.example.scoutingapp-main-33\:/mipmap-xhdpi/ic_launcher.webp=C\:\\Users\\cayde\\Desktop\\Scouting\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-xhdpi_ic_launcher.webp.flat
com.example.scoutingapp-main-33\:/mipmap-xhdpi/ic_launcher_foreground.webp=C\:\\Users\\cayde\\Desktop\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-xhdpi_ic_launcher_foreground.webp.flat com.example.scoutingapp-main-33\:/mipmap-xhdpi/ic_launcher_foreground.webp=C\:\\Users\\cayde\\Desktop\\Scouting\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-xhdpi_ic_launcher_foreground.webp.flat
com.example.scoutingapp-main-33\:/mipmap-xhdpi/ic_launcher_round.webp=C\:\\Users\\cayde\\Desktop\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-xhdpi_ic_launcher_round.webp.flat com.example.scoutingapp-main-33\:/mipmap-xhdpi/ic_launcher_round.webp=C\:\\Users\\cayde\\Desktop\\Scouting\\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\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-xxhdpi_ic_launcher.webp.flat com.example.scoutingapp-main-33\:/mipmap-xxhdpi/ic_launcher.webp=C\:\\Users\\cayde\\Desktop\\Scouting\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-xxhdpi_ic_launcher.webp.flat
com.example.scoutingapp-main-33\:/mipmap-xxhdpi/ic_launcher_foreground.webp=C\:\\Users\\cayde\\Desktop\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-xxhdpi_ic_launcher_foreground.webp.flat com.example.scoutingapp-main-33\:/mipmap-xxhdpi/ic_launcher_foreground.webp=C\:\\Users\\cayde\\Desktop\\Scouting\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-xxhdpi_ic_launcher_foreground.webp.flat
com.example.scoutingapp-main-33\:/mipmap-xxhdpi/ic_launcher_round.webp=C\:\\Users\\cayde\\Desktop\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-xxhdpi_ic_launcher_round.webp.flat com.example.scoutingapp-main-33\:/mipmap-xxhdpi/ic_launcher_round.webp=C\:\\Users\\cayde\\Desktop\\Scouting\\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\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-xxxhdpi_ic_launcher.webp.flat com.example.scoutingapp-main-33\:/mipmap-xxxhdpi/ic_launcher.webp=C\:\\Users\\cayde\\Desktop\\Scouting\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-xxxhdpi_ic_launcher.webp.flat
com.example.scoutingapp-main-33\:/mipmap-xxxhdpi/ic_launcher_foreground.webp=C\:\\Users\\cayde\\Desktop\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-xxxhdpi_ic_launcher_foreground.webp.flat com.example.scoutingapp-main-33\:/mipmap-xxxhdpi/ic_launcher_foreground.webp=C\:\\Users\\cayde\\Desktop\\Scouting\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-xxxhdpi_ic_launcher_foreground.webp.flat
com.example.scoutingapp-main-33\:/mipmap-xxxhdpi/ic_launcher_round.webp=C\:\\Users\\cayde\\Desktop\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-xxxhdpi_ic_launcher_round.webp.flat com.example.scoutingapp-main-33\:/mipmap-xxxhdpi/ic_launcher_round.webp=C\:\\Users\\cayde\\Desktop\\Scouting\\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\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\raw_info.json.flat com.example.scoutingapp-main-33\:/raw/info.json=C\:\\Users\\cayde\\Desktop\\Scouting\\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\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\xml_backup_rules.xml.flat com.example.scoutingapp-main-33\:/xml/backup_rules.xml=C\:\\Users\\cayde\\Desktop\\Scouting\\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\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\xml_data_extraction_rules.xml.flat com.example.scoutingapp-main-33\:/xml/data_extraction_rules.xml=C\:\\Users\\cayde\\Desktop\\Scouting\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\xml_data_extraction_rules.xml.flat

View File

@@ -959,8 +959,6 @@
<color name="switch_thumb_disabled_material_light">#ffbdbdbd</color> <color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
<color name="switch_thumb_normal_material_dark">#ffbdbdbd</color> <color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
<color name="switch_thumb_normal_material_light">#fff1f1f1</color> <color name="switch_thumb_normal_material_light">#fff1f1f1</color>
<color name="team4564silver1">#DFDFDF</color>
<color name="team4564silver2">#ACACAC</color>
<color name="tooltip_background_dark">#e6616161</color> <color name="tooltip_background_dark">#e6616161</color>
<color name="tooltip_background_light">#e6FFFFFF</color> <color name="tooltip_background_light">#e6FFFFFF</color>
<color name="white">#FFFFFFFF</color> <color name="white">#FFFFFFFF</color>
@@ -1998,6 +1996,7 @@
<string name="call_notification_incoming_text">Incoming call</string> <string name="call_notification_incoming_text">Incoming call</string>
<string name="call_notification_ongoing_text">Ongoing call</string> <string name="call_notification_ongoing_text">Ongoing call</string>
<string name="call_notification_screening_text">Screening an incoming call</string> <string name="call_notification_screening_text">Screening an incoming call</string>
<string name="can_leave">Can Leave</string>
<string name="can_remove_algae">Can Remove Algae</string> <string name="can_remove_algae">Can Remove Algae</string>
<string name="character_counter_content_description">Characters entered %1$d of %2$d</string> <string name="character_counter_content_description">Characters entered %1$d of %2$d</string>
<string name="character_counter_overflowed_content_description">Character limit exceeded %1$d of %2$d</string> <string name="character_counter_overflowed_content_description">Character limit exceeded %1$d of %2$d</string>

File diff suppressed because one or more lines are too long

View File

@@ -1,33 +1,33 @@
#Sat Dec 13 19:34:44 EST 2025 #Sat Oct 18 21:31:31 EDT 2025
com.example.scoutingapp-main-5\:/drawable/_025_reefscape_transparent_background.png=C\:\\Users\\cayde\\Desktop\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\_025_reefscape_transparent_background.png com.example.scoutingapp-main-5\:/drawable/_025_reefscape_transparent_background.png=C\:\\Users\\cayde\\Desktop\\Scouting\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\_025_reefscape_transparent_background.png
com.example.scoutingapp-main-5\:/drawable/_025_reefscape_transparent_background_blue.webp=C\:\\Users\\cayde\\Desktop\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\_025_reefscape_transparent_background_blue.webp com.example.scoutingapp-main-5\:/drawable/_025_reefscape_transparent_background_blue.webp=C\:\\Users\\cayde\\Desktop\\Scouting\\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\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\ic_launcher_background.xml com.example.scoutingapp-main-5\:/drawable/ic_launcher_background.xml=C\:\\Users\\cayde\\Desktop\\Scouting\\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\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\ic_launcher_foreground.xml com.example.scoutingapp-main-5\:/drawable/ic_launcher_foreground.xml=C\:\\Users\\cayde\\Desktop\\Scouting\\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\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\loop.png com.example.scoutingapp-main-5\:/drawable/loop.png=C\:\\Users\\cayde\\Desktop\\Scouting\\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\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\screenshot_2025_01_16_115155.webp com.example.scoutingapp-main-5\:/drawable/screenshot_2025_01_16_115155.webp=C\:\\Users\\cayde\\Desktop\\Scouting\\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\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\activity_auto.xml com.example.scoutingapp-main-5\:/layout/activity_auto.xml=C\:\\Users\\cayde\\Desktop\\Scouting\\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\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\activity_end.xml com.example.scoutingapp-main-5\:/layout/activity_end.xml=C\:\\Users\\cayde\\Desktop\\Scouting\\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\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\activity_main.xml com.example.scoutingapp-main-5\:/layout/activity_main.xml=C\:\\Users\\cayde\\Desktop\\Scouting\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\activity_main.xml
com.example.scoutingapp-main-5\:/layout/activity_settings.xml=C\:\\Users\\cayde\\Desktop\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\activity_settings.xml com.example.scoutingapp-main-5\:/layout/activity_settings.xml=C\:\\Users\\cayde\\Desktop\\Scouting\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\activity_settings.xml
com.example.scoutingapp-main-5\:/layout/activity_starting.xml=C\:\\Users\\cayde\\Desktop\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\activity_starting.xml com.example.scoutingapp-main-5\:/layout/activity_starting.xml=C\:\\Users\\cayde\\Desktop\\Scouting\\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\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\activity_tele.xml com.example.scoutingapp-main-5\:/layout/activity_tele.xml=C\:\\Users\\cayde\\Desktop\\Scouting\\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\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-anydpi-v26\\ic_launcher.xml com.example.scoutingapp-main-5\:/mipmap-anydpi-v26/ic_launcher.xml=C\:\\Users\\cayde\\Desktop\\Scouting\\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\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-anydpi-v26\\ic_launcher_round.xml com.example.scoutingapp-main-5\:/mipmap-anydpi-v26/ic_launcher_round.xml=C\:\\Users\\cayde\\Desktop\\Scouting\\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\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-hdpi-v4\\ic_launcher.webp com.example.scoutingapp-main-5\:/mipmap-hdpi/ic_launcher.webp=C\:\\Users\\cayde\\Desktop\\Scouting\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-hdpi-v4\\ic_launcher.webp
com.example.scoutingapp-main-5\:/mipmap-hdpi/ic_launcher_foreground.webp=C\:\\Users\\cayde\\Desktop\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-hdpi-v4\\ic_launcher_foreground.webp com.example.scoutingapp-main-5\:/mipmap-hdpi/ic_launcher_foreground.webp=C\:\\Users\\cayde\\Desktop\\Scouting\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-hdpi-v4\\ic_launcher_foreground.webp
com.example.scoutingapp-main-5\:/mipmap-hdpi/ic_launcher_round.webp=C\:\\Users\\cayde\\Desktop\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-hdpi-v4\\ic_launcher_round.webp com.example.scoutingapp-main-5\:/mipmap-hdpi/ic_launcher_round.webp=C\:\\Users\\cayde\\Desktop\\Scouting\\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\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-mdpi-v4\\ic_launcher.webp com.example.scoutingapp-main-5\:/mipmap-mdpi/ic_launcher.webp=C\:\\Users\\cayde\\Desktop\\Scouting\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-mdpi-v4\\ic_launcher.webp
com.example.scoutingapp-main-5\:/mipmap-mdpi/ic_launcher_foreground.webp=C\:\\Users\\cayde\\Desktop\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-mdpi-v4\\ic_launcher_foreground.webp com.example.scoutingapp-main-5\:/mipmap-mdpi/ic_launcher_foreground.webp=C\:\\Users\\cayde\\Desktop\\Scouting\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-mdpi-v4\\ic_launcher_foreground.webp
com.example.scoutingapp-main-5\:/mipmap-mdpi/ic_launcher_round.webp=C\:\\Users\\cayde\\Desktop\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-mdpi-v4\\ic_launcher_round.webp com.example.scoutingapp-main-5\:/mipmap-mdpi/ic_launcher_round.webp=C\:\\Users\\cayde\\Desktop\\Scouting\\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\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-xhdpi-v4\\ic_launcher.webp com.example.scoutingapp-main-5\:/mipmap-xhdpi/ic_launcher.webp=C\:\\Users\\cayde\\Desktop\\Scouting\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-xhdpi-v4\\ic_launcher.webp
com.example.scoutingapp-main-5\:/mipmap-xhdpi/ic_launcher_foreground.webp=C\:\\Users\\cayde\\Desktop\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-xhdpi-v4\\ic_launcher_foreground.webp com.example.scoutingapp-main-5\:/mipmap-xhdpi/ic_launcher_foreground.webp=C\:\\Users\\cayde\\Desktop\\Scouting\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-xhdpi-v4\\ic_launcher_foreground.webp
com.example.scoutingapp-main-5\:/mipmap-xhdpi/ic_launcher_round.webp=C\:\\Users\\cayde\\Desktop\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-xhdpi-v4\\ic_launcher_round.webp com.example.scoutingapp-main-5\:/mipmap-xhdpi/ic_launcher_round.webp=C\:\\Users\\cayde\\Desktop\\Scouting\\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\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-xxhdpi-v4\\ic_launcher.webp com.example.scoutingapp-main-5\:/mipmap-xxhdpi/ic_launcher.webp=C\:\\Users\\cayde\\Desktop\\Scouting\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-xxhdpi-v4\\ic_launcher.webp
com.example.scoutingapp-main-5\:/mipmap-xxhdpi/ic_launcher_foreground.webp=C\:\\Users\\cayde\\Desktop\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-xxhdpi-v4\\ic_launcher_foreground.webp com.example.scoutingapp-main-5\:/mipmap-xxhdpi/ic_launcher_foreground.webp=C\:\\Users\\cayde\\Desktop\\Scouting\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-xxhdpi-v4\\ic_launcher_foreground.webp
com.example.scoutingapp-main-5\:/mipmap-xxhdpi/ic_launcher_round.webp=C\:\\Users\\cayde\\Desktop\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-xxhdpi-v4\\ic_launcher_round.webp com.example.scoutingapp-main-5\:/mipmap-xxhdpi/ic_launcher_round.webp=C\:\\Users\\cayde\\Desktop\\Scouting\\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\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-xxxhdpi-v4\\ic_launcher.webp com.example.scoutingapp-main-5\:/mipmap-xxxhdpi/ic_launcher.webp=C\:\\Users\\cayde\\Desktop\\Scouting\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-xxxhdpi-v4\\ic_launcher.webp
com.example.scoutingapp-main-5\:/mipmap-xxxhdpi/ic_launcher_foreground.webp=C\:\\Users\\cayde\\Desktop\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-xxxhdpi-v4\\ic_launcher_foreground.webp com.example.scoutingapp-main-5\:/mipmap-xxxhdpi/ic_launcher_foreground.webp=C\:\\Users\\cayde\\Desktop\\Scouting\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-xxxhdpi-v4\\ic_launcher_foreground.webp
com.example.scoutingapp-main-5\:/mipmap-xxxhdpi/ic_launcher_round.webp=C\:\\Users\\cayde\\Desktop\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-xxxhdpi-v4\\ic_launcher_round.webp com.example.scoutingapp-main-5\:/mipmap-xxxhdpi/ic_launcher_round.webp=C\:\\Users\\cayde\\Desktop\\Scouting\\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\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\raw\\info.json com.example.scoutingapp-main-5\:/raw/info.json=C\:\\Users\\cayde\\Desktop\\Scouting\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\raw\\info.json
com.example.scoutingapp-main-5\:/xml/backup_rules.xml=C\:\\Users\\cayde\\Desktop\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\xml\\backup_rules.xml com.example.scoutingapp-main-5\:/xml/backup_rules.xml=C\:\\Users\\cayde\\Desktop\\Scouting\\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\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\xml\\data_extraction_rules.xml com.example.scoutingapp-main-5\:/xml/data_extraction_rules.xml=C\:\\Users\\cayde\\Desktop\\Scouting\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\xml\\data_extraction_rules.xml

View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="Base.Theme.ScoutingApp" parent="Theme.Material3.DayNight.NoActionBar">
</style>
</resources>

View File

@@ -2,11 +2,10 @@
<resources> <resources>
<color name="black">#FF000000</color> <color name="black">#FF000000</color>
<color name="ic_launcher_background">#000000</color> <color name="ic_launcher_background">#000000</color>
<color name="team4564silver1">#DFDFDF</color>
<color name="team4564silver2">#ACACAC</color>
<color name="white">#FFFFFFFF</color> <color name="white">#FFFFFFFF</color>
<string name="app_name">Scouting App</string> <string name="app_name">Scouting App</string>
<string name="auto">Auto</string> <string name="auto">Auto</string>
<string name="can_leave">Can Leave</string>
<string name="can_remove_algae">Can Remove Algae</string> <string name="can_remove_algae">Can Remove Algae</string>
<string name="coralScored">%s%dx</string> <string name="coralScored">%s%dx</string>
<string name="coral_pickup">Coral Pickup</string> <string name="coral_pickup">Coral Pickup</string>

File diff suppressed because one or more lines are too long

View File

@@ -1,8 +1,8 @@
#Sat Dec 13 19:46:44 EST 2025 #Mon Oct 20 09:35:28 EDT 2025
base.0=C\:\\Users\\cayde\\Desktop\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes.dex base.0=C\:\\Users\\cayde\\Desktop\\Scouting\\ScoutingApp\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes.dex
base.1=C\:\\Users\\cayde\\Desktop\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex base.1=C\:\\Users\\cayde\\Desktop\\Scouting\\ScoutingApp\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex
base.2=C\:\\Users\\cayde\\Desktop\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\4\\classes.dex base.2=C\:\\Users\\cayde\\Desktop\\Scouting\\ScoutingApp\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\4\\classes.dex
base.3=C\:\\Users\\cayde\\Desktop\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes2.dex base.3=C\:\\Users\\cayde\\Desktop\\Scouting\\ScoutingApp\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes2.dex
path.0=classes.dex path.0=classes.dex
path.1=0/classes.dex path.1=0/classes.dex
path.2=4/classes.dex path.2=4/classes.dex

View File

@@ -2,8 +2,6 @@ R_DEF: Internal format may change without notice
local local
color black color black
color ic_launcher_background color ic_launcher_background
color team4564silver1
color team4564silver2
color white color white
drawable _025_reefscape_transparent_background drawable _025_reefscape_transparent_background
drawable _025_reefscape_transparent_background_blue drawable _025_reefscape_transparent_background_blue
@@ -77,6 +75,7 @@ mipmap ic_launcher_round
raw info raw info
string app_name string app_name
string auto string auto
string can_leave
string can_remove_algae string can_remove_algae
string coralScored string coralScored
string coral_pickup string coral_pickup

View File

@@ -9,14 +9,14 @@
9 android:targetSdkVersion="34" /> 9 android:targetSdkVersion="34" />
10 10
11 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> 11 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
11-->C:\Users\cayde\Desktop\ScoutingApp\ScoutingApp\app\src\main\AndroidManifest.xml:5:5-79 11-->C:\Users\cayde\Desktop\Scouting\ScoutingApp\app\src\main\AndroidManifest.xml:5:5-79
11-->C:\Users\cayde\Desktop\ScoutingApp\ScoutingApp\app\src\main\AndroidManifest.xml:5:22-76 11-->C:\Users\cayde\Desktop\Scouting\ScoutingApp\app\src\main\AndroidManifest.xml:5:22-76
12 <uses-permission android:name="android.permission.INTERNET" /> 12 <uses-permission android:name="android.permission.INTERNET" />
12-->C:\Users\cayde\Desktop\ScoutingApp\ScoutingApp\app\src\main\AndroidManifest.xml:6:5-67 12-->C:\Users\cayde\Desktop\Scouting\ScoutingApp\app\src\main\AndroidManifest.xml:6:5-67
12-->C:\Users\cayde\Desktop\ScoutingApp\ScoutingApp\app\src\main\AndroidManifest.xml:6:22-64 12-->C:\Users\cayde\Desktop\Scouting\ScoutingApp\app\src\main\AndroidManifest.xml:6:22-64
13 <uses-permission android:name="android.permission.VIBRATE" /> 13 <uses-permission android:name="android.permission.VIBRATE" />
13-->C:\Users\cayde\Desktop\ScoutingApp\ScoutingApp\app\src\main\AndroidManifest.xml:7:5-66 13-->C:\Users\cayde\Desktop\Scouting\ScoutingApp\app\src\main\AndroidManifest.xml:7:5-66
13-->C:\Users\cayde\Desktop\ScoutingApp\ScoutingApp\app\src\main\AndroidManifest.xml:7:22-63 13-->C:\Users\cayde\Desktop\Scouting\ScoutingApp\app\src\main\AndroidManifest.xml:7:22-63
14 14
15 <permission 15 <permission
15-->[androidx.core:core:1.13.0] C:\Users\cayde\.gradle\caches\8.13\transforms\e14d9122d45fb71ea63e5eedb2149f5e\transformed\core-1.13.0\AndroidManifest.xml:22:5-24:47 15-->[androidx.core:core:1.13.0] C:\Users\cayde\.gradle\caches\8.13\transforms\e14d9122d45fb71ea63e5eedb2149f5e\transformed\core-1.13.0\AndroidManifest.xml:22:5-24:47
@@ -30,73 +30,73 @@
19-->[androidx.core:core:1.13.0] C:\Users\cayde\.gradle\caches\8.13\transforms\e14d9122d45fb71ea63e5eedb2149f5e\transformed\core-1.13.0\AndroidManifest.xml:26:22-94 19-->[androidx.core:core:1.13.0] C:\Users\cayde\.gradle\caches\8.13\transforms\e14d9122d45fb71ea63e5eedb2149f5e\transformed\core-1.13.0\AndroidManifest.xml:26:22-94
20 20
21 <application 21 <application
21-->C:\Users\cayde\Desktop\ScoutingApp\ScoutingApp\app\src\main\AndroidManifest.xml:9:5-43:19 21-->C:\Users\cayde\Desktop\Scouting\ScoutingApp\app\src\main\AndroidManifest.xml:9:5-43:19
22 android:allowBackup="true" 22 android:allowBackup="true"
22-->C:\Users\cayde\Desktop\ScoutingApp\ScoutingApp\app\src\main\AndroidManifest.xml:10:9-35 22-->C:\Users\cayde\Desktop\Scouting\ScoutingApp\app\src\main\AndroidManifest.xml:10:9-35
23 android:appComponentFactory="androidx.core.app.CoreComponentFactory" 23 android:appComponentFactory="androidx.core.app.CoreComponentFactory"
23-->[androidx.core:core:1.13.0] C:\Users\cayde\.gradle\caches\8.13\transforms\e14d9122d45fb71ea63e5eedb2149f5e\transformed\core-1.13.0\AndroidManifest.xml:28:18-86 23-->[androidx.core:core:1.13.0] C:\Users\cayde\.gradle\caches\8.13\transforms\e14d9122d45fb71ea63e5eedb2149f5e\transformed\core-1.13.0\AndroidManifest.xml:28:18-86
24 android:dataExtractionRules="@xml/data_extraction_rules" 24 android:dataExtractionRules="@xml/data_extraction_rules"
24-->C:\Users\cayde\Desktop\ScoutingApp\ScoutingApp\app\src\main\AndroidManifest.xml:11:9-65 24-->C:\Users\cayde\Desktop\Scouting\ScoutingApp\app\src\main\AndroidManifest.xml:11:9-65
25 android:debuggable="true" 25 android:debuggable="true"
26 android:extractNativeLibs="false" 26 android:extractNativeLibs="false"
27 android:fullBackupContent="@xml/backup_rules" 27 android:fullBackupContent="@xml/backup_rules"
27-->C:\Users\cayde\Desktop\ScoutingApp\ScoutingApp\app\src\main\AndroidManifest.xml:12:9-54 27-->C:\Users\cayde\Desktop\Scouting\ScoutingApp\app\src\main\AndroidManifest.xml:12:9-54
28 android:icon="@mipmap/ic_launcher" 28 android:icon="@mipmap/ic_launcher"
28-->C:\Users\cayde\Desktop\ScoutingApp\ScoutingApp\app\src\main\AndroidManifest.xml:13:9-43 28-->C:\Users\cayde\Desktop\Scouting\ScoutingApp\app\src\main\AndroidManifest.xml:13:9-43
29 android:label="@string/app_name" 29 android:label="@string/app_name"
29-->C:\Users\cayde\Desktop\ScoutingApp\ScoutingApp\app\src\main\AndroidManifest.xml:14:9-41 29-->C:\Users\cayde\Desktop\Scouting\ScoutingApp\app\src\main\AndroidManifest.xml:14:9-41
30 android:roundIcon="@mipmap/ic_launcher_round" 30 android:roundIcon="@mipmap/ic_launcher_round"
30-->C:\Users\cayde\Desktop\ScoutingApp\ScoutingApp\app\src\main\AndroidManifest.xml:15:9-54 30-->C:\Users\cayde\Desktop\Scouting\ScoutingApp\app\src\main\AndroidManifest.xml:15:9-54
31 android:supportsRtl="true" 31 android:supportsRtl="true"
31-->C:\Users\cayde\Desktop\ScoutingApp\ScoutingApp\app\src\main\AndroidManifest.xml:16:9-35 31-->C:\Users\cayde\Desktop\Scouting\ScoutingApp\app\src\main\AndroidManifest.xml:16:9-35
32 android:testOnly="true" 32 android:testOnly="true"
33 android:theme="@style/Theme.ScoutingApp" > 33 android:theme="@style/Theme.ScoutingApp" >
33-->C:\Users\cayde\Desktop\ScoutingApp\ScoutingApp\app\src\main\AndroidManifest.xml:17:9-49 33-->C:\Users\cayde\Desktop\Scouting\ScoutingApp\app\src\main\AndroidManifest.xml:17:9-49
34 <activity 34 <activity
34-->C:\Users\cayde\Desktop\ScoutingApp\ScoutingApp\app\src\main\AndroidManifest.xml:19:9-21:40 34-->C:\Users\cayde\Desktop\Scouting\ScoutingApp\app\src\main\AndroidManifest.xml:19:9-21:40
35 android:name="com.example.scoutingapp.SettingsActivity" 35 android:name="com.example.scoutingapp.SettingsActivity"
35-->C:\Users\cayde\Desktop\ScoutingApp\ScoutingApp\app\src\main\AndroidManifest.xml:20:13-45 35-->C:\Users\cayde\Desktop\Scouting\ScoutingApp\app\src\main\AndroidManifest.xml:20:13-45
36 android:exported="false" /> 36 android:exported="false" />
36-->C:\Users\cayde\Desktop\ScoutingApp\ScoutingApp\app\src\main\AndroidManifest.xml:21:13-37 36-->C:\Users\cayde\Desktop\Scouting\ScoutingApp\app\src\main\AndroidManifest.xml:21:13-37
37 <activity 37 <activity
37-->C:\Users\cayde\Desktop\ScoutingApp\ScoutingApp\app\src\main\AndroidManifest.xml:22:9-24:40 37-->C:\Users\cayde\Desktop\Scouting\ScoutingApp\app\src\main\AndroidManifest.xml:22:9-24:40
38 android:name="com.example.scoutingapp.startingActivity" 38 android:name="com.example.scoutingapp.startingActivity"
38-->C:\Users\cayde\Desktop\ScoutingApp\ScoutingApp\app\src\main\AndroidManifest.xml:23:13-45 38-->C:\Users\cayde\Desktop\Scouting\ScoutingApp\app\src\main\AndroidManifest.xml:23:13-45
39 android:exported="false" /> 39 android:exported="false" />
39-->C:\Users\cayde\Desktop\ScoutingApp\ScoutingApp\app\src\main\AndroidManifest.xml:24:13-37 39-->C:\Users\cayde\Desktop\Scouting\ScoutingApp\app\src\main\AndroidManifest.xml:24:13-37
40 <activity 40 <activity
40-->C:\Users\cayde\Desktop\ScoutingApp\ScoutingApp\app\src\main\AndroidManifest.xml:25:9-27:40 40-->C:\Users\cayde\Desktop\Scouting\ScoutingApp\app\src\main\AndroidManifest.xml:25:9-27:40
41 android:name="com.example.scoutingapp.EndActivity" 41 android:name="com.example.scoutingapp.EndActivity"
41-->C:\Users\cayde\Desktop\ScoutingApp\ScoutingApp\app\src\main\AndroidManifest.xml:26:13-40 41-->C:\Users\cayde\Desktop\Scouting\ScoutingApp\app\src\main\AndroidManifest.xml:26:13-40
42 android:exported="false" /> 42 android:exported="false" />
42-->C:\Users\cayde\Desktop\ScoutingApp\ScoutingApp\app\src\main\AndroidManifest.xml:27:13-37 42-->C:\Users\cayde\Desktop\Scouting\ScoutingApp\app\src\main\AndroidManifest.xml:27:13-37
43 <activity 43 <activity
43-->C:\Users\cayde\Desktop\ScoutingApp\ScoutingApp\app\src\main\AndroidManifest.xml:28:9-30:40 43-->C:\Users\cayde\Desktop\Scouting\ScoutingApp\app\src\main\AndroidManifest.xml:28:9-30:40
44 android:name="com.example.scoutingapp.TeleActivity" 44 android:name="com.example.scoutingapp.TeleActivity"
44-->C:\Users\cayde\Desktop\ScoutingApp\ScoutingApp\app\src\main\AndroidManifest.xml:29:13-41 44-->C:\Users\cayde\Desktop\Scouting\ScoutingApp\app\src\main\AndroidManifest.xml:29:13-41
45 android:exported="false" /> 45 android:exported="false" />
45-->C:\Users\cayde\Desktop\ScoutingApp\ScoutingApp\app\src\main\AndroidManifest.xml:30:13-37 45-->C:\Users\cayde\Desktop\Scouting\ScoutingApp\app\src\main\AndroidManifest.xml:30:13-37
46 <activity 46 <activity
46-->C:\Users\cayde\Desktop\ScoutingApp\ScoutingApp\app\src\main\AndroidManifest.xml:31:9-33:40 46-->C:\Users\cayde\Desktop\Scouting\ScoutingApp\app\src\main\AndroidManifest.xml:31:9-33:40
47 android:name="com.example.scoutingapp.AutoActivity" 47 android:name="com.example.scoutingapp.AutoActivity"
47-->C:\Users\cayde\Desktop\ScoutingApp\ScoutingApp\app\src\main\AndroidManifest.xml:32:13-41 47-->C:\Users\cayde\Desktop\Scouting\ScoutingApp\app\src\main\AndroidManifest.xml:32:13-41
48 android:exported="false" /> 48 android:exported="false" />
48-->C:\Users\cayde\Desktop\ScoutingApp\ScoutingApp\app\src\main\AndroidManifest.xml:33:13-37 48-->C:\Users\cayde\Desktop\Scouting\ScoutingApp\app\src\main\AndroidManifest.xml:33:13-37
49 <activity 49 <activity
49-->C:\Users\cayde\Desktop\ScoutingApp\ScoutingApp\app\src\main\AndroidManifest.xml:34:9-42:20 49-->C:\Users\cayde\Desktop\Scouting\ScoutingApp\app\src\main\AndroidManifest.xml:34:9-42:20
50 android:name="com.example.scoutingapp.MainActivity" 50 android:name="com.example.scoutingapp.MainActivity"
50-->C:\Users\cayde\Desktop\ScoutingApp\ScoutingApp\app\src\main\AndroidManifest.xml:35:13-41 50-->C:\Users\cayde\Desktop\Scouting\ScoutingApp\app\src\main\AndroidManifest.xml:35:13-41
51 android:exported="true" > 51 android:exported="true" >
51-->C:\Users\cayde\Desktop\ScoutingApp\ScoutingApp\app\src\main\AndroidManifest.xml:36:13-36 51-->C:\Users\cayde\Desktop\Scouting\ScoutingApp\app\src\main\AndroidManifest.xml:36:13-36
52 <intent-filter> 52 <intent-filter>
52-->C:\Users\cayde\Desktop\ScoutingApp\ScoutingApp\app\src\main\AndroidManifest.xml:37:13-41:29 52-->C:\Users\cayde\Desktop\Scouting\ScoutingApp\app\src\main\AndroidManifest.xml:37:13-41:29
53 <action android:name="android.intent.action.MAIN" /> 53 <action android:name="android.intent.action.MAIN" />
53-->C:\Users\cayde\Desktop\ScoutingApp\ScoutingApp\app\src\main\AndroidManifest.xml:38:17-69 53-->C:\Users\cayde\Desktop\Scouting\ScoutingApp\app\src\main\AndroidManifest.xml:38:17-69
53-->C:\Users\cayde\Desktop\ScoutingApp\ScoutingApp\app\src\main\AndroidManifest.xml:38:25-66 53-->C:\Users\cayde\Desktop\Scouting\ScoutingApp\app\src\main\AndroidManifest.xml:38:25-66
54 54
55 <category android:name="android.intent.category.LAUNCHER" /> 55 <category android:name="android.intent.category.LAUNCHER" />
55-->C:\Users\cayde\Desktop\ScoutingApp\ScoutingApp\app\src\main\AndroidManifest.xml:40:17-77 55-->C:\Users\cayde\Desktop\Scouting\ScoutingApp\app\src\main\AndroidManifest.xml:40:17-77
55-->C:\Users\cayde\Desktop\ScoutingApp\ScoutingApp\app\src\main\AndroidManifest.xml:40:27-74 55-->C:\Users\cayde\Desktop\Scouting\ScoutingApp\app\src\main\AndroidManifest.xml:40:27-74
56 </intent-filter> 56 </intent-filter>
57 </activity> 57 </activity>
58 58

View File

@@ -4,7 +4,7 @@
"outputFile": "com.example.scoutingapp-mergeDebugResources-29:/values-night-v8/values-night-v8.xml", "outputFile": "com.example.scoutingapp-mergeDebugResources-29:/values-night-v8/values-night-v8.xml",
"map": [ "map": [
{ {
"source": "C:\\Users\\cayde\\Desktop\\ScoutingApp\\ScoutingApp\\app\\src\\main\\res\\values-night\\themes.xml", "source": "C:\\Users\\cayde\\Desktop\\Scouting\\ScoutingApp\\app\\src\\main\\res\\values-night\\themes.xml",
"from": { "from": {
"startLines": "2", "startLines": "2",
"startColumns": "4", "startColumns": "4",

Binary file not shown.

Before

Width:  |  Height:  |  Size: 222 KiB

After

Width:  |  Height:  |  Size: 43 KiB

View File

@@ -13,9 +13,9 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:text="4564" android:text="2648"
android:textColor="#FFFFFF"
android:textSize="34sp" android:textSize="34sp"
android:textColor="#FFFFFF"
app:layout_constraintBottom_toTopOf="@+id/linearLayout" app:layout_constraintBottom_toTopOf="@+id/linearLayout"
app:layout_constraintEnd_toStartOf="@+id/matchNumber" app:layout_constraintEnd_toStartOf="@+id/matchNumber"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
@@ -128,7 +128,7 @@
android:id="@+id/button_Processor" android:id="@+id/button_Processor"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:backgroundTint="@color/team4564silver1" android:backgroundTint="#6B0EE906"
android:text="@string/processor" android:text="@string/processor"
android:textColor="#000000" android:textColor="#000000"
android:textSize="24sp" android:textSize="24sp"
@@ -137,7 +137,7 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/button_Net" app:layout_constraintStart_toEndOf="@+id/button_Net"
app:layout_constraintTop_toBottomOf="@+id/imageView2" app:layout_constraintTop_toBottomOf="@+id/imageView2"
app:strokeColor="@color/team4564silver2" app:strokeColor="#0EE906"
app:strokeWidth="5dp" app:strokeWidth="5dp"
tools:ignore="VisualLintButtonSize" /> tools:ignore="VisualLintButtonSize" />
@@ -145,7 +145,7 @@
android:id="@+id/button_Net" android:id="@+id/button_Net"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:backgroundTint="@color/team4564silver1" android:backgroundTint="#6B0EE906"
android:text="@string/net" android:text="@string/net"
android:textColor="#000000" android:textColor="#000000"
android:textSize="34sp" android:textSize="34sp"
@@ -154,7 +154,7 @@
app:layout_constraintEnd_toStartOf="@+id/button_Processor" app:layout_constraintEnd_toStartOf="@+id/button_Processor"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView2" app:layout_constraintTop_toBottomOf="@+id/imageView2"
app:strokeColor="@color/team4564silver2" app:strokeColor="#0EE906"
app:strokeWidth="5dp" app:strokeWidth="5dp"
tools:ignore="VisualLintButtonSize" /> tools:ignore="VisualLintButtonSize" />
@@ -172,7 +172,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:text="can't leave" android:text="@string/can_leave"
android:textColor="#FFFFFF" android:textColor="#FFFFFF"
tools:ignore="VisualLintButtonSize" /> tools:ignore="VisualLintButtonSize" />

View File

@@ -102,7 +102,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:text="4564" android:text="2648"
android:textColor="#FFFFFF" android:textColor="#FFFFFF"
android:textSize="34sp" android:textSize="34sp"
app:layout_constraintBottom_toTopOf="@+id/BackButton" app:layout_constraintBottom_toTopOf="@+id/BackButton"

View File

@@ -133,7 +133,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="50dp" android:layout_marginTop="50dp"
android:ems="10" android:ems="10"
android:text="Scouting App for FRC team 4564" android:text="Scouting App for FRC team 2648"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#FFFFFF" android:textColor="#FFFFFF"
android:textSize="24sp" android:textSize="24sp"

View File

@@ -85,7 +85,7 @@
android:id="@+id/Match" android:id="@+id/Match"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="Event" android:hint="Match"
android:textColor="#FFFFFF" android:textColor="#FFFFFF"
android:textColorHint="#AAAAAA" android:textColorHint="#AAAAAA"
app:layout_constraintTop_toBottomOf="@+id/Sheets" app:layout_constraintTop_toBottomOf="@+id/Sheets"

View File

@@ -13,7 +13,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:text="4564" android:text="2648"
android:textColor="#FFFFFF" android:textColor="#FFFFFF"
android:textSize="34sp" android:textSize="34sp"
app:layout_constraintBottom_toTopOf="@+id/nextButton" app:layout_constraintBottom_toTopOf="@+id/nextButton"

View File

@@ -13,9 +13,9 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:text="4564" android:text="2648"
android:textColor="#FFFFFF"
android:textSize="34sp" android:textSize="34sp"
android:textColor="#FFFFFF"
app:layout_constraintBottom_toTopOf="@+id/linearLayout" app:layout_constraintBottom_toTopOf="@+id/linearLayout"
app:layout_constraintEnd_toStartOf="@+id/matchNumber" app:layout_constraintEnd_toStartOf="@+id/matchNumber"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
@@ -128,7 +128,7 @@
android:id="@+id/button_Processor" android:id="@+id/button_Processor"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:backgroundTint="@color/team4564silver1" android:backgroundTint="#6B0EE906"
android:text="@string/processor" android:text="@string/processor"
android:textColor="#000000" android:textColor="#000000"
android:textSize="24sp" android:textSize="24sp"
@@ -137,7 +137,7 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/button_Net" app:layout_constraintStart_toEndOf="@+id/button_Net"
app:layout_constraintTop_toBottomOf="@+id/imageView2" app:layout_constraintTop_toBottomOf="@+id/imageView2"
app:strokeColor="@color/team4564silver2" app:strokeColor="#0EE906"
app:strokeWidth="5dp" app:strokeWidth="5dp"
tools:ignore="VisualLintButtonSize" /> tools:ignore="VisualLintButtonSize" />
@@ -145,7 +145,7 @@
android:id="@+id/button_Net" android:id="@+id/button_Net"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:backgroundTint="@color/team4564silver1" android:backgroundTint="#6B0EE906"
android:text="@string/net" android:text="@string/net"
android:textColor="#000000" android:textColor="#000000"
android:textSize="34sp" android:textSize="34sp"
@@ -154,7 +154,7 @@
app:layout_constraintEnd_toStartOf="@+id/button_Processor" app:layout_constraintEnd_toStartOf="@+id/button_Processor"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView2" app:layout_constraintTop_toBottomOf="@+id/imageView2"
app:strokeColor="@color/team4564silver2" app:strokeColor="#0EE906"
app:strokeWidth="5dp" app:strokeWidth="5dp"
tools:ignore="VisualLintButtonSize" /> tools:ignore="VisualLintButtonSize" />

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 7.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.8 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 9.6 KiB

Some files were not shown because too many files have changed in this diff Show More