diff --git a/code/src/Fitbot/.idea/misc.xml b/code/src/Fitbot/.idea/misc.xml index 6d5e29f..a647bf6 100644 --- a/code/src/Fitbot/.idea/misc.xml +++ b/code/src/Fitbot/.idea/misc.xml @@ -20,6 +20,7 @@ + @@ -32,7 +33,7 @@ - + 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 2c53230..264ad61 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 @@ -2,6 +2,7 @@ package com.example.fitbot.ui.activities; import android.os.Bundle; import android.util.Log; +import android.view.View; import android.widget.VideoView; import com.aldebaran.qi.sdk.QiContext; @@ -66,6 +67,17 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall personalMotionPreviewElement.provideQiContext(null); }); + // 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); } @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 765ff86..cbc714c 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 @@ -2,6 +2,7 @@ package com.example.fitbot.ui.activities; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; +import android.view.View; import com.example.fitbot.R; import com.example.fitbot.util.ButtonNavigation; @@ -15,5 +16,16 @@ public class HelpActivity extends AppCompatActivity { ButtonNavigation.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); } } \ 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 be78e12..4edfa2e 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 @@ -32,12 +32,10 @@ public class MainActivity extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); - // Set full screen mode + // Set full screen mode to hide status bar getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN); - // Hide system UI - hideSystemUI(); startButton = findViewById(R.id.startButtonMain); startButton.setOnClickListener(v -> { @@ -47,7 +45,11 @@ public class MainActivity extends AppCompatActivity { startActivity(intent); }); - setUpUi(); // Set up the UI + // Set up the UI + setUpUi(); + + // Hide system UI + hideSystemUI(); } private void setUpUi() { diff --git a/code/src/Fitbot/app/src/main/res/drawable/darkred_button_gradient.xml b/code/src/Fitbot/app/src/main/res/drawable/big_red_button_gradient.xml similarity index 89% rename from code/src/Fitbot/app/src/main/res/drawable/darkred_button_gradient.xml rename to code/src/Fitbot/app/src/main/res/drawable/big_red_button_gradient.xml index 6dce505..878f41e 100644 --- a/code/src/Fitbot/app/src/main/res/drawable/darkred_button_gradient.xml +++ b/code/src/Fitbot/app/src/main/res/drawable/big_red_button_gradient.xml @@ -2,11 +2,12 @@ + \ No newline at end of file diff --git a/code/src/Fitbot/app/src/main/res/drawable/red_button_gradient.xml b/code/src/Fitbot/app/src/main/res/drawable/red_button_gradient.xml index a087a43..6983a91 100644 --- a/code/src/Fitbot/app/src/main/res/drawable/red_button_gradient.xml +++ b/code/src/Fitbot/app/src/main/res/drawable/red_button_gradient.xml @@ -2,7 +2,7 @@ @@ -34,7 +36,7 @@ style="@style/TextStyleTitle" android:layout_width="match_parent" android:layout_height="match_parent" - android:text="@string/klaar" /> + android:text="@string/afgerond" /> + android:text="@string/voltooid" + android:textAlignment="center"/> 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 4d3e7f8..a619a72 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 @@ -45,6 +45,7 @@ tools:openDrawer="start"> android:layout_width="150dp" android:layout_height="75dp" android:layout_marginStart="404dp" + android:layout_marginBottom="30dp" android:background="@drawable/red_button_gradient" android:drawableTop="@drawable/ic_baseline_home_48" android:drawableTint="@color/white" diff --git a/code/src/Fitbot/app/src/main/res/layout/activity_help.xml b/code/src/Fitbot/app/src/main/res/layout/activity_help.xml index 72e7ff7..369397f 100644 --- a/code/src/Fitbot/app/src/main/res/layout/activity_help.xml +++ b/code/src/Fitbot/app/src/main/res/layout/activity_help.xml @@ -5,19 +5,22 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@color/darkBlue" + android:fitsSystemWindows="true" tools:context=".ui.activities.HelpActivity">