Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
This commit is contained in:
@@ -269,7 +269,7 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall
|
||||
public void incrementProgress(View view) {
|
||||
if (progress < maxProgress) {
|
||||
progress++;
|
||||
triggerColorBurst(false);
|
||||
triggerColorBurst(true);
|
||||
updateProgress();
|
||||
}
|
||||
}
|
||||
@@ -283,8 +283,10 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall
|
||||
|
||||
if (isGoodRep) {
|
||||
progressCircle.setProgressDrawable(ContextCompat.getDrawable(this, R.drawable.progress_circle_good));
|
||||
new MediaPlayer().create(this, R.raw.good_sound).start();
|
||||
} else {
|
||||
progressCircle.setProgressDrawable(ContextCompat.getDrawable(this, R.drawable.progress_circle_bad));
|
||||
new MediaPlayer().create(this, R.raw.wrong_sound).start();
|
||||
}
|
||||
|
||||
ObjectAnimator animator = ObjectAnimator.ofFloat(progressCircle, "alpha", 1f, 0f, 1f);
|
||||
|
@@ -130,7 +130,7 @@ public class InputProcessor {
|
||||
*/
|
||||
public void onAdequateRepetition() {
|
||||
ExerciseManager.TOTAL_REPETITIONS_PERFORMED++;
|
||||
// TODO: Play sound
|
||||
// TODO: Add animation for correct repetition
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -138,6 +138,7 @@ public class InputProcessor {
|
||||
*/
|
||||
public void onInadequateRepetition() {
|
||||
|
||||
// TODO: Add animation for wrong repetition
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -344,16 +345,6 @@ public class InputProcessor {
|
||||
return jsonArray.toString();
|
||||
}
|
||||
|
||||
/**
|
||||
* Method for getting the current progress of the exercise.
|
||||
* The return value will range between 0.0 and 1.0.
|
||||
*
|
||||
* @return The current progress of the exercise.
|
||||
*/
|
||||
public double getCurrentProgress() {
|
||||
return secondsPassed / exerciseDurationInSeconds;
|
||||
}
|
||||
|
||||
/**
|
||||
* Function for getting the combined (average) error value of both sensors.
|
||||
public double getCombinedError()
|
||||
@@ -373,9 +364,10 @@ public class InputProcessor {
|
||||
*/
|
||||
public double getError(int sensorId, float time) {
|
||||
|
||||
/*// Ensure the sensor ID is within the bounds of the array
|
||||
// Ensure the sensor ID is within the bounds of the array
|
||||
if (sensorId < 0 || sensorId >= selfRotationVectorPaths.length)
|
||||
return 0.0d;
|
||||
/*
|
||||
|
||||
// Index of the current rotation vector
|
||||
int targetIndex = (int) ((this.exerciseDurationInSeconds / this.targetRotationVectorPaths[sensorId].length) * time);
|
||||
|
BIN
code/src/Fitbot/app/src/main/res/raw/good_sound.mp3
Normal file
BIN
code/src/Fitbot/app/src/main/res/raw/good_sound.mp3
Normal file
Binary file not shown.
BIN
code/src/Fitbot/app/src/main/res/raw/wrong_sound.wav
Normal file
BIN
code/src/Fitbot/app/src/main/res/raw/wrong_sound.wav
Normal file
Binary file not shown.
Reference in New Issue
Block a user