Commit Graph

505 Commits

Author SHA1 Message Date
Luca Warmenhoven
c084443799 Fixed database request handling 2024-06-03 14:13:06 +02:00
Luca Warmenhoven
9f2bb805f0 Merge remote-tracking branch 'origin/main' 2024-06-03 14:04:03 +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
Niels Gras
dde65dd2b9 small documentation for fitbord ideas 2024-06-03 13:51:57 +02:00
ab6010d517 Hardware documentation 2024-06-03 13:17:23 +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
3145d3b3b0 Update esp server ip 2024-06-03 12:56:22 +02:00
b6353d15ba added endpoints for pepper and esp 2024-06-03 12:55:43 +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
a080b6c737 Script to pass ip adres from pepper to esp 2024-05-31 16:35:41 +02:00
Niels Gras
333317a9de Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-05-31 16:32:09 +02:00
Niels Gras
b9b4a9ca9b chore: Update Connectivity class with fetchIPAddress method 2024-05-31 16:32:06 +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
8df96091b1 Merge remote-tracking branch 'origin/main' 2024-05-31 13:05:33 +02:00
Niels Gras
3a6edc2cf0 custom icon for app 2024-05-31 13:05:04 +02:00
SebasKoedam
58b466dd27 opmaak 2024-05-31 12:59:26 +02:00
bc3c720fc2 OOP 2024-05-31 12:58:04 +02:00
28a49950ba change ending from going to mainscreen to endscreen 2024-05-31 12:57:57 +02:00
SebasKoedam
e35e7bf6c6 spatie weg 2024-05-31 12:55:39 +02:00
SebasKoedam
d3404a8eb2 expert review prep 2024-05-31 12:55:23 +02:00
SebasKoedam
70b5b1078b Position tracking docs added 2024-05-31 12:09:22 +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
SebasKoedam
4bd1419a8b added new request handlers 2024-05-30 15:23:46 +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
18ae9f0768 Testkaart 2024-05-30 14:16:09 +02:00
1426e039d1 Issues with hardware 2024-05-30 14:16:04 +02:00
af490e6f2e Animations for pepper 2024-05-30 14:15:47 +02:00
045e7fbe91 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:14:41 +02:00
f656a61b98 Infrastructure diagram 2024-05-30 14:14:37 +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
Sebas Koedam
dc68acc2a5 daily updates 2024-05-30 08:37:58 +02:00