diff --git a/code/src/Fitbot/.idea/misc.xml b/code/src/Fitbot/.idea/misc.xml
index 6711755..7b1e4ee 100644
--- a/code/src/Fitbot/.idea/misc.xml
+++ b/code/src/Fitbot/.idea/misc.xml
@@ -8,13 +8,14 @@
-
+
+
-
+
diff --git a/code/src/Fitbot/app/src/main/AndroidManifest.xml b/code/src/Fitbot/app/src/main/AndroidManifest.xml
index 61cd8ea..1c9e481 100644
--- a/code/src/Fitbot/app/src/main/AndroidManifest.xml
+++ b/code/src/Fitbot/app/src/main/AndroidManifest.xml
@@ -16,13 +16,7 @@
android:exported="false" />
-
-
-
-
-
-
+ android:exported="false" />
@@ -31,6 +25,9 @@
android:exported="false" />
+
diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/MainScreen.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/MainScreen.java
index 140d430..bc39699 100644
--- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/MainScreen.java
+++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/MainScreen.java
@@ -1,11 +1,13 @@
package com.example.fitbot;
+import android.annotation.SuppressLint;
import android.os.Bundle;
import android.support.design.widget.NavigationView;
+import android.support.v4.view.GravityCompat;
import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.ActionBarDrawerToggle;
import android.support.v7.app.AppCompatActivity;
-import android.widget.Toolbar;
+import android.support.v7.widget.Toolbar;
public class MainScreen extends AppCompatActivity {
@@ -14,6 +16,7 @@ public class MainScreen extends AppCompatActivity {
NavigationView navigationView;
Toolbar toolbar;
+ @SuppressLint("WrongViewCast")
@Override
protected void onCreate (Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -25,11 +28,23 @@ public class MainScreen extends AppCompatActivity {
toolbar = findViewById(R.id.toolbar);
/*---Tool Bar---*/
- setSupportActionBar(toolbar);
+// setSupportActionBar(toolbar);
/*---Navigation Drawer Menu---*/
- ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this.drawerLayout,toolbar,R.string.navigation_drawer_open,R.string.navigation_drawer_close);
+ navigationView.bringToFront();
+ ActionBarDrawerToggle toggle=new
+ ActionBarDrawerToggle(this,drawerLayout,toolbar,R.string.navigation_drawer_open,R.string.navigation_drawer_close);
drawerLayout.addDrawerListener(toggle);
toggle.syncState();
}
+
+ @Override
+ public void onBackPressed(){
+ if(drawerLayout.isDrawerOpen(GravityCompat.START)){
+ drawerLayout.closeDrawer(GravityCompat.START);
+ }
+ else
+ {super.onBackPressed();
+ }
+ }
}
diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/PowerScreen.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/PowerScreen.java
index cc29742..ff1f891 100644
--- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/PowerScreen.java
+++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/PowerScreen.java
@@ -25,15 +25,15 @@ public class PowerScreen extends AppCompatActivity {
Intent intent = new Intent(PowerScreen.this, BicepVideo.class);
startActivity(intent);
});
- openSquatVideo.setOnClickListener(v -> {
- Intent intent = new Intent(PowerScreen.this, SquatVideo.class);
- startActivity(intent);
- });
-
- openTricepVideo.setOnClickListener(v -> {
- Intent intent = new Intent(PowerScreen.this, TricepVideo.class);
- startActivity(intent);
- });
+// openSquatVideo.setOnClickListener(v -> {
+// Intent intent = new Intent(PowerScreen.this, SquatVideo.class);
+// startActivity(intent);
+// });
+//
+// openTricepVideo.setOnClickListener(v -> {
+// Intent intent = new Intent(PowerScreen.this, TricepVideo.class);
+// startActivity(intent);
+// });
goToHome.setOnClickListener(v -> {
Intent intent = new Intent(PowerScreen.this, MainActivity.class);
diff --git a/code/src/Fitbot/app/src/main/res/layout/activity_main.xml b/code/src/Fitbot/app/src/main/res/layout/activity_main.xml
index e331324..75bba1c 100644
--- a/code/src/Fitbot/app/src/main/res/layout/activity_main.xml
+++ b/code/src/Fitbot/app/src/main/res/layout/activity_main.xml
@@ -1,30 +1,25 @@
-
-
-
+ layout="@layout/toolbar" />
+ app:menu="@menu/main_menu" />
+ app:layout_constraintLeft_toLeftOf="parent" />
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/code/src/Fitbot/app/src/main/res/layout/header.xml b/code/src/Fitbot/app/src/main/res/layout/header.xml
index 6a3eac7..ab6095a 100644
--- a/code/src/Fitbot/app/src/main/res/layout/header.xml
+++ b/code/src/Fitbot/app/src/main/res/layout/header.xml
@@ -1,5 +1,6 @@
+ android:layout_marginStart="10dp"
+ android:layout_marginTop="20dp"
+ android:src="@drawable/robotlogo"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+ app:layout_constraintStart_toEndOf="@+id/imageView"
+ app:layout_constraintTop_toTopOf="parent" />
\ No newline at end of file
diff --git a/code/src/Fitbot/app/src/main/res/layout/toolbar.xml b/code/src/Fitbot/app/src/main/res/layout/toolbar.xml
index 1a12217..07ff786 100644
--- a/code/src/Fitbot/app/src/main/res/layout/toolbar.xml
+++ b/code/src/Fitbot/app/src/main/res/layout/toolbar.xml
@@ -2,8 +2,8 @@
+ android:theme="@style/Theme.AppCompat.Light.NoActionBar">
\ No newline at end of file
diff --git a/code/src/Fitbot/app/src/main/res/values-night/themes.xml b/code/src/Fitbot/app/src/main/res/values-night/themes.xml
index 70f3941..d8add63 100644
--- a/code/src/Fitbot/app/src/main/res/values-night/themes.xml
+++ b/code/src/Fitbot/app/src/main/res/values-night/themes.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/code/src/Fitbot/app/src/main/res/values/themes.xml b/code/src/Fitbot/app/src/main/res/values/themes.xml
index 607b278..e2327fb 100644
--- a/code/src/Fitbot/app/src/main/res/values/themes.xml
+++ b/code/src/Fitbot/app/src/main/res/values/themes.xml
@@ -1,6 +1,6 @@
-