Merge remote-tracking branch 'origin/main'

# Conflicts:
#	code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/FitnessActivity.java

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

@@ -20,6 +20,7 @@
         <entry key="..\:/Users/Niels/muupooviixee66-3/code/src/Fitbot/app/src/main/res/layout/header.xml" value="0.1234375" />
         <entry key="..\:/Users/Niels/muupooviixee66-3/code/src/Fitbot/app/src/main/res/layout/toolbar.xml" value="0.1234375" />
         <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/drawable-v24/ic_launcher_foreground.xml" value="0.25" />
+        <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/drawable/big_red_button_gradient.xml" value="0.2555" />
         <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/drawable/box_background.xml" value="0.2555" />
         <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/drawable/darkred_button_gradient.xml" value="0.346" />
         <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/drawable/help2_background.xml" value="0.2395" />
@@ -32,7 +33,7 @@
         <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.264" />
+        <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/activity_fitness.xml" value="0.6" />
         <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_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" />

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

@@ -1,6 +1,8 @@
 package com.example.fitbot.ui.activities;
 
 import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
 import android.widget.VideoView;
 
 import com.aldebaran.qi.sdk.QiContext;

code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/HelpActivity.java

@@ -2,6 +2,7 @@ package com.example.fitbot.ui.activities;
 
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.view.View;
 
 import com.example.fitbot.R;
 import com.example.fitbot.util.ButtonNavigation;
@@ -15,5 +16,16 @@ public class HelpActivity extends AppCompatActivity {
 
         ButtonNavigation.setupButtonNavigation(this, R.id.homeButtonHelp, MainActivity.class);
 
+        // Hide system UI
+        hideSystemUI();
+    }
+
+    private void hideSystemUI() {
+        View decorView = getWindow().getDecorView();
+        // Hide the status bar and navigation bar
+        int uiOptions = View.SYSTEM_UI_FLAG_FULLSCREEN
+                | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+                | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
+        decorView.setSystemUiVisibility(uiOptions);
     }
 }

code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/MainActivity.java

@@ -32,12 +32,10 @@ public class MainActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        // Set full screen mode
+        // Set full screen mode to hide status bar
         getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
                 WindowManager.LayoutParams.FLAG_FULLSCREEN);
 
