Commit Graph

610 Commits

Author SHA1 Message Date
Luca Warmenhoven
2b631bd600 Added error checking 2024-06-05 14:34:04 +02:00
Luca Warmenhoven
f4cbf50821 Added error checking 2024-06-05 14:32:06 +02:00
Luca Warmenhoven
e0bb86d0e9 Merge remote-tracking branch 'origin/main' 2024-06-05 14:23:33 +02:00
Luca Warmenhoven
3265ea308e Added error checking 2024-06-05 14:23:29 +02:00
SebasKoedam
53a6b647c3 Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-06-05 14:22:32 +02:00
SebasKoedam
83d2db6473 added shimmer animation 2024-06-05 14:22:31 +02:00
933986947c Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-06-05 14:16:35 +02:00
d40d874e01 UML arduino code 2024-06-05 14:16:29 +02:00
SebasKoedam
eacadfde5d het sloopte wel :((( 2024-06-05 14:13:44 +02:00
SebasKoedam
e33313fe2b Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-06-05 14:08:18 +02:00
SebasKoedam
b5d2e057c3 hoppelijk sloopt dit niks 2024-06-05 14:08:17 +02:00
Luca Warmenhoven
53e839ff4a Merge remote-tracking branch 'origin/main' 2024-06-05 14:07:00 +02:00
Luca Warmenhoven
0a2999afa1 Added faulty movement checking function 2024-06-05 14:06:57 +02:00
bb9e67a57e Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-06-05 13:56:33 +02:00
d0c74c4e25 comments and cleanup 2024-06-05 13:56:23 +02:00
Niels Gras
bf651cd92b Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-06-05 13:45:03 +02:00
Niels Gras
213af5e6fb Fixed animation placement 2024-06-05 13:45:00 +02:00
SebasKoedam
b811187f5c Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-06-05 13:43:39 +02:00
SebasKoedam
8e7b8dbafe added exercise rep increment to input processor 2024-06-05 13:43:11 +02:00
Luca Warmenhoven
a0f600c438 Merge remote-tracking branch 'origin/main' 2024-06-05 13:40:37 +02:00
Niels Gras
65f4bb32b7 fixed animation code placement 2024-06-05 13:40:30 +02:00
Luca Warmenhoven
8c462e9f48 Poekseps 2024-06-05 13:31:21 +02:00
fbca5ce351 Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-06-05 13:28:27 +02:00
23d4ce696a Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-06-05 13:28:22 +02:00
SebasKoedam
7384f0e62b Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-06-05 13:26:40 +02:00
SebasKoedam
cc46a109a6 added sound effects 2024-06-05 13:26:39 +02:00
Luca Warmenhoven
4fb2d3897a Merge remote-tracking branch 'origin/main' 2024-06-05 13:25:01 +02:00
18c4ef1b58 split recorded string into 4 2024-06-05 13:24:55 +02:00
Luca Warmenhoven
c421fb2c41 Poepzaad 2024-06-05 13:24:51 +02:00
Niels Gras
6bed3441dd added arm raise movement 2024-06-05 13:23:57 +02:00
Luca Warmenhoven
9f72374f6a Merge remote-tracking branch 'origin/main'
# Conflicts:
#	code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/FitnessActivity.java
2024-06-05 12:50:42 +02:00
Luca Warmenhoven
7782722310 Removed ExerciseStatusElement.java, moved all functionality to InputProcessor.java 2024-06-05 12:49:39 +02:00
SebasKoedam
8547fa563f Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-06-05 12:23:33 +02:00
SebasKoedam
2a0a08ee9e added progress circle with feedback to user how well they do the rep 2024-06-05 12:23:30 +02:00
Luca Warmenhoven
d46db1a525 Merge remote-tracking branch 'origin/main' 2024-06-05 11:44:57 +02:00
Luca Warmenhoven
20a2887401 Added JSON parsing for path instead of binary decoding 2024-06-05 11:44:52 +02:00
69003476ed Added correct file name extensions 2024-06-05 11:38:24 +02:00
4750b675f8 Update documentation 2024-06-05 11:37:50 +02:00
Luca Warmenhoven
0410b23c0d Fixed typo in FitnessActivity 2024-06-05 11:30:44 +02:00
Luca Warmenhoven
ae52d10041 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/FitnessActivity.java
2024-06-05 11:30:03 +02:00
Luca Warmenhoven
f69fbe8e5b Updated InputProcessor's convertRecordedDataToString to JSON output, updated GesturePath -> AnglePath 2024-06-05 11:29:32 +02:00
Luca Warmenhoven
ef7e7ae55c Updated infrastructure-design.md 2024-06-04 17:40:02 +02:00
Luca Warmenhoven
cac78aecb8 Updated documentation 2024-06-04 17:27:27 +02:00
Luca Warmenhoven
1e3388a2c4 Updated documentation 2024-06-04 17:10:11 +02:00
Luca Warmenhoven
18d64ba24b Merge remote-tracking branch 'origin/main' 2024-06-04 16:58:10 +02:00
Luca Warmenhoven
4dad284ba0 Updated documentation 2024-06-04 16:58:06 +02:00
SebasKoedam
e75551671a added working loading circle 2024-06-04 16:24:54 +02:00
SebasKoedam
ad83c7e450 added loading icon while video is getting fetched 2024-06-04 15:20:47 +02:00
SebasKoedam
8a02bf1daa Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-06-04 15:16:23 +02:00
SebasKoedam
62c97c3475 updated UI 2024-06-04 15:16:21 +02:00