diff --git a/ScoutingApp/.idea/assetWizardSettings.xml b/ScoutingApp/.idea/assetWizardSettings.xml
new file mode 100644
index 0000000..260b6e4
--- /dev/null
+++ b/ScoutingApp/.idea/assetWizardSettings.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ScoutingApp/.idea/caches/deviceStreaming.xml b/ScoutingApp/.idea/caches/deviceStreaming.xml
index b873865..e05e216 100644
--- a/ScoutingApp/.idea/caches/deviceStreaming.xml
+++ b/ScoutingApp/.idea/caches/deviceStreaming.xml
@@ -201,6 +201,17 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git 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
new file mode 100644
index 0000000..601f245
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_50ea05747660538aa33f38e7f0c16548f0f6edfe9cc27dca0400ccffcab99c6a_bucket_0/graph.bin differ
diff --git 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
new file mode 100644
index 0000000..601f245
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_50ea05747660538aa33f38e7f0c16548f0f6edfe9cc27dca0400ccffcab99c6a_bucket_1/graph.bin differ
diff --git 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
new file mode 100644
index 0000000..601f245
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_50ea05747660538aa33f38e7f0c16548f0f6edfe9cc27dca0400ccffcab99c6a_bucket_2/graph.bin differ
diff --git 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
new file mode 100644
index 0000000..601f245
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_50ea05747660538aa33f38e7f0c16548f0f6edfe9cc27dca0400ccffcab99c6a_bucket_3/graph.bin differ
diff --git 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
new file mode 100644
index 0000000..601f245
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_50ea05747660538aa33f38e7f0c16548f0f6edfe9cc27dca0400ccffcab99c6a_bucket_4/graph.bin differ
diff --git 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
new file mode 100644
index 0000000..601f245
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_50ea05747660538aa33f38e7f0c16548f0f6edfe9cc27dca0400ccffcab99c6a_bucket_5/graph.bin differ
diff --git 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
new file mode 100644
index 0000000..601f245
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_50ea05747660538aa33f38e7f0c16548f0f6edfe9cc27dca0400ccffcab99c6a_bucket_6/graph.bin differ
diff --git 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
new file mode 100644
index 0000000..601f245
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_50ea05747660538aa33f38e7f0c16548f0f6edfe9cc27dca0400ccffcab99c6a_bucket_7/graph.bin differ
diff --git 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
new file mode 100644
index 0000000..601f245
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_50ea05747660538aa33f38e7f0c16548f0f6edfe9cc27dca0400ccffcab99c6a_bucket_8/graph.bin differ
diff --git 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
new file mode 100644
index 0000000..601f245
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_50ea05747660538aa33f38e7f0c16548f0f6edfe9cc27dca0400ccffcab99c6a_bucket_9/graph.bin differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0P03CPkBeXwBYBYWkH+6k2Znn9U= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0P03CPkBeXwBYBYWkH+6k2Znn9U=
new file mode 100644
index 0000000..8fd6cd4
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0P03CPkBeXwBYBYWkH+6k2Znn9U= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0SRTSAWFTaxo_cQDU40z8L8W58g= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0SRTSAWFTaxo_cQDU40z8L8W58g=
new file mode 100644
index 0000000..c3eef53
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0SRTSAWFTaxo_cQDU40z8L8W58g= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0jBsOHOtM_jz9XOKFoW_jSOsoKk= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0jBsOHOtM_jz9XOKFoW_jSOsoKk=
new file mode 100644
index 0000000..dd51769
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0jBsOHOtM_jz9XOKFoW_jSOsoKk= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1AIWjl2C2vrV1cvBQ+VBPGgGIG8= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1AIWjl2C2vrV1cvBQ+VBPGgGIG8=
new file mode 100644
index 0000000..93a3b9f
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1AIWjl2C2vrV1cvBQ+VBPGgGIG8= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1Y9Pt_KjFEKsUuVCxQde7sMM8aA= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1Y9Pt_KjFEKsUuVCxQde7sMM8aA=
new file mode 100644
index 0000000..43e27f1
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1Y9Pt_KjFEKsUuVCxQde7sMM8aA= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/3E_hWJdqxgRIAu4Xi0ewcQUk8qc= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/3E_hWJdqxgRIAu4Xi0ewcQUk8qc=
new file mode 100644
index 0000000..f16f8cc
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/3E_hWJdqxgRIAu4Xi0ewcQUk8qc= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/3sCU6b2l7Nn9ORX1Zzm4c_SkWwU= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/3sCU6b2l7Nn9ORX1Zzm4c_SkWwU=
new file mode 100644
index 0000000..e1bd4ed
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/3sCU6b2l7Nn9ORX1Zzm4c_SkWwU= differ
diff --git 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=
new file mode 100644
index 0000000..c1ceb16
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/65i6ooPtOgvU3zNmHg_c4LDp_P8= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6PQJ6kc54Ofoit4n59oMAyhnZvo= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6PQJ6kc54Ofoit4n59oMAyhnZvo=
new file mode 100644
index 0000000..dc4b9fc
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6PQJ6kc54Ofoit4n59oMAyhnZvo= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6RqcXseTYyesUtxZwwLvRT1Wzqs= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6RqcXseTYyesUtxZwwLvRT1Wzqs=
new file mode 100644
index 0000000..e1bd4ed
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6RqcXseTYyesUtxZwwLvRT1Wzqs= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/8b78Dfuo7rN8JCW9qut9zxR6SjU= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/8b78Dfuo7rN8JCW9qut9zxR6SjU=
new file mode 100644
index 0000000..9b56dc7
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/8b78Dfuo7rN8JCW9qut9zxR6SjU= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/8ed9FeJJj0P18W7r4bx88wnWJEM= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/8ed9FeJJj0P18W7r4bx88wnWJEM=
new file mode 100644
index 0000000..32f2501
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/8ed9FeJJj0P18W7r4bx88wnWJEM= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9I5IeoAh04KErmMWB7ux2QFS2IA= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9I5IeoAh04KErmMWB7ux2QFS2IA=
new file mode 100644
index 0000000..168a921
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9I5IeoAh04KErmMWB7ux2QFS2IA= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9ZoyaPNWqGJ4akFmmrIsivLAYGA= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9ZoyaPNWqGJ4akFmmrIsivLAYGA=
new file mode 100644
index 0000000..1304df9
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9ZoyaPNWqGJ4akFmmrIsivLAYGA= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/A2JDMJvwY4+7fF8w9ED2hfbExb8= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/A2JDMJvwY4+7fF8w9ED2hfbExb8=
new file mode 100644
index 0000000..a429c72
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/A2JDMJvwY4+7fF8w9ED2hfbExb8= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/AVh9xeB0e82mrm3RCLM3xI1pfxw= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/AVh9xeB0e82mrm3RCLM3xI1pfxw=
new file mode 100644
index 0000000..4c9f52f
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/AVh9xeB0e82mrm3RCLM3xI1pfxw= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/AjMyU6ngjVehmdod3ClNj4EC2Wo= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/AjMyU6ngjVehmdod3ClNj4EC2Wo=
new file mode 100644
index 0000000..86f9a86
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/AjMyU6ngjVehmdod3ClNj4EC2Wo= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/BEG7rV9bWPbl26Jq8MEZMqaL1jg= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/BEG7rV9bWPbl26Jq8MEZMqaL1jg=
new file mode 100644
index 0000000..846dea1
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/BEG7rV9bWPbl26Jq8MEZMqaL1jg= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/BhFrXCmYZhMJXuTtKpcS+0IEsWw= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/BhFrXCmYZhMJXuTtKpcS+0IEsWw=
new file mode 100644
index 0000000..2245120
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/BhFrXCmYZhMJXuTtKpcS+0IEsWw= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/C45rJ+ORdXIbdAb7mhzM+tF_qiQ= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/C45rJ+ORdXIbdAb7mhzM+tF_qiQ=
new file mode 100644
index 0000000..1681922
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/C45rJ+ORdXIbdAb7mhzM+tF_qiQ= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CRIwxUFynkXmGsm8iknCcDtMHSw= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CRIwxUFynkXmGsm8iknCcDtMHSw=
new file mode 100644
index 0000000..43e27f1
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CRIwxUFynkXmGsm8iknCcDtMHSw= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CaA7QNNRpjBf0hUBTl7X1JAMsgg= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CaA7QNNRpjBf0hUBTl7X1JAMsgg=
new file mode 100644
index 0000000..f3fd80a
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CaA7QNNRpjBf0hUBTl7X1JAMsgg= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CcDiVJAButrGOLm4ySAuNEG8trE= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CcDiVJAButrGOLm4ySAuNEG8trE=
new file mode 100644
index 0000000..bff7b3b
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CcDiVJAButrGOLm4ySAuNEG8trE= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CmQQ0P8uJgdheNwyecP8L_w6SpY= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CmQQ0P8uJgdheNwyecP8L_w6SpY=
new file mode 100644
index 0000000..a0e7486
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CmQQ0P8uJgdheNwyecP8L_w6SpY= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CrsNisciTbFcawlVDE5SxqX0DWg= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CrsNisciTbFcawlVDE5SxqX0DWg=
new file mode 100644
index 0000000..29999b7
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CrsNisciTbFcawlVDE5SxqX0DWg= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/DgjAw_Im9hnFYdgRcxWmZ6TaI1U= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/DgjAw_Im9hnFYdgRcxWmZ6TaI1U=
new file mode 100644
index 0000000..d0c7a21
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/DgjAw_Im9hnFYdgRcxWmZ6TaI1U= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/DuDUzrmDKgwhYbr4EJzslYJAxJA= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/DuDUzrmDKgwhYbr4EJzslYJAxJA=
new file mode 100644
index 0000000..ff0bce5
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/DuDUzrmDKgwhYbr4EJzslYJAxJA= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/EyjdLd1GwvYcFb+gdSjnwZRtYPE= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/EyjdLd1GwvYcFb+gdSjnwZRtYPE=
new file mode 100644
index 0000000..e394491
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/EyjdLd1GwvYcFb+gdSjnwZRtYPE= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/FFwkWR0XQgw4c_jPs3OCsWGsHGU= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/FFwkWR0XQgw4c_jPs3OCsWGsHGU=
new file mode 100644
index 0000000..5e9d2aa
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/FFwkWR0XQgw4c_jPs3OCsWGsHGU= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/FlJgrvKaePE3KW1FSecooNmXnT4= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/FlJgrvKaePE3KW1FSecooNmXnT4=
new file mode 100644
index 0000000..2ba6503
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/FlJgrvKaePE3KW1FSecooNmXnT4= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/HRZlPW4wq4kAXffp0zjMgw9H9CY= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/HRZlPW4wq4kAXffp0zjMgw9H9CY=
new file mode 100644
index 0000000..5fa6ce9
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/HRZlPW4wq4kAXffp0zjMgw9H9CY= differ
diff --git 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=
new file mode 100644
index 0000000..ba4fe2e
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/IkrURBTPo+YPwTJKWN+MNpSHnEg= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Jj16WFFnYwUJzQL3XNLw7hiVZlA= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Jj16WFFnYwUJzQL3XNLw7hiVZlA=
new file mode 100644
index 0000000..93a3b9f
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Jj16WFFnYwUJzQL3XNLw7hiVZlA= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/KGACyKNKC6sPGru5wRY1SygEVLs= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/KGACyKNKC6sPGru5wRY1SygEVLs=
new file mode 100644
index 0000000..e9eed80
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/KGACyKNKC6sPGru5wRY1SygEVLs= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/KuQpAYd4m+DjDSPGBFLfT1B_6qU= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/KuQpAYd4m+DjDSPGBFLfT1B_6qU=
new file mode 100644
index 0000000..07b7738
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/KuQpAYd4m+DjDSPGBFLfT1B_6qU= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/MKHakyGHp1EfBRzVc87k044yTaA= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/MKHakyGHp1EfBRzVc87k044yTaA=
new file mode 100644
index 0000000..6ec2aba
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/MKHakyGHp1EfBRzVc87k044yTaA= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/MTXRxtqni4SFPEtAKULwY6cbNn0= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/MTXRxtqni4SFPEtAKULwY6cbNn0=
new file mode 100644
index 0000000..ae9d872
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/MTXRxtqni4SFPEtAKULwY6cbNn0= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NOkmfZZ3VHV_wBVx2Mwk8XRq0I4= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NOkmfZZ3VHV_wBVx2Mwk8XRq0I4=
new file mode 100644
index 0000000..a429c72
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NOkmfZZ3VHV_wBVx2Mwk8XRq0I4= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NWWm0TkmoIQvMXWVhWqCE8EBkZ0= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NWWm0TkmoIQvMXWVhWqCE8EBkZ0=
new file mode 100644
index 0000000..21e1755
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NWWm0TkmoIQvMXWVhWqCE8EBkZ0= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Or47ZWILAucAB0eGfmM_iVNwCpU= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Or47ZWILAucAB0eGfmM_iVNwCpU=
new file mode 100644
index 0000000..32f2501
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Or47ZWILAucAB0eGfmM_iVNwCpU= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Ox0aPLj0r68QbONiZdMCZy8Kadc= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Ox0aPLj0r68QbONiZdMCZy8Kadc=
new file mode 100644
index 0000000..f96d0da
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Ox0aPLj0r68QbONiZdMCZy8Kadc= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Ox27Q8b9fKBRYRCrX6lpBDk9MTQ= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Ox27Q8b9fKBRYRCrX6lpBDk9MTQ=
new file mode 100644
index 0000000..c703ef4
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Ox27Q8b9fKBRYRCrX6lpBDk9MTQ= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/PFnrPGag9ktavWMNYedF7eNqyYk= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/PFnrPGag9ktavWMNYedF7eNqyYk=
new file mode 100644
index 0000000..31b2786
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/PFnrPGag9ktavWMNYedF7eNqyYk= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Pom7hxf3mq_qS2WJ5FqHAjN3cUc= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Pom7hxf3mq_qS2WJ5FqHAjN3cUc=
new file mode 100644
index 0000000..ac6c1db
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Pom7hxf3mq_qS2WJ5FqHAjN3cUc= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/QCGaU4Nq73as1cmbgTvNtb1FG8E= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/QCGaU4Nq73as1cmbgTvNtb1FG8E=
new file mode 100644
index 0000000..f16f8cc
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/QCGaU4Nq73as1cmbgTvNtb1FG8E= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/QMBn7AhFipDTPbUjNDeUdjOcLwA= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/QMBn7AhFipDTPbUjNDeUdjOcLwA=
new file mode 100644
index 0000000..88f5191
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/QMBn7AhFipDTPbUjNDeUdjOcLwA= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/QyXlmj7WqSg+Zb_opStANisA36c= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/QyXlmj7WqSg+Zb_opStANisA36c=
new file mode 100644
index 0000000..6c9803f
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/QyXlmj7WqSg+Zb_opStANisA36c= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/R8jZ2suJsUM8+uGZ4st6b1HVkU4= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/R8jZ2suJsUM8+uGZ4st6b1HVkU4=
new file mode 100644
index 0000000..5fa6ce9
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/R8jZ2suJsUM8+uGZ4st6b1HVkU4= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/RGzENi_nk3DXahBQp2tQLpH6Xco= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/RGzENi_nk3DXahBQp2tQLpH6Xco=
new file mode 100644
index 0000000..2cec677
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/RGzENi_nk3DXahBQp2tQLpH6Xco= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/RjTIBBIDVvp5UasyeWYESXisdO8= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/RjTIBBIDVvp5UasyeWYESXisdO8=
new file mode 100644
index 0000000..e394491
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/RjTIBBIDVvp5UasyeWYESXisdO8= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/RwlZnyRGNY7IpEo2fPnIpPKxSmc= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/RwlZnyRGNY7IpEo2fPnIpPKxSmc=
new file mode 100644
index 0000000..218ee25
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/RwlZnyRGNY7IpEo2fPnIpPKxSmc= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/T18VSb3GWZWlcC6ZfqenT9EvppA= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/T18VSb3GWZWlcC6ZfqenT9EvppA=
new file mode 100644
index 0000000..8bf936d
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/T18VSb3GWZWlcC6ZfqenT9EvppA= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/T4q8R04vnghcjmSHlzjxgiva9Tc= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/T4q8R04vnghcjmSHlzjxgiva9Tc=
new file mode 100644
index 0000000..9b56dc7
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/T4q8R04vnghcjmSHlzjxgiva9Tc= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/TtwaLACqksavl724m__hMP5z6RU= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/TtwaLACqksavl724m__hMP5z6RU=
new file mode 100644
index 0000000..168a921
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/TtwaLACqksavl724m__hMP5z6RU= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/U1PtyTnxcG_86T3V8vnGiitILzo= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/U1PtyTnxcG_86T3V8vnGiitILzo=
new file mode 100644
index 0000000..de755d1
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/U1PtyTnxcG_86T3V8vnGiitILzo= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/V5NZ79kttRcQKELPrlckdE+Fm2U= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/V5NZ79kttRcQKELPrlckdE+Fm2U=
new file mode 100644
index 0000000..63edd05
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/V5NZ79kttRcQKELPrlckdE+Fm2U= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/VB0qWtvIrgSmlq453scboKa3l3M= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/VB0qWtvIrgSmlq453scboKa3l3M=
new file mode 100644
index 0000000..a0e7486
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/VB0qWtvIrgSmlq453scboKa3l3M= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/VM060aqEv+V4tuXBYAAYlQHQ_TU= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/VM060aqEv+V4tuXBYAAYlQHQ_TU=
new file mode 100644
index 0000000..1ffce77
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/VM060aqEv+V4tuXBYAAYlQHQ_TU= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/W86fpaOEBssmYFUbobruOnXl1ZE= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/W86fpaOEBssmYFUbobruOnXl1ZE=
new file mode 100644
index 0000000..2c4d543
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/W86fpaOEBssmYFUbobruOnXl1ZE= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/XxxP20jKBhOVlPUjL7ellXTq+Ms= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/XxxP20jKBhOVlPUjL7ellXTq+Ms=
new file mode 100644
index 0000000..b48d773
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/XxxP20jKBhOVlPUjL7ellXTq+Ms= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Z4liLfR5ZjGA3OIMRSZzGMMriTQ= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Z4liLfR5ZjGA3OIMRSZzGMMriTQ=
new file mode 100644
index 0000000..90d5279
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Z4liLfR5ZjGA3OIMRSZzGMMriTQ= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ZIH3tEKalgGdjj9ovSJnrrqNTXo= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ZIH3tEKalgGdjj9ovSJnrrqNTXo=
new file mode 100644
index 0000000..45832c0
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ZIH3tEKalgGdjj9ovSJnrrqNTXo= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ZXRPGKfkQs5lmuT+5alYrKg8J0c= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ZXRPGKfkQs5lmuT+5alYrKg8J0c=
new file mode 100644
index 0000000..59222d9
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ZXRPGKfkQs5lmuT+5alYrKg8J0c= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/_GyRBsFMmJPElLrb0t7tAcDGA_g= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/_GyRBsFMmJPElLrb0t7tAcDGA_g=
new file mode 100644
index 0000000..ba19014
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/_GyRBsFMmJPElLrb0t7tAcDGA_g= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/_SlCtTGIswFhPhhJ8urlH_e8qUw= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/_SlCtTGIswFhPhhJ8urlH_e8qUw=
new file mode 100644
index 0000000..761fe3b
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/_SlCtTGIswFhPhhJ8urlH_e8qUw= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/bAf2NP4+nkXzTu0m6msUqYg+K3U= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/bAf2NP4+nkXzTu0m6msUqYg+K3U=
new file mode 100644
index 0000000..86f9a86
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/bAf2NP4+nkXzTu0m6msUqYg+K3U= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ccoCFssTEeQmftAsxJMD6V27BkE= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ccoCFssTEeQmftAsxJMD6V27BkE=
new file mode 100644
index 0000000..fb794be
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ccoCFssTEeQmftAsxJMD6V27BkE= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/cnteccK5a8GhsUN4DbDt2pJRJJM= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/cnteccK5a8GhsUN4DbDt2pJRJJM=
new file mode 100644
index 0000000..2245120
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/cnteccK5a8GhsUN4DbDt2pJRJJM= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/e9F_AIq7Oe6Uu9jVxjiVqH_Fzlg= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/e9F_AIq7Oe6Uu9jVxjiVqH_Fzlg=
new file mode 100644
index 0000000..2e07982
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/e9F_AIq7Oe6Uu9jVxjiVqH_Fzlg= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ePwt19NzJmRS1iUhqkAoMXFjIAI= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ePwt19NzJmRS1iUhqkAoMXFjIAI=
new file mode 100644
index 0000000..f96d0da
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ePwt19NzJmRS1iUhqkAoMXFjIAI= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ejB0+JtmWxwp5szj_6KJQCNJlrQ= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ejB0+JtmWxwp5szj_6KJQCNJlrQ=
new file mode 100644
index 0000000..99f5ba0
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ejB0+JtmWxwp5szj_6KJQCNJlrQ= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ev01DqaYuMmX5vdFCCS_6PKFJVU= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ev01DqaYuMmX5vdFCCS_6PKFJVU=
new file mode 100644
index 0000000..faf3fa8
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ev01DqaYuMmX5vdFCCS_6PKFJVU= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/gERGmZKjcSRoOgIdty3ON9mNlJA= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/gERGmZKjcSRoOgIdty3ON9mNlJA=
new file mode 100644
index 0000000..5ea1683
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/gERGmZKjcSRoOgIdty3ON9mNlJA= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/hIzdk0brx6ShF_yNwxMOacykxYU= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/hIzdk0brx6ShF_yNwxMOacykxYU=
new file mode 100644
index 0000000..7d72bb7
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/hIzdk0brx6ShF_yNwxMOacykxYU= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/iOE1IDpVAySCWp_6siDg+r9sFro= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/iOE1IDpVAySCWp_6siDg+r9sFro=
new file mode 100644
index 0000000..c1ceb16
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/iOE1IDpVAySCWp_6siDg+r9sFro= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/iR5hfG217Uz2+LGLGz8ZWta_Xgg= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/iR5hfG217Uz2+LGLGz8ZWta_Xgg=
new file mode 100644
index 0000000..4b57f5b
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/iR5hfG217Uz2+LGLGz8ZWta_Xgg= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ih+tIfafB13mmngwGFL_K0OIZq0= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ih+tIfafB13mmngwGFL_K0OIZq0=
new file mode 100644
index 0000000..4b57f5b
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ih+tIfafB13mmngwGFL_K0OIZq0= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/itZLJwXxng81_aRilUWST7OHorI= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/itZLJwXxng81_aRilUWST7OHorI=
new file mode 100644
index 0000000..45832c0
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/itZLJwXxng81_aRilUWST7OHorI= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/jGXkGeaBW1e9E9CM4srMR5IXBoA= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/jGXkGeaBW1e9E9CM4srMR5IXBoA=
new file mode 100644
index 0000000..fb7d7d9
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/jGXkGeaBW1e9E9CM4srMR5IXBoA= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/jHduWo2J30r5u2DoZ0R8TWwwwnk= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/jHduWo2J30r5u2DoZ0R8TWwwwnk=
new file mode 100644
index 0000000..7d72bb7
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/jHduWo2J30r5u2DoZ0R8TWwwwnk= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/jT1G925_RKlT+wMXHHJ9rKblACw= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/jT1G925_RKlT+wMXHHJ9rKblACw=
new file mode 100644
index 0000000..b48d773
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/jT1G925_RKlT+wMXHHJ9rKblACw= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/jshy7Q7WIQkvc0PUbNXPoeTzSXg= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/jshy7Q7WIQkvc0PUbNXPoeTzSXg=
new file mode 100644
index 0000000..dc7b90e
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/jshy7Q7WIQkvc0PUbNXPoeTzSXg= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/kAXc541CzeS2HDci1sN4edGH6jI= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/kAXc541CzeS2HDci1sN4edGH6jI=
new file mode 100644
index 0000000..4f1af9b
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/kAXc541CzeS2HDci1sN4edGH6jI= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/kls7VK_SH7MRH0acz90fKNv6SzM= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/kls7VK_SH7MRH0acz90fKNv6SzM=
new file mode 100644
index 0000000..fd8615e
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/kls7VK_SH7MRH0acz90fKNv6SzM= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/kqKKBuDQvqhgmvdK1SGTL3acpN8= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/kqKKBuDQvqhgmvdK1SGTL3acpN8=
new file mode 100644
index 0000000..b2efafc
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/kqKKBuDQvqhgmvdK1SGTL3acpN8= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/mB3U7qw0t6RwLWPtrEA69vZRUkA= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/mB3U7qw0t6RwLWPtrEA69vZRUkA=
new file mode 100644
index 0000000..9426e40
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/mB3U7qw0t6RwLWPtrEA69vZRUkA= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/nNSgZ2rQfArHlIz80OZfuhQjQm4= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/nNSgZ2rQfArHlIz80OZfuhQjQm4=
new file mode 100644
index 0000000..86c0d45
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/nNSgZ2rQfArHlIz80OZfuhQjQm4= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/nUu62kBO+VXzPfzMOUyVF+IR+RA= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/nUu62kBO+VXzPfzMOUyVF+IR+RA=
new file mode 100644
index 0000000..fd8615e
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/nUu62kBO+VXzPfzMOUyVF+IR+RA= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/nVyip5NNKuboVJ4bmWYygcukbd8= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/nVyip5NNKuboVJ4bmWYygcukbd8=
new file mode 100644
index 0000000..21eb307
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/nVyip5NNKuboVJ4bmWYygcukbd8= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/npWbHDqhsKqHapktnKMQpM0o66Q= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/npWbHDqhsKqHapktnKMQpM0o66Q=
new file mode 100644
index 0000000..5c88b2b
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/npWbHDqhsKqHapktnKMQpM0o66Q= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/o+_tDBK+7xB5G2z6nSy5vIpKmpE= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/o+_tDBK+7xB5G2z6nSy5vIpKmpE=
new file mode 100644
index 0000000..833b095
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/o+_tDBK+7xB5G2z6nSy5vIpKmpE= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/oOqfqhIoF+E9yTIyntWeJcEEYU8= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/oOqfqhIoF+E9yTIyntWeJcEEYU8=
new file mode 100644
index 0000000..ec8ad90
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/oOqfqhIoF+E9yTIyntWeJcEEYU8= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/opzVWfB06SRmCd30tfyQU8UG_e4= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/opzVWfB06SRmCd30tfyQU8UG_e4=
new file mode 100644
index 0000000..6600c5b
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/opzVWfB06SRmCd30tfyQU8UG_e4= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/pT9p99Z3tUTiUevNxgvBic2Ys74= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/pT9p99Z3tUTiUevNxgvBic2Ys74=
new file mode 100644
index 0000000..218ee25
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/pT9p99Z3tUTiUevNxgvBic2Ys74= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/puU4u6vMJHRqrEGdltUTLP5li5c= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/puU4u6vMJHRqrEGdltUTLP5li5c=
new file mode 100644
index 0000000..59222d9
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/puU4u6vMJHRqrEGdltUTLP5li5c= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/sMnydUFKRla_yNiYkZgfRUUBDl4= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/sMnydUFKRla_yNiYkZgfRUUBDl4=
new file mode 100644
index 0000000..c68ea7a
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/sMnydUFKRla_yNiYkZgfRUUBDl4= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/s_C6tW88TIPlhrod+x2NH81NfsQ= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/s_C6tW88TIPlhrod+x2NH81NfsQ=
new file mode 100644
index 0000000..6ccda32
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/s_C6tW88TIPlhrod+x2NH81NfsQ= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/sgUcrKPY_NWygRLrS4iHweh3XAw= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/sgUcrKPY_NWygRLrS4iHweh3XAw=
new file mode 100644
index 0000000..d995431
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/sgUcrKPY_NWygRLrS4iHweh3XAw= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/t4hHO6iq92O8oVFFfFneC7dq5Qg= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/t4hHO6iq92O8oVFFfFneC7dq5Qg=
new file mode 100644
index 0000000..dccab6f
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/t4hHO6iq92O8oVFFfFneC7dq5Qg= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tHQ9WaccxK5Pp4s9ObYGvCHQKJM= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tHQ9WaccxK5Pp4s9ObYGvCHQKJM=
new file mode 100644
index 0000000..f8799c3
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tHQ9WaccxK5Pp4s9ObYGvCHQKJM= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tHdhXEPtuYJyYe9YHdFFb85ucCA= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tHdhXEPtuYJyYe9YHdFFb85ucCA=
new file mode 100644
index 0000000..fd6b42c
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tHdhXEPtuYJyYe9YHdFFb85ucCA= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tJyA+tORG5dmeGdTEjHMzC7YKSY= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tJyA+tORG5dmeGdTEjHMzC7YKSY=
new file mode 100644
index 0000000..e9eed80
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tJyA+tORG5dmeGdTEjHMzC7YKSY= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tO7hX1EGtu7CX3iu86dhv7MGGV8= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tO7hX1EGtu7CX3iu86dhv7MGGV8=
new file mode 100644
index 0000000..5ea1683
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tO7hX1EGtu7CX3iu86dhv7MGGV8= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tTcLS0FrQpnBNUT5Cc+ms9UN_uI= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tTcLS0FrQpnBNUT5Cc+ms9UN_uI=
new file mode 100644
index 0000000..ba4fe2e
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tTcLS0FrQpnBNUT5Cc+ms9UN_uI= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tpYQeUtJo4cIpShg1mCsclHhv3Y= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tpYQeUtJo4cIpShg1mCsclHhv3Y=
new file mode 100644
index 0000000..ec8ad90
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tpYQeUtJo4cIpShg1mCsclHhv3Y= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tqhmTz4MkXYfZ1_JNYbaO5shXxk= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tqhmTz4MkXYfZ1_JNYbaO5shXxk=
new file mode 100644
index 0000000..faf3fa8
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tqhmTz4MkXYfZ1_JNYbaO5shXxk= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/uYGP1hJsPx6EcZhnd0iQHObfbHk= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/uYGP1hJsPx6EcZhnd0iQHObfbHk=
new file mode 100644
index 0000000..6600c5b
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/uYGP1hJsPx6EcZhnd0iQHObfbHk= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/uarVRBqSiWSdmU4IJmZ+Fe5OfbA= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/uarVRBqSiWSdmU4IJmZ+Fe5OfbA=
new file mode 100644
index 0000000..567d422
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/uarVRBqSiWSdmU4IJmZ+Fe5OfbA= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/us2mueLiu3sDK2nLlXPPZviZtaY= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/us2mueLiu3sDK2nLlXPPZviZtaY=
new file mode 100644
index 0000000..f8799c3
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/us2mueLiu3sDK2nLlXPPZviZtaY= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/v1hqI7KamYUKFAoJ5r_VHOq65io= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/v1hqI7KamYUKFAoJ5r_VHOq65io=
new file mode 100644
index 0000000..d995431
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/v1hqI7KamYUKFAoJ5r_VHOq65io= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/vF4UtwNjrIlWvvPtQoje_E6QTXY= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/vF4UtwNjrIlWvvPtQoje_E6QTXY=
new file mode 100644
index 0000000..8568b5b
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/vF4UtwNjrIlWvvPtQoje_E6QTXY= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/vyzsZk_rPQPOw64avmiQ0JZtutY= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/vyzsZk_rPQPOw64avmiQ0JZtutY=
new file mode 100644
index 0000000..427b655
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/vyzsZk_rPQPOw64avmiQ0JZtutY= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wOj_Yh1k8prI4G+r+xg068ZL7pU= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wOj_Yh1k8prI4G+r+xg068ZL7pU=
new file mode 100644
index 0000000..1681922
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wOj_Yh1k8prI4G+r+xg068ZL7pU= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wj2qnEbTx_5CWIacSorFzkc1wGo= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wj2qnEbTx_5CWIacSorFzkc1wGo=
new file mode 100644
index 0000000..ff0bce5
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wj2qnEbTx_5CWIacSorFzkc1wGo= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/xOhdVos+VY0w8uBf9t1pI0dJpX0= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/xOhdVos+VY0w8uBf9t1pI0dJpX0=
new file mode 100644
index 0000000..b73828b
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/xOhdVos+VY0w8uBf9t1pI0dJpX0= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/z8bdFhGkTU6UqvS38IX3N8wqb2Q= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/z8bdFhGkTU6UqvS38IX3N8wqb2Q=
new file mode 100644
index 0000000..fd5e6f2
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/z8bdFhGkTU6UqvS38IX3N8wqb2Q= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/zg7h+IgIo_FqmtKW_qyXbIRYbPo= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/zg7h+IgIo_FqmtKW_qyXbIRYbPo=
new file mode 100644
index 0000000..dc4b9fc
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/zg7h+IgIo_FqmtKW_qyXbIRYbPo= differ
diff --git a/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/zpTnMnVE9RZwhD3IVI42eKAICgc= b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/zpTnMnVE9RZwhD3IVI42eKAICgc=
new file mode 100644
index 0000000..2510a5a
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/zpTnMnVE9RZwhD3IVI42eKAICgc= differ
diff --git a/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/drawable_loop.png.flat b/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/drawable_loop.png.flat
new file mode 100644
index 0000000..552d8c5
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/drawable_loop.png.flat differ
diff --git a/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/drawable/loop.png b/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/drawable/loop.png
new file mode 100644
index 0000000..e4519b1
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/drawable/loop.png differ
diff --git a/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/6d8b90a7f0ffdeb8006cb4e4aee4e2adbadc2c9da4ec3278c92abd6202315218_0.jar b/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/6d8b90a7f0ffdeb8006cb4e4aee4e2adbadc2c9da4ec3278c92abd6202315218_0.jar
new file mode 100644
index 0000000..5b01de0
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/6d8b90a7f0ffdeb8006cb4e4aee4e2adbadc2c9da4ec3278c92abd6202315218_0.jar differ
diff --git a/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/6d8b90a7f0ffdeb8006cb4e4aee4e2adbadc2c9da4ec3278c92abd6202315218_1.jar b/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/6d8b90a7f0ffdeb8006cb4e4aee4e2adbadc2c9da4ec3278c92abd6202315218_1.jar
new file mode 100644
index 0000000..31fb3b6
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/6d8b90a7f0ffdeb8006cb4e4aee4e2adbadc2c9da4ec3278c92abd6202315218_1.jar differ
diff --git a/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/6d8b90a7f0ffdeb8006cb4e4aee4e2adbadc2c9da4ec3278c92abd6202315218_2.jar b/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/6d8b90a7f0ffdeb8006cb4e4aee4e2adbadc2c9da4ec3278c92abd6202315218_2.jar
new file mode 100644
index 0000000..dd86ede
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/6d8b90a7f0ffdeb8006cb4e4aee4e2adbadc2c9da4ec3278c92abd6202315218_2.jar differ
diff --git a/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/6d8b90a7f0ffdeb8006cb4e4aee4e2adbadc2c9da4ec3278c92abd6202315218_3.jar b/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/6d8b90a7f0ffdeb8006cb4e4aee4e2adbadc2c9da4ec3278c92abd6202315218_3.jar
new file mode 100644
index 0000000..22a357d
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/6d8b90a7f0ffdeb8006cb4e4aee4e2adbadc2c9da4ec3278c92abd6202315218_3.jar differ
diff --git a/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/6d8b90a7f0ffdeb8006cb4e4aee4e2adbadc2c9da4ec3278c92abd6202315218_5.jar b/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/6d8b90a7f0ffdeb8006cb4e4aee4e2adbadc2c9da4ec3278c92abd6202315218_5.jar
new file mode 100644
index 0000000..c53060f
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/6d8b90a7f0ffdeb8006cb4e4aee4e2adbadc2c9da4ec3278c92abd6202315218_5.jar differ
diff --git a/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/6d8b90a7f0ffdeb8006cb4e4aee4e2adbadc2c9da4ec3278c92abd6202315218_6.jar b/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/6d8b90a7f0ffdeb8006cb4e4aee4e2adbadc2c9da4ec3278c92abd6202315218_6.jar
new file mode 100644
index 0000000..a618c75
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/6d8b90a7f0ffdeb8006cb4e4aee4e2adbadc2c9da4ec3278c92abd6202315218_6.jar differ
diff --git a/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/6d8b90a7f0ffdeb8006cb4e4aee4e2adbadc2c9da4ec3278c92abd6202315218_7.jar b/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/6d8b90a7f0ffdeb8006cb4e4aee4e2adbadc2c9da4ec3278c92abd6202315218_7.jar
new file mode 100644
index 0000000..665f3d5
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/6d8b90a7f0ffdeb8006cb4e4aee4e2adbadc2c9da4ec3278c92abd6202315218_7.jar differ
diff --git a/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/6d8b90a7f0ffdeb8006cb4e4aee4e2adbadc2c9da4ec3278c92abd6202315218_8.jar b/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/6d8b90a7f0ffdeb8006cb4e4aee4e2adbadc2c9da4ec3278c92abd6202315218_8.jar
new file mode 100644
index 0000000..be00ddc
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/6d8b90a7f0ffdeb8006cb4e4aee4e2adbadc2c9da4ec3278c92abd6202315218_8.jar differ
diff --git a/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/6d8b90a7f0ffdeb8006cb4e4aee4e2adbadc2c9da4ec3278c92abd6202315218_9.jar b/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/6d8b90a7f0ffdeb8006cb4e4aee4e2adbadc2c9da4ec3278c92abd6202315218_9.jar
new file mode 100644
index 0000000..c5f69b8
Binary files /dev/null and b/ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/6d8b90a7f0ffdeb8006cb4e4aee4e2adbadc2c9da4ec3278c92abd6202315218_9.jar differ
diff --git a/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/EndActivity.class.uniqueId4 b/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/EndActivity.class.uniqueId4
new file mode 100644
index 0000000..b095f55
Binary files /dev/null and b/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/EndActivity.class.uniqueId4 differ
diff --git a/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MainActivity$1.class.uniqueId1 b/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MainActivity$1.class.uniqueId1
new file mode 100644
index 0000000..254b725
Binary files /dev/null and b/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MainActivity$1.class.uniqueId1 differ
diff --git a/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MainActivity$AsynchronousGet.class.uniqueId2 b/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MainActivity$AsynchronousGet.class.uniqueId2
new file mode 100644
index 0000000..141a4cf
Binary files /dev/null and b/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MainActivity$AsynchronousGet.class.uniqueId2 differ
diff --git a/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/TeleActivity.class.uniqueId6 b/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/TeleActivity.class.uniqueId6
new file mode 100644
index 0000000..3159a1a
Binary files /dev/null and b/ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/TeleActivity.class.uniqueId6 differ
diff --git a/ScoutingApp/app/src/main/AndroidManifest.xml b/ScoutingApp/app/src/main/AndroidManifest.xml
index c16aa8a..3fc9bf9 100644
--- a/ScoutingApp/app/src/main/AndroidManifest.xml
+++ b/ScoutingApp/app/src/main/AndroidManifest.xml
@@ -5,7 +5,7 @@
-
+
-
+
\ No newline at end of file
diff --git a/ScoutingApp/app/src/main/java/com/example/scoutingapp/AutoActivity.java b/ScoutingApp/app/src/main/java/com/example/scoutingapp/AutoActivity.java
index 3b95fdb..9fcb29e 100644
--- a/ScoutingApp/app/src/main/java/com/example/scoutingapp/AutoActivity.java
+++ b/ScoutingApp/app/src/main/java/com/example/scoutingapp/AutoActivity.java
@@ -36,6 +36,10 @@ public class AutoActivity extends AppCompatActivity {
private Button l1Button;
private Button processorButton;
private Button netButton;
+ private String eventString, matchString, TeamString;
+ public static final String Event_Key = "EVENTCONFIRM";
+ public static final String Match_key = "MATCHCONFIRM";
+ public static final String Team_key = "TEAMCONFIRM";
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -47,6 +51,11 @@ public class AutoActivity extends AppCompatActivity {
v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom);
return insets;
});
+ Intent intentinput = getIntent();
+ eventString = intentinput.getStringExtra(MainActivity.Event_Key);
+ matchString = intentinput.getStringExtra(MainActivity.Match_key);
+ TeamString = intentinput.getStringExtra(MainActivity.Team_key);
+
l4Button = (Button) findViewById(R.id.button_L4);
l3Button = (Button) findViewById(R.id.button_L3);
@@ -130,7 +139,11 @@ public class AutoActivity extends AppCompatActivity {
nextButton.setOnLongClickListener((v) -> {
//submit data
+ CSVmake(AutoActivity.this);
Intent intent = new Intent(this, TeleActivity.class);
+ intent.putExtra(Event_Key, eventString);
+ intent.putExtra(Match_key, matchString);
+ intent.putExtra(Team_key, TeamString);
startActivity(intent);
return true;
});
@@ -172,17 +185,23 @@ public class AutoActivity extends AppCompatActivity {
public void CSVmake(Context context) {
//adds the strings
String CSVLine = String.format(
- "Auto, %s, %s, %s, %s, %s, %s, %s",
+ "%s,%s,%s,Auto,%s,%s,%s,%s,%s,%s,%s,%s,%s",
+ eventString,
+ matchString,
+ TeamString,
l4Scored,
l3Scored,
l2Scored,
l1Scored,
+ processorScored,
+ netScored,
reefPickup,
canLeave,
coralPickup
);
//makes the file
- File csvFile = new File(context.getFilesDir(), "match_data.csv");
+ File csvFile = new File(context.getFilesDir(), eventString+matchString+TeamString+".csv");
+ Log.d("CSVFile", "File created/written at: " + csvFile.getAbsolutePath());
//writes to file
try (FileWriter writer = new FileWriter(csvFile, true)) {
writer.append(CSVLine).append("\n");
diff --git a/ScoutingApp/app/src/main/java/com/example/scoutingapp/EndActivity.java b/ScoutingApp/app/src/main/java/com/example/scoutingapp/EndActivity.java
index 8fb60f4..cb209a4 100644
--- a/ScoutingApp/app/src/main/java/com/example/scoutingapp/EndActivity.java
+++ b/ScoutingApp/app/src/main/java/com/example/scoutingapp/EndActivity.java
@@ -1,5 +1,6 @@
package com.example.scoutingapp;
+import android.content.Intent;
import android.os.Bundle;
import android.view.View;
@@ -25,6 +26,9 @@ import java.io.File;
public class EndActivity extends AppCompatActivity {
+ private String eventString, matchString, TeamString;
+ public static final String Event_Key = "EVENTCONFIRM";
+ public static final String Match_key = "MATCHCONFIRM";
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -36,22 +40,24 @@ public class EndActivity extends AppCompatActivity {
v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom);
return insets;
});
+ Intent intentinput = getIntent();
+ eventString = intentinput.getStringExtra(TeleActivity.Event_Key);
+ matchString = intentinput.getStringExtra(TeleActivity.Match_key);
+ TeamString = intentinput.getStringExtra(TeleActivity.Team_key);
Button submit = (Button) findViewById(R.id.Submit_button);
submit.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
+ String csvFileString = eventString+matchString+TeamString+".csv";
Submit submit = new Submit();
- //Writes test Data to the String getTeamNumber
- //submit.getTeamNumberTest();
- //Makes the CSV file
- //submit.CSVmake(EndActivity.this);
//Writes data to file to make google sheet read it as a list
- File csvFile = new File(getExternalFilesDir(null), "match_data.csv");
- List> data = submit.parseCSVToList(csvFile);
- submit.parseCSVToList(csvFile);
+ File csvFilefile = new File(getFilesDir(), csvFileString);
+ List> data = submit.parseCSVToList(csvFilefile);
+ submit.parseCSVToList(csvFilefile);
//Uploads the Data to the Google sheet
- submit.uploadSheets(EndActivity.this);
+ submit.uploadSheets(EndActivity.this, csvFileString);
+ //submit.renameFile(EndActivity.this, csvFileString);
}
});
@@ -68,4 +74,7 @@ public class EndActivity extends AppCompatActivity {
}
+
+
}
+
diff --git a/ScoutingApp/app/src/main/java/com/example/scoutingapp/MainActivity.java b/ScoutingApp/app/src/main/java/com/example/scoutingapp/MainActivity.java
index 339f5b5..7fade69 100644
--- a/ScoutingApp/app/src/main/java/com/example/scoutingapp/MainActivity.java
+++ b/ScoutingApp/app/src/main/java/com/example/scoutingapp/MainActivity.java
@@ -1,12 +1,12 @@
package com.example.scoutingapp;
import android.content.Intent;
-import static java.sql.DriverManager.println;
-import android.os.AsyncTask;
import android.os.Bundle;
import android.view.View;
import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TextView;
import androidx.activity.EdgeToEdge;
import androidx.appcompat.app.AppCompatActivity;
@@ -14,17 +14,26 @@ import androidx.core.graphics.Insets;
import androidx.core.view.ViewCompat;
import androidx.core.view.WindowInsetsCompat;
+import org.json.JSONArray;
+import org.json.JSONObject;
+
import java.io.IOException;
-import okhttp3.Call;
-import okhttp3.Callback;
import okhttp3.Headers;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.Response;
-import okhttp3.ResponseBody;
public class MainActivity extends AppCompatActivity {
+ private EditText Match_number;
+ private EditText Event;
+ private EditText Team;
+ private String Match_numberString;
+ private String EventString;
+ private String TeamString;
+ public static final String Event_Key = "EVENTCONFIRM";
+ public static final String Match_key = "MATCHCONFIRM";
+ public static final String Team_key = "TEAMCONFIRM";
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -35,51 +44,79 @@ public class MainActivity extends AppCompatActivity {
Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom);
return insets;
+
});
+ Match_number = (EditText) findViewById(R.id.Match);
+ Event = (EditText) findViewById(R.id.Event);
+ Team = (EditText) findViewById(R.id.TeamNumber);
Button nextButton = (Button) findViewById(R.id.nextButton);
nextButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
+ Submit submit = new Submit();
+ submit.renameFileagain(MainActivity.this, "unuploaded.csv");
+ Match_numberString = Match_number.getText().toString();
+ EventString = Event.getText().toString();
+ TeamString = Team.getText().toString();
makeIntent();
}
});
+ Button submit = (Button) findViewById(R.id.Submit_button);
+ submit.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ Submit submit = new Submit();
+ submit.uploadSheets(MainActivity.this, "unuploaded.csv");
+ }
+ });
+
+ TextView TBAView = (TextView)findViewById(R.id.TBATest);
}
-
public final class AsynchronousGet {
private final OkHttpClient client = new OkHttpClient();
- public void run() throws Exception {
+
+
+ public String[][] getMatchTeams(String eventKey, int qualMatchNum) throws Exception {
+ // https://www.thebluealliance.com/api/v3/event/2024melew/teams?X-TBA-Auth-Key=0zxxGYSvY7xI2onqcWg0NT0sEtmtR6hCpmYJ29nwfxvqrP3Mf1M3lRZO5x6Kc3kt
+ // https://www.thebluealliance.com/api/v3/match/2024melew_qm1?X-TBA-Auth-Key=0zxxGYSvY7xI2onqcWg0NT0sEtmtR6hCpmYJ29nwfxvqrP3Mf1M3lRZO5x6Kc3kt
+
+ String fein;
+
Request request = new Request.Builder()
- .url("https://www.thebluealliance.com/api/v3/event/2025melew/teams?X-TBA-Auth-Key=your_api_key")
+ .url("https://www.thebluealliance.com/api/v3/match/" + eventKey + "_qm" + qualMatchNum + "?X-TBA-Auth-Key=0zxxGYSvY7xI2onqcWg0NT0sEtmtR6hCpmYJ29nwfxvqrP3Mf1M3lRZO5x6Kc3kt")
.build();
- client.newCall(request).enqueue(new Callback() {
- @Override
- public void onFailure(Call call, IOException e) {
- e.printStackTrace();
- }
+ try(Response response = client.newCall(request).execute()){
+ if(!response.isSuccessful()) throw new IOException("unexpected code " + response);
- @Override
- public void onResponse(Call call, Response response) throws IOException {
- try (ResponseBody responseBody = response.body()) {
- if (!response.isSuccessful())
- throw new IOException("Unexpected code " + response);
-
- Headers responseHeaders = response.headers();
- for (int i = 0, size = responseHeaders.size(); i < size; i++) {
- System.out.println(responseHeaders.name(i) + ": " + responseHeaders.value(i));
- }
- }
+ Headers responseHeaders = response.headers();
+ for(int i = 0; i < responseHeaders.size(); i++){
+ System.out.println(responseHeaders.name(i) + ": " + responseHeaders.value(i));
}
- });
+ fein = response.body().string();
+ }
+
+ JSONObject teamsJSON = new JSONObject(fein);
+ JSONArray blueTeamsJSON = teamsJSON.getJSONObject("alliances").getJSONObject("blue").getJSONArray("team_keys");
+ JSONArray redTeamsJSON = teamsJSON.getJSONObject("alliances").getJSONObject("blue").getJSONArray("team_keys");
+
+ String[] blueTeams = {blueTeamsJSON.getString(0), blueTeamsJSON.getString(1), blueTeamsJSON.getString(2)};
+ String[] redTeams = {redTeamsJSON.getString(0), redTeamsJSON.getString(1), redTeamsJSON.getString(2)};
+
+ return new String[][]{blueTeams, redTeams};
}
+
+
}
private void makeIntent()
{
Intent intent = new Intent(this, AutoActivity.class);
+ intent.putExtra(Event_Key, EventString);
+ intent.putExtra(Match_key, Match_numberString);
+ intent.putExtra(Team_key, TeamString);
startActivity(intent);
}
}
\ No newline at end of file
diff --git a/ScoutingApp/app/src/main/java/com/example/scoutingapp/Submit.java b/ScoutingApp/app/src/main/java/com/example/scoutingapp/Submit.java
index f8b2c84..1dd3075 100644
--- a/ScoutingApp/app/src/main/java/com/example/scoutingapp/Submit.java
+++ b/ScoutingApp/app/src/main/java/com/example/scoutingapp/Submit.java
@@ -23,13 +23,13 @@ import java.util.List;
public class Submit {
- void uploadSheets(Context context) {
+ void uploadSheets(Context context, String csvFileString) {
new Thread(() -> {
try {
//adds account info
InputStream serviceAccountStream = context.getResources().openRawResource(R.raw.info);
ServiceAccountCredentials credentials = ServiceAccountCredentials.fromStream(serviceAccountStream);
- //Srts up the google sheet API and json factury for use later
+ //Sets up the google sheet API and json factory for use later
Sheets sheetsService = new Sheets.Builder(
GoogleNetHttpTransport.newTrustedTransport(),
GsonFactory.getDefaultInstance(),
@@ -37,7 +37,7 @@ public class Submit {
).setApplicationName("Scouting App").build();
//make sure the file is there
- File csvFile = new File(context.getFilesDir(), "match_data.csv");
+ File csvFile = new File(context.getFilesDir(), csvFileString);
if (!csvFile.exists()) {
Log.d("CSVError", "CSV file does not exist.");
return;
@@ -47,7 +47,7 @@ public class Submit {
//data for the sheet API
ValueRange body = new ValueRange().setValues(data);
//the ID for the google sheet
- String spreadsheetId = "1WqULxMRuXV97sUy01hdy8hiDIud1M4j5oNpWWHDsvcI";
+ String spreadsheetId = "1ky5LBTpnEeBEEaaF7z6UWdh-E7YmOSeij4dYdR2PU4A";
//starting point
String range = "Sheet1!a2:O2";
//inserts data to the sheet
@@ -60,40 +60,79 @@ public class Submit {
Log.d("GoogleSheets", "Data uploaded to Google Sheets successfully.");
} catch (Exception e) {
Log.d("GoogleSheets", "Error uploading data", e);
+ renameFile(context, csvFileString);
}
}).start();
}
List> parseCSVToList(File csvFile) {
- //makes A array
List> data = Lists.newArrayList();
- //Reads the info from the CSV file and makes it usedable to upload to the google sheet
try (BufferedReader br = new BufferedReader(new FileReader(csvFile))) {
String line;
while ((line = br.readLine()) != null) {
- List