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

code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/FitnessActivity.java

@@ -0,0 +1,31 @@
+package com.example.yourapp;
+
+import android.os.Bundle;
+import androidx.appcompat.widget.Toolbar;
+import com.aldebaran.qi.sdk.QiContext;
+import com.aldebaran.qi.sdk.RobotLifecycleCallbacks;
+import com.aldebaran.qi.sdk.design.activity.RobotActivity;
+
+public class FitnessActivity extends RobotActivity implements RobotLifecycleCallbacks {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_fitness);
+    }
+
+    @Override
+    public void onRobotFocusGained(QiContext qiContext) {
+        // Implement your logic when the robot focus is gained
+    }
+
+    @Override
+    public void onRobotFocusLost() {
+        // Implement your logic when the robot focus is lost
+    }
+
+    @Override
+    public void onRobotFocusRefused(String reason) {
+        // Implement your logic when the robot focus is refused
+    }
+}

code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/MainActivity.java

@@ -1,6 +1,7 @@
-package com.example.fitbot.ui.activities;
+package com.example.fitbot;
 
 import android.annotation.SuppressLint;
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.design.widget.NavigationView;
 import android.support.v4.view.GravityCompat;
@@ -8,13 +9,14 @@ import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBarDrawerToggle;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
+import android.widget.Button;
 
 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 MainActivity extends AppCompatActivity {
+public class MainScreen extends AppCompatActivity {
 
     //Variables
     DrawerLayout drawerLayout;

code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/SportPreviewActivity.java

@@ -1,24 +0,0 @@
-package com.example.fitbot.ui.activities;
-
-import com.aldebaran.qi.sdk.QiContext;
-import com.aldebaran.qi.sdk.RobotLifecycleCallbacks;
-import com.aldebaran.qi.sdk.design.activity.RobotActivity;
-
-public class SportPreviewActivity extends RobotActivity implements RobotLifecycleCallbacks {
-
-
-    @Override
-    public void onRobotFocusGained(QiContext qiContext) {
-
-    }
-
-    @Override
-    public void onRobotFocusLost() {
-
-    }
-
-    @Override
-    public void onRobotFocusRefused(String reason) {
-
-    }
-}

code/src/Fitbot/app/src/main/java/com/example/fitbot/util/processing/MotionProcessor.java

@@ -240,7 +240,6 @@ public class MotionProcessor {
         Log.i("MotionProcessor", "Path length: " + relativePath.size());
         Log.i("MotionProcessor", "Sample rate: " + sampleRate);
         Log.i("MotionProcessor", "Calibration point: " + ZERO.toString());
-    }
 
     /**
      * Interface that accepts motion data and the transformed vector.