chore: Add transparent color to colors.xml, fix bug in incoming_request_handlers.js, and add close button drawable and dialog layout files

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)

code/src/Fitbot/.idea/misc.xml

@@ -35,13 +35,15 @@
         <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/drawable/red_button_gradient.xml" value="0.346" />
         <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/activity_bicepvideo.xml" value="0.22826086956521738" />
         <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/activity_end_screen.xml" value="0.4" />
-        <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/activity_fitness.xml" value="0.4" />
+        <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/activity_fitness.xml" value="0.1" />
         <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/activity_help.xml" value="0.4" />
+        <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/activity_info_dialog.xml" value="0.264" />
         <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/activity_main.xml" value="0.4" />
         <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/activity_main_screen.xml" value="0.1" />
         <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/activity_power_screen.xml" value="0.1" />
         <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/activity_sport_item.xml" value="0.1" />
         <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/activity_sport_menu.xml" value="0.1" />
+        <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/dialog_info.xml" value="0.4" />
         <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/header.xml" value="0.264" />
         <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/toolbar.xml" value="0.264" />
         <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/menu/main_menu.xml" value="0.4" />

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) {

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();
+    }
 }

code/src/Fitbot/app/src/main/res/drawable/ic_baseline_close_48.xml

@@ -0,0 +1,5 @@
+<vector android:height="48dp" android:tint="?attr/colorControlNormal"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>

code/src/Fitbot/app/src/main/res/layout/dialog_info.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="800dp"
+    android:layout_height="wrap_content"
+    android:background="@drawable/red_button_gradient"
+    android:orientation="vertical"
+    android:fitsSystemWindows="true">
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/textViewTitleDialog"
+            style="@style/TextStyleTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:layout_marginTop="10dp"
+            android:text="@string/descriptionTitle" />
+
+        <Button
+            android:id="@+id/closeButtonDialog"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_alignParentEnd="true"
+            android:layout_marginTop="20dp"
+            android:layout_marginEnd="10dp"
+            android:background="@color/transparent"
+            android:drawableTop="@drawable/ic_baseline_close_48"
+            android:drawableTint="@color/white" />
+
+    </RelativeLayout>
+
+    <TextView
+        android:id="@+id/textViewDialog"
+        style="@style/TextStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:maxWidth="800dp"
+        android:text="@string/description"
+        android:layout_marginHorizontal="10dp"
+        android:layout_marginBottom="10dp"/>
+
+</LinearLayout>

code/src/Fitbot/app/src/main/res/values/colors.xml

@@ -14,5 +14,6 @@
     <color name="invertedBackground">#FFFFFF</color>
     <color name="invertedTextColor">#000000</color>
     <color name="invertedIconTint">#000000</color>
+    <color name="transparent">#00000000</color>
 </resources>
 

code/src/Fitbot/app/src/main/res/values/strings.xml

@@ -26,4 +26,6 @@
     <string name="title">Title</string>
     <string name="context">ContextContextContext</string>
 
+    <string name="description">Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry\'s standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.</string>
+    <string name="descriptionTitle">Description</string>
 </resources>