merge of a bunch of files

.idea/caches/deviceStreaming.xml

@@ -124,6 +124,17 @@
           <option name="screenX" value="2220" />
           <option name="screenY" value="1080" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="dm2q" />
+          <option name="id" value="dm2q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="S23 Plus" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="34" />
           <option name="brand" value="samsung" />
@@ -267,6 +278,17 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="2400" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="motorola" />
+          <option name="codename" value="maui" />
+          <option name="id" value="maui" />
+          <option name="manufacturer" value="Motorola" />
+          <option name="name" value="moto g play - 2023" />
+          <option name="screenDensity" value="280" />
+          <option name="screenX" value="720" />
+          <option name="screenY" value="1600" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="31" />
           <option name="brand" value="google" />

ScoutingApp/.idea/caches/deviceStreaming.xml

@@ -69,6 +69,17 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="2400" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="motorola" />
+          <option name="codename" value="arcfox" />
+          <option name="id" value="arcfox" />
+          <option name="manufacturer" value="Motorola" />
+          <option name="name" value="razr plus 2024" />
+          <option name="screenDensity" value="360" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="1272" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="33" />
           <option name="brand" value="samsung" />
@@ -223,6 +234,17 @@
           <option name="screenX" value="720" />
           <option name="screenY" value="1600" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="g0q" />
+          <option name="id" value="g0q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="SM-S906U1" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="33" />
           <option name="brand" value="samsung" />

ScoutingApp/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties

@@ -1,24 +1,24 @@
-#Tue Feb 04 12:24:07 EST 2025
+#Tue Feb 04 12:24:47 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_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\\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/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\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_loop.png.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\\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\:/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\\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_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\\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_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\\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_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\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_activity_tele.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\\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.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\\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-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\\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.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\\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-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\\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.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\\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-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\\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.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\\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-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\\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.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\\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-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\\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.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\\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\:/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\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\raw_info.json.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\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\xml_backup_rules.xml.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\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\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\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\xml_data_extraction_rules.xml.flat

ScoutingApp/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties

@@ -1,24 +1,24 @@
-#Tue Feb 04 12:24:07 EST 2025
+#Tue Feb 04 12:24:48 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_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\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\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\\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\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\loop.png
+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\\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\:/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\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\activity_auto.xml
+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\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\activity_end.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\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\activity_main.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\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\activity_tele.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\\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.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\\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-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\\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.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\\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-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\\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.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\\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-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\\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.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\\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-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\\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.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\\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-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\\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.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\\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\:/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\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\raw\\info.json
+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\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\xml\\backup_rules.xml
+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\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\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\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\xml\\data_extraction_rules.xml

ScoutingApp/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt

@@ -1,8 +1,8 @@
-#Tue Feb 04 13:37:43 EST 2025
+#Tue Feb 04 12:41:48 EST 2025
-base.0=C\:\\Users\\26jacquesty\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes.dex
+base.0=C\:\\Users\\25lacorazzan\\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.1=C\:\\Users\\25lacorazzan\\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.2=C\:\\Users\\25lacorazzan\\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
+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

ScoutingApp/app/build/intermediates/local_only_symbol_list/debug/parseDebugLocalResources/R-def.txt

@@ -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

ScoutingApp/app/build/intermediates/merged_res_blame_folder/debug/mergeDebugResources/out/single/mergeDebugResources.json

