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

..

.idea

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

app

Merge remote-tracking branch 'origin/main'

2024-06-03 14:27:34 +02:00

gradle/wrapper

Update project files and remove unused files

2024-04-23 14:40:57 +02:00

.gitignore

Why

2024-06-03 13:41:10 +02:00

build.gradle

Update project files and remove unused files

2024-04-23 14:40:57 +02:00

gradle.properties

Update project files and remove unused files

2024-04-23 14:40:57 +02:00

gradlew

Update project files and remove unused files

2024-04-23 14:40:57 +02:00

gradlew.bat

Update project files and remove unused files

2024-04-23 14:40:57 +02:00

settings.gradle

Update project files and remove unused files

2024-04-23 14:40:57 +02:00