Luca Warmenhoven
|
cb53000eb3
|
Added NodeJS Server files
|
2024-05-24 10:53:14 +02:00 |
|
|
fdfb216617
|
Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
|
2024-05-23 19:57:26 +02:00 |
|
|
1a62421c90
|
added comment to animation class
|
2024-05-23 19:56:39 +02:00 |
|
SebasKoedam
|
25f9f098b0
|
improved main and fitness layout
|
2024-05-23 18:09:43 +02:00 |
|
SebasKoedam
|
9795ccb490
|
removed unsed files
|
2024-05-23 18:09:19 +02:00 |
|
SebasKoedam
|
8cc571bb3b
|
Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
|
2024-05-23 15:51:34 +02:00 |
|
SebasKoedam
|
58f8ff0054
|
chore: Update activity_main.xml and misc.xml
|
2024-05-23 15:50:53 +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
|
60fa1cec2c
|
Fixed crashing errors
|
2024-05-22 14:47:01 +02:00 |
|
Niels Gras
|
bc8763927b
|
chore: Update background color in activity_fitness.xml
|
2024-05-22 14:20:26 +02:00 |
|
Luca Warmenhoven
|
7064fa3b97
|
Updated PersonalMotionPreviewElement and FitnessActivity to match functionality
|
2024-05-22 11:48:02 +03: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
|
64412a849a
|
store
|
2024-05-22 10:51:41 +03: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
|
ab82bdce43
|
Fixed crashing errors
|
2024-05-21 15:20:41 +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 |
|
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 |
|
SebasKoedam
|
67045ed342
|
Merge branch '53-als-gebruiker-wil-ik-dat-mijn-bewegingen-op-het-wii-fit-board-worden-gemeten-zodat-dit-gebruikt'
|
2024-05-21 11:25:19 +02:00 |
|
SebasKoedam
|
536c8c75af
|
feat: Update FitBot architecture diagrams
|
2024-05-20 14:27:30 +02:00 |
|
Niels Gras
|
f87e4e5309
|
Fixed contrain
|
2024-05-17 16:06:02 +02:00 |
|
Niels Gras
|
a62c4e1b77
|
Fixed layout for fitness screen
|
2024-05-17 15:53:59 +02:00 |
|
Luca Warmenhoven
|
1fea68d90a
|
Merge remote-tracking branch 'origin/main'
|
2024-05-17 15:28:49 +02:00 |
|
Luca Warmenhoven
|
368067eb8b
|
Updated manifest
|
2024-05-17 15:28:43 +02:00 |
|
Niels Gras
|
d0ed34ec95
|
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-17 15:12:33 +02:00 |
|
Niels Gras
|
60bdf860d3
|
chore: Update activity_fitness.xml layout for Fitbot app
|
2024-05-17 15:11:42 +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
|
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 |
|
Luca Warmenhoven
|
3edab82535
|
Added example exercises
|
2024-05-17 12:42:10 +02:00 |
|
Luca Warmenhoven
|
59c374eb02
|
Added sport activity abstraction classes
|
2024-05-17 12:32:54 +02:00 |
|