@@ -1,98 +1,98 @@
 [
     {
-        "merged": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\drawable_loop.png.flat",
+        "merged": "C:\\Users\\25lacorazzan\\.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:\\drawable\\loop.png"
+        "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",
+        "merged": "C:\\Users\\25lacorazzan\\.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-xxhdpi\\ic_launcher_round.webp"
+        "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",
+        "merged": "C:\\Users\\25lacorazzan\\.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:\\mipmap-xxxhdpi\\ic_launcher_round.webp"
+        "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",
+        "merged": "C:\\Users\\25lacorazzan\\.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:\\xml\\data_extraction_rules.xml"
+        "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",
+        "merged": "C:\\Users\\25lacorazzan\\.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-anydpi-v26\\ic_launcher.xml"
+        "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",
+        "merged": "C:\\Users\\25lacorazzan\\.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"
+        "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",
+        "merged": "C:\\Users\\25lacorazzan\\.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:\\mipmap-mdpi\\ic_launcher_round.webp"
+        "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",
+        "merged": "C:\\Users\\25lacorazzan\\.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-anydpi-v26\\ic_launcher_round.xml"
+        "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",
+        "merged": "com.example.scoutingapp-debug-31:/drawable_loop.png.flat",
-        "source": "C:\\Users\\26jacquesty\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-hdpi\\ic_launcher_round.webp"
+        "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",
+        "merged": "C:\\Users\\25lacorazzan\\.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:\\raw\\info.json"
+        "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",
+        "merged": "C:\\Users\\25lacorazzan\\.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:\\mipmap-xhdpi\\ic_launcher_round.webp"
+        "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",
+        "merged": "C:\\Users\\25lacorazzan\\.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-mdpi\\ic_launcher.webp"
+        "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",
+        "merged": "C:\\Users\\25lacorazzan\\.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:\\layout\\activity_end.xml"
+        "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",
+        "merged": "C:\\Users\\25lacorazzan\\.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:\\drawable\\screenshot_2025_01_16_115155.png"
+        "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",
+        "merged": "C:\\Users\\25lacorazzan\\.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:\\mipmap-xhdpi\\ic_launcher.webp"
+        "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",
+        "merged": "C:\\Users\\25lacorazzan\\.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:\\drawable\\ic_launcher_background.xml"
+        "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",
+        "merged": "C:\\Users\\25lacorazzan\\.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:\\xml\\backup_rules.xml"
+        "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",
+        "merged": "C:\\Users\\25lacorazzan\\.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:\\drawable\\ic_launcher_foreground.xml"
+        "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",
+        "merged": "C:\\Users\\25lacorazzan\\.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:\\layout\\activity_main.xml"
+        "source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\drawable\\ic_launcher_background.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"
     }
 ]

ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/layout/activity_auto.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_width="0dp"
-        android:layout_height="100dp"
+        android:layout_height="0dp"
-        android:layout_marginTop="8dp"
+        android:layout_marginBottom="-5dp"
-        android:layout_marginEnd="8dp"
+        android:backgroundTint="#40FF5722"
-        android:backgroundTint="#F94C00"
         android:text="@string/l4"
-        android:textAlignment="center"
+        android:textColor="#000000"
-        android:textSize="40sp"
+        android:textSize="60sp"
+        app:cornerRadius="0dp"
+        app:layout_constraintBottom_toTopOf="@+id/button_L3"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintHorizontal_bias="0.0"
-
+        app:layout_constraintStart_toStartOf="parent"
-    <CheckBox
+        app:layout_constraintTop_toTopOf="@+id/imageView2"
-        android:id="@+id/cb_algaeReef"
+        app:strokeColor="#FF5722"
-        android:layout_width="wrap_content"
+        app:strokeWidth="5dp" />
-        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" />
 
     <Button
         android:id="@+id/button_L3"
-        android:layout_width="100dp"
+        android:layout_width="0dp"
-        android:layout_height="100dp"
+        android:layout_height="0dp"
-        android:layout_marginEnd="8dp"
+        android:backgroundTint="#40FF5722"
-        android:backgroundTint="#F94C00"
         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_width="0dp"
-        android:layout_height="100dp"
+        android:layout_height="0dp"
-        android:layout_marginEnd="8dp"
+        android:backgroundTint="#40FF5722"
-        android:backgroundTint="#F94C00"
         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_width="0dp"
-        android:layout_height="100dp"
+        android:layout_height="0dp"
-        android:layout_marginEnd="8dp"
+        android:backgroundTint="#40FF5722"
-        android:backgroundTint="#F94C00"
         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
+    <TextView
-        android:id="@+id/button_Net"
+        android:id="@+id/textView2"
-        android:layout_width="100dp"
+        android:layout_width="wrap_content"
-        android:layout_height="100dp"
+        android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
+        android:layout_marginTop="8dp"
-        android:backgroundTint="#F94C00"
+        android:text="@string/auto"
-        android:text="@string/net"
+        android:textSize="48sp"
-        android:textSize="20sp"
+        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@+id/button_Processor"
+        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <Button
         android:id="@+id/button_Processor"
