Merge remote-tracking branch 'origin/main'

code/src/Fitbot/.idea/deploymentTargetDropDown.xml

@@ -12,6 +12,6 @@
         </deviceKey>
       </Target>
     </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2024-04-25T18:30:01.781792600Z" />
+    <timeTargetWasSelectedWithDropDown value="2024-04-26T10:10:48.222593700Z" />
   </component>
 </project>

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

@@ -16,7 +16,6 @@ import com.aldebaran.qi.sdk.object.locale.Locale;
 import com.aldebaran.qi.sdk.object.locale.Region;
 import com.example.fitbot.ui.SportMenuActivity;
 
-
 public class MainActivity extends RobotActivity implements RobotLifecycleCallbacks {
 
     @Override

code/src/Fitbot/app/src/main/java/com/example/fitbot/MainScreen.java

@@ -1,6 +1,7 @@
 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,6 +9,9 @@ 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.ui.SportMenuActivity;
 
 public class MainScreen extends AppCompatActivity {
 
@@ -28,7 +32,7 @@ public class MainScreen extends AppCompatActivity {
         toolbar = findViewById(R.id.toolbar);
 
         /*---Tool Bar---*/
-//        setSupportActionBar(toolbar);
+//      setSupportActionBar(toolbar);
 
         /*---Navigation Drawer Menu---*/
         navigationView.bringToFront();