SebasKoedam
|
58f8ff0054
|
chore: Update activity_main.xml and misc.xml
|
2024-05-23 15:50:53 +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 |
|
Niels Gras
|
ab82bdce43
|
Fixed crashing errors
|
2024-05-21 15:20:41 +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
|
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 |
|
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 |
|
Niels Gras
|
a62c4e1b77
|
Fixed layout for fitness screen
|
2024-05-17 15:53:59 +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
|
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
|
01498b5643
|
Code is able to discover bluetooth devices but cant connect to the balance board
|
2024-05-16 11:30:10 +02:00 |
|
Luca Warmenhoven
|
612b1c8a7c
|
bread
|
2024-05-15 16:32:38 +02:00 |
|
Niels Gras
|
f06287d562
|
Added new XML files for vcs and modules configuration
|
2024-05-15 14:54:16 +02:00 |
|
SebasKoedam
|
a28f7a28e5
|
Add ERD, EERD, and infrastructure documentation
|
2024-05-13 15:07:08 +02:00 |
|
Luca Warmenhoven
|
add59d9ac2
|
Merge remote-tracking branch 'origin/main'
|
2024-05-07 15:09:59 +02:00 |
|
Luca Warmenhoven
|
d173546ea2
|
Removed unused files, added motion processing classes
|
2024-05-07 15:09:54 +02:00 |
|
SebasKoedam
|
91be9d7798
|
chore: Update Fitbot app styles and themes
|
2024-05-06 13:08:07 +02:00 |
|
SebasKoedam
|
a5a26a3b25
|
Update Fitbot app styles and themes
|
2024-04-26 11:11:21 +02:00 |
|
SebasKoedam
|
a824d4d37b
|
Update Fitbot app resources and dependencies
|
2024-04-25 20:32:21 +02:00 |
|
Niels
|
63b4b74132
|
Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
|
2024-04-25 15:44:42 +02:00 |
|
Niels
|
5bf81d1713
|
added image buttons and change mainscreen to powerscreen
|
2024-04-25 15:13:25 +02:00 |
|
SebasKoedam
|
53332d59ef
|
Update Fitbot project files and daily updates documentation
|
2024-04-25 14:19:04 +02:00 |
|
Niels
|
969d004d1a
|
fixed file and class names and added Completion Screen
|
2024-04-24 21:12:35 +02:00 |
|
Luca Warmenhoven
|
547cccc27f
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# code/src/Fitbot/.idea/deploymentTargetDropDown.xml
# code/src/Fitbot/app/src/main/java/com/example/fitbot/MainActivity.java
|
2024-04-24 15:59:43 +02:00 |
|
Luca Warmenhoven
|
4b44533c36
|
Added test UI for selecting sport items
|
2024-04-24 15:59:24 +02:00 |
|
SebasKoedam
|
ca89d7af94
|
Update Fitbot project files and add robot conversation in MainActivity.java
|
2024-04-24 15:18:22 +02:00 |
|
Luca Warmenhoven
|
0c1bff838e
|
Added SpeechGenerator.java
|
2024-04-24 13:56:45 +02:00 |
|
SebasKoedam
|
0482c2b386
|
Add deploymentTargetDropDown.xml file for Fitbot project
|
2024-04-24 12:35:32 +02:00 |
|
Niels
|
7d996bcb52
|
added video files
|
2024-04-23 19:25:09 +02:00 |
|
SebasKoedam
|
45805c4c6f
|
Update project files and remove unused files
|
2024-04-23 14:40:57 +02:00 |
|