diff --git a/code/src/Fitbot/.idea/deploymentTargetDropDown.xml b/code/src/Fitbot/.idea/deploymentTargetDropDown.xml
index a5abdd5..7f839bd 100644
--- a/code/src/Fitbot/.idea/deploymentTargetDropDown.xml
+++ b/code/src/Fitbot/.idea/deploymentTargetDropDown.xml
@@ -12,6 +12,6 @@
-
+
\ No newline at end of file
diff --git a/code/src/Fitbot/.idea/misc.xml b/code/src/Fitbot/.idea/misc.xml
index 42e8983..6711755 100644
--- a/code/src/Fitbot/.idea/misc.xml
+++ b/code/src/Fitbot/.idea/misc.xml
@@ -4,12 +4,17 @@
diff --git a/code/src/Fitbot/app/build.gradle b/code/src/Fitbot/app/build.gradle
index 23c5f19..5148a3d 100644
--- a/code/src/Fitbot/app/build.gradle
+++ b/code/src/Fitbot/app/build.gradle
@@ -33,6 +33,7 @@ dependencies {
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support.constraint:constraint-layout:2.0.4'
implementation 'com.android.support:cardview-v7:28.0.0'
+ implementation 'com.android.support:design:28.0.0'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
diff --git a/code/src/Fitbot/app/src/main/AndroidManifest.xml b/code/src/Fitbot/app/src/main/AndroidManifest.xml
index 7a1dc0f..61cd8ea 100644
--- a/code/src/Fitbot/app/src/main/AndroidManifest.xml
+++ b/code/src/Fitbot/app/src/main/AndroidManifest.xml
@@ -27,7 +27,7 @@
android:name=".BicepVideo"
android:exported="false" />
{
- Intent i = new Intent(MainScreen.this, BicepVideo.class);
- startActivity(i);
- });
+ /*---Hooks---*/
+ drawerLayout = findViewById(R.id.drawer_layout);
+ navigationView = findViewById(R.id.nav_view);
+ toolbar = findViewById(R.id.toolbar);
+
+ /*---Tool Bar---*/
+ setSupportActionBar(toolbar);
+
+ /*---Navigation Drawer Menu---*/
+ ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this.drawerLayout,toolbar,R.string.navigation_drawer_open,R.string.navigation_drawer_close);
+ drawerLayout.addDrawerListener(toggle);
+ toggle.syncState();
}
-}
\ No newline at end of file
+}
diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/PowerScreen.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/PowerScreen.java
new file mode 100644
index 0000000..cc29742
--- /dev/null
+++ b/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);
+ });
+ }
+}
\ No newline at end of file
diff --git a/code/src/Fitbot/app/src/main/res/drawable/house_3.png b/code/src/Fitbot/app/src/main/res/drawable/house_3.png
new file mode 100644
index 0000000..b2be9a1
Binary files /dev/null and b/code/src/Fitbot/app/src/main/res/drawable/house_3.png differ
diff --git a/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_home_48.xml b/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_home_48.xml
new file mode 100644
index 0000000..e6f32a4
--- /dev/null
+++ b/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_home_48.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_settings_48.xml b/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_settings_48.xml
new file mode 100644
index 0000000..d91f2bc
--- /dev/null
+++ b/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_settings_48.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_star_rate_48.xml b/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_star_rate_48.xml
new file mode 100644
index 0000000..a9aee33
--- /dev/null
+++ b/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_star_rate_48.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/code/src/Fitbot/app/src/main/res/drawable/noun_bicep_499185.png b/code/src/Fitbot/app/src/main/res/drawable/noun_bicep_499185.png
new file mode 100644
index 0000000..1cb2117
Binary files /dev/null and b/code/src/Fitbot/app/src/main/res/drawable/noun_bicep_499185.png differ
diff --git a/code/src/Fitbot/app/src/main/res/drawable/robotLogo.png b/code/src/Fitbot/app/src/main/res/drawable/robotLogo.png
new file mode 100644
index 0000000..48b5804
Binary files /dev/null and b/code/src/Fitbot/app/src/main/res/drawable/robotLogo.png differ
diff --git a/code/src/Fitbot/app/src/main/res/drawable/squatlogo.png b/code/src/Fitbot/app/src/main/res/drawable/squatlogo.png
new file mode 100644
index 0000000..a37bc8c
Binary files /dev/null and b/code/src/Fitbot/app/src/main/res/drawable/squatlogo.png differ
diff --git a/code/src/Fitbot/app/src/main/res/drawable/triceplogo.png b/code/src/Fitbot/app/src/main/res/drawable/triceplogo.png
new file mode 100644
index 0000000..69e714d
Binary files /dev/null and b/code/src/Fitbot/app/src/main/res/drawable/triceplogo.png differ
diff --git a/code/src/Fitbot/app/src/main/res/layout/activity_main.xml b/code/src/Fitbot/app/src/main/res/layout/activity_main.xml
index 8cebf92..e331324 100644
--- a/code/src/Fitbot/app/src/main/res/layout/activity_main.xml
+++ b/code/src/Fitbot/app/src/main/res/layout/activity_main.xml
@@ -1,19 +1,30 @@
-
+ tools:context=".MainActivity"
+ android:fitsSystemWindows="true"
+ tools:openDrawer="start">
+
+
+ android:text="Hello World"
+ android:layout_centerInParent="true"/>
+
+
-
\ No newline at end of file
+
+
+
\ No newline at end of file
diff --git a/code/src/Fitbot/app/src/main/res/layout/activity_main_screen.xml b/code/src/Fitbot/app/src/main/res/layout/activity_main_screen.xml
deleted file mode 100644
index 1ac4230..0000000
--- a/code/src/Fitbot/app/src/main/res/layout/activity_main_screen.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/code/src/Fitbot/app/src/main/res/layout/activity_power_screen.xml b/code/src/Fitbot/app/src/main/res/layout/activity_power_screen.xml
new file mode 100644
index 0000000..bbfe7df
--- /dev/null
+++ b/code/src/Fitbot/app/src/main/res/layout/activity_power_screen.xml
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/code/src/Fitbot/app/src/main/res/layout/header.xml b/code/src/Fitbot/app/src/main/res/layout/header.xml
new file mode 100644
index 0000000..6a3eac7
--- /dev/null
+++ b/code/src/Fitbot/app/src/main/res/layout/header.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/code/src/Fitbot/app/src/main/res/layout/toolbar.xml b/code/src/Fitbot/app/src/main/res/layout/toolbar.xml
new file mode 100644
index 0000000..1a12217
--- /dev/null
+++ b/code/src/Fitbot/app/src/main/res/layout/toolbar.xml
@@ -0,0 +1,9 @@
+
+
+
+
\ No newline at end of file
diff --git a/code/src/Fitbot/app/src/main/res/menu/main_menu.xml b/code/src/Fitbot/app/src/main/res/menu/main_menu.xml
new file mode 100644
index 0000000..38ae31c
--- /dev/null
+++ b/code/src/Fitbot/app/src/main/res/menu/main_menu.xml
@@ -0,0 +1,32 @@
+
+
diff --git a/code/src/Fitbot/app/src/main/res/values/strings.xml b/code/src/Fitbot/app/src/main/res/values/strings.xml
index f6ac891..731c17b 100644
--- a/code/src/Fitbot/app/src/main/res/values/strings.xml
+++ b/code/src/Fitbot/app/src/main/res/values/strings.xml
@@ -1,4 +1,7 @@
Fitbotoefeningvideo
+
+ Open navigation drawer
+ Open navigation close
\ No newline at end of file
diff --git a/docs/.pages b/docs/.pages
index 00324b7..9460ad7 100644
--- a/docs/.pages
+++ b/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
diff --git a/docs/documentation/android/VideoViewWidget.png b/docs/documentation/android/VideoViewWidget.png
new file mode 100644
index 0000000..eb5d751
Binary files /dev/null and b/docs/documentation/android/VideoViewWidget.png differ
diff --git a/docs/documentation/android/Videoview.md b/docs/documentation/android/Videoview.md
new file mode 100644
index 0000000..ee15bbe
--- /dev/null
+++ b/docs/documentation/android/Videoview.md
@@ -0,0 +1,23 @@
+# VideoView
+
+We wanted to show the different exercises in a video that anybody could replicate. For this we didn't want to implement a youtube function we wanted to have our own videos so that we don't rely on youtube. Ti start we need an emoty activity file you can create one in the android studio IDE. Then you need to head to the XML file you just created and the go to widgets and the add the VideoView element
+
+
+
+If you drag that in to your activity you can edit the layout of it but it will not function directly. To Let it play videos we need to write a java code. First start by coding what you want to view.
+```java
+ VideoView videoView = findViewById(R.id.videoView);
+ videoView.setVideoURI(Uri.parse("android.resource://" + getPackageName() + "/" + R.raw.videofile));
+```
+replace the video file with the name of the video. Then you need to code the media player aswell.
+```java
+ MediaController mediaController = new MediaController(this);
+ videoView.setMediaController(mediaController);
+ videoView.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
+ @Override
+ public void onCompletion(MediaPlayer mp) {
+ videoView.start(); // Restart video on completion
+ }
+ });`
+```
+Since we have short videos we will have a auto replay function if you want it can go to a completion screen after the video ended.
diff --git a/docs/documentation/android/robotmovement.md b/docs/documentation/android/robotmovement.md
new file mode 100644
index 0000000..bfdaed3
--- /dev/null
+++ b/docs/documentation/android/robotmovement.md
@@ -0,0 +1,49 @@
+# How to make the robot move
+
+## Getting started
+First make a animation file in the /res folder.
+
+
+
+Then right click it and click edit animation
+
+## Making keyframes
+
+Once you click edit animation you can click a bodypart and rotate it.
+
+
+
+Once you have positioned the robot into your preffered position you can click the keyframe button.
+
+
+
+You can grab and shift the keyframes around the timelines until you get something like this.
+
+
+
+Make sure to save it under the File tab once it is done.
+
+You can test it by clicking the play button in the top right.
+
+## Making the robot move
+
+Once you have made the animation file you can go to the robot movement script.
+
+```java
+// create the animation
+Animation animation = AnimationBuilder.with(qiContext)
+ //change bicepcurl to the name of your animation file
+ .withResources(R.raw.bicepcurl)
+ .build()
+
+// create the animate object
+Animate animate = AnimateBuilder.with(qiContext)
+ .withAnimation(animation)
+ .build()
+
+// play the animation
+animate.async().run();
+```
+
+
+If you run this on the robot the animation should play.
\ No newline at end of file
diff --git a/docs/documentation/robots/NAOBOT.png b/docs/documentation/assets/NAOBOT.png
similarity index 100%
rename from docs/documentation/robots/NAOBOT.png
rename to docs/documentation/assets/NAOBOT.png
diff --git a/docs/documentation/assets/android10.png b/docs/documentation/assets/android10.png
new file mode 100644
index 0000000..a1f4eb3
Binary files /dev/null and b/docs/documentation/assets/android10.png differ
diff --git a/docs/documentation/assets/exampleAnimation.png b/docs/documentation/assets/exampleAnimation.png
new file mode 100644
index 0000000..08883f3
Binary files /dev/null and b/docs/documentation/assets/exampleAnimation.png differ
diff --git a/docs/documentation/assets/image.png b/docs/documentation/assets/image.png
new file mode 100644
index 0000000..c7cd199
Binary files /dev/null and b/docs/documentation/assets/image.png differ
diff --git a/docs/documentation/assets/imageAnimation.png b/docs/documentation/assets/imageAnimation.png
new file mode 100644
index 0000000..bea9c58
Binary files /dev/null and b/docs/documentation/assets/imageAnimation.png differ
diff --git a/docs/documentation/assets/interfaceModules.png b/docs/documentation/assets/interfaceModules.png
new file mode 100644
index 0000000..e9a3645
Binary files /dev/null and b/docs/documentation/assets/interfaceModules.png differ
diff --git a/docs/documentation/assets/keyframebutton.png b/docs/documentation/assets/keyframebutton.png
new file mode 100644
index 0000000..01c9d55
Binary files /dev/null and b/docs/documentation/assets/keyframebutton.png differ
diff --git a/docs/documentation/brainstorm/colorsforlayout.md b/docs/documentation/brainstorm/colorsforlayout.md
new file mode 100644
index 0000000..47db35e
--- /dev/null
+++ b/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/
\ No newline at end of file
diff --git a/docs/documentation/pepper/pepperSetup.md b/docs/documentation/pepper/pepperSetup.md
new file mode 100644
index 0000000..9936497
--- /dev/null
+++ b/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.
+
+
+
+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:
+
+
+
+### 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.
\ No newline at end of file
diff --git a/docs/documentation/robots/Comparisons.md b/docs/documentation/robots/Comparisons.md
index 278d679..72bc99c 100644
--- a/docs/documentation/robots/Comparisons.md
+++ b/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
- 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
+ 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
-
+
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
diff --git a/docs/personalDocs/sebas/dailyUpdates.md b/docs/personalDocs/sebas/dailyUpdates.md
index e33b2f0..25b60d3 100644
--- a/docs/personalDocs/sebas/dailyUpdates.md
+++ b/docs/personalDocs/sebas/dailyUpdates.md
@@ -107,13 +107,16 @@ To do
Done
- -
+ - Start app design
+ - Start working on pepper
**25 April**
To do
- -
+ - Make navigation menu for the app
+ - Make documentation for pepper with andriod studio
+ - Fix notedpad
Done