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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/java/com/example/scoutingapp/MainActivity.java b/ScoutingApp/app/src/main/java/com/example/scoutingapp/MainActivity.java index 387cd09..0172bf8 100644 --- a/ScoutingApp/app/src/main/java/com/example/scoutingapp/MainActivity.java +++ b/ScoutingApp/app/src/main/java/com/example/scoutingapp/MainActivity.java @@ -15,15 +15,15 @@ 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 { @@ -52,11 +52,14 @@ public class MainActivity extends AppCompatActivity { public final class AsynchronousGet { private final OkHttpClient client = new OkHttpClient(); - /* - public int[] getMatchTeams(String eventKey, int qualMatchNum) 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/match/" + eventKey + "_qm" + qualMatchNum + "?X-TBA-Auth-Key=0zxxGYSvY7xI2onqcWg0NT0sEtmtR6hCpmYJ29nwfxvqrP3Mf1M3lRZO5x6Kc3kt") .build(); @@ -68,15 +71,20 @@ public class MainActivity extends AppCompatActivity { for(int i = 0; i < responseHeaders.size(); i++){ System.out.println(responseHeaders.name(i) + ": " + responseHeaders.value(i)); } - //fein = response.body().string(); + 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 + return new String[][]{blueTeams, redTeams}; } - */ + } private void makeIntent() diff --git a/ScoutingApp/app/src/main/res/layout/activity_main.xml b/ScoutingApp/app/src/main/res/layout/activity_main.xml index 0d8b962..ab4261c 100644 --- a/ScoutingApp/app/src/main/res/layout/activity_main.xml +++ b/ScoutingApp/app/src/main/res/layout/activity_main.xml @@ -18,11 +18,19 @@ app:layout_constraintTop_toTopOf="parent" /> + tools:layout_editor_absoluteX="75dp" + tools:layout_editor_absoluteY="94dp" /> + + \ No newline at end of file diff --git a/ers24nicholslDesktopAndroidReefscape-Scouting-App b/ers24nicholslDesktopAndroidReefscape-Scouting-App new file mode 100644 index 0000000..4fbedec --- /dev/null +++ b/ers24nicholslDesktopAndroidReefscape-Scouting-App @@ -0,0 +1,195 @@ +See 'git help ' to read about a specific subcommand + +Main Porcelain Commands + add Add file contents to the index + am Apply a series of patches from a mailbox + archive Create an archive of files from a named tree + bisect Use binary search to find the commit that introduced a bug + branch List, create, or delete branches + bundle Move objects and refs by archive + checkout Switch branches or restore working tree files + cherry-pick Apply the changes introduced by some existing commits + citool Graphical alternative to git-commit + clean Remove untracked files from the working tree + clone Clone a repository into a new directory + commit Record changes to the repository + describe Give an object a human readable name based on an available ref + diff Show changes between commits, commit and working tree, etc + fetch Download objects and refs from another repository + format-patch Prepare patches for e-mail submission + gc Cleanup unnecessary files and optimize the local repository + gitk The Git repository browser + grep Print lines matching a pattern + gui A portable graphical interface to Git + init Create an empty Git repository or reinitialize an existing one + log Show commit logs + maintenance Run tasks to optimize Git repository data + merge Join two or more development histories together + mv Move or rename a file, a directory, or a symlink + notes Add or inspect object notes + pull Fetch from and integrate with another repository or a local branch + push Update remote refs along with associated objects + range-diff Compare two commit ranges (e.g. two versions of a branch) + rebase Reapply commits on top of another base tip + reset Reset current HEAD to the specified state + restore Restore working tree files + revert Revert some existing commits + rm Remove files from the working tree and from the index + scalar A tool for managing large Git repositories + shortlog Summarize 'git log' output + show Show various types of objects + sparse-checkout Reduce your working tree to a subset of tracked files + stash Stash the changes in a dirty working directory away + status Show the working tree status + submodule Initialize, update or inspect submodules + switch Switch branches + tag Create, list, delete or verify a tag object signed with GPG + worktree Manage multiple working trees + +Ancillary Commands / Manipulators + config Get and set repository or global options + fast-export Git data exporter + fast-import Backend for fast Git data importers + filter-branch Rewrite branches + mergetool Run merge conflict resolution tools to resolve merge conflicts + pack-refs Pack heads and tags for efficient repository access + prune Prune all unreachable objects from the object database + reflog Manage reflog information + remote Manage set of tracked repositories + repack Pack unpacked objects in a repository + replace Create, list, delete refs to replace objects + +Ancillary Commands / Interrogators + annotate Annotate file lines with commit information + blame Show what revision and author last modified each line of a file + bugreport Collect information for user to file a bug report + count-objects Count unpacked number of objects and their disk consumption + diagnose Generate a zip archive of diagnostic information + difftool Show changes using common diff tools + fsck Verifies the connectivity and validity of the objects in the database + gitweb Git web interface (web frontend to Git repositories) + help Display help information about Git + instaweb Instantly browse your working repository in gitweb + merge-tree Perform merge without touching index or working tree + rerere Reuse recorded resolution of conflicted merges + show-branch Show branches and their commits + verify-commit Check the GPG signature of commits + verify-tag Check the GPG signature of tags + version Display version information about Git + whatchanged Show logs with differences each commit introduces + +Interacting with Others + archimport Import a GNU Arch repository into Git + cvsexportcommit Export a single commit to a CVS checkout + cvsimport Salvage your data out of another SCM people love to hate + cvsserver A CVS server emulator for Git + imap-send Send a collection of patches from stdin to an IMAP folder + p4 Import from and submit to Perforce repositories + quiltimport Applies a quilt patchset onto the current branch + request-pull Generates a summary of pending changes + send-email Send a collection of patches as emails + svn Bidirectional operation between a Subversion repository and Git + +Low-level Commands / Manipulators + apply Apply a patch to files and/or to the index + checkout-index Copy files from the index to the working tree + commit-graph Write and verify Git commit-graph files + commit-tree Create a new commit object + hash-object Compute object ID and optionally create an object from a file + index-pack Build pack index file for an existing packed archive + merge-file Run a three-way file merge + merge-index Run a merge for files needing merging + mktag Creates a tag object with extra validation + mktree Build a tree-object from ls-tree formatted text + multi-pack-index Write and verify multi-pack-indexes + pack-objects Create a packed archive of objects + prune-packed Remove extra objects that are already in pack files + read-tree Reads tree information into the index + replay EXPERIMENTAL: Replay commits on a new base, works with bare repos too + symbolic-ref Read, modify and delete symbolic refs + unpack-objects Unpack objects from a packed archive + update-index Register file contents in the working tree to the index + update-ref Update the object name stored in a ref safely + write-tree Create a tree object from the current index + +Low-level Commands / Interrogators + cat-file Provide contents or details of repository objects + cherry Find commits yet to be applied to upstream + diff-files Compares files in the working tree and the index + diff-index Compare a tree to the working tree or index + diff-tree Compares the content and mode of blobs found via two tree objects + for-each-ref Output information on each ref + for-each-repo Run a Git command on a list of repositories + get-tar-commit-id Extract commit ID from an archive created using git-archive + ls-files Show information about files in the index and the working tree + ls-remote List references in a remote repository + ls-tree List the contents of a tree object + merge-base Find as good common ancestors as possible for a merge + name-rev Find symbolic names for given revs + pack-redundant Find redundant pack files + rev-list Lists commit objects in reverse chronological order + rev-parse Pick out and massage parameters + show-index Show packed archive index + show-ref List references in a local repository + unpack-file Creates a temporary file with a blob's contents + var Show a Git logical variable + verify-pack Validate packed Git archive files + +Low-level Commands / Syncing Repositories + daemon A really simple server for Git repositories + fetch-pack Receive missing objects from another repository + http-backend Server side implementation of Git over HTTP + send-pack Push objects over Git protocol to another repository + update-server-info Update auxiliary info file to help dumb servers + +Low-level Commands / Internal Helpers + check-attr Display gitattributes information + check-ignore Debug gitignore / exclude files + check-mailmap Show canonical names and email addresses of contacts + check-ref-format Ensures that a reference name is well formed + column Display data in columns + credential Retrieve and store user credentials + credential-cache Helper to temporarily store passwords in memory + credential-store Helper to store credentials on disk + fmt-merge-msg Produce a merge commit message + hook Run git hooks + interpret-trailers Add or parse structured information in commit messages + mailinfo Extracts patch and authorship from a single e-mail message + mailsplit Simple UNIX mbox splitter program + merge-one-file The standard helper program to use with git-merge-index + patch-id Compute unique ID for a patch + sh-i18n Git's i18n setup code for shell scripts + sh-setup Common Git shell script setup code + stripspace Remove unnecessary whitespace + +User-facing repository, command and file interfaces + attributes Defining attributes per path + cli Git command-line interface and conventions + hooks Hooks used by Git + ignore Specifies intentionally untracked files to ignore + mailmap Map author/committer names and/or E-Mail addresses + modules Defining submodule properties + repository-layout Git Repository Layout + revisions Specifying revisions and ranges for Git + +Developer-facing file formats, protocols and other interfaces + format-bundle The bundle file format + format-chunk Chunk-based file formats + format-commit-graph Git commit-graph format + format-index Git index format + format-pack Git pack format + format-signature Git cryptographic signature formats + protocol-capabilities Protocol v0 and v1 capabilities + protocol-common Things common to various protocols + protocol-http Git HTTP-based protocols + protocol-pack How packs are transferred over-the-wire + protocol-v2 Git Wire Protocol, Version 2 + +External commands + askpass + askyesno + credential-helper-selector + credential-manager + flow + lfs + update-git-for-windows