SebasKoedam
46ba5dbdbd
video will now be displayed with link from database
2024-06-03 16:25:35 +02:00
Luca Warmenhoven
b1bbe9531b
Merge remote-tracking branch 'origin/main'
2024-06-03 14:55:27 +02:00
Luca Warmenhoven
627b50f7d5
Updated some stuff
2024-06-03 14:55:24 +02:00
SebasKoedam
f4fd183408
Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
2024-06-03 14:55:14 +02:00
SebasKoedam
85c6e4e918
feat: Add short description field to Exercise class
2024-06-03 14:55:13 +02:00
Niels Gras
902cc184ee
added arm circle movement
2024-06-03 14:47:51 +02:00
c0d002c46b
Luca's attempt at fixing app
2024-06-03 14:47:31 +02:00
SebasKoedam
456b959c5e
Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
2024-06-03 14:28:42 +02:00
SebasKoedam
baffe8b9ac
chore: Update activity_fitness.xml layout and fix bug in ExerciseManager
2024-06-03 14:28:00 +02:00
Luca Warmenhoven
926f369ff0
Merge remote-tracking branch 'origin/main'
...
# Conflicts:
# code/src/Fitbot/app/src/main/java/com/example/fitbot/exercise/ExerciseManager.java
# code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/FitnessActivity.java
2024-06-03 14:27:34 +02:00
Luca Warmenhoven
868542dba9
Updated InputProcessor and FitnessActivity, fixed some issues.
2024-06-03 14:26:17 +02:00
SebasKoedam
67860a6397
chore: Add transparent color to colors.xml, fix bug in incoming_request_handlers.js, and add close button drawable and dialog layout files
2024-06-03 14:03:48 +02:00
Luca Warmenhoven
882f07988d
Merge remote-tracking branch 'origin/main'
2024-06-03 13:41:59 +02:00
Luca Warmenhoven
517b5f8438
Why
2024-06-03 13:41:10 +02:00
cad5c8508e
Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
2024-06-03 12:56:31 +02:00
99c68fae9a
Update server ip adres in app
2024-06-03 12:55:34 +02:00
SebasKoedam
fc41cea618
fitness layout finished
2024-06-03 11:53:21 +02:00
594d0b91d0
Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
2024-05-31 16:36:58 +02:00
eda0601228
Added permissions to android manifest
2024-05-31 16:36:05 +02:00
61dde95684
Added so pepper sends its ip to another ip
2024-05-31 16:07:39 +02:00
SebasKoedam
92223fbf52
fitness activity
2024-05-31 15:44:56 +02:00
Niels Gras
3db278f92c
Add launcher background and icon resources
2024-05-31 13:06:11 +02:00
Niels Gras
3a6edc2cf0
custom icon for app
2024-05-31 13:05:04 +02:00
28a49950ba
change ending from going to mainscreen to endscreen
2024-05-31 12:57:57 +02:00
Luca Warmenhoven
84bdc7ca59
Renamed functions for clarity
2024-05-30 17:57:49 +02:00
Luca Warmenhoven
826ae8a9c7
Added motion recording functionality in InputProcessor (setRecording) and recorded data conversion to string for in the database (convertRecordedDataToString)
2024-05-30 17:41:06 +02:00
Luca Warmenhoven
3f37f44f22
Removed FitnessCycle, reformatted code, made Pepper actions globally accessible
2024-05-30 17:16:09 +02:00
Luca Warmenhoven
b4ce40ca7d
Merge remote-tracking branch 'origin/main'
2024-05-30 16:38:56 +02:00
Luca Warmenhoven
f7e96cf356
Added Pepper abstraction for synchronous events to prevent app from crashing
2024-05-30 16:38:48 +02:00
SebasKoedam
985d0b5219
refactor: Update layout for FitnessActivity
...
This commit updates the layout for the FitnessActivity by making the following changes:
- Adjusted the width of the LinearLayout to wrap its content
- Added padding to the LinearLayout and its child views
- Updated the dimensions of the VideoView and PersonalMotionPreviewElement
These changes improve the visual presentation and alignment of the elements in the FitnessActivity layout.
2024-05-30 16:32:10 +02:00
SebasKoedam
fa48f71407
Added hideUI in nav Manager
2024-05-30 15:57:49 +02:00
Luca Warmenhoven
a0988bf8cc
Merge remote-tracking branch 'origin/main'
2024-05-30 15:38:16 +02:00
Luca Warmenhoven
5c3b84b3ae
Updated exercise handling code to make pepper more verbal
2024-05-30 15:38:11 +02:00
SebasKoedam
e61ed86ea9
feat: Add exercise details to API response
...
The code changes include adding the `exerciseId`, `shortDescription`, `path`, and `duration` fields to the API response for exercises. This provides more comprehensive information about each exercise to the client.
Note: The recent user commits and repository commits are not relevant for generating the commit message.
2024-05-30 15:35:43 +02:00
562a863595
Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
2024-05-30 14:16:17 +02:00
af490e6f2e
Animations for pepper
2024-05-30 14:15:47 +02:00
Luca Warmenhoven
c6875d2ac7
Merge remote-tracking branch 'origin/main'
...
# Conflicts:
# code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/FitnessActivity.java
2024-05-30 14:12:31 +02:00
Luca Warmenhoven
e5c91b53f7
Updated motion handling, updated FitnessActivity to match motion handling
2024-05-30 14:11:16 +02:00
SebasKoedam
5685683aaf
last ui changes
2024-05-30 12:36:15 +02:00
SebasKoedam
20b75278f0
Fixed button ids
2024-05-30 10:43:56 +02:00
SebasKoedam
17f40a7a07
Merge branch '59-als-student-wil-ik-dat-de-ui-in-mijn-app-overal-het-zelfde-is-en-in-het-nederlands-wordt'
2024-05-30 10:01:59 +02:00
SebasKoedam
5753f7047d
finished all ui
2024-05-30 10:01:35 +02:00
SebasKoedam
7b72554110
poepies
2024-05-29 18:34:53 +02:00
SebasKoedam
59c906918e
added style for help menu
2024-05-29 18:31:03 +02:00
fbe392d511
removal of junk and changes made by luca
2024-05-29 17:34:24 +02:00
SebasKoedam
7efdf3579e
Added new style for fitness activity
2024-05-29 17:17:29 +02:00
SebasKoedam
447ef3a6af
toolbar navigation button white
2024-05-29 16:30:24 +02:00
98c4df1ad5
Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
2024-05-29 16:18:56 +02:00
Luca Warmenhoven
2e8feb686b
Updated PersonalMotionPreviewElement
2024-05-29 16:18:48 +02:00
SebasKoedam
426725a632
Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 into 59-als-student-wil-ik-dat-de-ui-in-mijn-app-overal-het-zelfde-is-en-in-het-nederlands-wordt
2024-05-29 16:14:12 +02:00
