|
|
06e11060c4
|
added a settings menu (not fucntional) and changed Main and end layout a tiny bit
|
2025-10-03 12:47:51 -04:00 |
|
|
|
0853d1376c
|
fixed time in match data
|
2025-10-02 14:48:26 -04:00 |
|
|
|
9f92229358
|
merge since it hasn't been merged since last school year
|
2025-10-02 14:25:04 -04:00 |
|
|
|
2add2398a1
|
Commit unless stuff to pull
|
2025-03-20 16:45:44 -04:00 |
|
|
|
5d44ebfb64
|
changed to 2025 TBA data
|
2025-03-13 22:35:10 -04:00 |
|
|
|
a6b7559f12
|
some back buttons are broke. and there's no time submitted
|
2025-03-13 22:23:20 -04:00 |
|
|
|
f6605cf0f8
|
Merge branch 'refs/heads/main' into MatchDataImplementation
# Conflicts:
# ScoutingApp/.gradle/8.7/executionHistory/executionHistory.bin
# ScoutingApp/.gradle/8.7/executionHistory/executionHistory.lock
# ScoutingApp/.gradle/8.7/fileHashes/fileHashes.bin
# ScoutingApp/.gradle/8.7/fileHashes/fileHashes.lock
# ScoutingApp/.gradle/8.7/fileHashes/resourceHashesCache.bin
# ScoutingApp/.gradle/buildOutputCleanup/buildOutputCleanup.lock
# ScoutingApp/app/build/intermediates/apk/debug/app-debug.apk
# ScoutingApp/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/processDebugResources/R.jar
# ScoutingApp/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex
# ScoutingApp/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex
# ScoutingApp/app/build/intermediates/dex_archive_input_jar_hashes/debug/dexBuilderDebug/out
# ScoutingApp/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
# ScoutingApp/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
# ScoutingApp/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
# ScoutingApp/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml
# ScoutingApp/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
# ScoutingApp/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
# ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/AutoActivity.class
# ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/EndActivity$2.class
# ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/EndActivity.class
# ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$2.class
# ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$3.class
# ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$4.class
# ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$5.class
# ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$6.class
# ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$7.class
# ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$8.class
# ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity.class
# ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/Submit.class
# ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/TeleActivity.class
# ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity$2.class
# ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity$3.class
# ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity$4.class
# ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity$5.class
# ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity$6.class
# ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity.class
# ScoutingApp/app/build/intermediates/linked_resources_binary_format/debug/processDebugResources/linked-resources-binary-format-debug.ap_
# ScoutingApp/app/build/intermediates/merged_res_blame_folder/debug/mergeDebugResources/out/multi-v2/mergeDebugResources.json
# ScoutingApp/app/build/intermediates/merged_res_blame_folder/debug/mergeDebugResources/out/single/mergeDebugResources.json
# ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/AutoActivity.dex
# ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/EndActivity$2.dex
# ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/EndActivity.dex
# ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/MainActivity$2.dex
# ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/MainActivity$3.dex
# ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/MainActivity$4.dex
# ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/MainActivity$5.dex
# ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/MainActivity$6.dex
# ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/MainActivity$7.dex
# ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/MainActivity$8.dex
# ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/MainActivity.dex
# ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/Submit.dex
# ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/TeleActivity.dex
# ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/startingActivity$2.dex
# ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/startingActivity$3.dex
# ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/startingActivity$4.dex
# ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/startingActivity$5.dex
# ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/startingActivity$6.dex
# ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/startingActivity.dex
# ScoutingApp/app/build/intermediates/stable_resource_ids_file/debug/processDebugResources/stableIds.txt
# ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
# ScoutingApp/app/src/main/java/com/example/scoutingapp/MainActivity.java
# ScoutingApp/app/src/main/java/com/example/scoutingapp/TeleActivity.java
|
2025-03-13 21:34:45 -04:00 |
|
|
|
2135749aaf
|
Made a edit text that shouldn't be a edit text is now just a text view
|
2025-03-13 14:58:25 -04:00 |
|
25lacorazzan
|
5b9ff3736d
|
did several things I cant remember
|
2025-03-13 14:56:01 -04:00 |
|
|
|
ab8e746a5d
|
Fixed radio button in start starting activity
|
2025-03-13 14:52:34 -04:00 |
|
|
|
c86fdff7eb
|
Fixed google sheet, Added Back Button and changed location of next button
|
2025-03-13 14:44:25 -04:00 |
|
25lacorazzan
|
b86833b682
|
merged with current main commit
|
2025-03-13 13:51:59 -04:00 |
|
25lacorazzan
|
c3cf27b39e
|
merge with main
|
2025-03-13 13:47:37 -04:00 |
|
|
|
d9a4eeb175
|
Changed image and fixed input scout name
|
2025-03-13 13:45:55 -04:00 |
|
25lacorazzan
|
b61ade61ef
|
Merged with current version of main
|
2025-03-13 13:43:29 -04:00 |
|
25lacorazzan
|
3979c8526f
|
MatchData class is fully functional on the version of main used
|
2025-03-13 13:07:41 -04:00 |
|
|
|
b55c6fe9b0
|
scout name in main
|
2025-03-11 13:29:26 -04:00 |
|
25lacorazzan
|
8a4d51bb78
|
THE MERGE
|
2025-03-11 13:20:04 -04:00 |
|
25lacorazzan
|
8fceb9bae2
|
began work on MatchData.java
|
2025-03-11 10:55:00 -04:00 |
|
|
|
78c9dd752b
|
tba requests work
|
2025-03-07 13:55:12 -05:00 |
|
|
|
854bfd5364
|
selection of teams works submit doesn't
|
2025-03-07 13:47:51 -05:00 |
|
|
|
f052627099
|
make teams select
|
2025-03-07 13:12:56 -05:00 |
|
|
|
7b226c40be
|
gets team numbers properly and working on main selection
|
2025-03-05 12:36:31 -05:00 |
|
25lacorazzan
|
6391b0a92c
|
made End Activity functioning
|
2025-02-27 11:03:32 -05:00 |
|
|
|
1ef0f6319a
|
tba stuff to main unfinished
|
2025-02-27 09:50:57 -05:00 |
|
24nicholsl
|
405f23d266
|
Added radio and comment box
|
2025-02-25 12:57:12 -05:00 |
|
24nicholsl
|
1cf8515324
|
Added radio and comment box
|
2025-02-25 12:56:22 -05:00 |
|
24nicholsl
|
cbe4512035
|
Added radio and comment box
|
2025-02-25 12:54:42 -05:00 |
|
|
|
f8bd16202e
|
tba request works
|
2025-02-25 12:28:44 -05:00 |
|
|
|
4d9aace5dd
|
http requests work
|
2025-02-14 13:40:40 -05:00 |
|
24nicholsl
|
27bf7ba8af
|
fixed merge conflict
|
2025-02-14 12:55:29 -05:00 |
|
25lacorazzan
|
f33a0080bd
|
Changed the way the info is submitted
|
2025-02-14 12:33:08 -05:00 |
|
25lacorazzan
|
b557bfd1ad
|
Changed how the data uploads
|
2025-02-14 12:25:49 -05:00 |
|
24nicholsl
|
43545afe20
|
resolved merge
|
2025-02-12 12:23:22 -05:00 |
|
24nicholsl
|
b18dd66eee
|
?
|
2025-02-12 12:21:38 -05:00 |
|
|
|
5cb2fecf8a
|
sychronous get
|
2025-02-10 12:38:31 -05:00 |
|
|
|
d4ec0dc8ba
|
made it so it doesnt crash everyones computer
|
2025-02-10 12:16:08 -05:00 |
|
|
|
074bb449a3
|
merge of a bunch of files
|
2025-02-10 11:54:06 -05:00 |
|
|
|
9df1a68442
|
tba api hanging up
|
2025-02-10 11:51:52 -05:00 |
|
25lacorazzan
|
d9896c3ef1
|
fixed an issue in tele
|
2025-02-04 12:46:19 -05:00 |
|
25lacorazzan
|
a4d7967024
|
fixed an issue in tele
|
2025-02-04 12:41:06 -05:00 |
|
25lacorazzan
|
bde724e6de
|
Changed auto and tele layouts
|
2025-02-04 12:17:39 -05:00 |
|
|
|
4091471ca6
|
fein
|
2025-02-04 12:10:29 -05:00 |
|
25lacorazzan
|
a6a9ac5c77
|
Changed the layouts of auto and tele
|
2025-02-04 12:01:24 -05:00 |
|
24nicholsl
|
a734027652
|
added logo
|
2025-01-31 11:57:44 -05:00 |
|
|
|
804d577d72
|
conflict in manifest fixed
|
2025-01-23 13:59:25 -05:00 |
|
|
|
f74e340cd2
|
grabbing json from tba
|
2025-01-23 13:58:08 -05:00 |
|
25lacorazzan
|
be5e87c1c0
|
added visual queues to teleop and auto
|
2025-01-23 13:55:43 -05:00 |
|
25lacorazzan
|
db76161750
|
formatted CSV code to be a little prettier
|
2025-01-23 13:32:28 -05:00 |
|
24nicholsl
|
2fc9152bdc
|
Test commit
|
2025-01-21 12:49:42 -05:00 |
|
