Luca Warmenhoven
6e8a66e327
Merge
2024-05-17 15:03:54 +02:00
Luca Warmenhoven
fb63b1364a
Merge remote-tracking branch 'refs/remotes/origin/35-als-gebruiker-wil-ik-live-mijn-bewegingen-doen-zodat-ik-kan-inzien-of-ik-het-goed-doe'
2024-05-17 15:03:20 +02:00
Luca Warmenhoven
13fca50d6f
Updated .gitignore
2024-05-17 14:56:20 +02:00
Luca Warmenhoven
7442d1fca4
Added fitness activity switching
2024-05-17 14:53:45 +02:00
Niels Gras
aa33bf2f12
Merge branch '54-als-gebruiker-wil-ik-een-scherm-waar-ik-mijn-score-kan-zien-na-de-oefeningen-zodat-ik-een' into 'main'
...
Resolve "Als gebruiker wil ik een scherm waar ik mijn score kan zien na de oefeningen zodat ik een inzicht heb van wat ik heb gedaan"
Closes #54
See merge request propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66!5
2024-05-17 13:34:08 +02:00
Niels Gras
2fdc8a7189
Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 into 54-als-gebruiker-wil-ik-een-scherm-waar-ik-mijn-score-kan-zien-na-de-oefeningen-zodat-ik-een
2024-05-17 13:33:32 +02:00
Niels Gras
6b40c5c079
Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
2024-05-17 13:32:17 +02:00
Niels Gras
6720b2af3d
Added new drawable and layout files for Fitbot app
2024-05-17 13:31:59 +02:00
Niels Gras
f9e340a500
Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 into 54-als-gebruiker-wil-ik-een-scherm-waar-ik-mijn-score-kan-zien-na-de-oefeningen-zodat-ik-een
2024-05-17 13:30:47 +02:00
Luca Warmenhoven
cfcbe7d51c
Added Gson for JSON parsing, added Exercise retriever
2024-05-17 13:25:50 +02:00
SebasKoedam
7dc0c7bc72
feat: Update FitBot architecture diagrams
...
The FitBot architecture diagrams have been updated to include a new version of the architecture diagram and a deployment diagram. These diagrams provide a visual representation of the infrastructure of FitBot.
2024-05-17 12:44:53 +02:00
Luca Warmenhoven
3edab82535
Added example exercises
2024-05-17 12:42:10 +02:00
SebasKoedam
031d766205
added docs voor expert 2
2024-05-17 12:35:55 +02:00
Luca Warmenhoven
3fe90ce547
Merge remote-tracking branch 'origin/main'
2024-05-17 12:32:59 +02:00
Luca Warmenhoven
59c374eb02
Added sport activity abstraction classes
2024-05-17 12:32:54 +02:00
Niels
866484c85b
fixed color
2024-05-16 23:32:48 +02:00
Niels
87e8b725e4
Added curves on endscreen
2024-05-16 23:24:09 +02:00
SebasKoedam
54cf012288
i tried :((((((((((((((((((((((((((((((((((((
2024-05-16 14:30:57 +02:00
SebasKoedam
01498b5643
Code is able to discover bluetooth devices but cant connect to the balance board
2024-05-16 11:30:10 +02:00
03b056811d
Name change
2024-05-15 17:03:32 +02:00
58f1b14ab6
Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
2024-05-15 17:03:07 +02:00
ab73c5012b
java class explanation
2024-05-15 17:03:02 +02:00
Luca Warmenhoven
a4a01ae9ef
fixed issues
2024-05-15 16:50:22 +02:00
Luca Warmenhoven
5b5934d985
g
2024-05-15 16:44:25 +02:00
Luca Warmenhoven
b89dab7792
Merge remote-tracking branch 'origin/main'
...
# Conflicts:
# code/src/Fitbot/app/src/main/AndroidManifest.xml
# code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/MainActivity.java
2024-05-15 16:44:07 +02:00
SebasKoedam
32020ce801
feat: Add Java build configuration update to .vscode/settings.json
2024-05-15 16:42:21 +02:00
SebasKoedam
4d169a5e74
Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
2024-05-15 16:42:11 +02:00
SebasKoedam
3ca982c36f
feat: Add Bluetooth permissions and location permission to AndroidManifest.xml
2024-05-15 16:41:32 +02:00
Luca Warmenhoven
ce5f50439a
fixed
2024-05-15 16:40:35 +02:00
Luca Warmenhoven
37ef0aa118
Merge branch 'refs/heads/35-als-gebruiker-wil-ik-live-mijn-bewegingen-doen-zodat-ik-kan-inzien-of-ik-het-goed-doe'
...
# Conflicts:
# code/src/Fitbot/app/src/main/AndroidManifest.xml
# code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/MainActivity.java
2024-05-15 16:35:40 +02:00
Luca Warmenhoven
af9138b1ea
store changes
2024-05-15 16:34:17 +02:00
Luca Warmenhoven
9107d5d9f7
Merge remote-tracking branch 'origin/35-als-gebruiker-wil-ik-live-mijn-bewegingen-doen-zodat-ik-kan-inzien-of-ik-het-goed-doe'
...
# Conflicts:
# code/src/Fitbot/app/src/main/AndroidManifest.xml
# code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/MainActivity.java
2024-05-15 16:32:56 +02:00
Luca Warmenhoven
612b1c8a7c
bread
2024-05-15 16:32:38 +02:00
Luca Warmenhoven
606a05aa13
Updated path math, started with 3d path to 2d screen space projection
2024-05-15 16:32:33 +02:00
Luca Warmenhoven
8224327a01
bread
2024-05-15 16:29:22 +02:00
Niels Gras
5cab887429
Add AndroidStyles.md file and update activity_end_screen.xml button ID
2024-05-15 16:09:14 +02:00
Niels Gras
5dbbacd140
Update button ID in activity_end_screen.xml
2024-05-15 16:09:05 +02:00
Luca Warmenhoven
cf429f993e
Merge remote-tracking branch 'origin/main'
2024-05-15 15:48:18 +02:00
Luca Warmenhoven
86a96740e5
Updated onderzoek-voorbeeld.md & motion-tracking-system-analysis.md
2024-05-15 15:47:52 +02:00
Niels Gras
0f2f174ea9
Add AndroidStyles.md file for documenting Android styles and themes
2024-05-15 15:33:56 +02:00
Niels Gras
f06287d562
Added new XML files for vcs and modules configuration
2024-05-15 14:54:16 +02:00
Niels Gras
c8d90c0992
Added new XML file for rectangle drawable and renamed activity_completion_screen.xml to activity_end_screen.xml
2024-05-15 14:54:06 +02:00
3a7d1cb72c
Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
2024-05-15 13:45:16 +02:00
92a1c2b650
Repaired the websocket connector
...
for some reason it doesnt wannar in a class
2024-05-15 13:45:13 +02:00
Luca Warmenhoven
5ff813c35c
Merge remote-tracking branch 'origin/main'
2024-05-15 13:38:43 +02:00
Luca Warmenhoven
552436b993
Updated onderzoek-voorbeeld.md and motion-tracking-system-analysis.md
2024-05-15 13:38:38 +02:00
SebasKoedam
c5c0e871e8
feat: Implement position tracking with Wii Fit Board
2024-05-15 12:36:57 +02:00
SebasKoedam
307a06e53f
feat: Add FitnessActivity for fitness tracking functionality
2024-05-15 12:36:50 +02:00
Luca Warmenhoven
7fba504e90
Renamed files, added motion-tracking-system-analysis.md
2024-05-15 12:04:36 +02:00
Luca Warmenhoven
20a2f3b6d5
Merge remote-tracking branch 'origin/main'
...
# Conflicts:
# code/src/Fitbot/app/src/main/java/com/example/fitbot/MainActivity.java
# code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/MainActivity.java
# code/src/Fitbot/app/src/main/java/com/example/fitbot/util/processing/MotionProcessor.java
2024-05-15 10:44:11 +02:00
