diff --git a/code/src/Fitbot/.gitignore b/code/src/Fitbot/.gitignore index 732c947..203dde6 100644 --- a/code/src/Fitbot/.gitignore +++ b/code/src/Fitbot/.gitignore @@ -14,4 +14,5 @@ .cxx local.properties .idea -.vscode \ No newline at end of file +.vscode +/.idea/ diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/FitnessActivity.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/FitnessActivity.java index 3c07cfb..fc29b4b 100644 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/FitnessActivity.java +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/FitnessActivity.java @@ -81,6 +81,7 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall motionProcessor.startListening(); motionProcessor.setInputHandler(personalMotionPreviewElement); + }, (n) -> { int randomMessageIndex = (int) Math.floor(Math.random() * EXERCISE_NOT_FOUND_MESSAGES.length); Pepper.say(EXERCISE_NOT_FOUND_MESSAGES[randomMessageIndex]); diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/components/ExerciseStatusElement.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/components/ExerciseStatusElement.java index 606321b..93b1214 100644 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/components/ExerciseStatusElement.java +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/components/ExerciseStatusElement.java @@ -159,7 +159,7 @@ public class ExerciseStatusElement extends View implements IInputHandler { this.exercise = exercise; } - + /** TODO: Remove */ private Vector2f projectVertex(Vector3f point, int virtualWidth, int virtualHeight) { viewMatrix .identity()