diff --git a/code/src/Fitbot/.idea/misc.xml b/code/src/Fitbot/.idea/misc.xml index 4595353..431d9ff 100644 --- a/code/src/Fitbot/.idea/misc.xml +++ b/code/src/Fitbot/.idea/misc.xml @@ -16,6 +16,8 @@ + + @@ -24,15 +26,16 @@ - - + + + - + - + diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/FitnessActivity.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/FitnessActivity.java index 8f886fa..db0b95b 100644 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/FitnessActivity.java +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/FitnessActivity.java @@ -3,6 +3,7 @@ package com.example.fitbot.ui.activities; import android.net.Uri; import android.os.Bundle; import android.util.Log; +import android.view.View; import android.widget.MediaController; import android.widget.VideoView; @@ -19,7 +20,7 @@ import org.joml.Vector3f; public class FitnessActivity extends RobotActivity implements RobotLifecycleCallbacks { -// PersonalMotionPreviewElement personalMotionPreviewElement; +// PersonalMotionPreviewElement personalMotionPreviewElement; @Override protected void onCreate(Bundle savedInstanceState) { @@ -28,6 +29,7 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall // Set the content view to the appropriate layout setContentView(R.layout.activity_fitness); + // Find the VideoView by its ID VideoView videoView = findViewById(R.id.videoView); diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/MainActivity.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/MainActivity.java index e760785..ca30bf2 100644 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/MainActivity.java +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/MainActivity.java @@ -1,16 +1,10 @@ package com.example.fitbot.ui.activities; -import android.Manifest; import android.annotation.SuppressLint; -import android.bluetooth.BluetoothAdapter; import android.content.Intent; -import android.content.pm.PackageManager; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.NonNull; import android.support.design.widget.NavigationView; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; import android.support.v4.view.GravityCompat; import android.support.v4.widget.DrawerLayout; import android.support.v7.app.ActionBarDrawerToggle; @@ -20,13 +14,9 @@ import android.util.Log; import android.widget.Button; import com.example.fitbot.R; -import com.example.fitbot.wiiboard.WiiBoardDiscoverer; public class MainActivity extends AppCompatActivity { - private static final int REQUEST_LOCATION_PERMISSION = 1; - private WiiBoardDiscoverer wiiBoardDiscoverer; - //Variables DrawerLayout drawerLayout; NavigationView navigationView; @@ -48,50 +38,7 @@ public class MainActivity extends AppCompatActivity { startActivity(intent); }); - - // Check if the device supports Bluetooth - if (BluetoothAdapter.getDefaultAdapter() == null) { - Log.i("WiiBoardDiscoverer", "Device doesn't support Bluetooth. Exiting."); - return; - } - - // Request location permissions for Bluetooth discovery on Android 6.0 and above - if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) { - ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, REQUEST_LOCATION_PERMISSION); - } else { - // Initialize WiiBoardDiscoverer - wiiBoardDiscoverer = new WiiBoardDiscoverer(this); - } - - setUpUi(); - } - - @Override - public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { - super.onRequestPermissionsResult(requestCode, permissions, grantResults); - if (requestCode == REQUEST_LOCATION_PERMISSION && grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) { - // Permission granted, initialize WiiBoardDiscoverer - wiiBoardDiscoverer = new WiiBoardDiscoverer(this); - } else { - // Handle the case where the user denies the location permission - Log.i("WiiBoardDiscoverer", "Location permission is required for Bluetooth discovery."); - } - } - - @Override - protected void onResume() { - super.onResume(); - if (wiiBoardDiscoverer != null) { - wiiBoardDiscoverer.startWiiBoardSearch(); - } - } - - @Override - protected void onPause() { - super.onPause(); - if (wiiBoardDiscoverer != null) { - wiiBoardDiscoverer.stopWiiBoardSearch(); - } + setUpUi(); // Set up the UI } private void setUpUi() { @@ -101,27 +48,27 @@ public class MainActivity extends AppCompatActivity { toolbar = findViewById(R.id.toolbar); startButton = findViewById(R.id.startButton); - startButton.setOnClickListener(v -> { - // Switch to fitness activity + startButton.setOnClickListener(v -> { // Switch to fitness activity Log.i("MainActivity", "Switching to FitnessActivity"); Intent intent = new Intent(MainActivity.this, FitnessActivity.class); startActivity(intent); }); /*---Tool Bar---*/ -// setSupportActionBar(toolbar); + setSupportActionBar(toolbar); // Make the toolbar act as the action bar + getSupportActionBar().setDisplayShowTitleEnabled(false); // Remove the title from the toolbar /*---Navigation Drawer Menu---*/ - navigationView.bringToFront(); + navigationView.bringToFront(); // Make the navigation drawer menu clickable - ActionBarDrawerToggle toggle=new + ActionBarDrawerToggle toggle=new // Create a toggle for the navigation drawer ActionBarDrawerToggle(this,drawerLayout,toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close); drawerLayout.addDrawerListener(toggle); - toggle.syncState(); + toggle.syncState(); // Synchronize the state of the navigation drawer } @Override - public void onBackPressed(){ + public void onBackPressed(){ // Close the navigation drawer when the back button is pressed if(drawerLayout.isDrawerOpen(GravityCompat.START)){ drawerLayout.closeDrawer(GravityCompat.START); } diff --git a/code/src/Fitbot/app/src/main/res/layout/activity_fitness.xml b/code/src/Fitbot/app/src/main/res/layout/activity_fitness.xml index 7375536..d74466d 100644 --- a/code/src/Fitbot/app/src/main/res/layout/activity_fitness.xml +++ b/code/src/Fitbot/app/src/main/res/layout/activity_fitness.xml @@ -5,8 +5,9 @@ xmlns:tools="http://schemas.android.com/tools" android:id="@+id/drawer_layout" android:layout_width="match_parent" android:layout_height="match_parent" -android:background="@color/red" +android:background="@color/black" android:fitsSystemWindows="true" +android:theme="@android:style/Theme.NoTitleBar.Fullscreen" tools:context=".ui.activities.FitnessActivity" tools:openDrawer="start"> @@ -23,51 +24,71 @@ tools:openDrawer="start"> + app:layout_constraintVertical_bias="0.2" /> + +