Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66

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

@@ -4,11 +4,12 @@
     <option name="filePathToZoomLevelMap">
       <map>
         <entry key="..\:/Users/31687/muupooviixee66-1/code/src/Fitbot/app/src/main/res/layout/activity_bicepvideo.xml" value="0.2015625" />
-        <entry key="..\:/Users/31687/muupooviixee66-1/code/src/Fitbot/app/src/main/res/layout/activity_main.xml" value="0.2015625" />
-        <entry key="..\:/Users/31687/muupooviixee66-1/code/src/Fitbot/app/src/main/res/layout/activity_main_screen.xml" value="0.358695652173913" />
-        <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_main.xml" value="0.264" />
-        <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/31687/muupooviixee66-1/code/src/Fitbot/app/src/main/res/layout/activity_completion_screen.xml" value="0.10078125" />
+        <entry key="..\:/Users/31687/muupooviixee66-1/code/src/Fitbot/app/src/main/res/layout/activity_main.xml" value="0.1" />
+        <entry key="..\:/Users/31687/muupooviixee66-1/code/src/Fitbot/app/src/main/res/layout/activity_main_screen.xml" value="0.15" />
+        <entry key="..\:/Users/31687/muupooviixee66-1/code/src/Fitbot/app/src/main/res/layout/activity_sport_item.xml" value="0.16336633663366337" />
+        <entry key="..\:/Users/31687/muupooviixee66-1/code/src/Fitbot/app/src/main/res/layout/activity_sport_menu.xml" value="0.16" />
+        <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/activity_main.xml" value="0.1" />
       </map>
     </option>
   </component>

code/src/Fitbot/app/src/main/AndroidManifest.xml

@@ -27,7 +27,7 @@
             android:name=".BicepVideo"
             android:exported="false" />
         <activity
-            android:name=".MainScreen"
+            android:name=".PowerScreen"
             android:exported="false" />
         <activity
             android:name=".MainActivity"

code/src/Fitbot/app/src/main/java/com/example/fitbot/MainScreen.java

@@ -1,22 +0,0 @@
-package com.example.fitbot;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.widget.Button;
-
-public class MainScreen extends AppCompatActivity {
-    Button button;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main_screen);
-
-        button = findViewById(R.id.open_BicepVideo);
-        button.setOnClickListener(v -> {
-            Intent i = new Intent(MainScreen.this, BicepVideo.class);
-            startActivity(i);
-        });
-    }
-}

code/src/Fitbot/app/src/main/java/com/example/fitbot/PowerScreen.java