-        android:layout_width="150sp"
+        android:layout_width="0dp"
-        android:layout_height="100dp"
+        android:layout_height="0dp"
-        android:layout_marginEnd="8dp"
+        android:backgroundTint="#402196F3"
-        android:layout_marginBottom="8dp"
-        android:backgroundTint="#F94C00"
         android:text="@string/processor"
-        android:textSize="20sp"
+        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" />
+
+    <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_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:layout_marginTop="8dp"
-        android:text="@string/can_leave"
+        android:layout_marginEnd="8dp"
-        app:layout_constraintBottom_toTopOf="@+id/cb_algaeReef"
+        android:text="Hold button to \ndecrement"
-        app:layout_constraintStart_toStartOf="parent" />
+        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>

ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/layout/activity_tele.xml

@@ -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_width="0dp"
-        android:layout_height="100dp"
+        android:layout_height="0dp"
-        android:layout_marginTop="8dp"
+        android:layout_marginBottom="-5dp"
-        android:layout_marginEnd="8dp"
+        android:backgroundTint="#40FF5722"
-        android:text="L4"
+        android:text="@string/l4"
-        android:textAlignment="center"
+        android:textColor="#000000"
-        android:textSize="40sp"
+        android:textSize="60sp"
+        app:cornerRadius="0dp"
+        app:layout_constraintBottom_toTopOf="@+id/button_L3"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintHorizontal_bias="0.0"
-
+        app:layout_constraintStart_toStartOf="parent"
-    <CheckBox
+        app:layout_constraintTop_toTopOf="@+id/imageView2"
-        android:id="@+id/cb_algaeReef"
+        app:strokeColor="#FF5722"
-        android:layout_width="wrap_content"
+        app:strokeWidth="5dp" />
-        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" />
 
     <Button
         android:id="@+id/button_L3"
-        android:layout_width="100dp"
+        android:layout_width="0dp"
-        android:layout_height="100dp"
+        android:layout_height="0dp"
-        android:layout_marginEnd="8dp"
+        android:backgroundTint="#40FF5722"
-        android:text="L3"
+        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_width="0dp"
-        android:layout_height="100dp"
+        android:layout_height="0dp"
-        android:layout_marginEnd="8dp"
+        android:backgroundTint="#40FF5722"
-        android:text="L2"
+        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_width="0dp"
-        android:layout_height="100dp"
+        android:layout_height="0dp"
-        android:layout_marginEnd="8dp"
+        android:backgroundTint="#40FF5722"
-        android:text="L1"
+        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
+    <TextView
-        android:id="@+id/button_Net"
+        android:id="@+id/textView2"
-        android:layout_width="100dp"
+        android:layout_width="wrap_content"
-        android:layout_height="100dp"
+        android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
+        android:layout_marginTop="8dp"
-        android:text="Net"
+        android:text="Tele"
-        android:textSize="20sp"
+        android:textSize="48sp"
-        app:layout_constraintBottom_toTopOf="@+id/button_Processor"
+        app:layout_constraintEnd_toEndOf="parent"
-        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_width="0dp"
-        android:layout_height="100dp"
+        android:layout_height="0dp"
-        android:layout_marginEnd="8dp"
+        android:backgroundTint="#402196F3"
-        android:layout_marginBottom="8dp"
+        android:text="@string/processor"
-        android:text="Processor"
+        android:textColor="#000000"
-        android:textSize="20sp"
+        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" />
+
+    <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_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:layout_marginTop="8dp"
-        android:text="Can Leave"
+        android:layout_marginEnd="8dp"
-        app:layout_constraintBottom_toTopOf="@+id/cb_algaeReef"
+        android:text="Hold button to \ndecrement"
-        app:layout_constraintStart_toStartOf="parent" />
+        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)"
+        android:backgroundTint="#FF5722"
-        app:layout_constraintStart_toStartOf="parent"
+        android:text="@string/next_hold"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:textColor="#000000"
-
+        app:cornerRadius="0dp"
-    <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"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 

ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/values/values.xml

@@ -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>

ScoutingApp/app/build/intermediates/symbol_list_with_package_name/debug/processDebugResources/package-aware-r.txt

@@ -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

ScoutingApp/app/src/main/java/com/example/scoutingapp/AutoActivity.java

