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 a871e28..217f60f 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 @@ -56,8 +56,8 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall VideoView videoView = findViewById(R.id.videoView); FitnessCycle.playVideo(videoView, this); NavigationManager.setupButtonNavigation(this, R.id.homeButtonFitness, MainActivity.class); - // Implement your logic when the robot focus is gained + NavigationManager.hideSystemUI(this); } @Override diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/HelpActivity.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/HelpActivity.java index 77705cb..161b1ad 100644 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/HelpActivity.java +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/HelpActivity.java @@ -1,5 +1,6 @@ package com.example.fitbot.ui.activities; +import android.app.Activity; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; import android.view.View; @@ -16,16 +17,6 @@ public class HelpActivity extends AppCompatActivity { NavigationManager.setupButtonNavigation(this, R.id.homeButtonHelp, MainActivity.class); - // Hide system UI - hideSystemUI(); - } - - private void hideSystemUI() { - View decorView = getWindow().getDecorView(); - // Hide the status bar and navigation bar - int uiOptions = View.SYSTEM_UI_FLAG_FULLSCREEN - | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION - | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY; - decorView.setSystemUiVisibility(uiOptions); + NavigationManager.hideSystemUI(this); } } \ No newline at end of file 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 61c07c1..2d86787 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 @@ -48,7 +48,7 @@ public class MainActivity extends AppCompatActivity { setUpUi(); // Hide system UI - hideSystemUI(); + NavigationManager.hideSystemUI(this); } private void setUpUi() { @@ -79,33 +79,22 @@ public class MainActivity extends AppCompatActivity { @Override public void onDrawerOpened(View drawerView) { super.onDrawerOpened(drawerView); - hideSystemUI(); } @Override public void onDrawerClosed(View drawerView) { super.onDrawerClosed(drawerView); - hideSystemUI(); } }; drawerLayout.addDrawerListener(toggle); toggle.syncState(); // Synchronize the state of the navigation drawer } - private void hideSystemUI() { - View decorView = getWindow().getDecorView(); - // Hide the status bar and navigation bar - int uiOptions = View.SYSTEM_UI_FLAG_FULLSCREEN - | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION - | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY; - decorView.setSystemUiVisibility(uiOptions); - } - @Override public void onWindowFocusChanged(boolean hasFocus) { super.onWindowFocusChanged(hasFocus); if (hasFocus) { - hideSystemUI(); + NavigationManager.hideSystemUI(this); } } diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/NavigationManager.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/NavigationManager.java index 2a4d966..88153b3 100644 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/NavigationManager.java +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/NavigationManager.java @@ -8,6 +8,7 @@ import android.widget.Button; import com.example.fitbot.ui.activities.FitnessActivity; import com.example.fitbot.ui.activities.MainActivity; +import com.example.fitbot.ui.activities.HelpActivity; public class NavigationManager { @@ -51,4 +52,14 @@ public class NavigationManager { Intent intent = new Intent(context, targetActivity); context.startActivity(intent); } + + public static void hideSystemUI(Activity currentActivity) { + View decorView = currentActivity.getWindow().getDecorView(); + // Hide the status bar and navigation bar + int uiOptions = View.SYSTEM_UI_FLAG_FULLSCREEN + | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION + | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY; + decorView.setSystemUiVisibility(uiOptions); + } + } \ No newline at end of file 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 e597559..70a555b 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 @@ -1,42 +1,67 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" + 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/darkBlue" + android:fitsSystemWindows="true" + tools:context=".ui.activities.FitnessActivity" + tools:openDrawer="start"> - + - + + + + + + + + + @@ -44,8 +69,8 @@ tools:openDrawer="start"> android:id="@+id/homeButtonFitness" android:layout_width="150dp" android:layout_height="75dp" - android:layout_marginStart="404dp" - android:layout_marginBottom="0dp" + android:layout_marginStart="200dp" + android:layout_marginBottom="30dp" android:background="@drawable/red_button_gradient" android:drawableTop="@drawable/ic_baseline_home_48" android:drawableTint="@color/white" @@ -54,4 +79,18 @@ tools:openDrawer="start"> app:layout_constraintStart_toStartOf="parent" tools:ignore="SpeakableTextPresentCheck" /> +