Merge remote-tracking branch 'origin/main'

# Conflicts:
#	src/app/src/main/AndroidManifest.xml

code/src/.idea/gradle.xml

@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />

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

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.fitbot.fitbot">
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/Theme.Fitbot">
+
+        <activity android:name=".MainActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>

code/src/app/src/main/java/com/fitbot/fitbot/MainActivity.java

@@ -0,0 +1,13 @@
+package com.fitbot.fitbot;
+
+import android.os.Bundle;
+import androidx.appcompat.app.AppCompatActivity;
+
+public class MainActivity extends AppCompatActivity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.testlayout); // replace with your layout file
+
+    }
+}

code/src/app/src/main/java/com/fitbot/fitbot/TextSetter.java

@@ -0,0 +1,18 @@
+package com.fitbot.fitbot;
+
+import android.app.Activity;
+import android.widget.TextView;
+
+public class TextSetter {
+    public static void setCustomText(Activity activity, int textViewId, String text) {
+        TextView textView = (TextView) activity.findViewById(textViewId);
+        textView.setText(text);
+    }
+}
+
+// usage:
+//  TextSetter.setCustomText(this, R.id.testText, "Bruh");
+// r.id.testText is the id of the textview in the layout file
+// "Bruh" is the text to be set
+
+// make sure you have the right layout set in MainActivity.java with the setContentView method

code/src/app/src/main/res/layout/testlayout.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.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">
+
+    <TextView
+        android:id="@+id/testText"
+        android:layout_width="200dp"
+        android:layout_height="100dp"
+        android:text="awa"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.497"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.465" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_begin="20dp" />
+</androidx.constraintlayout.widget.ConstraintLayout>

code/src/gradlew.bat

@@ -1,89 +1,89 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

docs/.pages

@@ -0,0 +1,20 @@
+nav:
+  - 🏚️ TI Portfolio Website: index.md
+  - 📝 Opdracht:
+    - Contents:
+      - Omschrijving: documentation/opdracht/assignment
+      - Planning: documentation/opdracht/planning
+      - Opdrachtgevers: documentation/opdracht/clients
+      - Betoog: documentation/opdracht/research
+      - Criteria: documentation/opdracht/criteria
+      - Links: documentation/opdracht/links
+  - 🤖 Robots:
+    - Contents:
+      - NAO: documentation/robots/nao
+      - Pepper: documentation/robots/pepper
+      - Little Endian: documentation/robots/little-endian
+  - 📚 Documentation:
+    - 🧠 Brianstorm:
+      - Ideas: documentation/brianstorm/ideas
+    - 📱Andriod:
+      - Andriod Studio: documentation/andriod/androidStudio

docs/documentation/android/androidStudio.md

