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

docs/.pages

@@ -16,5 +16,7 @@ nav:
   - 📚 Documentation:
     - 🧠 Brianstorm:
       - Ideas: documentation/brianstorm/ideas
-    - 📱Andriod:
+    - 📱 Andriod:
       - Andriod Studio: documentation/andriod/androidStudio
+    - 🤖 Pepper:
+      - Pepper Setup: documentation/pepper/pepperSetup

docs/documentation/android/appSetup.md

@@ -23,9 +23,13 @@ public class MainActivity extends AppCompatActivity {
     }
 }
 ```
+With setContentView you can set the layout file that you made earlier.
+``` java
+        setContentView(R.layout.activity_main);
+```
 
 ### Manifest
-For the app to be able to build you need to add the activity to the manifest file. You can do this by adding this to the manifest file.
+For the app to be able to build you need to add the activity class to the manifest file.
 
 ```xml
         <activity android:name=".MainActivity"
@@ -36,4 +40,4 @@ For the app to be able to build you need to add the activity to the manifest fil
             </intent-filter>
         </activity>
 ```
-The class name that is ran first is defined in the first line of the class.
+In this instance MainActivity is the first class that is ran.

docs/documentation/brainstorm/colorsforlayout.md

@@ -0,0 +1,18 @@
+# Colors for our app
+
+### Vision changes
+As we become older, our vision worsens. We need to keep this in mind because our target audience includes elderly people. Beginning around the age of 40 we are already seeing some issues with our sight. It might become harder to focus on text, hence the need for reading glasses. This is an issue to keep in mind when designing our app, we want to resolve this by using images or bigger text so that it becomes easier to read. We are planing to avoid redundant text. We also see issues with light. With aging our pupils will shrink, this will result in lower light sensitivity and the increased sensitivity to glare. We need to use warmer colors to reduce the brightness on the eye and make our app able to be used when the brightness of the screen is low to resolve this issue. However, one of the biggest issues is with contrast. The older we get, the less able we are able to make out of low contrast patterns. This is really important to keep in mind, some combinations can be really hard to see for elderly people. I'll show you how by providing an example.
+![contrast](contrastcolors.png)
+This image shows what elderly people may experience while reading or using an app. We must keep this in mind as we design our app.
+### color psychology
+
+
+
+### Conclusion
+
+
+
+
+# Source
+
+https://eldertech.org/color-in-designing-technology-for-seniors/

docs/documentation/pepper/pepperSetup.md

@@ -0,0 +1,60 @@
+# How to setup android studio for pepper
+
+This is a guide on pepper setup for android studio. This guide will show you how to setup android studio for pepper. To start off we will follow the provided guide on the [softbank website](https://qisdk.softbankrobotics.com/sdk/doc/pepper-sdk/ch1_gettingstarted/installation.html). This guide will only help with certain parts of the setup
+
+It is important to note that multiple combinations of android studio and pepper sdk can work together. This guide will show you how to setup android studio for pepper sdk with the versions that worked for us.
+
+## Installing the Pepper SDK plug-in
+
+### Install Android Studio
+
+To start off you need to install android studio. QiSDK recommends installing the latest stable version (version 3.4 or higher). In this guide we recommend using version 2021.1.1 You can download android studio [here](https://developer.android.com/studio/archive). It is recommended to always start up android studio as an administrator. This can be done by right clicking on the android studio icon and selecting `Run as administrator`.
+
+### Get Android SDK and Build-Tools
+
+Follow the first step on the QiSDK guide. Here are a few pointers to help you with this step:
+
+- Android 6.0 (API level 23) is the minimum version required for the Pepper SDK. But it is not the version that will be used.
+- The recommended version is Android 10.0 (API level 29). This is not shown as API 29 but as Android 10.0. This is the version that worked for us.
+
+![Android 10](../assets/android10.png)
+
+After this you can follow the rest of the guide on the QiSDK website.
+
+### Robot SDK Manager
+
+The option to simulate pepper and the tablet won't work. We have yet to find a solution for this. You can still create a device and run the app on the device. But you won't be able to simulate the robot.
+
+## Creating a robot application
+
+### Creating a project
+
+To create a project you need to follow the steps on the QiSDK website. Here are a few pointers to help you with this step:
+
+- Make sure to select a template that works for you. We recommend using the `Empty Activity` template. This will give you a blank project to start with.
+- On step 5 of the guide make sure that the interface looks the following image, if it does not look the same gradle doens't recognize the project as an android project:
+
+![Project structure interface](../assets/interfaceModules.png)
+
+### Implementing QiSDK Design & the Robot Life Cycle
+
+On this step the QiSDK guide provides you with a code snippet. This code snippet is used to make the robot do something. But the provided snipped makes use of the pepper library. This library is not included in the guide. To make use of the library you need to add the following line to the `settings.gradle` file:
+
+```gradle
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+        maven {
+            url 'https://qisdk.softbankrobotics.com/sdk/maven/'
+        }
+    }
+}
+```
+
+After this you should be able to make use of the pepper library. The imports of classes will show up red to solve this right click the imported class, there will be a option to import the class. Do this for all imports that are red. After this restart android studio and the imports should be fixed.
+
+### Conclusion
+
+The guide on the QiSDK website is a good guide to follow. But it is not complete. This guide is meant to help you with the parts that are not covered in the QiSDK guide. Once all steps from both guides are followed you should be able to run the app on the robot.

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