@@ -19,7 +19,6 @@ import java.io.FileWriter;
 import java.io.IOException;
 
 public class AutoActivity extends AppCompatActivity {
-    private String auto = "Auto";
     private int l4Scored = 0;
     private int l3Scored = 0;
     private int l2Scored = 0;
@@ -31,12 +30,12 @@ public class AutoActivity extends AppCompatActivity {
     private boolean canLeave = false;
     private boolean coralPickup = false;
 
-    private TextView l4TV;
+    private Button l4Button;
-    private TextView l3TV;
+    private Button l3Button;
-    private TextView l2TV;
+    private Button l2Button;
-    private TextView l1TV;
+    private Button l1Button;
-    private TextView processorTV;
+    private Button processorButton;
-    private TextView netTV;
+    private Button netButton;
     private String eventString, matchString, TeamString;
     public static final String Event_Key = "EVENTCONFIRM";
     public static final String Match_key = "MATCHCONFIRM";
@@ -58,25 +57,18 @@ public class AutoActivity extends AppCompatActivity {
         TeamString = intentinput.getStringExtra(MainActivity.Team_key);
 
 
-        Button l4Button = (Button) findViewById(R.id.button_L4);
+        l4Button = (Button) findViewById(R.id.button_L4);
-        Button l3Button = (Button) findViewById(R.id.button_L3);
+        l3Button = (Button) findViewById(R.id.button_L3);
-        Button l2Button = (Button) findViewById(R.id.button_L2);
+        l2Button = (Button) findViewById(R.id.button_L2);
-        Button l1Button = (Button) findViewById(R.id.button_L1);
+        l1Button = (Button) findViewById(R.id.button_L1);
-        Button processorButton = (Button) findViewById(R.id.button_Processor);
+        processorButton = (Button) findViewById(R.id.button_Processor);
-        Button netButton = (Button) findViewById(R.id.button_Net);
+        netButton = (Button) findViewById(R.id.button_Net);
         Button nextButton = (Button) findViewById(R.id.button_Next);
 
         CheckBox coralPickupBox = (CheckBox) findViewById(R.id.cb_coralPickup);
         CheckBox reefPickupBox = (CheckBox) findViewById(R.id.cb_algaeReef);
         CheckBox canLeaveBox = (CheckBox) findViewById(R.id.cb_CanLeave);
 
-        l4TV = (TextView) findViewById(R.id.tv_L4);
-        l3TV = (TextView) findViewById(R.id.tv_L3);
-        l2TV = (TextView) findViewById(R.id.tv_L2);
-        l1TV = (TextView) findViewById(R.id.tv_L1);
-        processorTV = (TextView) findViewById(R.id.tv_Net2);
-        netTV = (TextView) findViewById(R.id.tv_Net);
-
         //When clicked, add 1 to the scored and update the text for L4
         l4Button.setOnClickListener((v) -> {
             l4Scored++;
@@ -167,37 +159,36 @@ public class AutoActivity extends AppCompatActivity {
 
     //Methods that update the score count
     private void updateL4Text() {
-        l4TV.setText(String.format(getResources().getString(R.string.coralScored), l4Scored));
+        l4Button.setText(String.format(getResources().getString(R.string.coralScored), "L4 : ", l4Scored));
     }
 
     private void updateL3Text() {
-        l3TV.setText(String.format(getResources().getString(R.string.coralScored), l3Scored));
+        l3Button.setText(String.format(getResources().getString(R.string.coralScored), "L3 : ", l3Scored));
     }
 
     private void updateL2Text() {
-        l2TV.setText(String.format(getResources().getString(R.string.coralScored), l2Scored));
+        l2Button.setText(String.format(getResources().getString(R.string.coralScored), "L2 : ", l2Scored));
     }
 
     private void updateL1Text() {
-        l1TV.setText(String.format(getResources().getString(R.string.coralScored), l1Scored));
+        l1Button.setText(String.format(getResources().getString(R.string.coralScored), "L1 : ", l1Scored));
     }
 
     private void updateProcessorText() {
-        processorTV.setText(String.format(getResources().getString(R.string.coralScored), processorScored));
+        processorButton.setText(String.format(getResources().getString(R.string.coralScored), "Processor\n", processorScored));
     }
 
     private void updateNetText() {
-        netTV.setText(String.format(getResources().getString(R.string.coralScored), netScored));
+        netButton.setText(String.format(getResources().getString(R.string.coralScored), "Net\n", netScored));
     }
 
     public void CSVmake(Context context) {
         //adds the strings
         String CSVLine = String.format(
-                "%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s",
+                "%s,%s,%s,Auto,%s,%s,%s,%s,%s,%s,%s,%s,%s",
                 eventString,
                 matchString,
                 TeamString,
-                auto,
                 l4Scored,
                 l3Scored,
                 l2Scored,

ScoutingApp/app/src/main/java/com/example/scoutingapp/TeleActivity.java

@@ -19,7 +19,6 @@ import java.io.FileWriter;
 import java.io.IOException;
 
 public class TeleActivity extends AppCompatActivity {
-    private String tele = "Teleop";
     private int l4Scored = 0;
     private int l3Scored = 0;
     private int l2Scored = 0;
@@ -31,12 +30,12 @@ public class TeleActivity extends AppCompatActivity {
     private boolean canLeave = false;
     private boolean coralPickup = false;
 
-    private TextView l4TV;
+    private Button l4Button;
-    private TextView l3TV;
+    private Button l3Button;
-    private TextView l2TV;
+    private Button l2Button;
-    private TextView l1TV;
+    private Button l1Button;
-    private TextView processorTV;
+    private Button processorButton;
-    private TextView netTV;
+    private Button netButton;
     private String eventString, matchString, TeamString;
     public static final String Event_Key = "EVENTCONFIRM";
     public static final String Match_key = "MATCHCONFIRM";
@@ -46,7 +45,7 @@ public class TeleActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         EdgeToEdge.enable(this);
-        setContentView(R.layout.activity_auto);
+        setContentView(R.layout.activity_tele);
         ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> {
             Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
             v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom);
@@ -57,25 +56,18 @@ public class TeleActivity extends AppCompatActivity {
         matchString = intentinput.getStringExtra(AutoActivity.Match_key);
         TeamString = intentinput.getStringExtra(AutoActivity.Team_key);
 
-        Button l4Button = (Button) findViewById(R.id.button_L4);
+        l4Button = (Button) findViewById(R.id.button_L4);
-        Button l3Button = (Button) findViewById(R.id.button_L3);
+        l3Button = (Button) findViewById(R.id.button_L3);
-        Button l2Button = (Button) findViewById(R.id.button_L2);
+        l2Button = (Button) findViewById(R.id.button_L2);
-        Button l1Button = (Button) findViewById(R.id.button_L1);
+        l1Button = (Button) findViewById(R.id.button_L1);
-        Button processorButton = (Button) findViewById(R.id.button_Processor);
+        processorButton = (Button) findViewById(R.id.button_Processor);
-        Button netButton = (Button) findViewById(R.id.button_Net);
+        netButton = (Button) findViewById(R.id.button_Net);
         Button nextButton = (Button) findViewById(R.id.button_Next);
 
         CheckBox coralPickupBox = (CheckBox) findViewById(R.id.cb_coralPickup);
         CheckBox reefPickupBox = (CheckBox) findViewById(R.id.cb_algaeReef);
         CheckBox canLeaveBox = (CheckBox) findViewById(R.id.cb_CanLeave);
 
-        l4TV = (TextView) findViewById(R.id.tv_L4);
-        l3TV = (TextView) findViewById(R.id.tv_L3);
-        l2TV = (TextView) findViewById(R.id.tv_L2);
-        l1TV = (TextView) findViewById(R.id.tv_L1);
-        processorTV = (TextView) findViewById(R.id.tv_Net2);
-        netTV = (TextView) findViewById(R.id.tv_Net);
-
         //When clicked, add 1 to the scored and update the text for L4
         l4Button.setOnClickListener((v) -> {
             l4Scored++;
@@ -166,37 +158,36 @@ public class TeleActivity extends AppCompatActivity {
 
     //Methods that update the score count
     private void updateL4Text() {
-        l4TV.setText(String.format(getResources().getString(R.string.coralScored), l4Scored));
+        l4Button.setText(String.format(getResources().getString(R.string.coralScored), "L4 : ", l4Scored));
     }
 
     private void updateL3Text() {
-        l3TV.setText(String.format(getResources().getString(R.string.coralScored), l3Scored));
+        l3Button.setText(String.format(getResources().getString(R.string.coralScored), "L3 : ", l3Scored));
     }
 
     private void updateL2Text() {
-        l2TV.setText(String.format(getResources().getString(R.string.coralScored), l2Scored));
+        l2Button.setText(String.format(getResources().getString(R.string.coralScored), "L2 : ", l2Scored));
     }
 
     private void updateL1Text() {
-        l1TV.setText(String.format(getResources().getString(R.string.coralScored), l1Scored));
+        l1Button.setText(String.format(getResources().getString(R.string.coralScored), "L1 : ", l1Scored));
     }
 
     private void updateProcessorText() {
-        processorTV.setText(String.format(getResources().getString(R.string.coralScored), processorScored));
+        processorButton.setText(String.format(getResources().getString(R.string.coralScored), "Processor\n", processorScored));
     }
 
     private void updateNetText() {
-        netTV.setText(String.format(getResources().getString(R.string.coralScored), netScored));
+        netButton.setText(String.format(getResources().getString(R.string.coralScored), "Net\n", netScored));
     }
 
     public void csvMake() {
         //adds the strings
         String CSVLine = String.format(
-                "%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s",
+                "%s,%s,%s,Tele,%s,%s,%s,%s,%s,%s,%s,%s,%s",
                 eventString,
                 matchString,
                 TeamString,
-                tele,
                 l4Scored,
                 l3Scored,
                 l2Scored,
@@ -207,6 +198,7 @@ public class TeleActivity extends AppCompatActivity {
                 canLeave,
                 coralPickup
         );
+
         //makes the file
         File csvFile = new File(this.getFilesDir(), eventString+matchString+TeamString+".csv");
         Log.d("CSVFile", "File created/written at: " + csvFile.getAbsolutePath());

ScoutingApp/app/src/main/res/layout/activity_auto.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_width="0dp"
-        android:layout_height="100dp"
+        android:layout_height="0dp"
-        android:layout_marginTop="8dp"
+        android:layout_marginBottom="-5dp"
-        android:layout_marginEnd="8dp"
+        android:backgroundTint="#40FF5722"
-        android:backgroundTint="#F94C00"
         android:text="@string/l4"
-        android:textAlignment="center"
+        android:textColor="#000000"
-        android:textSize="40sp"
+        android:textSize="60sp"
+        app:cornerRadius="0dp"
+        app:layout_constraintBottom_toTopOf="@+id/button_L3"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintHorizontal_bias="0.0"
-
+        app:layout_constraintStart_toStartOf="parent"
-    <CheckBox
+        app:layout_constraintTop_toTopOf="@+id/imageView2"
-        android:id="@+id/cb_algaeReef"
+        app:strokeColor="#FF5722"
-        android:layout_width="wrap_content"
+        app:strokeWidth="5dp" />
-        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" />
 
     <Button
         android:id="@+id/button_L3"
-        android:layout_width="100dp"
+        android:layout_width="0dp"
-        android:layout_height="100dp"
+        android:layout_height="0dp"
-        android:layout_marginEnd="8dp"
+        android:backgroundTint="#40FF5722"
-        android:backgroundTint="#F94C00"
         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_width="0dp"
-        android:layout_height="100dp"
+        android:layout_height="0dp"
-        android:layout_marginEnd="8dp"
+        android:backgroundTint="#40FF5722"
-        android:backgroundTint="#F94C00"
         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_width="0dp"
-        android:layout_height="100dp"
+        android:layout_height="0dp"
-        android:layout_marginEnd="8dp"
+        android:backgroundTint="#40FF5722"
-        android:backgroundTint="#F94C00"
         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
+    <TextView
-        android:id="@+id/button_Net"
+        android:id="@+id/textView2"
-        android:layout_width="100dp"
+        android:layout_width="wrap_content"
-        android:layout_height="100dp"
+        android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
+        android:layout_marginTop="8dp"
-        android:backgroundTint="#F94C00"
+        android:text="@string/auto"
-        android:text="@string/net"
+        android:textSize="48sp"
-        android:textSize="20sp"
+        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@+id/button_Processor"
+        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <Button
         android:id="@+id/button_Processor"
-        android:layout_width="150sp"
+        android:layout_width="0dp"
-        android:layout_height="100dp"
+        android:layout_height="0dp"
-        android:layout_marginEnd="8dp"
+        android:backgroundTint="#402196F3"
-        android:layout_marginBottom="8dp"
-        android:backgroundTint="#F94C00"
         android:text="@string/processor"
-        android:textSize="20sp"
+        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" />
+
+    <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_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:layout_marginTop="8dp"
-        android:text="@string/can_leave"
+        android:layout_marginEnd="8dp"
-        app:layout_constraintBottom_toTopOf="@+id/cb_algaeReef"
+        android:text="Hold button to \ndecrement"
-        app:layout_constraintStart_toStartOf="parent" />
+        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>

ScoutingApp/app/src/main/res/layout/activity_tele.xml

@@ -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_width="0dp"
-        android:layout_height="100dp"
+        android:layout_height="0dp"
-        android:layout_marginTop="8dp"
+        android:layout_marginBottom="-5dp"
-        android:layout_marginEnd="8dp"
+        android:backgroundTint="#40FF5722"
-        android:text="L4"
+        android:text="@string/l4"
-        android:textAlignment="center"
+        android:textColor="#000000"
-        android:textSize="40sp"
+        android:textSize="60sp"
+        app:cornerRadius="0dp"
+        app:layout_constraintBottom_toTopOf="@+id/button_L3"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintHorizontal_bias="0.0"
-
+        app:layout_constraintStart_toStartOf="parent"
-    <CheckBox
+        app:layout_constraintTop_toTopOf="@+id/imageView2"
-        android:id="@+id/cb_algaeReef"
+        app:strokeColor="#FF5722"
-        android:layout_width="wrap_content"
+        app:strokeWidth="5dp" />
-        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" />
 
     <Button
         android:id="@+id/button_L3"
-        android:layout_width="100dp"
+        android:layout_width="0dp"
-        android:layout_height="100dp"
+        android:layout_height="0dp"
-        android:layout_marginEnd="8dp"
+        android:backgroundTint="#40FF5722"
-        android:text="L3"
+        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_width="0dp"
-        android:layout_height="100dp"
+        android:layout_height="0dp"
-        android:layout_marginEnd="8dp"
+        android:backgroundTint="#40FF5722"
-        android:text="L2"
+        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_width="0dp"
-        android:layout_height="100dp"
+        android:layout_height="0dp"
-        android:layout_marginEnd="8dp"
+        android:backgroundTint="#40FF5722"
-        android:text="L1"
+        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
+    <TextView
-        android:id="@+id/button_Net"
+        android:id="@+id/textView2"
-        android:layout_width="100dp"
+        android:layout_width="wrap_content"
-        android:layout_height="100dp"
+        android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
+        android:layout_marginTop="8dp"
-        android:text="Net"
+        android:text="Tele"
-        android:textSize="20sp"
+        android:textSize="48sp"
-        app:layout_constraintBottom_toTopOf="@+id/button_Processor"
+        app:layout_constraintEnd_toEndOf="parent"
-        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_width="0dp"
-        android:layout_height="100dp"
+        android:layout_height="0dp"
-        android:layout_marginEnd="8dp"
+        android:backgroundTint="#402196F3"
-        android:layout_marginBottom="8dp"
+        android:text="@string/processor"
-        android:text="Processor"
+        android:textColor="#000000"
-        android:textSize="20sp"
+        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" />
+
+    <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_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:layout_marginTop="8dp"
-        android:text="Can Leave"
+        android:layout_marginEnd="8dp"
-        app:layout_constraintBottom_toTopOf="@+id/cb_algaeReef"
+        android:text="Hold button to \ndecrement"
-        app:layout_constraintStart_toStartOf="parent" />
+        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)"
+        android:backgroundTint="#FF5722"
-        app:layout_constraintStart_toStartOf="parent"
+        android:text="@string/next_hold"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:textColor="#000000"
-
+        app:cornerRadius="0dp"
-    <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"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 

ScoutingApp/app/src/main/res/values/strings.xml

@@ -13,5 +13,5 @@
     <string name="coral_pickup">Coral Pickup</string>
     <string name="auto">Auto</string>
     <string name="image_of_field">Image of field</string>
-    <string name="coralScored">%dx</string>
+    <string name="coralScored">%s%dx</string>
 </resources>