Commit Graph

39 Commits

Author SHA1 Message Date
Luca Warmenhoven
d173546ea2 Removed unused files, added motion processing classes 2024-05-07 15:09:54 +02:00
Luca Warmenhoven
4ea72ca97c Merge remote-tracking branch 'origin/main'
# Conflicts:
#	code/src/Fitbot/app/src/main/java/com/example/fitbot/MainActivity.java
2024-04-26 11:24:51 +02:00
Luca Warmenhoven
0ab0c685c1 Updated SportMenuItem 2024-04-26 11:23:31 +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
SebasKoedam
daddd73dfb Add new files for Fitbot app: MainScreen.java, main_menu.xml, toolbar.xml, header.xml, ic_baseline_home_48.xml, ic_baseline_star_rate_48.xml, ic_baseline_settings_48.xml 2024-04-25 20:32:14 +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
0f66ece3f2 Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-04-25 14:30:32 +02:00
f4443f36ce Made class to play animations on robot 2024-04-25 14:30:12 +02:00
SebasKoedam
b1653820ae 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 14:20:19 +02:00
SebasKoedam
53332d59ef Update Fitbot project files and daily updates documentation 2024-04-25 14:19:04 +02:00
5f6ff11f4a Added libraries 2024-04-25 13:49:46 +02:00
Niels
969d004d1a fixed file and class names and added Completion Screen 2024-04-24 21:12:35 +02:00
f7c9e9ea01 Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-04-24 16:53:51 +02:00
c40be9ecc9 animation 2024-04-24 16:50:24 +02:00
9955dd5854 added libraries and attempted to call class in mainactivity 2024-04-24 16:50:16 +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
82a2f28927 Fix import statements in MainActivity.java 2024-04-24 15:19:37 +02:00
SebasKoedam
ca89d7af94 Update Fitbot project files and add robot conversation in MainActivity.java 2024-04-24 15:18:22 +02:00
ea184c9fc4 Added new libraries and made it so it can speak dutch 2024-04-24 13:58:27 +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
SebasKoedam
b505086a66 Add Fitbot project files and update Gradle settings 2024-04-23 14:40:49 +02:00
SebasKoedam
346a25a424 Fix Git mapping in vcs.xml and update research ethics form 2024-04-22 20:11:03 +02:00
SebasKoedam
bbca6c30ff Add HelloHuman class with say action 2024-04-21 16:09:10 +02:00
Luca Warmenhoven
56875ce2d8 Added generic code in MainActivity for robot 2024-04-19 15:40:18 +02:00
Luca Warmenhoven
c9a35f5e2a Added speech example 2024-04-19 15:34:43 +02:00
SebasKoedam
80ce41d00f Update Gradle configuration and dependencies 2024-04-19 14:50:00 +02:00
Luca Warmenhoven
b4457cda8a Merge remote-tracking branch 'origin/main' 2024-04-19 14:47:31 +02:00
Luca Warmenhoven
ead909c457 Moved files to appropriate directory. 2024-04-19 14:47:27 +02:00
SebasKoedam
31b1929209 Add Git mapping for project directory 2024-04-19 14:36:49 +02:00
f997c8e0f5 set correct java version 2024-04-19 11:15:13 +02:00
78ce790c6e Made it so the app actually start 2024-04-19 11:10:50 +02:00
76cd2d8728 Added class to change text on a layout 2024-04-18 15:08:45 +02:00
SebasKoedam
bc912fec9f Remove unused files and directories 2024-04-18 14:51:38 +02:00