wildercayden
|
c34ae11b0e
|
changed layout, fixed numbers when going back a page, removed L2 and L3 from auto, and fixed some bugs
|
2026-01-17 15:29:32 -05:00 |
|
|
|
19060d7c7c
|
added pratice button
|
2026-01-12 13:22:51 -05:00 |
|
|
|
449a9c4fbb
|
updated for the 2026 season
|
2026-01-11 20:34:15 -05:00 |
|
|
|
8235b5f239
|
Fixed event and made a new .json file
|
2025-12-27 14:44:12 -05:00 |
|
|
|
24e29027b8
|
fix again
|
2025-12-13 21:06:13 -05:00 |
|
|
|
67ae0f3a63
|
Merge branch 'main' of https://github.com/missluce54/Reefscape-Scouting-App
|
2025-12-13 21:03:38 -05:00 |
|
|
|
6ee907fcfc
|
test
|
2025-12-13 21:02:54 -05:00 |
|
|
|
091e1a785c
|
Update team number in README.md
|
2025-12-13 21:01:31 -05:00 |
|
|
|
d14b8705ac
|
fix
|
2025-12-13 20:59:43 -05:00 |
|
|
|
1a0cfa27f0
|
test
|
2025-12-13 20:45:59 -05:00 |
|
|
|
76b3b5d652
|
first release for 4564
|
2025-12-13 20:27:33 -05:00 |
|
|
|
1a04b239dc
|
made changes for team 4564
|
2025-12-13 17:54:52 -05:00 |
|
|
|
1a27e689fb
|
made changes for team 4564
|
2025-12-13 17:54:45 -05:00 |
|
|
|
9eb2aa505d
|
undo
|
2025-12-13 17:19:05 -05:00 |
|
|
|
7e415b037a
|
first commit for 4564
|
2025-12-13 17:09:51 -05:00 |
|
|
|
55601122d2
|
Update .gitignore to include Gradle and Android files
Added additional ignored files and directories for Gradle, Android Studio, and IntelliJ.
|
2025-12-13 17:04:25 -05:00 |
|
|
|
ee19bc4954
|
fixed activity stack
|
2025-10-20 09:38:00 -04:00 |
|
|
|
35d9cc6690
|
added settings, and made settings functional
|
2025-10-07 12:37:23 -04:00 |
|
|
|
1d1fb67f6a
|
fixed icon
|
2025-10-03 13:02:02 -04:00 |
|
|
|
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 |
|
NoahLacks
|
024f22ba0d
|
Update MatchData.java
Added the timestamp feature
|
2025-03-14 08:42:33 -04:00 |
|
NoahLacks
|
b9f08ad944
|
Update TeleActivity.java
Made the back button for tele work
|
2025-03-14 08:38:25 -04:00 |
|
NoahLacks
|
ae6409ccd3
|
Update AutoActivity.java
made the back button for Auto work
|
2025-03-14 08:37:36 -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 |
|
|
|
1d940d9a54
|
Fixed next button in tele activity
|
2025-03-13 14:47:11 -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 |
|
|
|
fe62776347
|
Fixed google sheet
|
2025-03-13 13:46:54 -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 |
|
|
|
a22829b3cb
|
Added text at the bottom for match, made the app team colors, and fixed end activity
|
2025-03-09 13:27:48 -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 |
|
|
|
46edec1967
|
Add files via upload
|
2025-03-05 11:42:51 -05:00 |
|
|
|
74f560e207
|
Fixed next button
|
2025-03-03 12:02:48 -05:00 |
|
