Luca Warmenhoven
|
b85219d013
|
Commit crack cocaine
|
2024-05-28 11:47:42 +02:00 |
|
Luca Warmenhoven
|
ff5d1ed31f
|
killed my brain doing literature
|
2024-05-25 19:31:13 +02:00 |
|
Niels Gras
|
5462a6fbcc
|
Added help activity
|
2024-05-24 13:41:53 +02:00 |
|
|
|
dd91639fb2
|
Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
|
2024-05-24 12:27:11 +02:00 |
|
|
|
02c2cff330
|
updated lateralraises animation
|
2024-05-24 12:24:58 +02:00 |
|
|
|
1fb1d5d02d
|
Added class and intergrated it into code
|
2024-05-24 12:24:48 +02:00 |
|
|
|
82731ee176
|
added library and videoview
|
2024-05-24 12:24:24 +02:00 |
|
Luca Warmenhoven
|
04bdf656f4
|
Merge remote-tracking branch 'origin/main'
|
2024-05-24 12:20:53 +02:00 |
|
Luca Warmenhoven
|
38e70e3b53
|
Fixed more shit
|
2024-05-24 12:20:49 +02:00 |
|
Niels Gras
|
a8e7f6d8b8
|
Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
|
2024-05-24 12:04:45 +02:00 |
|
Niels Gras
|
f96d6ec394
|
chore: Update navigation menu with Colors research page
|
2024-05-24 12:04:43 +02:00 |
|
Luca Warmenhoven
|
f5900bf50e
|
Merge remote-tracking branch 'origin/main'
|
2024-05-24 11:52:17 +02:00 |
|
Luca Warmenhoven
|
04054c862b
|
Fixed some shit and removed ugly ass shit
|
2024-05-24 11:52:12 +02:00 |
|
|
|
3ee81d0e48
|
fitnesscycle class it plays the animation a given amount of reps
|
2024-05-24 11:29:40 +02:00 |
|
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 |
|
