From 9846a7c82dba778b69e0aab65b878b5c535ef99b Mon Sep 17 00:00:00 2001
From: RuchiraHansanaBandara
 <38920827+RuchiraHansanaBandara@users.noreply.github.com>
Date: Fri, 13 Sep 2019 11:57:27 +0530
Subject: [PATCH 1/2] Add nav for all UI

---
 .../res/layout/activity_callorie_calc.xml     | 40 +++++++++++++++++++
 app/src/main/res/layout/activity_workouts.xml | 40 +++++++++++++++++++
 2 files changed, 80 insertions(+)

diff --git a/app/src/main/res/layout/activity_callorie_calc.xml b/app/src/main/res/layout/activity_callorie_calc.xml
index 0659b6b..ba3d166 100644
--- a/app/src/main/res/layout/activity_callorie_calc.xml
+++ b/app/src/main/res/layout/activity_callorie_calc.xml
@@ -474,4 +474,44 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.128" />
 
+
+    <android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/drawer_layout"
+        android:fitsSystemWindows="true"
+        tools:context=".create_user"
+        tools:openDrawer="start">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <android.support.v7.widget.Toolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:background="@color/colorPrimary"
+                android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+                app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+                android:elevation="4dp"/>
+
+            <FrameLayout
+                android:id="@+id/fragment_container"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </LinearLayout>
+        <android.support.design.widget.NavigationView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="start"
+            android:id="@+id/nav_view"
+            app:headerLayout="@layout/nav_header"
+            app:menu="@menu/drawer_menu"/>
+
+    </android.support.v4.widget.DrawerLayout>
+
+
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_workouts.xml b/app/src/main/res/layout/activity_workouts.xml
index d948000..cbb2bd7 100644
--- a/app/src/main/res/layout/activity_workouts.xml
+++ b/app/src/main/res/layout/activity_workouts.xml
@@ -408,4 +408,44 @@
         android:orientation="vertical"
         app:layout_constraintGuide_percent="0.5" />
 
+
+    <android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/drawer_layout"
+        android:fitsSystemWindows="true"
+        tools:context=".create_user"
+        tools:openDrawer="start">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <android.support.v7.widget.Toolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:background="@color/colorPrimary"
+                android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+                app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+                android:elevation="4dp"/>
+
+            <FrameLayout
+                android:id="@+id/fragment_container"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </LinearLayout>
+        <android.support.design.widget.NavigationView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="start"
+            android:id="@+id/nav_view"
+            app:headerLayout="@layout/nav_header"
+            app:menu="@menu/drawer_menu"/>
+
+    </android.support.v4.widget.DrawerLayout>
+
+
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file

From 8d2ce7ef1bbba664fd2dd3ba0a2ef58bd940aee1 Mon Sep 17 00:00:00 2001
From: RuchiraHansanaBandara
 <38920827+RuchiraHansanaBandara@users.noreply.github.com>
Date: Fri, 13 Sep 2019 12:12:27 +0530
Subject: [PATCH 2/2] Add nav for all UI..

---
 app/src/main/res/layout/activity_callorie_calc.xml | 12 +++---------
 app/src/main/res/layout/activity_workouts.xml      | 10 +---------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/app/src/main/res/layout/activity_callorie_calc.xml b/app/src/main/res/layout/activity_callorie_calc.xml
index ba3d166..484ecf4 100644
--- a/app/src/main/res/layout/activity_callorie_calc.xml
+++ b/app/src/main/res/layout/activity_callorie_calc.xml
@@ -7,6 +7,7 @@
     android:foregroundTint="#00D62222"
     tools:context=".CallorieCalc">
 
+
     <ImageView
         android:id="@+id/imageView8"
         android:layout_width="64dp"
@@ -474,7 +475,6 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.128" />
 
-
     <android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:tools="http://schemas.android.com/tools"
@@ -489,14 +489,7 @@
             android:layout_height="match_parent"
             android:orientation="vertical">
 
-            <android.support.v7.widget.Toolbar
-                android:id="@+id/toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                android:background="@color/colorPrimary"
-                android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-                app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
-                android:elevation="4dp"/>
+
 
             <FrameLayout
                 android:id="@+id/fragment_container"
@@ -514,4 +507,5 @@
     </android.support.v4.widget.DrawerLayout>
 
 
+
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_workouts.xml b/app/src/main/res/layout/activity_workouts.xml
index cbb2bd7..5441429 100644
--- a/app/src/main/res/layout/activity_workouts.xml
+++ b/app/src/main/res/layout/activity_workouts.xml
@@ -408,7 +408,6 @@
         android:orientation="vertical"
         app:layout_constraintGuide_percent="0.5" />
 
-
     <android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:tools="http://schemas.android.com/tools"
@@ -423,14 +422,7 @@
             android:layout_height="match_parent"
             android:orientation="vertical">
 
-            <android.support.v7.widget.Toolbar
-                android:id="@+id/toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                android:background="@color/colorPrimary"
-                android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-                app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
-                android:elevation="4dp"/>
+
 
             <FrameLayout
                 android:id="@+id/fragment_container"