@@ -0,0 +1,43 @@
+package com.example.fitbot;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.widget.ImageButton;
+
+public class PowerScreen extends AppCompatActivity {
+    ImageButton openBicepVideo;
+    ImageButton openSquatVideo;
+    ImageButton openTricepVideo;
+    ImageButton goToHome;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_power_screen);
+
+        openBicepVideo = findViewById(R.id.open_BicepVideo);
+        openSquatVideo = findViewById(R.id.open_SquatVideo);
+        openTricepVideo = findViewById(R.id.open_TricepVideo);
+        goToHome = findViewById(R.id.GoToHome);
+
+        openBicepVideo.setOnClickListener(v -> {
+            Intent intent = new Intent(PowerScreen.this, BicepVideo.class);
+            startActivity(intent);
+        });
+        openSquatVideo.setOnClickListener(v -> {
+            Intent intent = new Intent(PowerScreen.this, SquatVideo.class);
+            startActivity(intent);
+        });
+
+        openTricepVideo.setOnClickListener(v -> {
+            Intent intent = new Intent(PowerScreen.this, TricepVideo.class);
+            startActivity(intent);
+        });
+
+        goToHome.setOnClickListener(v -> {
+            Intent intent = new Intent(PowerScreen.this, MainActivity.class);
+            startActivity(intent);
+        });
+    }
+}

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

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".MainScreen">
-
-  <Button
-      android:id="@+id/open_BicepVideo"
-      android:layout_width="215dp"
-      android:layout_height="64dp"
-      android:layout_marginStart="108dp"
-      android:layout_marginTop="341dp"
-      android:layout_marginEnd="108dp"
-      android:layout_marginBottom="342dp"
-      android:text="Bicep Oefening"
-      app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent"
-      app:layout_constraintVertical_bias="1.0" />
-
-</android.support.constraint.ConstraintLayout>

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

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".PowerScreen">
+
+<!--  <Button-->
+<!--      android:id="@+id/open_BicepVideo"-->
+<!--      android:layout_width="215dp"-->
+<!--      android:layout_height="64dp"-->
+<!--      android:layout_marginStart="108dp"-->
+<!--      android:layout_marginTop="341dp"-->
+<!--      android:layout_marginEnd="108dp"-->
+<!--      android:layout_marginBottom="342dp"-->
+<!--      android:text="Bicep Oefening"-->
+<!--      app:layout_constraintBottom_toBottomOf="parent"-->
+<!--      app:layout_constraintEnd_toEndOf="parent"-->
+<!--      app:layout_constraintStart_toStartOf="parent"-->
+<!--      app:layout_constraintTop_toTopOf="parent"-->
+<!--      app:layout_constraintVertical_bias="1.0" />-->
+
+
+  <ImageButton
+      android:id="@+id/open_BicepVideo"
+      android:layout_width="330dp"
+      android:layout_height="300dp"
+      android:layout_marginStart="120dp"
+      android:layout_marginTop="60dp"
+      android:layout_marginEnd="190dp"
+      android:layout_marginBottom="40dp"
+      app:layout_constraintBottom_toTopOf="@+id/open_SquatVideo"
+      app:layout_constraintEnd_toStartOf="@+id/open_TricepVideo"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent"
+      app:srcCompat="@drawable/noun_bicep_499185"
+      android:contentDescription="Open bicep exercise video" />
+
+  <ImageButton
+      android:id="@+id/open_SquatVideo"
+      android:layout_width="330dp"
+      android:layout_height="300dp"
+      android:layout_marginStart="120dp"
+      android:layout_marginTop="40dp"
+      android:layout_marginEnd="190dp"
+      android:layout_marginBottom="60dp"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toStartOf="@+id/GoToHome"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@+id/open_BicepVideo"
+      app:srcCompat="@drawable/squatlogo"
+      android:contentDescription="Open squad exercise video" />
+
+  <ImageButton
+      android:id="@+id/open_TricepVideo"
+      android:layout_width="330dp"
+      android:layout_height="300dp"
+      android:layout_marginStart="190dp"
+      android:layout_marginTop="60dp"
+      android:layout_marginEnd="120dp"
+      android:layout_marginBottom="40dp"
+      app:layout_constraintBottom_toTopOf="@+id/GoToHome"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toEndOf="@+id/open_BicepVideo"
+      app:layout_constraintTop_toTopOf="parent"
+      app:srcCompat="@drawable/triceplogo"
+      android:contentDescription="Open tricep exercise video" />
+
+  <ImageButton
+      android:id="@+id/GoToHome"
+      android:layout_width="330dp"
+      android:layout_height="300dp"
+      android:layout_marginStart="190dp"
+      android:layout_marginTop="40dp"
+      android:layout_marginEnd="120dp"
+      android:layout_marginBottom="60dp"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toEndOf="@+id/open_SquatVideo"
+      app:layout_constraintTop_toBottomOf="@+id/open_TricepVideo"
+      app:srcCompat="@drawable/house_3"
+      android:contentDescription="Go to Home Screen" />
+</android.support.constraint.ConstraintLayout>

docs/documentation/brainstorm/colorsforlayout.md

@@ -0,0 +1,17 @@
+# Colors for our app
+
+### Issues with elderly
+As we become older, our vision worsens. We need to keep this in mind because our target audience includes elderly people. Elderly people appear to have reduced contrast sensitivity. This means they don't have the same ability to distinguish between similar colors as a younger adult. This means we are not using the same colors on each other so for example Merlot on Blush. These colors are both red however they are different in contrast. This means that we won't use the same colors on each other, such as Merlot on Blush. The two colors are both red, yet they differ in contrast. 
+
+### color psychology
+
+
+
+### Conclusion
+
+
+
+
+# Source
+
+https://eldertech.org/color-in-designing-technology-for-seniors/

docs/documentation/robots/Comparisons.md

@@ -7,7 +7,7 @@ With our project, we want the people to start moving more. Since people are beco
 
 ### Why are we not using the NAO bot
 
-![NAO](NAOBOT.png) The NAO robot is a humanoid robot used for research and education. The robot was developed by the French company Aldebaran Robotics, which was acquired by the Japanese Softbank Robotics in 2015. We did not end up using this robot for our project. Due to its complex programming and not havong a built in tablet. This made it for us hard to work with and the tablet makes it nice to additional guidance for the people. I will list some pros and cons below
+![NAO](/docs/documentation/assets/NAOBOT.png) The NAO robot is a humanoid robot used for research and education. The robot was developed by the French company Aldebaran Robotics, which was acquired by the Japanese Softbank Robotics in 2015. We did not end up using this robot for our project. Due to its complex programming and not havong a built in tablet. This made it for us hard to work with and the tablet makes it nice to additional guidance for the people. I will list some pros and cons below
 
 #### Pros
 NAO has more control over its body. It can use it legs to walk or sit, for example. This makes it able to demonstrate a lot more exercises which could come in handy especially with more leg focused exercises.
@@ -22,7 +22,7 @@ Due to its small size, the battery is also way smaller, which might make it hard
 
 
 # Pepper bot
-
+![pepper bot](/docs/documentation/assets/pepper_whole.png)
 The Pepper robot is a humanoid robot developed by the Japanese company Softbank Robotics. The robot is designed to communicate with humans and can do this through speech, facial recognition and movement. This robot is also equipped with a tablet so you can use Android apps.
 
 ### Why did we choose the pepper bot