resolved merge

2025-02-12 12:23:22 -05:00 · 2025-02-12 12:23:22 -05:00 · 43545afe20
commit 43545afe20
parent b18dd66eee 56a8d17403
434 changed files with 9781 additions and 10105 deletions
--- a/.idea/caches/deviceStreaming.xml
+++ b/.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" />
--- a/ScoutingApp/.gradle/8.7/checksums/checksums.lock
+++ b/ScoutingApp/.gradle/8.7/checksums/checksums.lock
--- a/ScoutingApp/.gradle/8.7/checksums/sha1-checksums.bin
+++ b/ScoutingApp/.gradle/8.7/checksums/sha1-checksums.bin
--- a/ScoutingApp/.gradle/8.7/executionHistory/executionHistory.bin
+++ b/ScoutingApp/.gradle/8.7/executionHistory/executionHistory.bin
--- a/ScoutingApp/.gradle/8.7/executionHistory/executionHistory.lock
+++ b/ScoutingApp/.gradle/8.7/executionHistory/executionHistory.lock
--- a/ScoutingApp/.gradle/8.7/fileHashes/fileHashes.bin
+++ b/ScoutingApp/.gradle/8.7/fileHashes/fileHashes.bin
--- a/ScoutingApp/.gradle/8.7/fileHashes/fileHashes.lock
+++ b/ScoutingApp/.gradle/8.7/fileHashes/fileHashes.lock
--- a/ScoutingApp/.gradle/8.7/fileHashes/resourceHashesCache.bin
+++ b/ScoutingApp/.gradle/8.7/fileHashes/resourceHashesCache.bin
--- a/ScoutingApp/.gradle/buildOutputCleanup/buildOutputCleanup.lock
+++ b/ScoutingApp/.gradle/buildOutputCleanup/buildOutputCleanup.lock
--- a/ScoutingApp/.gradle/file-system.probe
+++ b/ScoutingApp/.gradle/file-system.probe
--- a/ScoutingApp/.idea/caches/deviceStreaming.xml
+++ b/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" />
@ -124,6 +135,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" />
@ -212,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" />
@ -267,6 +300,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" />
--- a/ScoutingApp/app/build/intermediates/apk/debug/app-debug.apk
+++ b/ScoutingApp/app/build/intermediates/apk/debug/app-debug.apk
--- a/ScoutingApp/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/processDebugResources/R.jar
+++ b/ScoutingApp/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/processDebugResources/R.jar
--- a/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_50ea05747660538aa33f38e7f0c16548f0f6edfe9cc27dca0400ccffcab99c6a_bucket_0/graph.bin
+++ b/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_50ea05747660538aa33f38e7f0c16548f0f6edfe9cc27dca0400ccffcab99c6a_bucket_0/graph.bin
--- a/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_50ea05747660538aa33f38e7f0c16548f0f6edfe9cc27dca0400ccffcab99c6a_bucket_1/graph.bin
+++ b/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_50ea05747660538aa33f38e7f0c16548f0f6edfe9cc27dca0400ccffcab99c6a_bucket_1/graph.bin
--- a/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_50ea05747660538aa33f38e7f0c16548f0f6edfe9cc27dca0400ccffcab99c6a_bucket_2/graph.bin
+++ b/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_50ea05747660538aa33f38e7f0c16548f0f6edfe9cc27dca0400ccffcab99c6a_bucket_2/graph.bin
--- a/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_50ea05747660538aa33f38e7f0c16548f0f6edfe9cc27dca0400ccffcab99c6a_bucket_3/graph.bin
+++ b/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_50ea05747660538aa33f38e7f0c16548f0f6edfe9cc27dca0400ccffcab99c6a_bucket_3/graph.bin
--- a/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_50ea05747660538aa33f38e7f0c16548f0f6edfe9cc27dca0400ccffcab99c6a_bucket_4/graph.bin
+++ b/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_50ea05747660538aa33f38e7f0c16548f0f6edfe9cc27dca0400ccffcab99c6a_bucket_4/graph.bin
--- a/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_50ea05747660538aa33f38e7f0c16548f0f6edfe9cc27dca0400ccffcab99c6a_bucket_5/graph.bin
+++ b/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_50ea05747660538aa33f38e7f0c16548f0f6edfe9cc27dca0400ccffcab99c6a_bucket_5/graph.bin
--- a/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_50ea05747660538aa33f38e7f0c16548f0f6edfe9cc27dca0400ccffcab99c6a_bucket_6/graph.bin
+++ b/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_50ea05747660538aa33f38e7f0c16548f0f6edfe9cc27dca0400ccffcab99c6a_bucket_6/graph.bin
--- a/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_50ea05747660538aa33f38e7f0c16548f0f6edfe9cc27dca0400ccffcab99c6a_bucket_7/graph.bin
+++ b/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_50ea05747660538aa33f38e7f0c16548f0f6edfe9cc27dca0400ccffcab99c6a_bucket_7/graph.bin
--- a/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_50ea05747660538aa33f38e7f0c16548f0f6edfe9cc27dca0400ccffcab99c6a_bucket_8/graph.bin
+++ b/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_50ea05747660538aa33f38e7f0c16548f0f6edfe9cc27dca0400ccffcab99c6a_bucket_8/graph.bin
--- a/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_50ea05747660538aa33f38e7f0c16548f0f6edfe9cc27dca0400ccffcab99c6a_bucket_9/graph.bin
+++ b/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_50ea05747660538aa33f38e7f0c16548f0f6edfe9cc27dca0400ccffcab99c6a_bucket_9/graph.bin
--- a/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_ac25d2ab76ba4a15c1c0d1a6c5dbcc214cc616af246736d60985a2beee6d2cb3_bucket_0/graph.bin
+++ b/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_ac25d2ab76ba4a15c1c0d1a6c5dbcc214cc616af246736d60985a2beee6d2cb3_bucket_0/graph.bin
--- a/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_ac25d2ab76ba4a15c1c0d1a6c5dbcc214cc616af246736d60985a2beee6d2cb3_bucket_1/graph.bin
+++ b/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_ac25d2ab76ba4a15c1c0d1a6c5dbcc214cc616af246736d60985a2beee6d2cb3_bucket_1/graph.bin
--- a/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_ac25d2ab76ba4a15c1c0d1a6c5dbcc214cc616af246736d60985a2beee6d2cb3_bucket_2/graph.bin
+++ b/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_ac25d2ab76ba4a15c1c0d1a6c5dbcc214cc616af246736d60985a2beee6d2cb3_bucket_2/graph.bin
--- a/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_ac25d2ab76ba4a15c1c0d1a6c5dbcc214cc616af246736d60985a2beee6d2cb3_bucket_3/graph.bin
+++ b/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_ac25d2ab76ba4a15c1c0d1a6c5dbcc214cc616af246736d60985a2beee6d2cb3_bucket_3/graph.bin
--- a/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_ac25d2ab76ba4a15c1c0d1a6c5dbcc214cc616af246736d60985a2beee6d2cb3_bucket_4/graph.bin
+++ b/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_ac25d2ab76ba4a15c1c0d1a6c5dbcc214cc616af246736d60985a2beee6d2cb3_bucket_4/graph.bin
--- a/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_ac25d2ab76ba4a15c1c0d1a6c5dbcc214cc616af246736d60985a2beee6d2cb3_bucket_5/graph.bin
+++ b/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_ac25d2ab76ba4a15c1c0d1a6c5dbcc214cc616af246736d60985a2beee6d2cb3_bucket_5/graph.bin
--- a/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_ac25d2ab76ba4a15c1c0d1a6c5dbcc214cc616af246736d60985a2beee6d2cb3_bucket_6/graph.bin
+++ b/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_ac25d2ab76ba4a15c1c0d1a6c5dbcc214cc616af246736d60985a2beee6d2cb3_bucket_6/graph.bin
--- a/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_ac25d2ab76ba4a15c1c0d1a6c5dbcc214cc616af246736d60985a2beee6d2cb3_bucket_7/graph.bin
+++ b/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_ac25d2ab76ba4a15c1c0d1a6c5dbcc214cc616af246736d60985a2beee6d2cb3_bucket_7/graph.bin
--- a/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_ac25d2ab76ba4a15c1c0d1a6c5dbcc214cc616af246736d60985a2beee6d2cb3_bucket_8/graph.bin
+++ b/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_ac25d2ab76ba4a15c1c0d1a6c5dbcc214cc616af246736d60985a2beee6d2cb3_bucket_8/graph.bin
--- a/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_ac25d2ab76ba4a15c1c0d1a6c5dbcc214cc616af246736d60985a2beee6d2cb3_bucket_9/graph.bin
+++ b/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_ac25d2ab76ba4a15c1c0d1a6c5dbcc214cc616af246736d60985a2beee6d2cb3_bucket_9/graph.bin
--- a/ScoutingApp/app/build/intermediates/dex/debug/mergeExtDexDebug/classes.dex
+++ b/ScoutingApp/app/build/intermediates/dex/debug/mergeExtDexDebug/classes.dex
--- a/ScoutingApp/app/build/intermediates/dex/debug/mergeExtDexDebug/classes2.dex
+++ b/ScoutingApp/app/build/intermediates/dex/debug/mergeExtDexDebug/classes2.dex
--- a/ScoutingApp/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex
+++ b/ScoutingApp/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex
--- a/ScoutingApp/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex
+++ b/ScoutingApp/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex
--- a/ScoutingApp/app/build/intermediates/dex_archive_input_jar_hashes/debug/dexBuilderDebug/out
+++ b/ScoutingApp/app/build/intermediates/dex_archive_input_jar_hashes/debug/dexBuilderDebug/out
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/+eGMcUxa9E_f_YStOMVV4iv2+Jw=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/+eGMcUxa9E_f_YStOMVV4iv2+Jw=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0gnOXOsEs1kXhdA9pLMeLvrWvC4=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0gnOXOsEs1kXhdA9pLMeLvrWvC4=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/11d+4Sfsz4ioXjWNa6IuG_2GjQc=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/11d+4Sfsz4ioXjWNa6IuG_2GjQc=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1GfVwZj9DKpGLP0FfKwOLCySIcM=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1GfVwZj9DKpGLP0FfKwOLCySIcM=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1Y9Pt_KjFEKsUuVCxQde7sMM8aA=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1Y9Pt_KjFEKsUuVCxQde7sMM8aA=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1vODwvg8vg+8gFQ3SwmRuBZ71jY=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1vODwvg8vg+8gFQ3SwmRuBZ71jY=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/2bt2SAh61vwz_73dIj_XAJODiJk=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/2bt2SAh61vwz_73dIj_XAJODiJk=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/49YEm1LN13WPKYWsEb8_VRzAm78=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/49YEm1LN13WPKYWsEb8_VRzAm78=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/4F1f1xbBVvYSHmnP6qbmzyVGy2Y=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/4F1f1xbBVvYSHmnP6qbmzyVGy2Y=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/4mHoSx6liU94LFjzB7bf4Y0JRMk=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/4mHoSx6liU94LFjzB7bf4Y0JRMk=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/4pJNcRRYxlIMet1SOZIpo9jSi1M=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/4pJNcRRYxlIMet1SOZIpo9jSi1M=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/4rJ8YPQ24jVIZLP1kWjROfpmi2o=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/4rJ8YPQ24jVIZLP1kWjROfpmi2o=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/65i6ooPtOgvU3zNmHg_c4LDp_P8=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/65i6ooPtOgvU3zNmHg_c4LDp_P8=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6PQJ6kc54Ofoit4n59oMAyhnZvo=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6PQJ6kc54Ofoit4n59oMAyhnZvo=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6RqcXseTYyesUtxZwwLvRT1Wzqs=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6RqcXseTYyesUtxZwwLvRT1Wzqs=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/7pdi4E8GyEgiluREz6RBMuAAr6E=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/7pdi4E8GyEgiluREz6RBMuAAr6E=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/8ENo8c6JR57EVS0l2ppWkcr_RhY=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/8ENo8c6JR57EVS0l2ppWkcr_RhY=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/8ITmy+_7LGMWm0290xvxesadix4=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/8ITmy+_7LGMWm0290xvxesadix4=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/91U1kvmJZijcCOiOfdDeB_ASQfo=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/91U1kvmJZijcCOiOfdDeB_ASQfo=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/93xPMbPjr33xyYDNmiWdSFYgIm0=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/93xPMbPjr33xyYDNmiWdSFYgIm0=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9I5IeoAh04KErmMWB7ux2QFS2IA=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9I5IeoAh04KErmMWB7ux2QFS2IA=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9evtu2RoN0B7Blhp4e41wQ+khMI=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9evtu2RoN0B7Blhp4e41wQ+khMI=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/AP_eNF2vSBkq1w2p+yfcVD0gKlk=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/AP_eNF2vSBkq1w2p+yfcVD0gKlk=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/AjMyU6ngjVehmdod3ClNj4EC2Wo=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/AjMyU6ngjVehmdod3ClNj4EC2Wo=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/B5tNdEApA1IIxSN816QXqcGqhco=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/B5tNdEApA1IIxSN816QXqcGqhco=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/BhFrXCmYZhMJXuTtKpcS+0IEsWw=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/BhFrXCmYZhMJXuTtKpcS+0IEsWw=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Cml1jcZtPXqjcMdQS_fLDFq05m0=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Cml1jcZtPXqjcMdQS_fLDFq05m0=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/DeVHwzpy7FpE0m7OK9lIMEUSI2c=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/DeVHwzpy7FpE0m7OK9lIMEUSI2c=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/DuDUzrmDKgwhYbr4EJzslYJAxJA=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/DuDUzrmDKgwhYbr4EJzslYJAxJA=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/E8poOLaO+nKd5KaJ3vMB3ZhMzLk=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/E8poOLaO+nKd5KaJ3vMB3ZhMzLk=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/EdhJ5J3hKq0TjkPChRSUkQZhb6U=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/EdhJ5J3hKq0TjkPChRSUkQZhb6U=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/EmRrSmPcnHNSkEv+yM2Mz4iVVMg=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/EmRrSmPcnHNSkEv+yM2Mz4iVVMg=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/FBajpy25yWfrpU5BwoTC3fsDETs=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/FBajpy25yWfrpU5BwoTC3fsDETs=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/FV0G7HBHqaVncq2Xk3HsM4bJQ1w=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/FV0G7HBHqaVncq2Xk3HsM4bJQ1w=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GiEuBHS0D01Sj3VL6KjqyoJDZIY=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GiEuBHS0D01Sj3VL6KjqyoJDZIY=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Gw6HCs36h17sKHMQI5jqVj37Q+c=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Gw6HCs36h17sKHMQI5jqVj37Q+c=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/HRZlPW4wq4kAXffp0zjMgw9H9CY=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/HRZlPW4wq4kAXffp0zjMgw9H9CY=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/HxWl+48fs+g4SUe+n1REi7s9BfY=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/HxWl+48fs+g4SUe+n1REi7s9BfY=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/HzR33vRcUubvBLfmrrvpAd5UPGw=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/HzR33vRcUubvBLfmrrvpAd5UPGw=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/IR7eOGtYk4HQR2AvNI4AlYziEPA=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/IR7eOGtYk4HQR2AvNI4AlYziEPA=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/IbPHjVKwSbXOyMtggX5maAZPbbM=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/IbPHjVKwSbXOyMtggX5maAZPbbM=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/IkrURBTPo+YPwTJKWN+MNpSHnEg=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/IkrURBTPo+YPwTJKWN+MNpSHnEg=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Jj16WFFnYwUJzQL3XNLw7hiVZlA=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Jj16WFFnYwUJzQL3XNLw7hiVZlA=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/KUbM_tWHKz_wdUqj+vsQ5s1oTOg=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/KUbM_tWHKz_wdUqj+vsQ5s1oTOg=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/LBgao0ADP2kdj0ciVlz6r879+aI=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/LBgao0ADP2kdj0ciVlz6r879+aI=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/LLaqIGll8X36IYBYHeyrAn88g88=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/LLaqIGll8X36IYBYHeyrAn88g88=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/LRoqL05+sTi982YVZLaj4ZXPWxo=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/LRoqL05+sTi982YVZLaj4ZXPWxo=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/M6u_pAS8hFYo24Df78N+1itaFKU=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/M6u_pAS8hFYo24Df78N+1itaFKU=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/MQnlwLouYo0Ax0c_kDm1SVdEqNQ=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/MQnlwLouYo0Ax0c_kDm1SVdEqNQ=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NAXOuRDMVrWf4luTY7QqNzacSTg=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NAXOuRDMVrWf4luTY7QqNzacSTg=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NKeJ2vMbPl9FgiYwb8vrISA6iE8=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NKeJ2vMbPl9FgiYwb8vrISA6iE8=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NOkmfZZ3VHV_wBVx2Mwk8XRq0I4=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NOkmfZZ3VHV_wBVx2Mwk8XRq0I4=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/O4TvUzo1vGBvTRrjKKlGL+jGU4Q=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/O4TvUzo1vGBvTRrjKKlGL+jGU4Q=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/OTmushbkRPyjAgQQwtMCANjMbHU=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/OTmushbkRPyjAgQQwtMCANjMbHU=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/OXzWXvCQOnLYgc9p_TAt4RfCk4k=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/OXzWXvCQOnLYgc9p_TAt4RfCk4k=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Or47ZWILAucAB0eGfmM_iVNwCpU=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Or47ZWILAucAB0eGfmM_iVNwCpU=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Ox0aPLj0r68QbONiZdMCZy8Kadc=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Ox0aPLj0r68QbONiZdMCZy8Kadc=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Ox27Q8b9fKBRYRCrX6lpBDk9MTQ=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Ox27Q8b9fKBRYRCrX6lpBDk9MTQ=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Pom7hxf3mq_qS2WJ5FqHAjN3cUc=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Pom7hxf3mq_qS2WJ5FqHAjN3cUc=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/PtgXUPV00q80KRbJKhgdeKX+M6U=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/PtgXUPV00q80KRbJKhgdeKX+M6U=
--- a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/QCGaU4Nq73as1cmbgTvNtb1FG8E=
+++ b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/QCGaU4Nq73as1cmbgTvNtb1FG8E=
--- a/Show More
+++ b/Show More