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 |
|
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 |
|
|
|
8cd2b00eb0
|
Fix automatic ip adress esp
|
2024-06-04 14:40:06 +02:00 |
|
Luca Warmenhoven
|
79a96bc193
|
Fixed order
|
2024-06-04 14:18:04 +02:00 |
|
SebasKoedam
|
67fece4e2e
|
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 14:16:19 +02:00 |
|
SebasKoedam
|
d604a6ef84
|
chore: Update Fitbot launcher background color
|
2024-06-04 14:16:17 +02:00 |
|
Niels Gras
|
f64d7ff34e
|
armraise
|
2024-06-04 13:47:02 +02:00 |
|
SebasKoedam
|
13b2b2f821
|
Fixed description size
|
2024-06-04 12:58:14 +02:00 |
|
SebasKoedam
|
c0aa0b46e9
|
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 12:31:30 +02:00 |
|
SebasKoedam
|
19e50eefea
|
Refactor database query to fetch a specific exercise by ExerciseID
|
2024-06-04 12:31:29 +02:00 |
|
Niels Gras
|
761de7955d
|
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 12:02:31 +02:00 |
|
SebasKoedam
|
398389aa5e
|
added comments and optimized code
|
2024-06-04 11:32:05 +02:00 |
|
|
|
0c98744bdd
|
fix crashes and video player, changed loading elements to UI thread
|
2024-06-04 11:25:49 +02:00 |
|
|
|
cd00d36166
|
Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
|
2024-06-04 10:33:43 +02:00 |
|
|
|
3b65fffec8
|
motion processing stuff + logs + fix crash (luca)
|
2024-06-04 10:31:24 +02:00 |
|
Niels Gras
|
4273a43a1a
|
fixed squat
|
2024-06-03 16:30:07 +02:00 |
|
SebasKoedam
|
d0d09aa2d2
|
Refactor FitnessActivity code to remove commented out video playback function
|
2024-06-03 16:28:56 +02:00 |
|
SebasKoedam
|
77875c45d6
|
Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
|
2024-06-03 16:25:36 +02:00 |
|
SebasKoedam
|
46ba5dbdbd
|
video will now be displayed with link from database
|
2024-06-03 16:25:35 +02:00 |
|
|
|
ffb90c001d
|
Refactoring
|
2024-06-03 16:17:27 +02:00 |
|
Niels Gras
|
452aad6929
|
added squat
|
2024-06-03 15:59:26 +02:00 |
|
Niels Gras
|
296d2f0fbf
|
changed movement
|
2024-06-03 15:51:17 +02:00 |
|
Niels Gras
|
7264811444
|
Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
|
2024-06-03 15:32:34 +02:00 |
|
Niels Gras
|
d167aed8a6
|
added sound
|
2024-06-03 15:32:31 +02:00 |
|
Luca Warmenhoven
|
18ec63fcd1
|
Updated some stuff
|
2024-06-03 15:23:57 +02:00 |
|
Luca Warmenhoven
|
b1bbe9531b
|
Merge remote-tracking branch 'origin/main'
|
2024-06-03 14:55:27 +02:00 |
|
Luca Warmenhoven
|
627b50f7d5
|
Updated some stuff
|
2024-06-03 14:55:24 +02:00 |
|
SebasKoedam
|
f4fd183408
|
Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
|
2024-06-03 14:55:14 +02:00 |
|
SebasKoedam
|
85c6e4e918
|
feat: Add short description field to Exercise class
|
2024-06-03 14:55:13 +02:00 |
|
Niels Gras
|
902cc184ee
|
added arm circle movement
|
2024-06-03 14:47:51 +02:00 |
|
|
|
c0d002c46b
|
Luca's attempt at fixing app
|
2024-06-03 14:47:31 +02:00 |
|
Niels Gras
|
7574a3eaea
|
Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
|
2024-06-03 14:32:00 +02:00 |
|
Niels Gras
|
f1464653b0
|
added comments
|
2024-06-03 14:31:39 +02:00 |
|
SebasKoedam
|
456b959c5e
|
Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
|
2024-06-03 14:28:42 +02:00 |
|
SebasKoedam
|
baffe8b9ac
|
chore: Update activity_fitness.xml layout and fix bug in ExerciseManager
|
2024-06-03 14:28:00 +02:00 |
|
Luca Warmenhoven
|
926f369ff0
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# code/src/Fitbot/app/src/main/java/com/example/fitbot/exercise/ExerciseManager.java
# code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/FitnessActivity.java
|
2024-06-03 14:27:34 +02:00 |
|
Luca Warmenhoven
|
868542dba9
|
Updated InputProcessor and FitnessActivity, fixed some issues.
|
2024-06-03 14:26:17 +02:00 |
|
|
|
53bc94aba3
|
Fixed it so it only pulls the ip once
|
2024-06-03 14:21:42 +02:00 |
|
Luca Warmenhoven
|
c084443799
|
Fixed database request handling
|
2024-06-03 14:13:06 +02:00 |
|
Luca Warmenhoven
|
9f2bb805f0
|
Merge remote-tracking branch 'origin/main'
|
2024-06-03 14:04:03 +02:00 |
|
SebasKoedam
|
67860a6397
|
chore: Add transparent color to colors.xml, fix bug in incoming_request_handlers.js, and add close button drawable and dialog layout files
|
2024-06-03 14:03:48 +02:00 |
|
Luca Warmenhoven
|
882f07988d
|
Merge remote-tracking branch 'origin/main'
|
2024-06-03 13:41:59 +02:00 |
|
Luca Warmenhoven
|
517b5f8438
|
Why
|
2024-06-03 13:41:10 +02:00 |
|
|
|
cad5c8508e
|
Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
|
2024-06-03 12:56:31 +02:00 |
|
|
|
3145d3b3b0
|
Update esp server ip
|
2024-06-03 12:56:22 +02:00 |
|
|
|
b6353d15ba
|
added endpoints for pepper and esp
|
2024-06-03 12:55:43 +02:00 |
|