-        // Hide system UI
-        hideSystemUI();
 
         startButton = findViewById(R.id.startButtonMain);
         startButton.setOnClickListener(v -> {
@@ -47,7 +45,11 @@ public class MainActivity extends AppCompatActivity {
             startActivity(intent);
         });
 
-        setUpUi(); // Set up the UI
+        // Set up the UI
+        setUpUi();
+
+        // Hide system UI
+        hideSystemUI();
     }
 
     private void setUpUi() {

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

@@ -2,11 +2,12 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
     <corners
-        android:radius="15dp"
+        android:radius="40dp"
         />
 
     <gradient
         android:startColor="#990000"
         android:endColor="#FF0000"
         android:angle="90"/>
+
 </shape>

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

@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
     <corners
-        android:radius="30dp"
+        android:radius="25dp"
         />
 
     <gradient

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

@@ -22,10 +22,12 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="20dp"
+            android:layout_marginBottom="40dp"
             android:background="@drawable/help_background"
             android:orientation="vertical"
-            android:padding="16dp"
+            android:paddingVertical="15dp"
+            android:paddingHorizontal="20dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
@@ -34,7 +36,7 @@
                 style="@style/TextStyleTitle"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:text="@string/klaar" />
+                android:text="@string/afgerond" />
         </LinearLayout>
 
         <LinearLayout
@@ -53,7 +55,8 @@
                 style="@style/TextStyle"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:text="@string/voltooid" />
+                android:text="@string/voltooid"
+                android:textAlignment="center"/>
         </LinearLayout>
 
         <LinearLayout
@@ -83,6 +86,7 @@
         android:layout_width="150dp"
         android:layout_height="75dp"
         android:layout_marginEnd="280dp"
+        android:layout_marginBottom="30dp"
         android:background="@drawable/red_button_gradient"
         android:drawableTop="@drawable/ic_baseline_home_48"
         android:drawableTint="@color/white"
@@ -95,12 +99,13 @@
         android:layout_width="150dp"
         android:layout_height="75dp"
         android:layout_marginStart="280dp"
+        android:layout_marginBottom="30dp"
         android:background="@drawable/red_button_gradient"
+        android:padding="15dp"
         android:text="@string/start"
         android:textAllCaps="false"
         android:textColor="@color/white"
         android:textSize="30sp"
-        android:padding="15dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 

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

@@ -45,6 +45,7 @@ tools:openDrawer="start">
         android:layout_width="150dp"
         android:layout_height="75dp"
         android:layout_marginStart="404dp"
+        android:layout_marginBottom="30dp"
         android:background="@drawable/red_button_gradient"
         android:drawableTop="@drawable/ic_baseline_home_48"
         android:drawableTint="@color/white"

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

@@ -5,19 +5,22 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/darkBlue"
+    android:fitsSystemWindows="true"
     tools:context=".ui.activities.HelpActivity">
 
     <Button
         android:id="@+id/homeButtonHelp"
         android:layout_width="150dp"
         android:layout_height="75dp"
-        android:layout_marginStart="404dp"
+        android:layout_marginStart="406dp"
-        android:layout_marginBottom="10dp"
+        android:layout_marginEnd="406dp"
+        android:layout_marginBottom="30dp"
         android:background="@drawable/red_button_gradient"
         android:drawableTop="@drawable/ic_baseline_home_48"
         android:drawableTint="@color/white"
         android:padding="15dp"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
     <LinearLayout
@@ -35,10 +38,12 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="20dp"
+            android:layout_marginBottom="40dp"
             android:background="@drawable/help_background"
             android:orientation="vertical"
-            android:padding="16dp"
+            android:paddingVertical="15dp"
+            android:paddingHorizontal="20dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
@@ -66,7 +71,8 @@
                 style="@style/TextStyle"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:text="@string/uitlegStart" />
+                android:text="@string/uitlegStart"
+                android:textAlignment="center"/>
         </LinearLayout>
 
         <LinearLayout
@@ -85,7 +91,8 @@
                 style="@style/TextStyle"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:text="@string/uitlegHome" />
+                android:text="@string/uitlegHome"
+                android:textAlignment="center"/>
         </LinearLayout>
 
     </LinearLayout>

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

@@ -27,11 +27,15 @@
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="208dp"
+            android:layout_marginStart="215dp"
             android:layout_marginTop="120dp"
+            android:layout_marginEnd="215dp"
+            android:layout_marginBottom="23dp"
             android:background="@drawable/box_background"
             android:orientation="vertical"
             android:padding="16dp"
+            app:layout_constraintBottom_toTopOf="@+id/startButtonMain"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
@@ -55,44 +59,60 @@
 
         <Button
             android:id="@+id/startButtonMain"
-            android:layout_width="200dp"
+            android:layout_width="wrap_content"
-            android:layout_height="100dp"
+            android:layout_height="wrap_content"
-            android:layout_marginStart="368dp"
+            android:layout_marginStart="365dp"
-            android:layout_marginTop="312dp"
+            android:layout_marginTop="315dp"
-            android:background="@drawable/red_button_gradient"
+            android:layout_marginEnd="365dp"
+            android:layout_marginBottom="22dp"
+            android:background="@drawable/big_red_button_gradient"
+            android:gravity="center"
+            android:paddingHorizontal="25dp"
+            android:paddingVertical="5dp"
             android:text="@string/start"
+            android:textAlignment="center"
             android:textAllCaps="false"
             android:textColor="@color/white"
             android:textSize="80sp"
-            android:gravity="center"
+            app:layout_constraintBottom_toTopOf="@+id/helpButtonMain"
-            android:textAlignment="center"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.727" />
 
         <Button
             android:id="@+id/helpButtonMain"
-            android:layout_width="100dp"
+            android:layout_width="wrap_content"
-            android:layout_height="50dp"
+            android:layout_height="wrap_content"
             android:layout_marginStart="420dp"
-            android:layout_marginTop="424dp"
+            android:layout_marginTop="444dp"
-            android:background="@drawable/darkred_button_gradient"
+            android:layout_marginEnd="420dp"
+            android:background="@drawable/red_button_gradient"
+            android:gravity="center"
+            android:paddingHorizontal="20dp"
+            android:paddingVertical="5dp"
             android:text="@string/help"
+            android:textAlignment="center"
             android:textAllCaps="false"
             android:textColor="@color/white"
             android:textSize="40sp"
-            android:gravity="center"
+            app:layout_constraintBottom_toBottomOf="parent"
-            android:textAlignment="center"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.258" />
 
         <ImageView
             android:id="@+id/imageViewRobotLogo"
             android:layout_width="200dp"
             android:layout_height="200dp"
-            android:layout_marginTop="340dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginBottom="4dp"
             android:contentDescription="@string/robot_logo"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
             app:srcCompat="@drawable/robot_logo_inverted" />
 
 

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

@@ -19,8 +19,8 @@
     <string name="uitlegStart">Druk op Start om de oefening te beginnen</string>
     <string name="uitlegHome">Ga terug naar het begin scherm door op het huisje te klikken</string>
 
-    <string name="klaar">Klaar!</string>
+    <string name="afgerond">Oefeningen afgerond</string>
-    <string name="voltooid">U heeft de oefeningen voltooid, druk op start om nog een sessie te beginnen</string>
+    <string name="voltooid">U heeft de oefeningen voltooid! \n Druk op start om nog een sessie te beginnen</string>
     <string name="score">Score:</string>
 
 </resources>