Niels
b0caed783f
persoonlijke reflectie
2024-05-22 17:19:36 +02:00
9925fcd637
edited code for video
2024-05-22 15:50:43 +02:00
40cf9f37fc
made video work using ffmpeg
2024-05-22 15:50:27 +02:00
Niels Gras
981b4670e3
Merge remote-tracking branch 'origin/main'
2024-05-22 15:06:37 +02:00
Niels Gras
390bd3c667
changed video format
2024-05-22 15:06:28 +02:00
6d79b0f762
kinda fix for main activity still needs better layout
2024-05-22 15:03:16 +02:00
Niels Gras
60747d07c5
Merge branch '55-als-gebruiker-wil-ik-oefeningen-te-zien-krijgen-met-een-instructie-video-zodat-ik-weet-wat-ik' into 'main'
...
Fixed crashing errors
Closes #55
See merge request propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66!11
2024-05-22 14:57:56 +02:00
Niels Gras
60fa1cec2c
Fixed crashing errors
2024-05-22 14:47:01 +02:00
Niels Gras
54df52736f
Merge branch '55-als-gebruiker-wil-ik-oefeningen-te-zien-krijgen-met-een-instructie-video-zodat-ik-weet-wat-ik' into 'main'
...
Resolve "Als gebruiker wil ik oefeningen te zien krijgen met een instructie video zodat ik weet wat ik moet doen"
Closes #55
See merge request propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66!9
2024-05-22 14:20:55 +02:00
Niels Gras
bc8763927b
chore: Update background color in activity_fitness.xml
2024-05-22 14:20:26 +02:00
Niels Gras
5552865fd2
Merge branch '55-als-gebruiker-wil-ik-oefeningen-te-zien-krijgen-met-een-instructie-video-zodat-ik-weet-wat-ik' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 into 55-als-gebruiker-wil-ik-oefeningen-te-zien-krijgen-met-een-instructie-video-zodat-ik-weet-wat-ik
2024-05-22 14:19:37 +02:00
Niels Gras
bcf394ef29
test
2024-05-22 14:12:29 +02:00
SebasKoedam
fdd67d3e7e
stipje weggehaald
2024-05-22 11:54:21 +02:00
SebasKoedam
4a904be8f0
Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
2024-05-22 11:45:22 +02:00
SebasKoedam
904e4e98ed
reflectie blok 1,2 en 3 skill ontwikkeling
2024-05-22 11:45:21 +02:00
Luca Warmenhoven
f72879d66e
Merge remote-tracking branch 'origin/main'
2024-05-22 11:48:13 +03:00
Luca Warmenhoven
7064fa3b97
Updated PersonalMotionPreviewElement and FitnessActivity to match functionality
2024-05-22 11:48:02 +03:00
SebasKoedam
37ed64cd50
added daily tasks
2024-05-22 10:44:25 +02:00
Luca Warmenhoven
53d5e48b9b
Merge remote-tracking branch 'origin/main'
...
# Conflicts:
# code/src/Fitbot/app/src/main/java/com/example/fitbot/EndScreenActivity.java
# code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/FitnessActivity.java
# code/src/Fitbot/app/src/main/res/layout/activity_fitness.xml
2024-05-22 11:03:11 +03:00
Luca Warmenhoven
ccaf302558
store
2024-05-22 11:01:18 +03:00
Luca Warmenhoven
64412a849a
store
2024-05-22 10:51:41 +03:00
Luca Warmenhoven
5432b0656e
Added Skills Ontwikkelings Plan.docx
2024-05-22 10:42:34 +03:00
Luca Warmenhoven
03c14d12eb
Merge remote-tracking branch 'origin/main'
2024-05-22 10:41:43 +03:00
Luca Warmenhoven
3826adb891
nonsense
2024-05-22 10:41:25 +03:00
f97686aa74
Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
2024-05-21 22:19:52 +02:00
cb3c4ca99f
reflectieopdracht
2024-05-21 22:19:36 +02:00
d1f5f76eea
Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
2024-05-21 22:16:28 +02:00
851541923c
junk removal
2024-05-21 22:16:23 +02:00
Niels
bbe3a8127c
Expert sprint 2
2024-05-21 17:43:24 +02:00
Niels Gras
5d966ea3b9
feat: Add personal reflection documentation for each block
2024-05-21 15:52:46 +02:00
f288535c44
Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
2024-05-21 15:34:12 +02:00
183d5b826b
Research sensors
2024-05-21 15:34:09 +02:00
Niels Gras
fc06974af1
feat: Update import statement for EndScreenActivity in FitnessActivity
2024-05-21 15:25:23 +02:00
Niels Gras
831fd06489
refactor: Move EndScreenActivity to ui.activities package
2024-05-21 15:24:02 +02:00
Niels Gras
9f87fb5e6f
Merge branch '55-als-gebruiker-wil-ik-oefeningen-te-zien-krijgen-met-een-instructie-video-zodat-ik-weet-wat-ik' into 'main'
...
Resolve "Als gebruiker wil ik oefeningen te zien krijgen met een instructie video zodat ik weet wat ik moet doen"
Closes #55
See merge request propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66!4
2024-05-21 15:22:56 +02:00
Niels Gras
ab82bdce43
Fixed crashing errors
2024-05-21 15:20:41 +02:00
Niels Gras
1edaf096b2
feat: Add personal reflection documentation for each block
2024-05-21 14:26:00 +02:00
Niels Gras
af596ea67c
Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 into 55-als-gebruiker-wil-ik-oefeningen-te-zien-krijgen-met-een-instructie-video-zodat-ik-weet-wat-ik
2024-05-21 14:21:05 +02:00
Niels Gras
d08e8dd50f
added placeholder video
2024-05-21 14:20:22 +02:00
Niels Gras
f50f332664
added a ButtonNavigation class
2024-05-21 14:11:41 +02:00
8e92cbee7d
Merge branch '51-als-gebruiker-wil-ik-dat-pepper-mee-beweegt-tijdens-oefeningen-zodat-ik-meer-motivatie-heb-om'
2024-05-21 13:50:50 +02:00
Niels Gras
d718046402
added video player and media player
2024-05-21 13:03:34 +02:00
bad3346475
fixed minsdk so it can actually be uploaded to robot
2024-05-21 12:54:20 +02:00
Niels Gras
e00b15480c
Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 into 55-als-gebruiker-wil-ik-oefeningen-te-zien-krijgen-met-een-instructie-video-zodat-ik-weet-wat-ik
2024-05-21 12:49:43 +02:00
Niels Gras
a854c9b5e1
changed background
2024-05-21 12:48:43 +02:00
Niels Gras
ba0ae4c6b7
fixed build errors
2024-05-21 12:43:12 +02:00
Luca Warmenhoven
0bdd1664dc
crack cocaine and sport activities
2024-05-21 12:31:45 +02:00
59d7c4f1ec
Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
2024-05-21 12:31:15 +02:00
Niels Gras
c398f8ff70
Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 into 55-als-gebruiker-wil-ik-oefeningen-te-zien-krijgen-met-een-instructie-video-zodat-ik-weet-wat-ik
2024-05-21 12:14:43 +02:00
Niels Gras
3e791f8ac0
added skip button
2024-05-21 12:13:33 +02:00