@@ -0,0 +1,33 @@
+# Learning android studio 
+
+## The order of making a android app
+
+### 1. Layout
+When you've created a project you need to make the layout of the app. This is done in the `res/layout/activity_main.xml` file. This file is a xml file that describes the layout of the app. If the folder doesnt exist you can create it by right clicking on the `res` folder and selecting `New -> Android Resource File`. There you can add qualifiers to the file. Qualifiers are used to specify what kind of properties its has. 
+
+### 2. Variables for the layout
+When you're dragging and droppign things in you can add a recource name to the object. This is used to reference the object in the code. You can add a recource name by clicking on the object and then going to the `Attributes` tab. There you can add a recource name. That recource name is then used to reference the object in the code.
+
+### 3. Code
+After you made the layout you can start writing code in the `MainActivity.java` file. This file is located in the `java/com.example.myfirstapp` folder. This file is the main file of the app and is the file that is run when the app is started. 
+
+### 4. Permissions
+
+If you want to use a certain permission in your app you need to add the permission to the `AndroidManifest.xml` file. This file is located in the `app` folder. You can add a permission like this:
+    
+```xml
+<uses-permission android:name="android.permission.INTERNET"/>
+```
+[This](https://gist.githubusercontent.com/Arinerron/1bcaadc7b1cbeae77de0263f4e15156f/raw/6c577d9f425340a7dcd1ec5efc7a12c054d6623f/xml_permissions.txt) is a list of all the permissions you can use.
+
+
+
+
+## Sources
+
+* Android studio guides
+    * https://developer.android.com/codelabs/build-your-first-android-app
+    * https://www.jetbrains.com/help/idea/create-your-first-android-application.html#yivskh_3
+
+* Permission list
+    * https://gist.githubusercontent.com/Arinerron/1bcaadc7b1cbeae77de0263f4e15156f/raw/6c577d9f425340a7dcd1ec5efc7a12c054d6623f/xml_permissions.txt

docs/documentation/diagrams/projectDiagram.drawio

@@ -0,0 +1,175 @@
+<mxfile host="Electron" modified="2024-04-18T12:23:53.920Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/22.1.2 Chrome/114.0.5735.289 Electron/25.9.4 Safari/537.36" etag="D4iC2llhZXUPtDZwrZt_" version="22.1.2" type="device">
+  <diagram name="Page-1" id="32LJBP8FN4-76Xjem5gl">
+    <mxGraphModel dx="2943" dy="1045" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0">
+      <root>
+        <mxCell id="0" />
+        <mxCell id="1" parent="0" />
+        <mxCell id="iET7LRSqevPwp7B0sxoL-18" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="iET7LRSqevPwp7B0sxoL-1" target="iET7LRSqevPwp7B0sxoL-3" edge="1">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="iET7LRSqevPwp7B0sxoL-19" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="iET7LRSqevPwp7B0sxoL-1" target="iET7LRSqevPwp7B0sxoL-2" edge="1">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="iET7LRSqevPwp7B0sxoL-21" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="iET7LRSqevPwp7B0sxoL-1" target="iET7LRSqevPwp7B0sxoL-6" edge="1">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="iET7LRSqevPwp7B0sxoL-53" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" parent="1" source="iET7LRSqevPwp7B0sxoL-1" target="iET7LRSqevPwp7B0sxoL-52" edge="1">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="iET7LRSqevPwp7B0sxoL-1" value="FitBot" style="ellipse;whiteSpace=wrap;html=1;fillColor=#FFCCCC;" parent="1" vertex="1">
+          <mxGeometry x="360" y="240" width="120" height="80" as="geometry" />
+        </mxCell>
+        <mxCell id="iET7LRSqevPwp7B0sxoL-29" style="edgeStyle=orthogonalEdgeStyle;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;curved=1;" parent="1" source="iET7LRSqevPwp7B0sxoL-2" target="iET7LRSqevPwp7B0sxoL-9" edge="1">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="iET7LRSqevPwp7B0sxoL-43" style="edgeStyle=orthogonalEdgeStyle;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;curved=1;" parent="1" source="iET7LRSqevPwp7B0sxoL-2" target="iET7LRSqevPwp7B0sxoL-10" edge="1">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="iET7LRSqevPwp7B0sxoL-2" value="Client" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#E6FFCC;" parent="1" vertex="1">
+          <mxGeometry x="520" y="260" width="120" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="UK7NyPSLFSLbF9Z6cTB4-5" style="edgeStyle=orthogonalEdgeStyle;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;curved=1;" edge="1" parent="1" source="iET7LRSqevPwp7B0sxoL-3" target="iET7LRSqevPwp7B0sxoL-14">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="UK7NyPSLFSLbF9Z6cTB4-6" style="edgeStyle=orthogonalEdgeStyle;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;curved=1;" edge="1" parent="1" source="iET7LRSqevPwp7B0sxoL-3" target="iET7LRSqevPwp7B0sxoL-15">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="iET7LRSqevPwp7B0sxoL-3" value="Pepper" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#E6FFCC;" parent="1" vertex="1">
+          <mxGeometry x="360" y="360" width="120" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="UK7NyPSLFSLbF9Z6cTB4-3" style="edgeStyle=orthogonalEdgeStyle;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;curved=1;" edge="1" parent="1" source="iET7LRSqevPwp7B0sxoL-6" target="iET7LRSqevPwp7B0sxoL-30">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="UK7NyPSLFSLbF9Z6cTB4-4" style="edgeStyle=orthogonalEdgeStyle;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;curved=1;" edge="1" parent="1" source="iET7LRSqevPwp7B0sxoL-6" target="iET7LRSqevPwp7B0sxoL-31">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="iET7LRSqevPwp7B0sxoL-6" value="Components" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#E6FFCC;" parent="1" vertex="1">
+          <mxGeometry x="200" y="260" width="120" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="iET7LRSqevPwp7B0sxoL-44" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="iET7LRSqevPwp7B0sxoL-9" target="iET7LRSqevPwp7B0sxoL-39" edge="1">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="iET7LRSqevPwp7B0sxoL-9" value="Amstelhuis" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#CCFFFF;" parent="1" vertex="1">
+          <mxGeometry x="680" y="180" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="iET7LRSqevPwp7B0sxoL-45" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="iET7LRSqevPwp7B0sxoL-10" target="iET7LRSqevPwp7B0sxoL-40" edge="1">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="iET7LRSqevPwp7B0sxoL-10" value="Buurt Campus" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#CCFFFF;" parent="1" vertex="1">
+          <mxGeometry x="680" y="320" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="UK7NyPSLFSLbF9Z6cTB4-7" style="edgeStyle=orthogonalEdgeStyle;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;curved=1;" edge="1" parent="1" source="iET7LRSqevPwp7B0sxoL-14" target="iET7LRSqevPwp7B0sxoL-59">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="UK7NyPSLFSLbF9Z6cTB4-8" style="edgeStyle=orthogonalEdgeStyle;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;curved=1;" edge="1" parent="1" source="iET7LRSqevPwp7B0sxoL-14" target="iET7LRSqevPwp7B0sxoL-51">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="iET7LRSqevPwp7B0sxoL-14" value="Robot&lt;br&gt;" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#CCFFFF;" parent="1" vertex="1">
+          <mxGeometry x="200" y="420" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="UK7NyPSLFSLbF9Z6cTB4-9" style="edgeStyle=orthogonalEdgeStyle;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;curved=1;" edge="1" parent="1" source="iET7LRSqevPwp7B0sxoL-15" target="iET7LRSqevPwp7B0sxoL-48">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="UK7NyPSLFSLbF9Z6cTB4-10" style="edgeStyle=orthogonalEdgeStyle;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;curved=1;" edge="1" parent="1" source="iET7LRSqevPwp7B0sxoL-15" target="iET7LRSqevPwp7B0sxoL-49">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="iET7LRSqevPwp7B0sxoL-15" value="Tablet" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#CCFFFF;" parent="1" vertex="1">
+          <mxGeometry x="520" y="420" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="iET7LRSqevPwp7B0sxoL-30" value="Wii Fit Balance Board" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#CCFFFF;" parent="1" vertex="1">
+          <mxGeometry x="40" y="180" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="UK7NyPSLFSLbF9Z6cTB4-21" style="edgeStyle=orthogonalEdgeStyle;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;curved=1;" edge="1" parent="1" source="iET7LRSqevPwp7B0sxoL-31" target="iET7LRSqevPwp7B0sxoL-34">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="UK7NyPSLFSLbF9Z6cTB4-22" style="edgeStyle=orthogonalEdgeStyle;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;curved=1;" edge="1" parent="1" source="iET7LRSqevPwp7B0sxoL-31" target="iET7LRSqevPwp7B0sxoL-33">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="iET7LRSqevPwp7B0sxoL-31" value="Dumbel&amp;nbsp;" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#CCFFFF;" parent="1" vertex="1">
+          <mxGeometry x="40" y="320" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="iET7LRSqevPwp7B0sxoL-33" value="Accelerometer" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#CCFFFF;" parent="1" vertex="1">
+          <mxGeometry x="-120" y="360" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="iET7LRSqevPwp7B0sxoL-34" value="Gyroscope" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#CCFFFF;" parent="1" vertex="1">
+          <mxGeometry x="-120" y="280" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="iET7LRSqevPwp7B0sxoL-39" value="Pension (65+)" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#CCFFFF;" parent="1" vertex="1">
+          <mxGeometry x="840" y="180" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="iET7LRSqevPwp7B0sxoL-40" value="Family (12-65)" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#CCFFFF;" parent="1" vertex="1">
+          <mxGeometry x="840" y="320" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="UK7NyPSLFSLbF9Z6cTB4-18" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="iET7LRSqevPwp7B0sxoL-48" target="UK7NyPSLFSLbF9Z6cTB4-17">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="iET7LRSqevPwp7B0sxoL-48" value="Database" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#E6FFCC;" parent="1" vertex="1">
+          <mxGeometry x="590" y="520" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="UK7NyPSLFSLbF9Z6cTB4-12" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" edge="1" parent="1" source="iET7LRSqevPwp7B0sxoL-49" target="iET7LRSqevPwp7B0sxoL-58">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="iET7LRSqevPwp7B0sxoL-49" value="App" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#E6FFCC;" parent="1" vertex="1">
+          <mxGeometry x="450" y="520" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="iET7LRSqevPwp7B0sxoL-51" value="Beweging" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#E6FFCC;" parent="1" vertex="1">
+          <mxGeometry x="270" y="520" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="iET7LRSqevPwp7B0sxoL-52" value="Exercises" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#E6FFCC;" parent="1" vertex="1">
+          <mxGeometry x="360" y="160" width="120" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="UK7NyPSLFSLbF9Z6cTB4-15" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="iET7LRSqevPwp7B0sxoL-56" target="iET7LRSqevPwp7B0sxoL-63">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="iET7LRSqevPwp7B0sxoL-56" value="Daily challange&lt;br&gt;" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#CCFFFF;" parent="1" vertex="1">
+          <mxGeometry x="450" y="760" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="UK7NyPSLFSLbF9Z6cTB4-14" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="iET7LRSqevPwp7B0sxoL-57" target="iET7LRSqevPwp7B0sxoL-56">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="iET7LRSqevPwp7B0sxoL-57" value="Animations" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#CCFFFF;" parent="1" vertex="1">
+          <mxGeometry x="450" y="680" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="iET7LRSqevPwp7B0sxoL-58" value="Statistics" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#CCFFFF;" parent="1" vertex="1">
+          <mxGeometry x="450" y="600" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="iET7LRSqevPwp7B0sxoL-59" value="Speech to text" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#E6FFCC;" parent="1" vertex="1">
+          <mxGeometry x="130" y="520" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="iET7LRSqevPwp7B0sxoL-60" value="LLM Parse" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#CCFFFF;" parent="1" vertex="1">
+          <mxGeometry x="130" y="600" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="iET7LRSqevPwp7B0sxoL-61" value="Rewards" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#CCFFFF;" parent="1" vertex="1">
+          <mxGeometry x="270" y="600" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="iET7LRSqevPwp7B0sxoL-62" value="Exercises" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#CCFFFF;" parent="1" vertex="1">
+          <mxGeometry x="270" y="680" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="UK7NyPSLFSLbF9Z6cTB4-16" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="iET7LRSqevPwp7B0sxoL-63" target="iET7LRSqevPwp7B0sxoL-64">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="iET7LRSqevPwp7B0sxoL-63" value="Score system" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#CCFFFF;" parent="1" vertex="1">
+          <mxGeometry x="450" y="840" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="iET7LRSqevPwp7B0sxoL-64" value="Leaderboard" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#CCFFFF;" parent="1" vertex="1">
+          <mxGeometry x="450" y="920" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="iET7LRSqevPwp7B0sxoL-65" value="WIP" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="390" y="110" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="UK7NyPSLFSLbF9Z6cTB4-13" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="iET7LRSqevPwp7B0sxoL-58" target="iET7LRSqevPwp7B0sxoL-57">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="UK7NyPSLFSLbF9Z6cTB4-20" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="UK7NyPSLFSLbF9Z6cTB4-17" target="UK7NyPSLFSLbF9Z6cTB4-19">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="UK7NyPSLFSLbF9Z6cTB4-17" value="Statistics" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#CCFFFF;" vertex="1" parent="1">
+          <mxGeometry x="590" y="600" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="UK7NyPSLFSLbF9Z6cTB4-19" value="Users" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#CCFFFF;" vertex="1" parent="1">
+          <mxGeometry x="590" y="680" width="120" height="60" as="geometry" />
+        </mxCell>
+      </root>
+    </mxGraphModel>
+  </diagram>
+</mxfile>

docs/documentation/robots/Comparisons.md

@@ -0,0 +1,10 @@
+# Our project
+
+With our project, we want the people to start moving more. Since people are becoming less fit, especially elderly people, we wanted to design something that would help people to get in shape. However, not every one wants to do it alone or wants to go to the gym to get in shape. We aim to solve 2 problems with our project. We want people to get in shape, and we want people to be more social. We came to the conclusion that we want to create a social robot that helps with basic exercises. Furthermore, we also want it to have a point system, so people can compete against each other. This helps to bind people together while pushing them to exercise.
+
+
+# NAO BOT
+
+### 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. The main reason is iets complexity. it is nice to be able to move the legs but it is realy hard and for a lot of excersises it lacks a good exhibition. The pepper bot does not have legs but it has a tablet where we can show the escersizes on. This helps the user by dislpaying a preview of the excersize aswell as being able to do the arms motion. The Nao bot is also smaller than the pepper bot

docs/index.md

@@ -3,7 +3,6 @@
 Welkom op jullie portfolio website! Hier kunnen jullie documentatie kwijt
 die jullie gaan schrijven voor jullie project.
 
-Pepper Team 6
-
+Wij zijn team 6 (FitBot) en wij gaan aan de slag met Pepper. Pepper is een robot die wij gaan gebruiken om mensen te helpen met hun fitness doelen. Pepper kan mensen motiveren, helpen met oefeningen en nog veel meer. Wij gaan Pepper programmeren om deze taken uit te voeren.
 
 {{ mdocotion_header('https://images.unsplash.com/photo-1498050108023-c5249f4df085?q=80&w=2072&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D') }}

docs/teamdocumentatie/sprint-reports/sprint-report-s1.md

@@ -0,0 +1 @@
+a

docs/teamdocumentatie/sprint-reports/sprint-report-s2.md

@@ -0,0 +1 @@
+b

docs/teamdocumentatie/sprint-reports/sprint-report-s3.md

@@ -0,0 +1 @@
+c

documentation/docs/.pages

@@ -1,40 +0,0 @@
-nav:
-  - 🏚️ TI Portfolio Website: index.md
-    - Opdracht: 
-      - Omschrijving: assignment.md
-      - Planning: planning.md
-      - Opdrachtgevers: clients.md
-      - Betoog: research.md
-      - Criteria: criteria.md
-      - Links: links.md
-  - 📚 Documentation:
-    - Testing: testing
-    - Website:
-      - Apache2: website/server
-      - Webapp: website/webApplication
-      - Dashboard: website/dashboard
-    - Backend:
-      - NodeJS: backend/nodejs
-      - Database: backend/database
-      - Database Setup: backend/dbSetup
-    - Embedded Device (SB Node):
-      - Libraries:
-        - Libraries: sbnode/lib/libraries
-        - Silent Booth: sbnode/lib/SB
-        - Silent Booth HTTP: sbnode/lib/SBHTTP
-        - Silent Booth Oled: sbnode/lib/SBOled
-      - Sensors:
-        - Hall Effect Sensor: sbnode/sensors/hallSensor
-        - Motion Sensor: sbnode/sensors/motionSensor
-        - Temp and Humidity Sensor: sbnode/sensors/tempHumidSensor
-      - Technical Documentation: sbnode/technicaldocs
-      - User Manual: sbnode/usermanual
-      - Circuit Diagram: sbnode/circuitDiagram
-      - Bill of Materials: sbnode/billOfMaterials
-      - PCB Design: sbnode/pcb
-    - Process:
-      - Cooperation Agreement: process/agreement
-      - Sources: process/sources
-    - UML:
-      - UML: uml/uml
-      - Infrastructure: uml/infrastructure

documentation/docs/brainstorm/.pages

@@ -1,2 +0,0 @@
-nav:    
-    - Ideas: ideas.md

documentation/docs/opdracht/.pages

@@ -1,7 +0,0 @@
-nav:    
-    - Omschrijving: assignment.md
-    - Planning: planning.md
-    - Opdrachtgevers: clients.md
-    - Betoog: research.md
-    - Criteria: criteria.md
-    - Links: links.md

documentation/docs/robots/.pages

@@ -1,4 +0,0 @@
-nav:
-    - NAO: nao.md
-    - Pepper: pepper.md
-    - Little Endian: little-endian.md

mkdocs.yml

@@ -6,9 +6,9 @@ copyright: Copyright 2023 Hogeschool van Amsterdam
 theme:
     name: material
     custom_dir: mdocotion/
-    logo: assets/robot.svg
+    logo: documentation/assets/robot.svg
     sidebar_color: 'rgb(250, 240, 230)'
-    favicon: assets/robot.svg
+    favicon: documentation/assets/robot.svg
     features:
         - navigation.sections
         - content.tabs.link

src/app/src/main/AndroidManifest.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.fitbot.fitbot">
-
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="fitbot"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:theme="@style/Theme.Fitbot" />
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-
-</manifest>