SebasKoedam
4bd1419a8b
added new request handlers
2024-05-30 15:23:46 +02:00
562a863595
Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
2024-05-30 14:16:17 +02:00
18ae9f0768
Testkaart
2024-05-30 14:16:09 +02:00
1426e039d1
Issues with hardware
2024-05-30 14:16:04 +02:00
af490e6f2e
Animations for pepper
2024-05-30 14:15:47 +02:00
045e7fbe91
Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
2024-05-30 14:14:41 +02:00
f656a61b98
Infrastructure diagram
2024-05-30 14:14:37 +02:00
Luca Warmenhoven
c6875d2ac7
Merge remote-tracking branch 'origin/main'
...
# Conflicts:
# code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/FitnessActivity.java
2024-05-30 14:12:31 +02:00
Luca Warmenhoven
e5c91b53f7
Updated motion handling, updated FitnessActivity to match motion handling
2024-05-30 14:11:16 +02:00
SebasKoedam
5685683aaf
last ui changes
2024-05-30 12:36:15 +02:00
SebasKoedam
20b75278f0
Fixed button ids
2024-05-30 10:43:56 +02:00
SebasKoedam
17f40a7a07
Merge branch '59-als-student-wil-ik-dat-de-ui-in-mijn-app-overal-het-zelfde-is-en-in-het-nederlands-wordt'
2024-05-30 10:01:59 +02:00
SebasKoedam
5753f7047d
finished all ui
2024-05-30 10:01:35 +02:00
Sebas Koedam
dc68acc2a5
daily updates
2024-05-30 08:37:58 +02:00
SebasKoedam
7b72554110
poepies
2024-05-29 18:34:53 +02:00
SebasKoedam
59c906918e
added style for help menu
2024-05-29 18:31:03 +02:00
406e2843f4
Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
2024-05-29 17:56:59 +02:00
3e2a36c185
disabled accelerometer (use past commit for this script to work for app)
2024-05-29 17:56:47 +02:00
fbe392d511
removal of junk and changes made by luca
2024-05-29 17:34:24 +02:00
Niels Gras
9f17cf9d8b
added docs about the usertest
2024-05-29 17:27:29 +02:00
SebasKoedam
7efdf3579e
Added new style for fitness activity
2024-05-29 17:17:29 +02:00
f350e58fda
Junk removal
2024-05-29 16:30:35 +02:00
SebasKoedam
447ef3a6af
toolbar navigation button white
2024-05-29 16:30:24 +02:00
98c4df1ad5
Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
2024-05-29 16:18:56 +02:00
Luca Warmenhoven
2e8feb686b
Updated PersonalMotionPreviewElement
2024-05-29 16:18:48 +02:00
SebasKoedam
426725a632
Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 into 59-als-student-wil-ik-dat-de-ui-in-mijn-app-overal-het-zelfde-is-en-in-het-nederlands-wordt
2024-05-29 16:14:12 +02:00
SebasKoedam
4b46738bf0
fixed the main menu bars and theme
2024-05-29 16:12:37 +02:00
SebasKoedam
34dc294d06
fixed the main menu bars and theme
2024-05-29 16:12:23 +02:00
bceef3bde1
Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
2024-05-29 16:11:54 +02:00
Luca Warmenhoven
2426e7b2e2
Updated PersonalMotionPreviewElement
2024-05-29 16:11:43 +02:00
ba92ae62c7
Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
2024-05-29 16:06:15 +02:00
Luca Warmenhoven
6ffbb503c9
Added more logging for debugging functionality
2024-05-29 16:06:10 +02:00
8441097bf1
Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
2024-05-29 15:56:50 +02:00
9b71df061f
change array
2024-05-29 15:56:04 +02:00
Luca Warmenhoven
bd9ace61e9
Added more logging for debugging functionality
2024-05-29 15:55:37 +02:00
Luca Warmenhoven
60a45fd510
Merge remote-tracking branch 'origin/main'
...
# Conflicts:
# code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/components/PersonalMotionPreviewElement.java
2024-05-29 15:39:34 +02:00
Luca Warmenhoven
a6977b057c
Added more logging for debugging functionality
2024-05-29 15:39:13 +02:00
7e60d5e5e6
fixed type error causing bootloop
2024-05-29 15:35:29 +02:00
9ad44897ff
optimization
2024-05-29 15:22:38 +02:00
0441133744
Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
2024-05-29 15:15:23 +02:00
c3329a4c52
Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
2024-05-29 15:15:14 +02:00
Niels Gras
4c8c9d9f32
Merge branch '57-als-gebruiker-wil-ik-een-uitleg-scherm-zodat-ik-kan-zien-wat-fitbot-inhoudt' into 'main'
...
Resolve "Als gebruiker wil ik een uitleg scherm zodat ik kan zien wat fitbot inhoudt."
Closes #57
See merge request propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66!13
2024-05-29 15:14:48 +02:00
Luca Warmenhoven
447a021b10
Added more logging for debugging functionality
2024-05-29 15:13:04 +02:00
49eb09b105
added logging
2024-05-29 15:12:27 +02:00
ea9a35030b
qi.sdk unregister added
2024-05-29 15:12:18 +02:00
Niels Gras
940202d9f4
Edited help screen
2024-05-29 14:00:45 +02:00
Luca Warmenhoven
4983162ac9
Merge remote-tracking branch 'origin/main'
2024-05-29 13:41:00 +02:00
Luca Warmenhoven
95ed46d9ac
cermit
2024-05-29 13:40:53 +02:00
SebasKoedam
d6fc5098dd
Update database host to use IP address instead of localhost
2024-05-29 13:06:55 +02:00
SebasKoedam
b8e3e89bb2
Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
2024-05-29 13:04:59 +02:00
