diff --git a/code/server/incoming_request_handlers.js b/code/server/incoming_request_handlers.js index 1f8d257..6fa0f41 100644 --- a/code/server/incoming_request_handlers.js +++ b/code/server/incoming_request_handlers.js @@ -42,7 +42,7 @@ function handleIncoming(request, response, app, pool) path: row.Path, duration: row.Duration }; - }); + })[0]; response .status(200) diff --git a/code/src/Fitbot/.idea/misc.xml b/code/src/Fitbot/.idea/misc.xml index a6192e8..b1965d6 100644 --- a/code/src/Fitbot/.idea/misc.xml +++ b/code/src/Fitbot/.idea/misc.xml @@ -35,13 +35,15 @@ - + + + diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/exercise/ExerciseManager.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/exercise/ExerciseManager.java index dc045e5..75b11ae 100644 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/exercise/ExerciseManager.java +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/exercise/ExerciseManager.java @@ -85,7 +85,7 @@ public class ExerciseManager { */ public static Exercise fetchExerciseFromDatabase() { String response = sendHTTP( - HOST_ADDRESS, "POST", "application/json", null + HOST_ADDRESS, "POST", "application/json", ); // Validate the response if (response != null) { 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 8a40859..abde556 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 @@ -1,9 +1,14 @@ package com.example.fitbot.ui.activities; +import android.app.Dialog; import android.content.Context; +import android.graphics.drawable.ColorDrawable; import android.net.Uri; import android.os.Bundle; import android.util.Log; +import android.view.View; +import android.view.WindowManager; +import android.widget.Button; import android.widget.VideoView; import com.aldebaran.qi.sdk.QiContext; @@ -56,7 +61,17 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall VideoView videoView = findViewById(R.id.videoView); playVideo(videoView, this); 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.hideSystemUI(this); + + Button infoButtonFitness = findViewById(R.id.infoButtonFitness); + infoButtonFitness.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + showInfoDialog(); + } + }); } @Override @@ -157,4 +172,24 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall super.onDestroy(); } + + private void showInfoDialog() { + final Dialog dialog = new Dialog(this); + dialog.setContentView(R.layout.dialog_info); + + NavigationManager.hideSystemUI(this); + + dialog.getWindow().setDimAmount(0.5f); + dialog.getWindow().setBackgroundDrawable(new ColorDrawable(android.graphics.Color.TRANSPARENT)); + dialog.setCancelable(true); + + Button closeButton = dialog.findViewById(R.id.closeButtonDialog); + closeButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + dialog.dismiss(); + } + }); + dialog.show(); + } } \ No newline at end of file diff --git a/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_close_48.xml b/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_close_48.xml new file mode 100644 index 0000000..72f8573 --- /dev/null +++ b/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_close_48.xml @@ -0,0 +1,5 @@ + + + diff --git a/code/src/Fitbot/app/src/main/res/layout/dialog_info.xml b/code/src/Fitbot/app/src/main/res/layout/dialog_info.xml new file mode 100644 index 0000000..f64e32a --- /dev/null +++ b/code/src/Fitbot/app/src/main/res/layout/dialog_info.xml @@ -0,0 +1,45 @@ + + + + + + + +