Smikkelbakje/J1B4-Fitbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix crashes and video player, changed loading elements to UI thread

Browse Source
This commit is contained in:
Sam Hos
2024-06-04 11:25:49 +02:00
parent cd00d36166
commit 0c98744bdd
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/FitnessActivity.java
View File

@@ -72,8 +72,7 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall
setSpeechBarDisplayStrategy(SpeechBarDisplayStrategy.IMMERSIVE); setSpeechBarDisplayStrategy(SpeechBarDisplayStrategy.IMMERSIVE);
// Find the VideoView by its ID // Find the VideoView by its ID
VideoView videoView = findViewById(R.id.videoView);
// playVideo(videoView, this);
NavigationManager.setupButtonNavigation(this, R.id.homeButtonFitness, MainActivity.class); NavigationManager.setupButtonNavigation(this, R.id.homeButtonFitness, MainActivity.class);
NavigationManager.setupButtonNavigation(this, R.id.skipButtonFitness, MainActivity.class); //Needs to skip exercises once those are implemented NavigationManager.setupButtonNavigation(this, R.id.skipButtonFitness, MainActivity.class); //Needs to skip exercises once those are implemented
@@ -139,15 +138,18 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall
if (exercise == null) { if (exercise == null) {
onFailedFetch.handle(null); onFailedFetch.handle(null);
} else { } else {
exerciseNameTextView.setText(exercise.name);
exerciseShortDescriptionTextView.setText(exercise.shortDescription);
exerciseDescriptionTextView.setText(exercise.description);
exerciseVideoUrl = exercise.videoUrl;
onSuccessfulFetch.handle(exercise); onSuccessfulFetch.handle(exercise);
this.runOnUiThread(() -> { this.runOnUiThread(() -> {
exerciseNameTextView.setText(exercise.name); exerciseNameTextView.setText(exercise.name);
exerciseShortDescriptionTextView.setText(exercise.shortDescription); exerciseShortDescriptionTextView.setText(exercise.shortDescription);
exerciseNameTextView.setText(exercise.name);
exerciseShortDescriptionTextView.setText(exercise.shortDescription);
// exerciseDescriptionTextView.setText(exercise.description);
exerciseVideoUrl = exercise.videoUrl;
// exerciseDescriptionTextView.setText(exercise.description); // exerciseDescriptionTextView.setText(exercise.description);
VideoView videoView = findViewById(R.id.videoView);
Log.e("exerciseVideoUrl", "videourl:" + exerciseVideoUrl);
playVideo(videoView, this);
}); });
} }
})).start(); })).start();