diff --git a/code/src/Fitbot/app/src/main/AndroidManifest.xml b/code/src/Fitbot/app/src/main/AndroidManifest.xml
index bd9a6b6..2c2784b 100644
--- a/code/src/Fitbot/app/src/main/AndroidManifest.xml
+++ b/code/src/Fitbot/app/src/main/AndroidManifest.xml
@@ -11,24 +11,12 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.Fitbot" >
-
-
-
-
diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/BicepVideo.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/BicepVideo.java
deleted file mode 100644
index 3016b0a..0000000
--- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/BicepVideo.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.example.fitbot;
-
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.widget.Button;
-import android.widget.MediaController;
-import android.widget.VideoView;
-
-import com.aldebaran.qi.sdk.QiContext;
-import com.aldebaran.qi.sdk.builder.AnimateBuilder;
-import com.aldebaran.qi.sdk.builder.AnimationBuilder;
-import com.aldebaran.qi.sdk.object.actuation.Animate;
-import com.aldebaran.qi.sdk.object.actuation.Animation;
-
-public class BicepVideo extends AppCompatActivity {
-
-// private QiContext qiContext;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_bicepvideo);
- setupButtons();
- }
-
- public void Video(QiContext qiContext) {
- VideoView videoView = findViewById(R.id.videoView);
- videoView.setVideoURI(Uri.parse("android.resource://" + getPackageName() + "/" + R.raw.bicepvideo));
-
- MediaController mediaController = new MediaController(this);
- videoView.setMediaController(mediaController);
- videoView.setOnCompletionListener(mp -> videoView.start());
- videoView.start();
-
- Animation animation = AnimationBuilder.with(qiContext)
- .withResources(R.raw.bicepcurl)
- .build();
-
- Animate animate = AnimateBuilder.with(qiContext)
- .withAnimation(animation)
- .build();
-
-
- animate.async().run();
-
- }
- private void setupButtons() {
- Button backButton = findViewById(R.id.buttonback);
- backButton.setOnClickListener(v -> finish());
-
- Button completeButton = findViewById(R.id.buttoncomplete);
- completeButton.setOnClickListener(v -> {
- Intent intent = new Intent(BicepVideo.this, Completion_Screen.class);
- startActivity(intent);
- });
- }
-}
\ No newline at end of file
diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/Completion_Screen.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/Completion_Screen.java
deleted file mode 100644
index 55dd036..0000000
--- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/Completion_Screen.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.example.fitbot;
-
-import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-
-public class Completion_Screen extends AppCompatActivity {
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_completion_screen);
- }
-}
\ No newline at end of file
diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/MainActivity.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/MainActivity.java
deleted file mode 100644
index 14e8445..0000000
--- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/MainActivity.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.example.fitbot;
-
-import android.os.Bundle;
-
-import com.aldebaran.qi.sdk.QiContext;
-import com.aldebaran.qi.sdk.QiSDK;
-import com.aldebaran.qi.sdk.RobotLifecycleCallbacks;
-import com.aldebaran.qi.sdk.design.activity.RobotActivity;
-
-public class MainActivity extends RobotActivity implements RobotLifecycleCallbacks {
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- // Register the RobotLifecycleCallbacks to this Activity.
-
- QiSDK.register(this, this);
-
- }
-
- @Override
- protected void onDestroy() {
- // Unregister the RobotLifecycleCallbacks for this Activity.
- QiSDK.unregister(this, this);
- super.onDestroy();
- }
-
- @Override
- public void onRobotFocusGained(QiContext qiContext) {
- // TODO:
- // Add start screen.
- }
-
-
- @Override
- public void onRobotFocusLost() {
- // Nothing here.
- }
-
- @Override
- public void onRobotFocusRefused(String reason) {
- // The robot focus is refused.
- }
-}
\ 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
deleted file mode 100644
index ff1f891..0000000
--- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/PowerScreen.java
+++ /dev/null
@@ -1,43 +0,0 @@
-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/java/com/example/fitbot/ui/activities/CompletionActivity.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/CompletionActivity.java
new file mode 100644
index 0000000..8cc269b
--- /dev/null
+++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/CompletionActivity.java
@@ -0,0 +1,4 @@
+package com.example.fitbot.ui.activities;
+
+public class CompletionActivity {
+}
diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/MainScreen.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/MainActivity.java
similarity index 92%
rename from code/src/Fitbot/app/src/main/java/com/example/fitbot/MainScreen.java
rename to code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/MainActivity.java
index f8ddf0a..dc62c2e 100644
--- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/MainScreen.java
+++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/MainActivity.java
@@ -1,4 +1,4 @@
-package com.example.fitbot;
+package com.example.fitbot.ui.activities;
import android.annotation.SuppressLint;
import android.os.Bundle;
@@ -9,11 +9,12 @@ import android.support.v7.app.ActionBarDrawerToggle;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
+import com.example.fitbot.R;
import com.example.fitbot.util.processing.GesturePath;
import com.example.fitbot.util.processing.MotionProcessor;
import com.example.fitbot.util.processing.Vector3;
-public class MainScreen extends AppCompatActivity {
+public class MainActivity extends AppCompatActivity {
//Variables
DrawerLayout drawerLayout;
diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/SportPreviewActivity.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/SportPreviewActivity.java
similarity index 91%
rename from code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/SportPreviewActivity.java
rename to code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/SportPreviewActivity.java
index ce952bc..02e289f 100644
--- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/SportPreviewActivity.java
+++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/SportPreviewActivity.java
@@ -1,4 +1,4 @@
-package com.example.fitbot.ui;
+package com.example.fitbot.ui.activities;
import com.aldebaran.qi.sdk.QiContext;
import com.aldebaran.qi.sdk.RobotLifecycleCallbacks;
diff --git a/code/src/Fitbot/app/src/main/res/layout/activity_bicepvideo.xml b/code/src/Fitbot/app/src/main/res/layout/activity_bicepvideo.xml
deleted file mode 100644
index b866143..0000000
--- a/code/src/Fitbot/app/src/main/res/layout/activity_bicepvideo.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/code/src/Fitbot/app/src/main/res/layout/activity_completion_screen.xml b/code/src/Fitbot/app/src/main/res/layout/activity_completion_screen.xml
deleted file mode 100644
index 71fa72b..0000000
--- a/code/src/Fitbot/app/src/main/res/layout/activity_completion_screen.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
\ No newline at end of file
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 2baee25..901a002 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
@@ -6,7 +6,7 @@
android:layout_height="match_parent"
android:background="#232323"
android:fitsSystemWindows="true"
- tools:context=".MainActivity"
+ tools:context=".ui.activities.MainActivity"
tools:openDrawer="start">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/code/src/Fitbot/app/src/main/res/layout/activity_sport_item.xml b/code/src/Fitbot/app/src/main/res/layout/activity_sport_item.xml
deleted file mode 100644
index ae843ab..0000000
--- a/code/src/Fitbot/app/src/main/res/layout/activity_sport_item.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/code/src/Fitbot/app/src/main/res/layout/activity_sport_menu.xml b/code/src/Fitbot/app/src/main/res/layout/activity_sport_menu.xml
deleted file mode 100644
index 7a2e72b..0000000
--- a/code/src/Fitbot/app/src/main/res/layout/activity_sport_menu.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/docs/documentation/diagrams/assets/.$appDiagram.png.dtmp b/docs/documentation/diagrams/assets/.$appDiagram.png.dtmp
deleted file mode 100644
index cc2914b..0000000
--- a/docs/documentation/diagrams/assets/.$appDiagram.png.dtmp
+++ /dev/null
@@ -1,181 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/docs/documentation/diagrams/assets/appDiagram.png b/docs/documentation/diagrams/assets/appDiagram.png
index 41ba8b7..5816953 100644
Binary files a/docs/documentation/diagrams/assets/appDiagram.png and b/docs/documentation/diagrams/assets/appDiagram.png differ