From d384ae9e6c263265d0a777d9fa529f5688ea24ff Mon Sep 17 00:00:00 2001
From: NikM3 <nikolas.a.melendez@gmail.com>
Date: Fri, 21 Apr 2023 17:08:04 -0400
Subject: [PATCH 01/18] Registration and Home behavioral test

---
 .../com/symphony/mrfit/ui/HomeActivityTest.kt | 77 +++++++++++++++++++
 .../symphony/mrfit/ui/RegisterActivityTest.kt | 56 ++++++++++++++
 app/src/main/res/layout/activity_home.xml     |  8 +-
 app/src/main/res/layout/activity_register.xml |  5 +-
 app/src/main/res/layout/card_goal.xml         |  6 +-
 app/src/main/res/layout/card_history.xml      |  8 +-
 app/src/main/res/layout/card_history2.xml     |  6 +-
 .../main/res/layout/popup_new_exercise.xml    |  8 +-
 8 files changed, 154 insertions(+), 20 deletions(-)
 create mode 100644 app/src/androidTest/java/com/symphony/mrfit/ui/HomeActivityTest.kt
 create mode 100644 app/src/androidTest/java/com/symphony/mrfit/ui/RegisterActivityTest.kt

diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/HomeActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/HomeActivityTest.kt
new file mode 100644
index 0000000..816b1ab
--- /dev/null
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/HomeActivityTest.kt
@@ -0,0 +1,77 @@
+/*
+ *  Created by Team Symphony on 4/21/23, 5:08 PM
+ *  Copyright (c) 2023 . All rights reserved.
+ *  Last modified 4/21/23, 5:03 PM
+ */
+
+package com.symphony.mrfit.ui
+
+import androidx.test.espresso.Espresso
+import androidx.test.espresso.assertion.ViewAssertions
+import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.ext.junit.rules.activityScenarioRule
+import androidx.test.filters.LargeTest
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
+import com.symphony.mrfit.R
+import org.hamcrest.Matchers.not
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4ClassRunner::class)
+@LargeTest
+class HomeActivityTest {
+
+    @get:Rule
+    var activityScenarioRule = activityScenarioRule<HomeActivity>()
+
+    /**
+     * Test if the activity is displayed and visible to user
+     */
+    @Test
+    fun checkActivityVisibility() {
+        Espresso.onView(ViewMatchers.withId(R.id.layout_homeActivity))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+    }
+
+    /**
+     * Test if all the components are visible
+     */
+    @Test
+    fun checkViewVisibility() {
+        Espresso.onView(ViewMatchers.withId(R.id.homeScreenView))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.userLayout))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.homeProfilePicture))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.homeWelcomeTextView))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.homeNameTextView))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(ViewMatchers.withId(R.id.homeScreenView))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.settingsCog))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.scheduleButton))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.pastWorkout))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.workoutButton))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.historyList))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.loadingSpinner))
+            .check(ViewAssertions.matches(not(ViewMatchers.isDisplayed())))
+    }
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/RegisterActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/RegisterActivityTest.kt
new file mode 100644
index 0000000..b7ffa8d
--- /dev/null
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/RegisterActivityTest.kt
@@ -0,0 +1,56 @@
+/*
+ *  Created by Team Symphony on 4/21/23, 5:08 PM
+ *  Copyright (c) 2023 . All rights reserved.
+ *  Last modified 4/21/23, 4:12 PM
+ */
+
+package com.symphony.mrfit.ui
+
+import androidx.test.espresso.Espresso
+import androidx.test.espresso.assertion.ViewAssertions
+import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.ext.junit.rules.activityScenarioRule
+import androidx.test.filters.LargeTest
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
+import com.symphony.mrfit.R
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4ClassRunner::class)
+@LargeTest
+class RegisterActivityTest {
+
+    @get:Rule
+    var activityScenarioRule = activityScenarioRule<RegisterActivity>()
+
+    /**
+     * Test if the activity is displayed and visible to user
+     */
+    @Test
+    fun checkActivityVisibility() {
+        Espresso.onView(ViewMatchers.withId(R.id.layout_registerActivity))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+    }
+
+    /**
+     * Test if all the components are visible
+     */
+    @Test
+    fun checkViewVisibility() {
+        Espresso.onView(ViewMatchers.withId(R.id.registerEmail))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.registerPassword))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.confirmPassword))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.registerButton))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.toLoginTextView))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index 295a307..f8932ab 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~  Created by Team Symphony on 4/21/23, 3:22 PM
+  ~  Created by Team Symphony on 4/21/23, 5:08 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/21/23, 3:17 PM
+  ~  Last modified 4/21/23, 4:39 PM
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -49,7 +49,7 @@
                 android:orientation="vertical">
 
                 <TextView
-                    android:id="@+id/templateNameTextView"
+                    android:id="@+id/homeWelcomeTextView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/welcome"
@@ -67,7 +67,7 @@
             </LinearLayout>
 
             <ImageView
-                android:id="@+id/imageView"
+                android:id="@+id/settingsCog"
                 android:layout_width="30dp"
                 android:layout_height="30dp"
                 android:layout_margin="5dp"
diff --git a/app/src/main/res/layout/activity_register.xml b/app/src/main/res/layout/activity_register.xml
index f09f774..1484b7c 100644
--- a/app/src/main/res/layout/activity_register.xml
+++ b/app/src/main/res/layout/activity_register.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~  Created by Team Symphony on 4/7/23, 7:13 PM
+  ~  Created by Team Symphony on 4/21/23, 5:08 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/7/23, 6:43 PM
+  ~  Last modified 4/21/23, 4:12 PM
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/layout_registerActivity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".ui.RegisterActivity">
diff --git a/app/src/main/res/layout/card_goal.xml b/app/src/main/res/layout/card_goal.xml
index 19f701f..8b5eb3a 100644
--- a/app/src/main/res/layout/card_goal.xml
+++ b/app/src/main/res/layout/card_goal.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~  Created by Team Symphony on 4/2/23, 3:50 AM
+  ~  Created by Team Symphony on 4/21/23, 5:08 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/2/23, 1:29 AM
+  ~  Last modified 4/21/23, 5:00 PM
   -->
 
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
@@ -24,7 +24,7 @@ will add padding in API v21+ as well to have the same measurements with previous
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="70dp"
+        android:layout_height="wrap_content"
         android:gravity="center"
         android:padding="10dp">
 
diff --git a/app/src/main/res/layout/card_history.xml b/app/src/main/res/layout/card_history.xml
index 4310e13..ce212b3 100644
--- a/app/src/main/res/layout/card_history.xml
+++ b/app/src/main/res/layout/card_history.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~  Created by Team Symphony on 4/1/23, 4:23 AM
+  ~  Created by Team Symphony on 4/21/23, 5:08 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/1/23, 4:20 AM
+  ~  Last modified 4/21/23, 5:00 PM
   -->
 
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
@@ -25,7 +25,7 @@ will add padding in API v21+ as well to have the same measurements with previous
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="70dp"
+        android:layout_height="wrap_content"
         android:background="@drawable/border_thick"
         android:gravity="center">
 
@@ -42,7 +42,7 @@ will add padding in API v21+ as well to have the same measurements with previous
 
         <LinearLayout
             android:layout_width="wrap_content"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:layout_weight="1"
             android:gravity="right"
             android:orientation="vertical"
diff --git a/app/src/main/res/layout/card_history2.xml b/app/src/main/res/layout/card_history2.xml
index b601639..0f3e0fe 100644
--- a/app/src/main/res/layout/card_history2.xml
+++ b/app/src/main/res/layout/card_history2.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~  Created by Team Symphony on 4/2/23, 3:50 AM
+  ~  Created by Team Symphony on 4/21/23, 5:08 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/2/23, 1:29 AM
+  ~  Last modified 4/21/23, 5:00 PM
   -->
 
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
@@ -24,7 +24,7 @@ will add padding in API v21+ as well to have the same measurements with previous
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="70dp"
+        android:layout_height="wrap_content"
         android:gravity="center"
         android:padding="10dp">
 
diff --git a/app/src/main/res/layout/popup_new_exercise.xml b/app/src/main/res/layout/popup_new_exercise.xml
index 6b6e2d8..6958cbc 100644
--- a/app/src/main/res/layout/popup_new_exercise.xml
+++ b/app/src/main/res/layout/popup_new_exercise.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~  Created by Team Symphony on 4/20/23, 1:04 AM
+  ~  Created by Team Symphony on 4/21/23, 5:08 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/20/23, 1:04 AM
+  ~  Last modified 4/21/23, 5:00 PM
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -54,7 +54,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/hint_tags"
-                android:inputType="textMultiLine|text" />
+                android:inputType="textLongMessage|text" />
         </com.google.android.material.textfield.TextInputLayout>
 
         <com.google.android.material.textfield.TextInputLayout
@@ -67,7 +67,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/hint_description"
-                android:inputType="textLongMessage|textMultiLine|text" />
+                android:inputType="textLongMessage|text" />
         </com.google.android.material.textfield.TextInputLayout>
 
         <TextView

From c5a113d526c201b144d1b6067e9b2de816679c59 Mon Sep 17 00:00:00 2001
From: nicolekaate <NGC2@email.sc.edu>
Date: Fri, 21 Apr 2023 19:39:31 -0400
Subject: [PATCH 02/18] unit test for register user #75

---
 .../symphony/mrfit/ui/RegisterActivityTest.kt | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 app/src/androidTest/java/com/symphony/mrfit/ui/RegisterActivityTest.kt

diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/RegisterActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/RegisterActivityTest.kt
new file mode 100644
index 0000000..674ca5f
--- /dev/null
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/RegisterActivityTest.kt
@@ -0,0 +1,46 @@
+package com.symphony.mrfit.ui
+
+import androidx.test.espresso.Espresso
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions
+import androidx.test.espresso.assertion.ViewAssertions
+import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.ext.junit.rules.activityScenarioRule
+import com.symphony.mrfit.R
+import org.junit.Assert.*
+import org.junit.Rule
+
+import org.junit.Test
+
+class RegisterActivityTest {
+
+    @get:Rule
+    var activityScenarioRule = activityScenarioRule<RegisterActivity>()
+
+    /*tests if register works*/
+    @Test
+    fun checkValidRegister() {
+        onView(withId(R.id.registerEmail))
+            .perform(ViewActions.typeText(REAL_EMAIL))
+        onView(withId(R.id.registerPassword))
+            .perform(ViewActions.typeText(LoginActivityTest.REAL_PASS), ViewActions.closeSoftKeyboard())
+        onView(withId(R.id.registerButton))
+            .perform(ViewActions.click())
+    }
+
+    /*tests if empty email/pass gives error*/
+    @Test
+    fun checkInvalidRegister() {
+        onView(withId(R.id.registerEmail))
+            .perform(ViewActions.typeText(TEST_EMAIL))
+    }
+
+    companion object {
+
+        const val REAL_EMAIL = "testregister@symphony.com"
+        const val REAL_PASS = "abcd1234"
+        const val TEST_EMAIL = ""
+        const val TEST_PASS = ""
+    }
+}
\ No newline at end of file

From 490e995c0fede4c8f065aa584035e3df7888d80d Mon Sep 17 00:00:00 2001
From: NikM3 <nikolas.a.melendez@gmail.com>
Date: Fri, 21 Apr 2023 22:19:01 -0400
Subject: [PATCH 03/18] A bunch of basic behavioral tests for #75

---
 app/build.gradle                              | 29 +++---
 .../com/symphony/mrfit/ui/ExerciseTest.kt     | 69 +++++++++++++
 .../com/symphony/mrfit/ui/HomeActivityTest.kt | 12 ++-
 .../mrfit/ui/TemplateSelectionActivityTest.kt | 60 +++++++++++
 .../mrfit/ui/UserProfileActivityTest.kt       | 99 +++++++++++++++++++
 .../mrfit/ui/WorkoutRoutineActivityTest.kt    | 92 +++++++++++++++++
 .../mrfit/ui/WorkoutTemplateActivityTest.kt   | 85 ++++++++++++++++
 .../mrfit/ui/WorkoutRoutineActivity.kt        |  6 +-
 app/src/main/res/layout/activity_exercise.xml |  6 +-
 .../res/layout/activity_routine_selection.xml |  5 +-
 .../main/res/layout/activity_user_profile.xml | 10 +-
 .../res/layout/activity_workout_routine.xml   |  5 +-
 .../res/layout/activity_workout_template.xml  | 23 ++---
 13 files changed, 461 insertions(+), 40 deletions(-)
 create mode 100644 app/src/androidTest/java/com/symphony/mrfit/ui/ExerciseTest.kt
 create mode 100644 app/src/androidTest/java/com/symphony/mrfit/ui/TemplateSelectionActivityTest.kt
 create mode 100644 app/src/androidTest/java/com/symphony/mrfit/ui/UserProfileActivityTest.kt
 create mode 100644 app/src/androidTest/java/com/symphony/mrfit/ui/WorkoutRoutineActivityTest.kt
 create mode 100644 app/src/androidTest/java/com/symphony/mrfit/ui/WorkoutTemplateActivityTest.kt

diff --git a/app/build.gradle b/app/build.gradle
index 2854a2e..04ce123 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -42,22 +42,23 @@ android {
 
 dependencies {
 
-    implementation 'androidx.core:core-ktx:1.9.0'
+    implementation 'androidx.core:core-ktx:1.10.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'com.google.android.material:material:1.8.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'com.google.firebase:firebase-database-ktx:20.1.0'
-    implementation 'com.google.firebase:firebase-database:20.1.0'
+    implementation 'com.google.firebase:firebase-database-ktx:20.2.0'
+    implementation 'com.google.firebase:firebase-database:20.2.0'
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.6.4"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.0"
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.6.0"
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.1'
     implementation 'androidx.navigation:navigation-fragment-ktx:2.5.3'
     implementation 'androidx.navigation:navigation-ui-ktx:2.5.3'
 
     // Testing dependencies
+    implementation 'androidx.arch.core:core-testing:2.2.0'
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.junit.jupiter:junit-jupiter'
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
     androidTestImplementation 'androidx.test:runner:1.5.2'
@@ -66,13 +67,17 @@ dependencies {
     androidTestImplementation 'androidx.test:core-ktx:1.5.0'
     androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.5'
 
+    // https://mvnrepository.com/artifact/net.bytebuddy/byte-buddy
+    implementation 'net.bytebuddy:byte-buddy-android:1.14.4'
+
     // Optional -- Mockito framework
-    testImplementation 'org.mockito:mockito-core:5.0.0'
+    testImplementation 'org.mockito:mockito-core:5.3.1'
+    testImplementation 'org.mockito:mockito-android:5.3.1'
     testImplementation 'org.mockito.kotlin:mockito-kotlin:4.1.0'
-    testImplementation 'io.mockk:mockk:1.13.4'
+    testImplementation 'io.mockk:mockk:1.13.5'
 
     // Import the BoM for the Firebase platform
-    implementation platform('com.google.firebase:firebase-bom:31.1.0')
+    implementation platform('com.google.firebase:firebase-bom:31.5.0')
 
     // Add the dependency for the Firebase library
     // When using the BoM, you don't specify versions in Firebase library dependencies
@@ -95,11 +100,11 @@ dependencies {
     implementation 'com.firebaseui:firebase-ui-storage:8.0.2'
 
     // Also add the dependency for the Google Play services library and specify its version
-    implementation 'com.google.android.gms:play-services-auth:20.4.1'
+    implementation 'com.google.android.gms:play-services-auth:20.5.0'
 
     // Add the dependency for Glide
-    implementation 'com.github.bumptech.glide:glide:4.15.0'
-    kapt 'com.github.bumptech.glide:compiler:4.15.0'
+    implementation 'com.github.bumptech.glide:glide:4.15.1'
+    kapt 'com.github.bumptech.glide:compiler:4.15.1'
 
     // Konfetti by https://github.com/DanielMartinus/Konfetti
     implementation 'nl.dionsegijn:konfetti-xml:2.0.2'
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/ExerciseTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/ExerciseTest.kt
new file mode 100644
index 0000000..eeeef0e
--- /dev/null
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/ExerciseTest.kt
@@ -0,0 +1,69 @@
+/*
+ *  Created by Team Symphony on 4/21/23, 10:18 PM
+ *  Copyright (c) 2023 . All rights reserved.
+ *  Last modified 4/21/23, 10:18 PM
+ */
+
+package com.symphony.mrfit.ui
+
+import androidx.test.espresso.Espresso
+import androidx.test.espresso.assertion.ViewAssertions
+import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.ext.junit.rules.activityScenarioRule
+import androidx.test.filters.LargeTest
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
+import com.symphony.mrfit.R
+import org.hamcrest.Matchers
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4ClassRunner::class)
+@LargeTest
+class ExerciseTest {
+
+    @Before
+    fun setUp() {
+    }
+
+    @get:Rule
+    var activityScenarioRule = activityScenarioRule<ExerciseActivity>()
+
+    /**
+     * Test if the activity is displayed and visible to user
+     */
+    @Test
+    fun checkActivityVisibility() {
+        Espresso.onView(ViewMatchers.withId(R.id.layout_exerciseSelectionActivity))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+    }
+
+    /**
+     * Test if all the appropriate components are visible
+     */
+    @Test
+    fun checkViewVisibility() {
+        Thread.sleep(500)
+        Espresso.onView(ViewMatchers.withId(R.id.exerciseScreenView))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.exerciseListView))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.exerciseSearchTextView))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.exerciseSearchEditText))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.exerciseSearchButton))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.button2))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.loadingSpinner))
+            .check(ViewAssertions.matches(Matchers.not(ViewMatchers.isDisplayed())))
+    }
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/HomeActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/HomeActivityTest.kt
index 816b1ab..f6576e3 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/HomeActivityTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/HomeActivityTest.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/21/23, 5:08 PM
+ *  Created by Team Symphony on 4/21/23, 10:18 PM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/21/23, 5:03 PM
+ *  Last modified 4/21/23, 10:18 PM
  */
 
 package com.symphony.mrfit.ui
@@ -14,6 +14,7 @@ import androidx.test.filters.LargeTest
 import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
 import com.symphony.mrfit.R
 import org.hamcrest.Matchers.not
+import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -22,6 +23,10 @@ import org.junit.runner.RunWith
 @LargeTest
 class HomeActivityTest {
 
+    @Before
+    fun setUp() {
+    }
+
     @get:Rule
     var activityScenarioRule = activityScenarioRule<HomeActivity>()
 
@@ -35,10 +40,11 @@ class HomeActivityTest {
     }
 
     /**
-     * Test if all the components are visible
+     * Test if all the appropriate components are visible
      */
     @Test
     fun checkViewVisibility() {
+        Thread.sleep(1000)
         Espresso.onView(ViewMatchers.withId(R.id.homeScreenView))
             .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
 
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/TemplateSelectionActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/TemplateSelectionActivityTest.kt
new file mode 100644
index 0000000..b63420f
--- /dev/null
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/TemplateSelectionActivityTest.kt
@@ -0,0 +1,60 @@
+/*
+ *  Created by Team Symphony on 4/21/23, 10:18 PM
+ *  Copyright (c) 2023 . All rights reserved.
+ *  Last modified 4/21/23, 9:24 PM
+ */
+
+package com.symphony.mrfit.ui
+
+import androidx.test.espresso.Espresso
+import androidx.test.espresso.assertion.ViewAssertions
+import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.ext.junit.rules.activityScenarioRule
+import androidx.test.filters.LargeTest
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
+import com.symphony.mrfit.R
+import org.hamcrest.Matchers
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4ClassRunner::class)
+@LargeTest
+class TemplateSelectionActivityTest {
+
+    @Before
+    fun setUp() {
+    }
+
+    @get:Rule
+    var activityScenarioRule = activityScenarioRule<RoutineSelectionActivity>()
+
+    /**
+     * Test if the activity is displayed and visible to user
+     */
+    @Test
+    fun checkActivityVisibility() {
+        Espresso.onView(ViewMatchers.withId(R.id.layout_selectionActivity))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+    }
+
+    /**
+     * Test if all the appropriate components are visible
+     */
+    @Test
+    fun checkViewVisibility() {
+        Thread.sleep(500)
+        Espresso.onView(ViewMatchers.withId(R.id.selectionScreenView))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.routineListView))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.newWorkoutButton))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.loadingSpinner))
+            .check(ViewAssertions.matches(Matchers.not(ViewMatchers.isDisplayed())))
+    }
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/UserProfileActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/UserProfileActivityTest.kt
new file mode 100644
index 0000000..851d757
--- /dev/null
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/UserProfileActivityTest.kt
@@ -0,0 +1,99 @@
+/*
+ *  Created by Team Symphony on 4/21/23, 10:18 PM
+ *  Copyright (c) 2023 . All rights reserved.
+ *  Last modified 4/21/23, 8:55 PM
+ */
+
+package com.symphony.mrfit.ui
+
+import androidx.test.espresso.Espresso
+import androidx.test.espresso.assertion.ViewAssertions
+import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.ext.junit.rules.activityScenarioRule
+import androidx.test.filters.LargeTest
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
+import com.symphony.mrfit.R
+import org.hamcrest.Matchers
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4ClassRunner::class)
+@LargeTest
+class UserProfileActivityTest {
+
+    @Before
+    fun setUp() {
+    }
+
+    @get:Rule
+    var activityScenarioRule = activityScenarioRule<UserProfileActivity>()
+
+    /**
+     * Test if the activity is displayed and visible to user
+     */
+    @Test
+    fun checkActivityVisibility() {
+        Espresso.onView(ViewMatchers.withId(R.id.layout_profileActivity))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+    }
+
+    /**
+     * Test if all the appropriate components are visible
+     */
+    @Test
+    fun checkViewVisibility() {
+        Thread.sleep(500)
+        Espresso.onView(ViewMatchers.withId(R.id.profileScreenView))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.profilePicture))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.profileNameTextView))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.editProfileButton))
+            .check(ViewAssertions.matches(Matchers.not(ViewMatchers.isDisplayed())))
+
+        Espresso.onView(ViewMatchers.withId(R.id.heightLayout))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.weightLayout))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.ageLayout))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.stuffLayout))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.goalsButton))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.notificationsButton))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.historyButton))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.customExercisesButton))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.settingLayout))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.notificationToggle))
+            .check(ViewAssertions.matches(Matchers.not(ViewMatchers.isDisplayed())))
+
+        Espresso.onView(ViewMatchers.withId(R.id.logoutButton))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.deleteButton))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.loadingSpinner))
+            .check(ViewAssertions.matches(Matchers.not(ViewMatchers.isDisplayed())))
+    }
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/WorkoutRoutineActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/WorkoutRoutineActivityTest.kt
new file mode 100644
index 0000000..317caf6
--- /dev/null
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/WorkoutRoutineActivityTest.kt
@@ -0,0 +1,92 @@
+/*
+ *  Created by Team Symphony on 4/21/23, 10:18 PM
+ *  Copyright (c) 2023 . All rights reserved.
+ *  Last modified 4/21/23, 10:18 PM
+ */
+
+package com.symphony.mrfit.ui
+
+import android.content.Intent
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.espresso.Espresso
+import androidx.test.espresso.assertion.ViewAssertions
+import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.ext.junit.rules.activityScenarioRule
+import androidx.test.filters.LargeTest
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
+import com.symphony.mrfit.R
+import org.hamcrest.Matchers
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4ClassRunner::class)
+@LargeTest
+class WorkoutRoutineActivityTest {
+
+    @Before
+    fun setUp() {
+    }
+
+    @get:Rule
+    var activityScenarioRule = activityScenarioRule<WorkoutRoutineActivity>(
+        intent = Intent(
+            ApplicationProvider.getApplicationContext(),
+            WorkoutRoutineActivity::class.java
+        )
+            .putExtra(WorkoutTemplateActivity.EXTRA_IDENTITY, "test")
+    )
+
+    /**
+     * Test if the activity is displayed and visible to user
+     */
+    @Test
+    fun checkActivityVisibility() {
+        Espresso.onView(ViewMatchers.withId(R.id.layout_workoutBuilderActivity))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+    }
+
+    /**
+     * Test if all the appropriate components are visible
+     */
+    @Test
+    fun checkViewVisibility() {
+        Thread.sleep(1000)
+        Espresso.onView(ViewMatchers.withId(R.id.routineScreenView))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.headerLayout))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.routineNameEditText))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.workoutPlaylistEditText))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.openPlaylistButton))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.workoutListView))
+            .check(ViewAssertions.matches(Matchers.not(ViewMatchers.isDisplayed())))
+
+        Espresso.onView(ViewMatchers.withId(R.id.routineScreenButtons))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.startWorkoutButton))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.newExerciseButton))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.saveWorkoutButton))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.deleteWorkoutButton))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.loadingSpinner))
+            .check(ViewAssertions.matches(Matchers.not(ViewMatchers.isDisplayed())))
+    }
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/WorkoutTemplateActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/WorkoutTemplateActivityTest.kt
new file mode 100644
index 0000000..e96a27b
--- /dev/null
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/WorkoutTemplateActivityTest.kt
@@ -0,0 +1,85 @@
+/*
+ *  Created by Team Symphony on 4/21/23, 10:18 PM
+ *  Copyright (c) 2023 . All rights reserved.
+ *  Last modified 4/21/23, 10:18 PM
+ */
+
+package com.symphony.mrfit.ui
+
+import android.content.Intent
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.espresso.Espresso
+import androidx.test.espresso.assertion.ViewAssertions
+import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.ext.junit.rules.activityScenarioRule
+import androidx.test.filters.LargeTest
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
+import com.symphony.mrfit.R
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4ClassRunner::class)
+@LargeTest
+class WorkoutTemplateActivityTest {
+
+    @Before
+    fun setUp() {
+    }
+
+    @get:Rule
+    var activityScenarioRule = activityScenarioRule<WorkoutTemplateActivity>(
+        intent = Intent(
+            ApplicationProvider.getApplicationContext(),
+            WorkoutTemplateActivity::class.java
+        )
+            .putExtra(WorkoutRoutineActivity.EXTRA_ROUTINE, "test")
+            .putExtra(WorkoutTemplateActivity.EXTRA_IDENTITY, "test")
+            .putExtra(WorkoutTemplateActivity.EXTRA_EXERCISE, "test")
+            .putExtra(WorkoutTemplateActivity.EXTRA_LIST, ArrayList<String>())
+    )
+
+    /**
+     * Test if the activity is displayed and visible to user
+     */
+    @Test
+    fun checkActivityVisibility() {
+        Espresso.onView(ViewMatchers.withId(R.id.layout_exerciseBuilderActivity))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+    }
+
+    /**
+     * Test if all the appropriate components are visible
+     */
+    @Test
+    fun checkViewVisibility() {
+        Thread.sleep(500)
+        Espresso.onView(ViewMatchers.withId(R.id.templateScreenView))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.exerciseCardView))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.editDuration))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.editDistance))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.repsAndSetsLayout))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.editReps))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.editSets))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.deleteTemplateButton))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.saveTemplateButton))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/symphony/mrfit/ui/WorkoutRoutineActivity.kt b/app/src/main/java/com/symphony/mrfit/ui/WorkoutRoutineActivity.kt
index 7fc296b..51fd8bb 100644
--- a/app/src/main/java/com/symphony/mrfit/ui/WorkoutRoutineActivity.kt
+++ b/app/src/main/java/com/symphony/mrfit/ui/WorkoutRoutineActivity.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/20/23, 2:11 AM
+ *  Created by Team Symphony on 4/21/23, 10:18 PM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/20/23, 2:08 AM
+ *  Last modified 4/21/23, 9:57 PM
  */
 
 package com.symphony.mrfit.ui
@@ -81,7 +81,6 @@ class WorkoutRoutineActivity : AppCompatActivity() {
 
         placeholderText.visibility = View.VISIBLE
         workoutList.visibility = View.GONE
-        spinner.visibility = View.VISIBLE
 
         /**
          * Retrieve the extras passed to this intent
@@ -109,6 +108,7 @@ class WorkoutRoutineActivity : AppCompatActivity() {
                 routinePlaylist.setText(BLANK)
             }
             if (routine.workoutList != null) {
+                spinner.visibility = View.VISIBLE
                 placeholderText.visibility = View.GONE
                 workoutList.visibility = View.VISIBLE
                 passedList = routine.workoutList
diff --git a/app/src/main/res/layout/activity_exercise.xml b/app/src/main/res/layout/activity_exercise.xml
index 5a040ec..290e077 100644
--- a/app/src/main/res/layout/activity_exercise.xml
+++ b/app/src/main/res/layout/activity_exercise.xml
@@ -1,19 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~  Created by Team Symphony on 4/7/23, 7:13 PM
+  ~  Created by Team Symphony on 4/21/23, 10:18 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/7/23, 7:12 PM
+  ~  Last modified 4/21/23, 10:16 PM
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/layout_exerciseSelectionActivity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".ui.ExerciseActivity">
 
 
     <LinearLayout
+        android:id="@+id/exerciseScreenView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="20dp"
diff --git a/app/src/main/res/layout/activity_routine_selection.xml b/app/src/main/res/layout/activity_routine_selection.xml
index ec3be1f..b682128 100644
--- a/app/src/main/res/layout/activity_routine_selection.xml
+++ b/app/src/main/res/layout/activity_routine_selection.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~  Created by Team Symphony on 2/24/23, 11:21 PM
+  ~  Created by Team Symphony on 4/21/23, 10:18 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 2/24/23, 11:20 PM
+  ~  Last modified 4/21/23, 9:24 PM
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/layout_selectionActivity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".ui.RoutineSelectionActivity">
diff --git a/app/src/main/res/layout/activity_user_profile.xml b/app/src/main/res/layout/activity_user_profile.xml
index f98d3de..a284916 100644
--- a/app/src/main/res/layout/activity_user_profile.xml
+++ b/app/src/main/res/layout/activity_user_profile.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~  Created by Team Symphony on 4/19/23, 5:18 PM
+  ~  Created by Team Symphony on 4/21/23, 10:18 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/19/23, 5:06 PM
+  ~  Last modified 4/21/23, 8:40 PM
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/layout_profileActivity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".ui.UserProfileActivity">
@@ -15,7 +16,9 @@
     <ScrollView
         android:id="@+id/profileScreenView"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -208,6 +211,7 @@
                         android:text="@string/label_settings" />
 
                     <LinearLayout
+                        android:id="@+id/notificationToggle"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:orientation="horizontal"
diff --git a/app/src/main/res/layout/activity_workout_routine.xml b/app/src/main/res/layout/activity_workout_routine.xml
index 1a09085..a16f4d9 100644
--- a/app/src/main/res/layout/activity_workout_routine.xml
+++ b/app/src/main/res/layout/activity_workout_routine.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~  Created by Team Symphony on 4/2/23, 1:04 AM
+  ~  Created by Team Symphony on 4/21/23, 10:18 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/2/23, 1:01 AM
+  ~  Last modified 4/21/23, 9:24 PM
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/layout_workoutBuilderActivity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_weight="1"
diff --git a/app/src/main/res/layout/activity_workout_template.xml b/app/src/main/res/layout/activity_workout_template.xml
index 5f9fc14..ce8a588 100644
--- a/app/src/main/res/layout/activity_workout_template.xml
+++ b/app/src/main/res/layout/activity_workout_template.xml
@@ -1,27 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~  Created by Team Symphony on 4/19/23, 4:10 PM
+  ~  Created by Team Symphony on 4/21/23, 10:18 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/19/23, 4:07 PM
+  ~  Last modified 4/21/23, 10:16 PM
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/layout_exerciseBuilderActivity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".data.model.Workout">
 
     <LinearLayout
-        android:layout_width="380dp"
-        android:layout_height="699dp"
-        android:layout_marginStart="17dp"
-        android:layout_marginTop="17dp"
-        android:layout_marginEnd="14dp"
-        android:layout_marginBottom="15dp"
+        android:id="@+id/templateScreenView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_margin="15dp"
         android:orientation="vertical"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
@@ -33,8 +30,8 @@
             android:visibility="visible" />
 
         <com.google.android.material.textfield.TextInputLayout
-            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
             android:id="@+id/durationLayout"
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp">
@@ -84,8 +81,8 @@
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="5dp"
                     android:layout_weight="1"
-                    android:hint="@string/hint_reps"
                     android:digits="0123456789."
+                    android:hint="@string/hint_reps"
                     android:inputType="numberDecimal"
                     android:maxLength="4"
                     android:visibility="visible" />
@@ -105,8 +102,8 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="5dp"
                     android:layout_weight="1"
-                    android:hint="@string/hint_sets"
                     android:digits="0123456789."
+                    android:hint="@string/hint_sets"
                     android:inputType="numberDecimal"
                     android:maxLength="4" />
             </com.google.android.material.textfield.TextInputLayout>

From 0f153591bb949dd6b8e1f5f06ad89d34f9ac0f51 Mon Sep 17 00:00:00 2001
From: NikM3 <nikolas.a.melendez@gmail.com>
Date: Fri, 21 Apr 2023 22:36:54 -0400
Subject: [PATCH 04/18] Minor UI fixes

---
 .../symphony/mrfit/ui/CurrentWorkoutActivity.kt |  9 ++++-----
 .../symphony/mrfit/ui/WorkoutRoutineActivity.kt | 16 +++++++++-------
 .../main/res/layout/activity_post_workout.xml   |  5 ++---
 .../res/layout/activity_workout_routine.xml     | 17 +++++++++++------
 app/src/main/res/layout/card_history.xml        |  6 ++----
 5 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/com/symphony/mrfit/ui/CurrentWorkoutActivity.kt b/app/src/main/java/com/symphony/mrfit/ui/CurrentWorkoutActivity.kt
index e81a7f1..3a8bb0d 100644
--- a/app/src/main/java/com/symphony/mrfit/ui/CurrentWorkoutActivity.kt
+++ b/app/src/main/java/com/symphony/mrfit/ui/CurrentWorkoutActivity.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/20/23, 2:11 AM
+ *  Created by Team Symphony on 4/21/23, 10:36 PM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/20/23, 2:11 AM
+ *  Last modified 4/21/23, 10:36 PM
  */
 
 package com.symphony.mrfit.ui
@@ -134,16 +134,15 @@ class CurrentWorkoutActivity : AppCompatActivity() {
                 .inflate(R.layout.activity_post_workout, null, false)
 
             materialDialog.setView(dialogView)
-                .setTitle("Post Exercise")
 
             val text = dialogView.findViewById<TextView>(R.id.postWorkoutTime)
             val startTime = SimpleDateFormat(
-                "'You started this workout at' hh:mm a",
+                "'You started this workout at 'hh:mm a",
                 Locale.getDefault()
             )
                 .format(Date().time - timeSpent)
             val endTime = SimpleDateFormat(
-                "' and finished at ' hh:mm a",
+                "' and finished at 'hh:mm a",
                 Locale.getDefault()
             )
                 .format(Date())
diff --git a/app/src/main/java/com/symphony/mrfit/ui/WorkoutRoutineActivity.kt b/app/src/main/java/com/symphony/mrfit/ui/WorkoutRoutineActivity.kt
index 51fd8bb..f879436 100644
--- a/app/src/main/java/com/symphony/mrfit/ui/WorkoutRoutineActivity.kt
+++ b/app/src/main/java/com/symphony/mrfit/ui/WorkoutRoutineActivity.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/21/23, 10:18 PM
+ *  Created by Team Symphony on 4/21/23, 10:36 PM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/21/23, 9:57 PM
+ *  Last modified 4/21/23, 10:26 PM
  */
 
 package com.symphony.mrfit.ui
@@ -108,11 +108,13 @@ class WorkoutRoutineActivity : AppCompatActivity() {
                 routinePlaylist.setText(BLANK)
             }
             if (routine.workoutList != null) {
-                spinner.visibility = View.VISIBLE
-                placeholderText.visibility = View.GONE
-                workoutList.visibility = View.VISIBLE
-                passedList = routine.workoutList
-                exerciseViewModel.getWorkouts(routine.workoutList)
+                if (routine.workoutList.isNotEmpty()) {
+                    spinner.visibility = View.VISIBLE
+                    placeholderText.visibility = View.GONE
+                    workoutList.visibility = View.VISIBLE
+                    passedList = routine.workoutList
+                    exerciseViewModel.getWorkouts(routine.workoutList)
+                }
             }
         })
         exerciseViewModel.workoutList.observe(this, Observer {
diff --git a/app/src/main/res/layout/activity_post_workout.xml b/app/src/main/res/layout/activity_post_workout.xml
index d34401a..a1f27bd 100644
--- a/app/src/main/res/layout/activity_post_workout.xml
+++ b/app/src/main/res/layout/activity_post_workout.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~  Created by Team Symphony on 4/20/23, 2:11 AM
+  ~  Created by Team Symphony on 4/21/23, 10:36 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/20/23, 2:11 AM
+  ~  Last modified 4/21/23, 10:36 PM
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -39,7 +39,6 @@
             android:gravity="center"
             android:maxLines="2"
             android:text="Good job!"
-            android:textColor="#000000"
             android:textSize="24sp" />
 
         <TextView
diff --git a/app/src/main/res/layout/activity_workout_routine.xml b/app/src/main/res/layout/activity_workout_routine.xml
index a16f4d9..54c7e7a 100644
--- a/app/src/main/res/layout/activity_workout_routine.xml
+++ b/app/src/main/res/layout/activity_workout_routine.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~  Created by Team Symphony on 4/21/23, 10:18 PM
+  ~  Created by Team Symphony on 4/21/23, 10:36 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/21/23, 9:24 PM
+  ~  Last modified 4/21/23, 10:27 PM
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -42,10 +42,12 @@
                 android:layout_marginTop="10dp"
                 android:ems="10"
                 android:hint="@string/label_routine_name"
+                android:importantForAutofill="no"
                 android:inputType="textPersonName"
                 android:minHeight="48dp"
-                android:importantForAutofill="no"
-                android:textAlignment="center" />
+                android:textAlignment="center"
+                android:textColor="@color/black"
+                android:textColorHint="@color/black" />
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -56,7 +58,8 @@
                     style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
-                    android:layout_weight="1">
+                    android:layout_weight="1"
+                    android:textColorHint="@color/material_dynamic_neutral40">
 
                     <com.google.android.material.textfield.TextInputEditText
                         android:id="@+id/workoutPlaylistEditText"
@@ -64,7 +67,9 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="10dp"
                         android:layout_marginRight="10dp"
-                        android:hint="@string/workout_playlist" />
+                        android:hint="@string/workout_playlist"
+                        android:textColor="@color/black"
+                        android:textColorHint="@color/black" />
                 </com.google.android.material.textfield.TextInputLayout>
 
                 <Button
diff --git a/app/src/main/res/layout/card_history.xml b/app/src/main/res/layout/card_history.xml
index 96d8a85..dda46fd 100644
--- a/app/src/main/res/layout/card_history.xml
+++ b/app/src/main/res/layout/card_history.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~  Created by Team Symphony on 4/21/23, 5:28 PM
+  ~  Created by Team Symphony on 4/21/23, 10:36 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/21/23, 5:17 PM
+  ~  Last modified 4/21/23, 10:27 PM
   -->
 
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
@@ -26,7 +26,6 @@ will add padding in API v21+ as well to have the same measurements with previous
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/border_thick"
         android:gravity="center">
 
         <TextView
@@ -36,7 +35,6 @@ will add padding in API v21+ as well to have the same measurements with previous
             android:layout_margin="10dp"
             android:layout_weight="1"
             android:text="@string/PLACEHOLDER_TEXT"
-            android:textColor="@color/black"
             android:textSize="18sp"
             android:textStyle="bold" />
 

From f4d6103eae05cc8cbfb1ebbf5d5ffcb74063a672 Mon Sep 17 00:00:00 2001
From: NikM3 <nikolas.a.melendez@gmail.com>
Date: Fri, 21 Apr 2023 22:43:24 -0400
Subject: [PATCH 05/18] Mmore minor UI fixes

---
 app/src/main/res/layout/card_goal.xml         | 11 ++++++-----
 app/src/main/res/layout/card_history2.xml     |  8 +++++---
 app/src/main/res/layout/card_notification.xml | 14 ++++++++------
 app/src/main/res/layout/card_workout2.xml     |  6 +++---
 app/src/main/res/layout/popup_edit_goal.xml   |  5 ++---
 5 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/app/src/main/res/layout/card_goal.xml b/app/src/main/res/layout/card_goal.xml
index a5a82d0..e5ee07d 100644
--- a/app/src/main/res/layout/card_goal.xml
+++ b/app/src/main/res/layout/card_goal.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~  Created by Team Symphony on 4/21/23, 5:08 PM
+  ~  Created by Team Symphony on 4/21/23, 10:43 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/21/23, 5:00 PM
+  ~  Last modified 4/21/23, 10:40 PM
   -->
 
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
@@ -30,7 +30,7 @@ will add padding in API v21+ as well to have the same measurements with previous
 
         <LinearLayout
             android:layout_width="0dp"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:layout_weight="1"
             android:orientation="vertical">
 
@@ -38,13 +38,14 @@ will add padding in API v21+ as well to have the same measurements with previous
                 android:id="@+id/goalName"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="Goal name"
-                android:maxLength="35"/>
+                android:layout_marginBottom="2dp"
+                android:text="Goal name" />
 
             <TextView
                 android:id="@+id/goalProgress"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
                 android:text="___ / 50 days" />
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/card_history2.xml b/app/src/main/res/layout/card_history2.xml
index 0f3e0fe..b5771f2 100644
--- a/app/src/main/res/layout/card_history2.xml
+++ b/app/src/main/res/layout/card_history2.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~  Created by Team Symphony on 4/21/23, 5:08 PM
+  ~  Created by Team Symphony on 4/21/23, 10:43 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/21/23, 5:00 PM
+  ~  Last modified 4/21/23, 10:43 PM
   -->
 
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
@@ -30,7 +30,7 @@ will add padding in API v21+ as well to have the same measurements with previous
 
         <LinearLayout
             android:layout_width="0dp"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:layout_weight="1"
             android:orientation="vertical">
 
@@ -38,12 +38,14 @@ will add padding in API v21+ as well to have the same measurements with previous
                 android:id="@+id/historyName"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginBottom="2dp"
                 android:text="history name" />
 
             <TextView
                 android:id="@+id/historyProgress"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
                 android:text="Exercised for hh:mm:ss on MMMM dd, yyyy" />
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/card_notification.xml b/app/src/main/res/layout/card_notification.xml
index 5edc382..0c064aa 100644
--- a/app/src/main/res/layout/card_notification.xml
+++ b/app/src/main/res/layout/card_notification.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~  Created by Team Symphony on 4/2/23, 3:50 AM
+  ~  Created by Team Symphony on 4/21/23, 10:43 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/2/23, 1:29 AM
+  ~  Last modified 4/21/23, 10:43 PM
   -->
 
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
@@ -24,13 +24,13 @@ will add padding in API v21+ as well to have the same measurements with previous
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="70dp"
+        android:layout_height="wrap_content"
         android:gravity="center"
         android:padding="10dp">
 
         <LinearLayout
             android:layout_width="0dp"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:layout_weight="1"
             android:orientation="vertical">
 
@@ -38,29 +38,31 @@ will add padding in API v21+ as well to have the same measurements with previous
                 android:id="@+id/notificationMessage"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginBottom="2dp"
                 android:text="Notification Message" />
 
             <TextView
                 android:id="@+id/notificationTimeAndDate"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
                 android:text="Scheduled for Date and Time" />
         </LinearLayout>
 
         <Button
             android:id="@+id/cancelNotificationButton"
+            style="?android:attr/buttonBarButtonStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/button_cancel"
-            style="?android:attr/buttonBarButtonStyle"
             android:visibility="gone" />
 
         <Button
             android:id="@+id/deleteNotifcationButton"
+            style="?android:attr/buttonBarButtonStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/button_delete"
-            style="?android:attr/buttonBarButtonStyle"
             android:visibility="visible" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/card_workout2.xml b/app/src/main/res/layout/card_workout2.xml
index d350700..ffe5cc0 100644
--- a/app/src/main/res/layout/card_workout2.xml
+++ b/app/src/main/res/layout/card_workout2.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~  Created by Team Symphony on 4/1/23, 4:23 AM
+  ~  Created by Team Symphony on 4/21/23, 10:43 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/1/23, 4:20 AM
+  ~  Last modified 4/21/23, 10:43 PM
   -->
 
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
@@ -44,7 +44,7 @@ will add padding in API v21+ as well to have the same measurements with previous
         <!-- Text View to display Exercise Name -->
         <LinearLayout
             android:layout_width="0dp"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:layout_weight="1"
             android:orientation="vertical">
 
diff --git a/app/src/main/res/layout/popup_edit_goal.xml b/app/src/main/res/layout/popup_edit_goal.xml
index 279ad8d..3a02d69 100644
--- a/app/src/main/res/layout/popup_edit_goal.xml
+++ b/app/src/main/res/layout/popup_edit_goal.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~  Created by Team Symphony on 4/19/23, 11:58 PM
+  ~  Created by Team Symphony on 4/21/23, 10:43 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/19/23, 11:57 PM
+  ~  Last modified 4/21/23, 10:39 PM
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/border_thin"
     android:padding="5dp">
 
     <LinearLayout

From 90f0172fccd33e0801bddb62003dc72e8feb627b Mon Sep 17 00:00:00 2001
From: esartawi <esartawi@email.sc.edu>
Date: Fri, 21 Apr 2023 23:10:49 -0400
Subject: [PATCH 06/18] Unit Testing #75

---
 .../symphony/mrfit/ui/CalendarActivityTest.kt | 18 ++++++
 .../mrfit/ui/CurrentWorkoutActivityTest.kt    | 56 +++++++++++++++++++
 .../mrfit/ui/CustomExercisesActivityTest.kt   | 27 +++++++++
 .../symphony/mrfit/ui/GoalsActivityTest.kt    | 24 ++++++++
 .../java/com/symphony/mrfit/ui/HelperTest.kt  | 31 ++++++++++
 5 files changed, 156 insertions(+)
 create mode 100644 app/src/androidTest/java/com/symphony/mrfit/ui/CalendarActivityTest.kt
 create mode 100644 app/src/androidTest/java/com/symphony/mrfit/ui/CurrentWorkoutActivityTest.kt
 create mode 100644 app/src/androidTest/java/com/symphony/mrfit/ui/CustomExercisesActivityTest.kt
 create mode 100644 app/src/androidTest/java/com/symphony/mrfit/ui/GoalsActivityTest.kt
 create mode 100644 app/src/androidTest/java/com/symphony/mrfit/ui/HelperTest.kt

diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/CalendarActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/CalendarActivityTest.kt
new file mode 100644
index 0000000..5b87b9d
--- /dev/null
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/CalendarActivityTest.kt
@@ -0,0 +1,18 @@
+package com.symphony.mrfit.ui
+
+import org.junit.Assert.*
+
+import org.junit.Test
+
+class CalendarActivityTest {
+    //behavioral
+    @Test
+    fun onCreate() {
+    }
+    @Test
+    fun onStart() {
+    }
+    @Test
+    fun onSupportNavigateUp() {
+    }
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/CurrentWorkoutActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/CurrentWorkoutActivityTest.kt
new file mode 100644
index 0000000..3eff07c
--- /dev/null
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/CurrentWorkoutActivityTest.kt
@@ -0,0 +1,56 @@
+package com.symphony.mrfit.ui
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import androidx.test.core.app.ActivityScenario
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.rules.activityScenarioRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.rule.ActivityTestRule
+import org.junit.After
+import org.junit.Assert.*
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.Assert.assertEquals
+
+
+
+
+@RunWith(AndroidJUnit4::class)
+class CurrentWorkoutActivityTest {
+    //behavioral
+    @Test
+    fun onCreate() {
+
+    }
+    //behavioral
+    @Test
+    fun onStart() {
+
+    }
+    @Test
+    fun gotoHome() {
+        // Start the activity
+        val context = ApplicationProvider.getApplicationContext<Context>()
+        val intent = Intent(context, HomeActivity::class.java)
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK)
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+
+        val expectedFlags = (Intent.FLAG_ACTIVITY_CLEAR_TOP or
+                Intent.FLAG_ACTIVITY_CLEAR_TASK or
+                Intent.FLAG_ACTIVITY_NEW_TASK)
+
+        assertEquals(expectedFlags, intent.flags)
+        assertEquals(context.packageName, intent.component?.packageName)
+        assertEquals(HomeActivity::class.java.name, intent.component?.className)
+    }
+    //behavioral
+    @Test
+    fun onSupportNavigateUp() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/CustomExercisesActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/CustomExercisesActivityTest.kt
new file mode 100644
index 0000000..b4086ae
--- /dev/null
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/CustomExercisesActivityTest.kt
@@ -0,0 +1,27 @@
+package com.symphony.mrfit.ui
+
+import androidx.test.core.app.ApplicationProvider
+import com.symphony.mrfit.data.exercise.ExerciseViewModel
+import com.symphony.mrfit.data.model.Exercise
+import org.junit.Assert.*
+import org.junit.Before
+
+import org.junit.Test
+
+class CustomExercisesActivityTest {
+    //behavioral
+    //TODO
+    @Test
+    fun onCreate() {
+    }
+    @Test
+    fun onStart() {
+    }
+    @Test
+    fun onSupportNavigateUp() {
+    }
+    @Test
+    fun deleteExercise(){
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/GoalsActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/GoalsActivityTest.kt
new file mode 100644
index 0000000..e7495b9
--- /dev/null
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/GoalsActivityTest.kt
@@ -0,0 +1,24 @@
+package com.symphony.mrfit.ui
+
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.ext.junit.rules.activityScenarioRule
+import org.junit.Rule
+import org.junit.Test
+import com.symphony.mrfit.R
+
+
+
+
+class GoalsActivityTest {
+    @get:Rule
+    var activityScenarioRule = activityScenarioRule<GoalsActivity>()
+
+    //TODO
+    @Test
+    fun checkActivityVisibility() {
+    }
+}
+
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/HelperTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/HelperTest.kt
new file mode 100644
index 0000000..02b8e8d
--- /dev/null
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/HelperTest.kt
@@ -0,0 +1,31 @@
+package com.symphony.mrfit.ui
+
+import android.app.Activity
+import android.view.View
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.*
+import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
+import com.google.android.material.snackbar.Snackbar
+import org.hamcrest.CoreMatchers.*
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+import java.util.*
+
+
+class HelperTest{
+    private lateinit var activity: Activity
+
+    //test functionality of calendar method
+    @Test
+    fun toCalendarconvertsDatetoCalendar() {
+        val date = Date()
+        val cal = Helper.toCalendar(date)
+        assertThat(cal.get(Calendar.YEAR), `is`(Calendar.getInstance().get(Calendar.YEAR)))
+        assertThat(cal.get(Calendar.MONTH), `is`(Calendar.getInstance().get(Calendar.MONTH)))
+        assertThat(cal.get(Calendar.DAY_OF_MONTH), `is`(Calendar.getInstance().get(Calendar.DAY_OF_MONTH))
+        )
+    }
+}
\ No newline at end of file

From e75f2e281b42cceb60e6a4d4ec04ac6202620921 Mon Sep 17 00:00:00 2001
From: NikM3 <nikolas.a.melendez@gmail.com>
Date: Fri, 21 Apr 2023 23:51:47 -0400
Subject: [PATCH 07/18] Fixes #145

---
 .../mrfit/ui/WorkoutRoutineActivity.kt        | 87 ++++++++++++-------
 1 file changed, 55 insertions(+), 32 deletions(-)

diff --git a/app/src/main/java/com/symphony/mrfit/ui/WorkoutRoutineActivity.kt b/app/src/main/java/com/symphony/mrfit/ui/WorkoutRoutineActivity.kt
index f879436..8733139 100644
--- a/app/src/main/java/com/symphony/mrfit/ui/WorkoutRoutineActivity.kt
+++ b/app/src/main/java/com/symphony/mrfit/ui/WorkoutRoutineActivity.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/21/23, 10:36 PM
+ *  Created by Team Symphony on 4/21/23, 11:51 PM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/21/23, 10:26 PM
+ *  Last modified 4/21/23, 11:51 PM
  */
 
 package com.symphony.mrfit.ui
@@ -43,9 +43,11 @@ class WorkoutRoutineActivity : AppCompatActivity() {
     private lateinit var profileViewModel: ProfileViewModel
     private lateinit var exerciseViewModel: ExerciseViewModel
     private lateinit var binding: ActivityWorkoutRoutineBinding
-    private lateinit var routineName: EditText
+    private lateinit var routineNameText: EditText
     private lateinit var routinePlaylist: EditText
     private lateinit var passedRoutineID: String
+    private var routineName: String? = ""
+    private var playlist: String? = ""
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -59,17 +61,9 @@ class WorkoutRoutineActivity : AppCompatActivity() {
             this, ExerciseViewModelFactory()
         )[ExerciseViewModel::class.java]
 
-    }
-
-    override fun onStart() {
-        super.onStart()
-
-
-        Log.d(ContentValues.TAG, "Activity has (Re)Started")
-
         // Bind variables to View elements
         val spinner = binding.loadingSpinner
-        routineName = binding.routineNameEditText
+        routineNameText = binding.routineNameEditText
         routinePlaylist = binding.workoutPlaylistEditText
         val workoutList = binding.workoutListView
         val startWorkout = binding.startWorkoutButton
@@ -91,19 +85,18 @@ class WorkoutRoutineActivity : AppCompatActivity() {
         passedRoutineID = intent.getStringExtra(EXTRA_IDENTITY)!!
         var passedList = ArrayList<String>()
 
-
         // Set the layout of the list of workouts presented to the user
         layoutManager = LinearLayoutManager(this)
         workoutList.layoutManager = layoutManager
-
-        // Populate the list with the workouts associated with this routine
         exerciseViewModel.getRoutine(passedRoutineID)
         exerciseViewModel.routine.observe(this, Observer {
             val routine = it ?: return@Observer
 
-            routineName.setText(routine.name)
+            routineName = routine.name
+            routineNameText.setText(routineName)
             if (routine.playlist != null) {
-                routinePlaylist.setText(routine.playlist)
+                playlist = routine.playlist
+                routinePlaylist.setText(playlist)
             } else {
                 routinePlaylist.setText(BLANK)
             }
@@ -136,13 +129,9 @@ class WorkoutRoutineActivity : AppCompatActivity() {
         // then return to their Home screen
         startWorkout.setOnClickListener {
             // Check if the routine name is empty
-            var newRoutineName = NEW_ROUTINE
-            if (routineName.text.isNotEmpty()) {
-                newRoutineName = routineName.text.toString()
-            }
-            save()
+            saveRoutine()
             val intent = Intent(this, CurrentWorkoutActivity::class.java)
-            intent.putExtra(EXTRA_STRING, newRoutineName)
+            intent.putExtra(EXTRA_STRING, routineName)
             intent.putExtra(EXTRA_ROUTINE, passedRoutineID)
             intent.putExtra(EXTRA_LIST, passedList)
             startActivity(intent)
@@ -150,7 +139,6 @@ class WorkoutRoutineActivity : AppCompatActivity() {
 
         // Navigate to a screen to make a new workout
         newExercise.setOnClickListener {
-            save()
             val intent = Intent(this, WorkoutTemplateActivity::class.java)
             intent.putExtra(EXTRA_ROUTINE, passedRoutineID)
             intent.putExtra(EXTRA_IDENTITY, NEW_ID)
@@ -161,7 +149,7 @@ class WorkoutRoutineActivity : AppCompatActivity() {
 
         // Save the current Routine and go back to the user's Home screen
         saveWorkout.setOnClickListener {
-            save()
+            saveRoutine()
             finish()
         }
 
@@ -178,24 +166,58 @@ class WorkoutRoutineActivity : AppCompatActivity() {
         }
     }
 
+    override fun onStart() {
+        super.onStart()
+
+        Log.d(ContentValues.TAG, "Activity has (Re)Started")
+
+        /**
+         * Retrieve the extras saved to this intent
+         * savedName = The Name of the template if it was navigated away from
+         * savedMusic = The playlist for the template if it was navigated away from
+         */
+        routineName = intent.getStringExtra(SAVED_NAME)
+        playlist = intent.getStringExtra(SAVED_PLAYLIST)
+
+        // Populate the list with the information associated with this routine
+        if (routineName != null) {
+            routineNameText.setText(routineName)
+            routinePlaylist.setText(playlist)
+        }
+
+    }
+
     override fun onPause() {
         super.onPause()
-        save()
+        tempSave()
+    }
+
+    private fun tempSave() {
+        val n: String? = if (routineNameText.text.isNotEmpty())
+            routineNameText.text.toString()
+        else
+            routineName
+        val p: String? = if (routinePlaylist.text.isNotEmpty())
+            routinePlaylist.text.toString()
+        else
+            playlist
+        intent.putExtra(SAVED_NAME, n)
+        intent.putExtra(SAVED_PLAYLIST, p)
     }
 
     /**
      * Save the current routine
      */
-    private fun save() {
-        var newRoutineName = NEW_ROUTINE
-        if (routineName.text.isNotEmpty()) {
-            newRoutineName = routineName.text.toString()
+    private fun saveRoutine() {
+        routineName = NEW_ROUTINE
+        if (routineNameText.text.isNotEmpty()) {
+            routineName = routineNameText.text.toString()
         }
         var newRoutinePlaylist = BLANK
         if (routinePlaylist.text!!.isNotEmpty()) {
             newRoutinePlaylist = routinePlaylist.text.toString()
         }
-        exerciseViewModel.updateRoutine(newRoutineName, newRoutinePlaylist, passedRoutineID)
+        exerciseViewModel.updateRoutine(routineName!!, newRoutinePlaylist, passedRoutineID)
     }
 
     /**
@@ -227,9 +249,10 @@ class WorkoutRoutineActivity : AppCompatActivity() {
     }
 
     companion object {
-        const val DEFAULT_DESC = "Workout Description"
         const val EXTRA_ROUTINE = "passed routine id"
         const val NEW_ID = "NEW"
+        const val SAVED_NAME = "saved template name"
+        const val SAVED_PLAYLIST = "saved playlist"
     }
 
 }
\ No newline at end of file

From ca33997d9c6c1eee4ac9ca513c96501961b21afa Mon Sep 17 00:00:00 2001
From: NikM3 <nikolas.a.melendez@gmail.com>
Date: Sat, 22 Apr 2023 03:13:10 -0400
Subject: [PATCH 08/18] Behavioral test for core functionality #75 needs to be
 logged out first

---
 app/build.gradle                              |   8 +
 .../mrfit/ui/CoreFunctionalityTest.kt         | 150 +++++++++
 .../com/symphony/mrfit/ui/ExerciseTest.kt     |  43 +--
 .../symphony/mrfit/ui/GoalsActivityTest.kt    |  14 +-
 .../java/com/symphony/mrfit/ui/HelperTest.kt  |  18 +-
 .../com/symphony/mrfit/ui/HomeActivityTest.kt |  63 ++--
 .../symphony/mrfit/ui/LoginActivityTest.kt    |  55 ++--
 .../symphony/mrfit/ui/RegisterActivityTest.kt |  33 +-
 .../mrfit/ui/TemplateSelectionActivityTest.kt |  31 +-
 .../mrfit/ui/UserProfileActivityTest.kt       | 147 ++++++---
 .../mrfit/ui/WorkoutRoutineActivityTest.kt    |  63 ++--
 .../mrfit/ui/WorkoutTemplateActivityTest.kt   |  49 +--
 .../mrfit/data/exercise/WorkoutAdapter.kt     |  11 +-
 .../mrfit/data/profile/UserRepository.kt      | 285 ++++++++++--------
 .../mrfit/ui/WorkoutRoutineActivity.kt        |  64 ++--
 .../mrfit/ui/WorkoutTemplateActivity.kt       |   6 +-
 .../res/layout/activity_current_workout.xml   |   5 +-
 .../res/layout/activity_custom_exercises.xml  |   5 +-
 app/src/main/res/layout/activity_goals.xml    |   5 +-
 .../res/layout/activity_notification_log.xml  |   5 +-
 .../main/res/layout/activity_post_workout.xml |   7 +-
 .../res/layout/activity_workout_history.xml   |   5 +-
 22 files changed, 668 insertions(+), 404 deletions(-)
 create mode 100644 app/src/androidTest/java/com/symphony/mrfit/ui/CoreFunctionalityTest.kt

diff --git a/app/build.gradle b/app/build.gradle
index 04ce123..ec3756f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -40,6 +40,7 @@ android {
     }
 }
 
+
 dependencies {
 
     implementation 'androidx.core:core-ktx:1.10.0'
@@ -61,6 +62,13 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation('androidx.test.espresso:espresso-contrib:3.5.1') {
+        exclude group: 'com.android.support', module: 'appcompat'
+        exclude group: 'com.android.support', module: 'support-v4'
+        exclude module: 'recyclerview-v7'
+        exclude module: "protobuf-lite"
+    }
+    androidTestImplementation "org.hamcrest:hamcrest:2.2"
     androidTestImplementation 'androidx.test:runner:1.5.2'
     androidTestImplementation 'androidx.test:rules:1.5.0'
     androidTestImplementation 'androidx.test:core:1.5.0'
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/CoreFunctionalityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/CoreFunctionalityTest.kt
new file mode 100644
index 0000000..817086a
--- /dev/null
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/CoreFunctionalityTest.kt
@@ -0,0 +1,150 @@
+/*
+ *  Created by Team Symphony on 4/22/23, 3:13 AM
+ *  Copyright (c) 2023 . All rights reserved.
+ *  Last modified 4/22/23, 2:45 AM
+ */
+
+package com.symphony.mrfit.ui
+
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.espresso.Espresso
+import androidx.test.espresso.action.ViewActions.*
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.contrib.RecyclerViewActions.actionOnItemAtPosition
+import androidx.test.espresso.matcher.ViewMatchers.*
+import androidx.test.ext.junit.rules.activityScenarioRule
+import androidx.test.filters.LargeTest
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
+import com.symphony.mrfit.R
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4ClassRunner::class)
+@LargeTest
+class CoreFunctionalityTest {
+
+    @get:Rule
+    var activityScenarioRule = activityScenarioRule<MainActivity>()
+
+    /**
+     * Test a run through of the app's core functionality. It should:
+     * Log in with the credentials 'demo@email.com' and 'pass123'
+     * Start a new workout
+     * Make a new workout called "Automated Testing"
+     * Add 3 exercises to it, whichever 3 are at the top of the list
+     * Start the workout, wait 5 seconds, then finish the workout
+     * Return to the home screen after
+     * Navigate to and delete this new workout
+     * Navigate to the user's profile and log out
+     */
+    @Test
+    fun coreFunctionality() {
+        // Wait to automatically move past welcome screen
+        Thread.sleep(100)
+        Espresso.onView(withId(R.id.layout_loginActivity))
+            .check(matches(isDisplayed()))
+
+        // Attempt to log in
+        Espresso.onView(withId(R.id.loginEmail))
+            .perform(typeText(TEST_EMAIL), closeSoftKeyboard())
+        Thread.sleep(500)
+        Espresso.onView(withId(R.id.loginPassword))
+            .perform(typeText(TEST_PASS), closeSoftKeyboard())
+        Thread.sleep(500)
+        Espresso.onView(withId(R.id.loginButton))
+            .perform(click())
+        Thread.sleep(1000)
+        Espresso.onView(withId(R.id.layout_homeActivity))
+            .check(matches(isDisplayed()))
+
+        // Navigate to the Template selection screen
+        Espresso.onView(withId(R.id.workoutButton))
+            .perform(click())
+        Thread.sleep(1000)
+        Espresso.onView(withId(R.id.layout_selectionActivity))
+            .check(matches(isDisplayed()))
+
+        // Make a new workout and name it
+        Espresso.onView(withId(R.id.newWorkoutButton))
+            .perform(click())
+        Thread.sleep(500)
+        Espresso.onView(withId(R.id.routineNameEditText))
+            .perform(clearText())
+            .perform(typeText(TEST_TEMPLATE), closeSoftKeyboard())
+
+        // Add 3 exercises
+        // 1st Exercise
+        Thread.sleep(1000)
+        Espresso.onView(withId(R.id.newExerciseButton))
+            .perform(click())
+        Thread.sleep(500)
+        Espresso.onView(withId(R.id.exerciseListView))
+            .perform(actionOnItemAtPosition<RecyclerView.ViewHolder>(0, click()))
+        Thread.sleep(500)
+        Espresso.onView(withId(R.id.saveTemplateButton))
+            .perform(click())
+        Thread.sleep(1000)
+        // 2nd Exercise
+        Espresso.onView(withId(R.id.newExerciseButton))
+            .perform(click())
+        Thread.sleep(500)
+        Espresso.onView(withId(R.id.exerciseListView))
+            .perform(actionOnItemAtPosition<RecyclerView.ViewHolder>(1, click()))
+        Thread.sleep(500)
+        Espresso.onView(withId(R.id.saveTemplateButton))
+            .perform(click())
+        Thread.sleep(1000)
+        // 3rd Exercise
+        Espresso.onView(withId(R.id.newExerciseButton))
+            .perform(click())
+        Thread.sleep(500)
+        Espresso.onView(withId(R.id.exerciseListView))
+            .perform(actionOnItemAtPosition<RecyclerView.ViewHolder>(2, click()))
+        Thread.sleep(500)
+        Espresso.onView(withId(R.id.saveTemplateButton))
+            .perform(click())
+        Thread.sleep(1000)
+
+        // Start the workout and finish it after 10 seconds
+        Espresso.onView(withId(R.id.startWorkoutButton))
+            .perform(click())
+        Espresso.onView(withId(R.id.layout_currentActivity))
+            .check(matches(isDisplayed()))
+        Thread.sleep(10000)
+        Espresso.onView(withId(R.id.finishWorkoutButton))
+            .perform(click())
+        Espresso.onView(withText("Good job!")).check(matches(isDisplayed()))
+        Espresso.onView(withText("Return Home")).perform(click())
+
+        // Navigate back and delete workout
+        Thread.sleep(1000)
+        Espresso.onView(withId(R.id.workoutButton))
+            .perform(click())
+        Thread.sleep(1000)
+        Espresso.onView(withId(R.id.layout_selectionActivity))
+            .check(matches(isDisplayed()))
+        Espresso.onView(withText(TEST_TEMPLATE))
+            .perform(click())
+        Thread.sleep(1000)
+        Espresso.onView(withId(R.id.deleteWorkoutButton))
+            .perform(click())
+        Espresso.pressBack()
+        Thread.sleep(1000)
+
+        // Navigate to user profile and log out
+        Espresso.onView(withId(R.id.userLayout))
+            .perform(click())
+        Thread.sleep(1000)
+        Espresso.onView(withId(R.id.layout_profileActivity))
+            .check(matches(isDisplayed()))
+        Espresso.onView(withId(R.id.logoutButton))
+            .perform(click())
+    }
+
+    companion object {
+        const val TEST_EMAIL = "demo@email.com"
+        const val TEST_PASS = "pass123"
+        const val TEST_TEMPLATE = "Automated Testing"
+    }
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/ExerciseTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/ExerciseTest.kt
index eeeef0e..44d02c6 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/ExerciseTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/ExerciseTest.kt
@@ -1,19 +1,20 @@
 /*
- *  Created by Team Symphony on 4/21/23, 10:18 PM
+ *  Created by Team Symphony on 4/22/23, 3:13 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/21/23, 10:18 PM
+ *  Last modified 4/22/23, 2:45 AM
  */
 
 package com.symphony.mrfit.ui
 
 import androidx.test.espresso.Espresso
-import androidx.test.espresso.assertion.ViewAssertions
-import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.rules.activityScenarioRule
 import androidx.test.filters.LargeTest
 import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
 import com.symphony.mrfit.R
-import org.hamcrest.Matchers
+import org.hamcrest.CoreMatchers.not
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -35,8 +36,8 @@ class ExerciseTest {
      */
     @Test
     fun checkActivityVisibility() {
-        Espresso.onView(ViewMatchers.withId(R.id.layout_exerciseSelectionActivity))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.layout_exerciseSelectionActivity))
+            .check(matches(isDisplayed()))
     }
 
     /**
@@ -45,25 +46,25 @@ class ExerciseTest {
     @Test
     fun checkViewVisibility() {
         Thread.sleep(500)
-        Espresso.onView(ViewMatchers.withId(R.id.exerciseScreenView))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.exerciseScreenView))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.exerciseListView))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.exerciseListView))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.exerciseSearchTextView))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.exerciseSearchTextView))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.exerciseSearchEditText))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.exerciseSearchEditText))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.exerciseSearchButton))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.exerciseSearchButton))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.button2))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.button2))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.loadingSpinner))
-            .check(ViewAssertions.matches(Matchers.not(ViewMatchers.isDisplayed())))
+        Espresso.onView(withId(R.id.loadingSpinner))
+            .check(matches(not(isDisplayed())))
     }
 }
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/GoalsActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/GoalsActivityTest.kt
index e7495b9..f37c93b 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/GoalsActivityTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/GoalsActivityTest.kt
@@ -1,16 +1,14 @@
+/*
+ *  Created by Team Symphony on 4/22/23, 3:13 AM
+ *  Copyright (c) 2023 . All rights reserved.
+ *  Last modified 4/22/23, 2:45 AM
+ */
+
 package com.symphony.mrfit.ui
 
-import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
-import androidx.test.espresso.matcher.ViewMatchers.withId
-import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.ext.junit.rules.activityScenarioRule
 import org.junit.Rule
 import org.junit.Test
-import com.symphony.mrfit.R
-
-
-
 
 class GoalsActivityTest {
     @get:Rule
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/HelperTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/HelperTest.kt
index 02b8e8d..2714ae0 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/HelperTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/HelperTest.kt
@@ -1,16 +1,14 @@
+/*
+ *  Created by Team Symphony on 4/22/23, 3:13 AM
+ *  Copyright (c) 2023 . All rights reserved.
+ *  Last modified 4/22/23, 2:45 AM
+ */
+
 package com.symphony.mrfit.ui
 
 import android.app.Activity
-import android.view.View
-import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.action.ViewActions
-import androidx.test.espresso.assertion.ViewAssertions.matches
-import androidx.test.espresso.matcher.ViewMatchers.*
-import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
-import com.google.android.material.snackbar.Snackbar
-import org.hamcrest.CoreMatchers.*
-import org.junit.Assert.assertEquals
-import org.junit.Before
+import androidx.test.espresso.matcher.ViewMatchers.assertThat
+import org.hamcrest.CoreMatchers.`is`
 import org.junit.Test
 import java.util.*
 
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/HomeActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/HomeActivityTest.kt
index f6576e3..5906279 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/HomeActivityTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/HomeActivityTest.kt
@@ -1,19 +1,20 @@
 /*
- *  Created by Team Symphony on 4/21/23, 10:18 PM
+ *  Created by Team Symphony on 4/22/23, 3:13 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/21/23, 10:18 PM
+ *  Last modified 4/22/23, 2:45 AM
  */
 
 package com.symphony.mrfit.ui
 
 import androidx.test.espresso.Espresso
-import androidx.test.espresso.assertion.ViewAssertions
-import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.rules.activityScenarioRule
 import androidx.test.filters.LargeTest
 import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
 import com.symphony.mrfit.R
-import org.hamcrest.Matchers.not
+import org.hamcrest.core.IsNot.not
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -35,8 +36,8 @@ class HomeActivityTest {
      */
     @Test
     fun checkActivityVisibility() {
-        Espresso.onView(ViewMatchers.withId(R.id.layout_homeActivity))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.layout_homeActivity))
+            .check(matches(isDisplayed()))
     }
 
     /**
@@ -45,39 +46,39 @@ class HomeActivityTest {
     @Test
     fun checkViewVisibility() {
         Thread.sleep(1000)
-        Espresso.onView(ViewMatchers.withId(R.id.homeScreenView))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.homeScreenView))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.userLayout))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.userLayout))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.homeProfilePicture))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.homeProfilePicture))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.homeWelcomeTextView))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.homeWelcomeTextView))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.homeNameTextView))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
-        Espresso.onView(ViewMatchers.withId(R.id.homeScreenView))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.homeNameTextView))
+            .check(matches(isDisplayed()))
+        Espresso.onView(withId(R.id.homeScreenView))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.settingsCog))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.settingsCog))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.scheduleButton))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.scheduleButton))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.pastWorkout))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.pastWorkout))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.workoutButton))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.workoutButton))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.historyList))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.historyList))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.loadingSpinner))
-            .check(ViewAssertions.matches(not(ViewMatchers.isDisplayed())))
+        Espresso.onView(withId(R.id.loadingSpinner))
+            .check(matches(not(isDisplayed())))
     }
 }
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/LoginActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/LoginActivityTest.kt
index 41094ea..8ef06a1 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/LoginActivityTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/LoginActivityTest.kt
@@ -1,14 +1,13 @@
 /*
- *  Created by Team Symphony on 2/24/23, 11:21 PM
+ *  Created by Team Symphony on 4/22/23, 3:13 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 2/24/23, 11:20 PM
+ *  Last modified 4/22/23, 3:01 AM
  */
 
 package com.symphony.mrfit.ui
 
-import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.action.ViewActions
-import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.Espresso
+import androidx.test.espresso.action.ViewActions.*
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withId
@@ -33,7 +32,8 @@ class LoginActivityTest {
      */
     @Test
     fun checkActivityVisibility() {
-        onView(withId(R.id.layout_loginActivity)).check(matches(isDisplayed()))
+        Espresso.onView(withId(R.id.layout_loginActivity))
+            .check(matches(isDisplayed()))
     }
 
     /**
@@ -41,19 +41,19 @@ class LoginActivityTest {
      */
     @Test
     fun checkViewVisibility() {
-        onView(withId(R.id.loginEmail))
+        Espresso.onView(withId(R.id.loginEmail))
             .check(matches(isDisplayed()))
 
-        onView(withId(R.id.loginPassword))
+        Espresso.onView(withId(R.id.loginPassword))
             .check(matches(isDisplayed()))
 
-        onView(withId(R.id.loginButton))
+        Espresso.onView(withId(R.id.loginButton))
             .check(matches(isDisplayed()))
 
-        onView(withId(R.id.googleButton))
+        Espresso.onView(withId(R.id.googleButton))
             .check(matches(isDisplayed()))
 
-        onView(withId(R.id.toRegisterTextView))
+        Espresso.onView(withId(R.id.toRegisterTextView))
             .check(matches(isDisplayed()))
     }
 
@@ -62,37 +62,36 @@ class LoginActivityTest {
      */
     @Test
     fun checkFailedLogin() {
-        onView(withId(R.id.loginEmail))
-            .perform(ViewActions.typeText(TEST_EMAIL), ViewActions.closeSoftKeyboard())
-        onView(withId(R.id.loginPassword))
-            .perform(ViewActions.typeText(TEST_PASS), ViewActions.closeSoftKeyboard())
-        onView(withId(R.id.loginButton))
+        Espresso.onView(withId(R.id.loginEmail))
+            .perform(typeText(TEST_EMAIL), closeSoftKeyboard())
+        Espresso.onView(withId(R.id.loginPassword))
+            .perform(typeText(TEST_PASS), closeSoftKeyboard())
+        Espresso.onView(withId(R.id.loginButton))
             .perform(click())
 
-        onView(withId(R.id.layout_loginActivity)).check(matches(isDisplayed()))
+        Espresso.onView(withId(R.id.layout_loginActivity))
+            .check(matches(isDisplayed()))
     }
 
     /**
      * Test if login works
      */
-    /*
     @Test
     fun checkValidLogin() {
-        onView(withId(R.id.loginEmail))
-            .perform(ViewActions.typeText(REAL_EMAIL), ViewActions.closeSoftKeyboard())
-        onView(withId(R.id.loginPassword))
-            .perform(ViewActions.typeText(REAL_PASS), ViewActions.closeSoftKeyboard())
-        onView(withId(R.id.loginButton))
+        Espresso.onView(withId(R.id.loginEmail))
+            .perform(typeText(REAL_EMAIL), closeSoftKeyboard())
+        Espresso.onView(withId(R.id.loginPassword))
+            .perform(typeText(REAL_PASS), closeSoftKeyboard())
+        Espresso.onView(withId(R.id.loginButton))
             .perform(click())
-        onView(withId(R.id.layout_loginActivity)).check(matches(isDisplayed()))
+        Espresso.onView(withId(R.id.layout_loginActivity))
+            .check(matches(isDisplayed()))
     }
 
-     */
-
     companion object {
 
-        const val REAL_EMAIL = "test@symphony.com"
-        const val REAL_PASS = "abcd1234"
+        const val REAL_EMAIL = "demo@symphony.com"
+        const val REAL_PASS = "pass123"
         const val TEST_EMAIL = "fake_email@symphony.com"
         const val TEST_PASS = "1234abcd"
     }
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/RegisterActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/RegisterActivityTest.kt
index b7ffa8d..dcab491 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/RegisterActivityTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/RegisterActivityTest.kt
@@ -1,14 +1,15 @@
 /*
- *  Created by Team Symphony on 4/21/23, 5:08 PM
+ *  Created by Team Symphony on 4/22/23, 3:13 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/21/23, 4:12 PM
+ *  Last modified 4/22/23, 2:45 AM
  */
 
 package com.symphony.mrfit.ui
 
 import androidx.test.espresso.Espresso
-import androidx.test.espresso.assertion.ViewAssertions
-import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.rules.activityScenarioRule
 import androidx.test.filters.LargeTest
 import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
@@ -29,8 +30,8 @@ class RegisterActivityTest {
      */
     @Test
     fun checkActivityVisibility() {
-        Espresso.onView(ViewMatchers.withId(R.id.layout_registerActivity))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.layout_registerActivity))
+            .check(matches(isDisplayed()))
     }
 
     /**
@@ -38,19 +39,19 @@ class RegisterActivityTest {
      */
     @Test
     fun checkViewVisibility() {
-        Espresso.onView(ViewMatchers.withId(R.id.registerEmail))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.registerEmail))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.registerPassword))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.registerPassword))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.confirmPassword))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.confirmPassword))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.registerButton))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.registerButton))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.toLoginTextView))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.toLoginTextView))
+            .check(matches(isDisplayed()))
     }
 }
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/TemplateSelectionActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/TemplateSelectionActivityTest.kt
index b63420f..f4d5033 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/TemplateSelectionActivityTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/TemplateSelectionActivityTest.kt
@@ -1,19 +1,20 @@
 /*
- *  Created by Team Symphony on 4/21/23, 10:18 PM
+ *  Created by Team Symphony on 4/22/23, 3:13 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/21/23, 9:24 PM
+ *  Last modified 4/22/23, 2:45 AM
  */
 
 package com.symphony.mrfit.ui
 
 import androidx.test.espresso.Espresso
-import androidx.test.espresso.assertion.ViewAssertions
-import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.rules.activityScenarioRule
 import androidx.test.filters.LargeTest
 import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
 import com.symphony.mrfit.R
-import org.hamcrest.Matchers
+import org.hamcrest.CoreMatchers.not
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -35,8 +36,8 @@ class TemplateSelectionActivityTest {
      */
     @Test
     fun checkActivityVisibility() {
-        Espresso.onView(ViewMatchers.withId(R.id.layout_selectionActivity))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.layout_selectionActivity))
+            .check(matches(isDisplayed()))
     }
 
     /**
@@ -45,16 +46,16 @@ class TemplateSelectionActivityTest {
     @Test
     fun checkViewVisibility() {
         Thread.sleep(500)
-        Espresso.onView(ViewMatchers.withId(R.id.selectionScreenView))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.selectionScreenView))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.routineListView))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.routineListView))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.newWorkoutButton))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.newWorkoutButton))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.loadingSpinner))
-            .check(ViewAssertions.matches(Matchers.not(ViewMatchers.isDisplayed())))
+        Espresso.onView(withId(R.id.loadingSpinner))
+            .check(matches(not(isDisplayed())))
     }
 }
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/UserProfileActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/UserProfileActivityTest.kt
index 851d757..0288faf 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/UserProfileActivityTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/UserProfileActivityTest.kt
@@ -1,19 +1,21 @@
 /*
- *  Created by Team Symphony on 4/21/23, 10:18 PM
+ *  Created by Team Symphony on 4/22/23, 3:13 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/21/23, 8:55 PM
+ *  Last modified 4/22/23, 3:08 AM
  */
 
 package com.symphony.mrfit.ui
 
 import androidx.test.espresso.Espresso
-import androidx.test.espresso.assertion.ViewAssertions
-import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.rules.activityScenarioRule
 import androidx.test.filters.LargeTest
 import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
 import com.symphony.mrfit.R
-import org.hamcrest.Matchers
+import org.hamcrest.CoreMatchers.not
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -35,8 +37,8 @@ class UserProfileActivityTest {
      */
     @Test
     fun checkActivityVisibility() {
-        Espresso.onView(ViewMatchers.withId(R.id.layout_profileActivity))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.layout_profileActivity))
+            .check(matches(isDisplayed()))
     }
 
     /**
@@ -45,55 +47,118 @@ class UserProfileActivityTest {
     @Test
     fun checkViewVisibility() {
         Thread.sleep(500)
-        Espresso.onView(ViewMatchers.withId(R.id.profileScreenView))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.profileScreenView))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.profilePicture))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.profilePicture))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.profileNameTextView))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.profileNameTextView))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.editProfileButton))
-            .check(ViewAssertions.matches(Matchers.not(ViewMatchers.isDisplayed())))
+        Espresso.onView(withId(R.id.editProfileButton))
+            .check(matches(not(isDisplayed())))
 
-        Espresso.onView(ViewMatchers.withId(R.id.heightLayout))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.heightLayout))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.weightLayout))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.weightLayout))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.ageLayout))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.ageLayout))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.stuffLayout))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.stuffLayout))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.goalsButton))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.goalsButton))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.notificationsButton))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.notificationsButton))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.historyButton))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.historyButton))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.customExercisesButton))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.customExercisesButton))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.settingLayout))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.settingLayout))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.notificationToggle))
-            .check(ViewAssertions.matches(Matchers.not(ViewMatchers.isDisplayed())))
+        Espresso.onView(withId(R.id.notificationToggle))
+            .check(matches(not(isDisplayed())))
 
-        Espresso.onView(ViewMatchers.withId(R.id.logoutButton))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.logoutButton))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.deleteButton))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.deleteButton))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.loadingSpinner))
-            .check(ViewAssertions.matches(Matchers.not(ViewMatchers.isDisplayed())))
+        Espresso.onView(withId(R.id.loadingSpinner))
+            .check(matches(not(isDisplayed())))
+    }
+
+    /**
+     * Test if the Notifications button navigates properly
+     */
+    @Test
+    fun notificationsButtonTest() {
+        Espresso.onView(withId(R.id.notificationsButton))
+            .perform(click())
+        Espresso.onView(withId(R.id.layout_notificationLogActivity))
+            .check(matches(isDisplayed()))
+        Espresso.pressBack()
+        Thread.sleep(500)
+    }
+
+    /**
+     * Test if the Goals button navigates properly
+     */
+    @Test
+    fun goalsButtonTest() {
+        Espresso.onView(withId(R.id.goalsButton))
+            .perform(click())
+        Espresso.onView(withId(R.id.layout_goalsActivity))
+            .check(matches(isDisplayed()))
+        Espresso.pressBack()
+        Thread.sleep(500)
+    }
+
+    /**
+     * Test if the History button navigates properly
+     */
+    @Test
+    fun historyButtonTest() {
+        Espresso.onView(withId(R.id.historyButton))
+            .perform(click())
+        Espresso.onView(withId(R.id.layout_workoutHistoryActivity))
+            .check(matches(isDisplayed()))
+        Espresso.pressBack()
+        Thread.sleep(500)
+    }
+
+    /**
+     * Test if the Exercises button navigates properly
+     */
+    @Test
+    fun exerciseButtonTest() {
+        Espresso.onView(withId(R.id.customExercisesButton))
+            .perform(click())
+        Espresso.onView(withId(R.id.layout_customExerciseActivity))
+            .check(matches(isDisplayed()))
+        Espresso.pressBack()
+        Thread.sleep(500)
+    }
+
+    /**
+     * Test if the Logout button navigates properly
+     */
+    @Test
+    fun logoutButtonTest() {
+        Espresso.onView(withId(R.id.logoutButton))
+            .perform(click())
+        Espresso.onView(withId(R.id.layout_loginActivity))
+            .check(matches(isDisplayed()))
     }
 }
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/WorkoutRoutineActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/WorkoutRoutineActivityTest.kt
index 317caf6..cfcfab5 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/WorkoutRoutineActivityTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/WorkoutRoutineActivityTest.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/21/23, 10:18 PM
+ *  Created by Team Symphony on 4/22/23, 3:13 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/21/23, 10:18 PM
+ *  Last modified 4/22/23, 2:45 AM
  */
 
 package com.symphony.mrfit.ui
@@ -9,13 +9,14 @@ package com.symphony.mrfit.ui
 import android.content.Intent
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso
-import androidx.test.espresso.assertion.ViewAssertions
-import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.rules.activityScenarioRule
 import androidx.test.filters.LargeTest
 import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
 import com.symphony.mrfit.R
-import org.hamcrest.Matchers
+import org.hamcrest.CoreMatchers.not
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -43,8 +44,8 @@ class WorkoutRoutineActivityTest {
      */
     @Test
     fun checkActivityVisibility() {
-        Espresso.onView(ViewMatchers.withId(R.id.layout_workoutBuilderActivity))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.layout_workoutBuilderActivity))
+            .check(matches(isDisplayed()))
     }
 
     /**
@@ -53,40 +54,40 @@ class WorkoutRoutineActivityTest {
     @Test
     fun checkViewVisibility() {
         Thread.sleep(1000)
-        Espresso.onView(ViewMatchers.withId(R.id.routineScreenView))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.routineScreenView))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.headerLayout))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.headerLayout))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.routineNameEditText))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.routineNameEditText))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.workoutPlaylistEditText))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.workoutPlaylistEditText))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.openPlaylistButton))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.openPlaylistButton))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.workoutListView))
-            .check(ViewAssertions.matches(Matchers.not(ViewMatchers.isDisplayed())))
+        Espresso.onView(withId(R.id.workoutListView))
+            .check(matches(not(isDisplayed())))
 
-        Espresso.onView(ViewMatchers.withId(R.id.routineScreenButtons))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.routineScreenButtons))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.startWorkoutButton))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.startWorkoutButton))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.newExerciseButton))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.newExerciseButton))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.saveWorkoutButton))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.saveWorkoutButton))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.deleteWorkoutButton))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.deleteWorkoutButton))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.loadingSpinner))
-            .check(ViewAssertions.matches(Matchers.not(ViewMatchers.isDisplayed())))
+        Espresso.onView(withId(R.id.loadingSpinner))
+            .check(matches(not(isDisplayed())))
     }
 }
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/WorkoutTemplateActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/WorkoutTemplateActivityTest.kt
index e96a27b..ec6aff0 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/WorkoutTemplateActivityTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/WorkoutTemplateActivityTest.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/21/23, 10:18 PM
+ *  Created by Team Symphony on 4/22/23, 3:13 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/21/23, 10:18 PM
+ *  Last modified 4/22/23, 2:45 AM
  */
 
 package com.symphony.mrfit.ui
@@ -9,8 +9,9 @@ package com.symphony.mrfit.ui
 import android.content.Intent
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso
-import androidx.test.espresso.assertion.ViewAssertions
-import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.rules.activityScenarioRule
 import androidx.test.filters.LargeTest
 import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
@@ -45,8 +46,8 @@ class WorkoutTemplateActivityTest {
      */
     @Test
     fun checkActivityVisibility() {
-        Espresso.onView(ViewMatchers.withId(R.id.layout_exerciseBuilderActivity))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.layout_exerciseBuilderActivity))
+            .check(matches(isDisplayed()))
     }
 
     /**
@@ -55,31 +56,31 @@ class WorkoutTemplateActivityTest {
     @Test
     fun checkViewVisibility() {
         Thread.sleep(500)
-        Espresso.onView(ViewMatchers.withId(R.id.templateScreenView))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.templateScreenView))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.exerciseCardView))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.exerciseCardView))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.editDuration))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.editDuration))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.editDistance))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.editDistance))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.repsAndSetsLayout))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.repsAndSetsLayout))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.editReps))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.editReps))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.editSets))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.editSets))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.deleteTemplateButton))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.deleteTemplateButton))
+            .check(matches(isDisplayed()))
 
-        Espresso.onView(ViewMatchers.withId(R.id.saveTemplateButton))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.saveTemplateButton))
+            .check(matches(isDisplayed()))
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/symphony/mrfit/data/exercise/WorkoutAdapter.kt b/app/src/main/java/com/symphony/mrfit/data/exercise/WorkoutAdapter.kt
index e485500..e196904 100644
--- a/app/src/main/java/com/symphony/mrfit/data/exercise/WorkoutAdapter.kt
+++ b/app/src/main/java/com/symphony/mrfit/data/exercise/WorkoutAdapter.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/2/23, 10:27 PM
+ *  Created by Team Symphony on 4/22/23, 3:13 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/2/23, 10:22 PM
+ *  Last modified 4/22/23, 2:45 AM
  */
 
 package com.symphony.mrfit.data.exercise
@@ -31,7 +31,12 @@ import com.symphony.mrfit.ui.WorkoutTemplateActivity.Companion.EXTRA_LIST
  * a passed list of Workouts, as well as the parent Routine's ID and workoutList
  */
 
-class WorkoutAdapter (val context: Context, val data: ArrayList<Workout>, private val rID: String, private val rList: ArrayList<String>): RecyclerView.Adapter<WorkoutAdapter.ViewHolder>() {
+class WorkoutAdapter(
+    val context: Context,
+    val data: ArrayList<Workout>,
+    private val rID: String,
+    private val rList: ArrayList<String>
+) : RecyclerView.Adapter<WorkoutAdapter.ViewHolder>() {
 
     private var storage: FirebaseStorage = Firebase.storage
 
diff --git a/app/src/main/java/com/symphony/mrfit/data/profile/UserRepository.kt b/app/src/main/java/com/symphony/mrfit/data/profile/UserRepository.kt
index 5bdac84..8f7e4bb 100644
--- a/app/src/main/java/com/symphony/mrfit/data/profile/UserRepository.kt
+++ b/app/src/main/java/com/symphony/mrfit/data/profile/UserRepository.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/19/23, 7:07 PM
+ *  Created by Team Symphony on 4/22/23, 3:13 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/19/23, 7:07 PM
+ *  Last modified 4/22/23, 3:05 AM
  */
 
 package com.symphony.mrfit.data.profile
@@ -50,21 +50,26 @@ class UserRepository {
      * Pull the currently logged in user's profile from Firestore
      */
     suspend fun getCurrentUser() : User? {
-        Log.d(TAG, "Retrieving User ${auth.currentUser!!.uid} from Firestore")
-        val doc = auth.currentUser!!.uid
-        val docRef = database.collection(USER_COLLECTION).document(doc)
-        return try {
-            val snapshot = docRef.get().await()
-            // Something wrong happened when deleting this user, fix it
-            if (snapshot.get("userID") == null) {
-                LoginRepository().delete()
-                LoginRepository().logout()
-                User("delete")
+        val user = auth.currentUser
+        if (user != null) {
+            Log.d(TAG, "Retrieving User ${user.uid} from Firestore")
+            val doc = user.uid
+            val docRef = database.collection(USER_COLLECTION).document(doc)
+            return try {
+                val snapshot = docRef.get().await()
+                // Something wrong happened when deleting this user, fix it
+                if (snapshot.get("userID") == null) {
+                    LoginRepository().delete()
+                    LoginRepository().logout()
+                    User("delete")
+                }
+                snapshot.toObject<User>()
+            } catch (e: java.lang.Exception) {
+                Log.w(TAG, "Error getting document", e)
+                null
             }
-            snapshot.toObject<User>()
-        } catch (e: java.lang.Exception) {
-            Log.w(TAG, "Error getting document", e)
-            null
+        } else {
+            return user
         }
     }
 
@@ -97,15 +102,17 @@ class UserRepository {
      * Only called when a user is being deleted, remove their document from Firestore
      */
     suspend fun removeUser() {
-        val user = auth.currentUser!!
-        Log.d(TAG, "Removing User ${user.uid} from Firestore")
-        try {
-            database.collection(USER_COLLECTION).document(user.uid)
-                .delete()
-                .await()
-            Log.d(TAG, "DocumentSnapshot successfully deleted!")
-        } catch (e: java.lang.Exception) {
-            Log.w(TAG, "Error deleting document", e)
+        val user = auth.currentUser
+        if (user != null) {
+            Log.d(TAG, "Removing User ${user.uid} from Firestore")
+            try {
+                database.collection(USER_COLLECTION).document(user.uid)
+                    .delete()
+                    .await()
+                Log.d(TAG, "DocumentSnapshot successfully deleted!")
+            } catch (e: java.lang.Exception) {
+                Log.w(TAG, "Error deleting document", e)
+            }
         }
     }
 
@@ -113,14 +120,16 @@ class UserRepository {
      * Add a new Workout History to the user's subcollection
      */
     suspend fun addWorkoutHistory(history: History) {
-        val user = auth.currentUser!!
-        Log.d(TAG, "Adding to the history of ${user.uid}")
-        try {
-            val docRef = database.collection(USER_COLLECTION).document(user.uid)
-                .collection(HISTORY_COLLECTION).add(history).await()
-            docRef.update("historyID", docRef.id).await()
-        } catch (e: java.lang.Exception) {
-            Log.d(TAG, "Error writing documents: ", e)
+        val user = auth.currentUser
+        if (user != null) {
+            Log.d(TAG, "Adding to the history of ${user.uid}")
+            try {
+                val docRef = database.collection(USER_COLLECTION).document(user.uid)
+                    .collection(HISTORY_COLLECTION).add(history).await()
+                docRef.update("historyID", docRef.id).await()
+            } catch (e: java.lang.Exception) {
+                Log.d(TAG, "Error writing documents: ", e)
+            }
         }
     }
 
@@ -128,37 +137,43 @@ class UserRepository {
      * Delete a given history via its ID
      */
     suspend fun deleteWorkoutHistory(historyID: String) {
-        val user = auth.currentUser!!
-        Log.d(TAG, "Deleting history $historyID belonging to ${user.uid}")
-        database.collection(USER_COLLECTION)
-            .document(user.uid)
-            .collection(HISTORY_COLLECTION)
-            .document(historyID)
-            .delete()
-            .await()
+        val user = auth.currentUser
+        if (user != null) {
+            Log.d(TAG, "Deleting history $historyID belonging to ${user.uid}")
+            database.collection(USER_COLLECTION)
+                .document(user.uid)
+                .collection(HISTORY_COLLECTION)
+                .document(historyID)
+                .delete()
+                .await()
+        }
     }
 
     /**
      * Get a user's complete Workout History
      */
     suspend fun getWorkoutHistory(): ArrayList<History> {
-        val user = auth.currentUser!!
+        val user = auth.currentUser
         val historyList = arrayListOf<History>()
-        Log.d(TAG, "Getting the history of ${user.uid}")
-        try {
-            val result = database.collection(USER_COLLECTION)
-                .document(user.uid)
-                .collection(HISTORY_COLLECTION)
-                .get()
-                .await()
+        if (user != null) {
+            Log.d(TAG, "Getting the history of ${user.uid}")
+            try {
+                val result = database.collection(USER_COLLECTION)
+                    .document(user.uid)
+                    .collection(HISTORY_COLLECTION)
+                    .get()
+                    .await()
 
-            for (document in result) {
-                historyList.add(document.toObject())
+                for (document in result) {
+                    historyList.add(document.toObject())
+                }
+            } catch (e: java.lang.Exception) {
+                Log.d(TAG, "Error getting documents: ", e)
             }
-        } catch (e: java.lang.Exception) {
-            Log.d(TAG, "Error getting documents: ", e)
+            return historyList
+        } else {
+            return historyList
         }
-        return historyList
     }
 
     /**
@@ -191,69 +206,78 @@ class UserRepository {
      * Add a new Notification to the user's notification subcollection
      */
     suspend fun addNotification(notification: Notification) {
-        val user = auth.currentUser!!
-        Log.d(TAG, "Adding to the history of ${user.uid}")
-        database.collection(USER_COLLECTION)
-            .document(user.uid)
-            .collection(NOTIFICATION_COLLECTION)
-            .document(notification.date!!.toDate().time.toString())
-            .set(notification)
-            .await()
+        val user = auth.currentUser
+        if (user != null) {
+            Log.d(TAG, "Adding to the history of ${user.uid}")
+            database.collection(USER_COLLECTION)
+                .document(user.uid)
+                .collection(NOTIFICATION_COLLECTION)
+                .document(notification.date!!.toDate().time.toString())
+                .set(notification)
+                .await()
+        }
     }
 
     /**
      * Get a user's scheduled and past notifications
      */
     suspend fun getNotifications(): ArrayList<Notification> {
-        val user = auth.currentUser!!
+        val user = auth.currentUser
         val notificationList = arrayListOf<Notification>()
-        Log.d(TAG, "Getting the notifications of ${user.uid}")
-        try {
-            val result = database.collection(USER_COLLECTION)
-                .document(user.uid)
-                .collection(NOTIFICATION_COLLECTION)
-                .get()
-                .await()
+        if (user == null) {
+            return notificationList
+        } else {
+            Log.d(TAG, "Getting the notifications of ${user.uid}")
+            try {
+                val result = database.collection(USER_COLLECTION)
+                    .document(user.uid)
+                    .collection(NOTIFICATION_COLLECTION)
+                    .get()
+                    .await()
 
-            for (document in result) {
-                notificationList.add(document.toObject())
+                for (document in result) {
+                    notificationList.add(document.toObject())
+                }
+            } catch (e: java.lang.Exception) {
+                Log.d(TAG, "Error getting documents: ", e)
             }
-        } catch (e: java.lang.Exception) {
-            Log.d(TAG, "Error getting documents: ", e)
+            return notificationList
         }
-        return notificationList
     }
 
     /**
      * Remove a notification from the user's subcollection
      */
     suspend fun deleteNotification(date: String) {
-        val user = auth.currentUser!!
-        Log.d(TAG, "Deleting notification with timestamp: $date")
-        database.collection(USER_COLLECTION)
-            .document(user.uid)
-            .collection(NOTIFICATION_COLLECTION)
-            .document(date)
-            .delete()
-            .await()
-
+        val user = auth.currentUser
+        if (user != null) {
+            Log.d(TAG, "Deleting notification with timestamp: $date")
+            database.collection(USER_COLLECTION)
+                .document(user.uid)
+                .collection(NOTIFICATION_COLLECTION)
+                .document(date)
+                .delete()
+                .await()
+        }
     }
 
     /**
      * Add a new Goal to the user's goal subcollection
      */
     suspend fun addGoal(goal: Goal) {
-        val user = auth.currentUser!!
-        Log.d(TAG, "Adding to the goals of ${user.uid}")
-        try {
-            val docRef = database.collection(USER_COLLECTION)
-                .document(user.uid)
-                .collection(GOAL_COLLECTION)
-                .add(goal)
-                .await()
-            docRef.update("goalID", docRef.id).await()
-        } catch (e: java.lang.Exception) {
-            Log.w(TAG, "Error writing document", e)
+        val user = auth.currentUser
+        if (user != null) {
+            Log.d(TAG, "Adding to the goals of ${user.uid}")
+            try {
+                val docRef = database.collection(USER_COLLECTION)
+                    .document(user.uid)
+                    .collection(GOAL_COLLECTION)
+                    .add(goal)
+                    .await()
+                docRef.update("goalID", docRef.id).await()
+            } catch (e: java.lang.Exception) {
+                Log.w(TAG, "Error writing document", e)
+            }
         }
     }
 
@@ -261,16 +285,18 @@ class UserRepository {
      * Update an existing goal with its id
      */
     suspend fun updateGoal(goal: Goal) {
-        val user = auth.currentUser!!
-        Log.d(TAG, "Updating goal ${goal.goalID} belonging to ${user.uid}")
-        try {
-            database.collection(USER_COLLECTION)
-                .document(user.uid)
-                .collection(GOAL_COLLECTION)
-                .document(goal.goalID!!)
-                .set(goal)
-        } catch (e: java.lang.Exception) {
-            Log.w(TAG, "Error writing document", e)
+        val user = auth.currentUser
+        if (user != null) {
+            Log.d(TAG, "Updating goal ${goal.goalID} belonging to ${user.uid}")
+            try {
+                database.collection(USER_COLLECTION)
+                    .document(user.uid)
+                    .collection(GOAL_COLLECTION)
+                    .document(goal.goalID!!)
+                    .set(goal)
+            } catch (e: java.lang.Exception) {
+                Log.w(TAG, "Error writing document", e)
+            }
         }
     }
 
@@ -278,38 +304,43 @@ class UserRepository {
      * Get a user's scheduled and past goals
      */
     suspend fun getGoals(): ArrayList<Goal> {
-        val user = auth.currentUser!!
+        val user = auth.currentUser
         val goalList = arrayListOf<Goal>()
-        Log.d(TAG, "Getting the goals of ${user.uid}")
-        try {
-            val result = database.collection(USER_COLLECTION)
-                .document(user.uid)
-                .collection(GOAL_COLLECTION)
-                .get()
-                .await()
+        if (user == null) {
+            return goalList
+        } else {
+            Log.d(TAG, "Getting the goals of ${user.uid}")
+            try {
+                val result = database.collection(USER_COLLECTION)
+                    .document(user.uid)
+                    .collection(GOAL_COLLECTION)
+                    .get()
+                    .await()
 
-            for (document in result) {
-                goalList.add(document.toObject())
+                for (document in result) {
+                    goalList.add(document.toObject())
+                }
+            } catch (e: java.lang.Exception) {
+                Log.d(TAG, "Error getting documents: ", e)
             }
-        } catch (e: java.lang.Exception) {
-            Log.d(TAG, "Error getting documents: ", e)
+            return goalList
         }
-        return goalList
     }
 
     /**
      * Remove a goal from the user's subcollection
      */
     suspend fun deleteGoal(goalID: String) {
-        val user = auth.currentUser!!
-        Log.d(TAG, "Deleting goal with ID: $goalID")
-        database.collection(USER_COLLECTION)
-            .document(user.uid)
-            .collection(GOAL_COLLECTION)
-            .document(goalID)
-            .delete()
-            .await()
-
+        val user = auth.currentUser
+        if (user != null) {
+            Log.d(TAG, "Deleting goal with ID: $goalID")
+            database.collection(USER_COLLECTION)
+                .document(user.uid)
+                .collection(GOAL_COLLECTION)
+                .document(goalID)
+                .delete()
+                .await()
+        }
     }
 
     companion object {
diff --git a/app/src/main/java/com/symphony/mrfit/ui/WorkoutRoutineActivity.kt b/app/src/main/java/com/symphony/mrfit/ui/WorkoutRoutineActivity.kt
index 8733139..5b866c9 100644
--- a/app/src/main/java/com/symphony/mrfit/ui/WorkoutRoutineActivity.kt
+++ b/app/src/main/java/com/symphony/mrfit/ui/WorkoutRoutineActivity.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/21/23, 11:51 PM
+ *  Created by Team Symphony on 4/22/23, 3:13 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/21/23, 11:51 PM
+ *  Last modified 4/22/23, 2:45 AM
  */
 
 package com.symphony.mrfit.ui
@@ -43,11 +43,14 @@ class WorkoutRoutineActivity : AppCompatActivity() {
     private lateinit var profileViewModel: ProfileViewModel
     private lateinit var exerciseViewModel: ExerciseViewModel
     private lateinit var binding: ActivityWorkoutRoutineBinding
+    private lateinit var workoutList: RecyclerView
     private lateinit var routineNameText: EditText
     private lateinit var routinePlaylist: EditText
     private lateinit var passedRoutineID: String
-    private var routineName: String? = ""
-    private var playlist: String? = ""
+    private var routineName: String? = null
+    private var playlist: String? = null
+    private var exercises: ArrayList<String> = ArrayList()
+    private var passedList: ArrayList<String> = ArrayList()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -61,11 +64,18 @@ class WorkoutRoutineActivity : AppCompatActivity() {
             this, ExerciseViewModelFactory()
         )[ExerciseViewModel::class.java]
 
+    }
+
+    override fun onStart() {
+        super.onStart()
+
+        Log.d(ContentValues.TAG, "Activity has (Re)Started")
+
         // Bind variables to View elements
         val spinner = binding.loadingSpinner
         routineNameText = binding.routineNameEditText
         routinePlaylist = binding.workoutPlaylistEditText
-        val workoutList = binding.workoutListView
+        workoutList = binding.workoutListView
         val startWorkout = binding.startWorkoutButton
         val newExercise = binding.newExerciseButton
         val saveWorkout = binding.saveWorkoutButton
@@ -81,9 +91,12 @@ class WorkoutRoutineActivity : AppCompatActivity() {
          * passedID = The ID of the parent Routine
          * passedName = The Name of the parent Routine
          * passedList = The workoutList from the parent Routine
+         * savedName = The Name of the template if it was navigated away from
+         * savedMusic = The playlist for the template if it was navigated away from
          */
         passedRoutineID = intent.getStringExtra(EXTRA_IDENTITY)!!
-        var passedList = ArrayList<String>()
+        routineName = intent.getStringExtra(SAVED_NAME)
+        playlist = intent.getStringExtra(SAVED_PLAYLIST)
 
         // Set the layout of the list of workouts presented to the user
         layoutManager = LinearLayoutManager(this)
@@ -92,9 +105,16 @@ class WorkoutRoutineActivity : AppCompatActivity() {
         exerciseViewModel.routine.observe(this, Observer {
             val routine = it ?: return@Observer
 
-            routineName = routine.name
+            if (routineName != null) {
+                routineNameText.setText(routineName)
+                routinePlaylist.setText(playlist)
+            } else {
+                routineName = routine.name
+            }
             routineNameText.setText(routineName)
-            if (routine.playlist != null) {
+            if (playlist != null) {
+                routinePlaylist.setText(playlist)
+            } else if (routine.playlist != null) {
                 playlist = routine.playlist
                 routinePlaylist.setText(playlist)
             } else {
@@ -102,17 +122,18 @@ class WorkoutRoutineActivity : AppCompatActivity() {
             }
             if (routine.workoutList != null) {
                 if (routine.workoutList.isNotEmpty()) {
+                    exercises = routine.workoutList
                     spinner.visibility = View.VISIBLE
-                    placeholderText.visibility = View.GONE
-                    workoutList.visibility = View.VISIBLE
                     passedList = routine.workoutList
-                    exerciseViewModel.getWorkouts(routine.workoutList)
+                    exerciseViewModel.getWorkouts(exercises)
                 }
             }
         })
         exerciseViewModel.workoutList.observe(this, Observer {
             val workList = it ?: return@Observer
             workoutList.adapter = WorkoutAdapter(this, workList, passedRoutineID, passedList)
+            placeholderText.visibility = View.GONE
+            workoutList.visibility = View.VISIBLE
             spinner.visibility = View.GONE
         })
 
@@ -166,27 +187,6 @@ class WorkoutRoutineActivity : AppCompatActivity() {
         }
     }
 
-    override fun onStart() {
-        super.onStart()
-
-        Log.d(ContentValues.TAG, "Activity has (Re)Started")
-
-        /**
-         * Retrieve the extras saved to this intent
-         * savedName = The Name of the template if it was navigated away from
-         * savedMusic = The playlist for the template if it was navigated away from
-         */
-        routineName = intent.getStringExtra(SAVED_NAME)
-        playlist = intent.getStringExtra(SAVED_PLAYLIST)
-
-        // Populate the list with the information associated with this routine
-        if (routineName != null) {
-            routineNameText.setText(routineName)
-            routinePlaylist.setText(playlist)
-        }
-
-    }
-
     override fun onPause() {
         super.onPause()
         tempSave()
diff --git a/app/src/main/java/com/symphony/mrfit/ui/WorkoutTemplateActivity.kt b/app/src/main/java/com/symphony/mrfit/ui/WorkoutTemplateActivity.kt
index 9e9fd2f..d97e43d 100644
--- a/app/src/main/java/com/symphony/mrfit/ui/WorkoutTemplateActivity.kt
+++ b/app/src/main/java/com/symphony/mrfit/ui/WorkoutTemplateActivity.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/1/23, 7:44 PM
+ *  Created by Team Symphony on 4/22/23, 3:13 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/1/23, 7:41 PM
+ *  Last modified 4/22/23, 2:45 AM
  */
 
 package com.symphony.mrfit.ui
@@ -222,7 +222,7 @@ class WorkoutTemplateActivity : AppCompatActivity() {
                         .child(ExerciseRepository.EXERCISE_PICTURE)
                         .child(exercise.exerciseID!!)
                 )
-                .placeholder(R.drawable.cactuar)
+                .placeholder(R.drawable.glide_placeholder)
                 .into(exeCard.exerciseImage)
             exeCard.exerciseNameTextView.text = exercise.name
             exeCard.exerciseTagsTextView.text = exercise.tags.toString()
diff --git a/app/src/main/res/layout/activity_current_workout.xml b/app/src/main/res/layout/activity_current_workout.xml
index 133ee4b..6040978 100644
--- a/app/src/main/res/layout/activity_current_workout.xml
+++ b/app/src/main/res/layout/activity_current_workout.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~  Created by Team Symphony on 4/19/23, 4:23 PM
+  ~  Created by Team Symphony on 4/22/23, 3:13 AM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/19/23, 4:13 PM
+  ~  Last modified 4/22/23, 2:45 AM
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/layout_currentActivity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".ui.CurrentWorkoutActivity">
diff --git a/app/src/main/res/layout/activity_custom_exercises.xml b/app/src/main/res/layout/activity_custom_exercises.xml
index 7b2bff5..94a3af5 100644
--- a/app/src/main/res/layout/activity_custom_exercises.xml
+++ b/app/src/main/res/layout/activity_custom_exercises.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~  Created by Team Symphony on 4/2/23, 2:50 PM
+  ~  Created by Team Symphony on 4/22/23, 3:13 AM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/2/23, 2:50 PM
+  ~  Last modified 4/22/23, 2:55 AM
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/layout_customExerciseActivity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".ui.CustomExercisesActivity">
diff --git a/app/src/main/res/layout/activity_goals.xml b/app/src/main/res/layout/activity_goals.xml
index b2c4710..3bab47e 100644
--- a/app/src/main/res/layout/activity_goals.xml
+++ b/app/src/main/res/layout/activity_goals.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~  Created by Team Symphony on 4/1/23, 6:46 PM
+  ~  Created by Team Symphony on 4/22/23, 3:13 AM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/1/23, 6:46 PM
+  ~  Last modified 4/22/23, 2:53 AM
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/layout_goalsActivity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".ui.GoalsActivity">
diff --git a/app/src/main/res/layout/activity_notification_log.xml b/app/src/main/res/layout/activity_notification_log.xml
index 892274c..3bc82ca 100644
--- a/app/src/main/res/layout/activity_notification_log.xml
+++ b/app/src/main/res/layout/activity_notification_log.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~  Created by Team Symphony on 4/2/23, 9:44 PM
+  ~  Created by Team Symphony on 4/22/23, 3:13 AM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/2/23, 9:42 PM
+  ~  Last modified 4/22/23, 2:50 AM
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/layout_notificationLogActivity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".ui.NotificationLogActivity">
diff --git a/app/src/main/res/layout/activity_post_workout.xml b/app/src/main/res/layout/activity_post_workout.xml
index a1f27bd..383925d 100644
--- a/app/src/main/res/layout/activity_post_workout.xml
+++ b/app/src/main/res/layout/activity_post_workout.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~  Created by Team Symphony on 4/21/23, 10:36 PM
+  ~  Created by Team Symphony on 4/22/23, 3:13 AM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/21/23, 10:36 PM
+  ~  Last modified 4/22/23, 2:45 AM
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -73,8 +73,7 @@
                 android:id="@+id/returnHomeButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="10dp"
-                android:text="@string/button_return_home" />
+                android:layout_margin="10dp" />
         </LinearLayout>
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_workout_history.xml b/app/src/main/res/layout/activity_workout_history.xml
index a532e0a..f63a08f 100644
--- a/app/src/main/res/layout/activity_workout_history.xml
+++ b/app/src/main/res/layout/activity_workout_history.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~  Created by Team Symphony on 4/20/23, 7:03 PM
+  ~  Created by Team Symphony on 4/22/23, 3:13 AM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/20/23, 1:38 PM
+  ~  Last modified 4/22/23, 2:53 AM
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/layout_workoutHistoryActivity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".ui.WorkoutHistoryActivity">

From cb880ba4a4d09294a31cb6b07114c507f115d8ab Mon Sep 17 00:00:00 2001
From: NikM3 <nikolas.a.melendez@gmail.com>
Date: Sat, 22 Apr 2023 06:21:57 -0400
Subject: [PATCH 09/18] Early morning UI fixes and tests

---
 .../mrfit/ui/CoreFunctionalityTest.kt         |  4 +-
 .../com/symphony/mrfit/ui/ExerciseTest.kt     |  4 +-
 .../symphony/mrfit/ui/GoalsActivityTest.kt    |  4 +-
 .../java/com/symphony/mrfit/ui/HelperTest.kt  |  4 +-
 .../com/symphony/mrfit/ui/HomeActivityTest.kt |  4 +-
 .../symphony/mrfit/ui/LoginActivityTest.kt    |  4 +-
 .../symphony/mrfit/ui/RegisterActivityTest.kt |  4 +-
 .../mrfit/ui/TemplateSelectionActivityTest.kt |  4 +-
 .../mrfit/ui/UserProfileActivityTest.kt       |  4 +-
 .../mrfit/ui/WorkoutRoutineActivityTest.kt    |  4 +-
 .../mrfit/ui/WorkoutTemplateActivityTest.kt   |  4 +-
 .../com/symphony/mrfit/AddStockExercises.kt   |  8 +--
 .../mrfit/data/exercise/WorkoutAdapter.kt     |  4 +-
 .../mrfit/data/profile/UserRepository.kt      |  4 +-
 .../mrfit/ui/WorkoutRoutineActivity.kt        |  4 +-
 .../mrfit/ui/WorkoutTemplateActivity.kt       |  4 +-
 .../res/layout/activity_current_workout.xml   |  4 +-
 .../res/layout/activity_custom_exercises.xml  |  4 +-
 app/src/main/res/layout/activity_goals.xml    |  4 +-
 .../res/layout/activity_notification_log.xml  |  4 +-
 .../main/res/layout/activity_post_workout.xml |  4 +-
 .../res/layout/activity_workout_history.xml   |  4 +-
 app/src/main/res/layout/card_exercise.xml     | 32 ++++++------
 app/src/main/res/layout/card_exercise2.xml    |  6 +--
 app/src/main/res/layout/card_workout.xml      | 50 +++++++++----------
 app/src/main/res/layout/card_workout2.xml     |  6 +--
 26 files changed, 89 insertions(+), 97 deletions(-)

diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/CoreFunctionalityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/CoreFunctionalityTest.kt
index 817086a..6aa60e6 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/CoreFunctionalityTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/CoreFunctionalityTest.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/22/23, 3:13 AM
+ *  Created by Team Symphony on 4/22/23, 6:21 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/22/23, 2:45 AM
+ *  Last modified 4/22/23, 6:05 AM
  */
 
 package com.symphony.mrfit.ui
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/ExerciseTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/ExerciseTest.kt
index 44d02c6..bb258ad 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/ExerciseTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/ExerciseTest.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/22/23, 3:13 AM
+ *  Created by Team Symphony on 4/22/23, 6:21 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/22/23, 2:45 AM
+ *  Last modified 4/22/23, 6:05 AM
  */
 
 package com.symphony.mrfit.ui
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/GoalsActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/GoalsActivityTest.kt
index f37c93b..d422f68 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/GoalsActivityTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/GoalsActivityTest.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/22/23, 3:13 AM
+ *  Created by Team Symphony on 4/22/23, 6:21 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/22/23, 2:45 AM
+ *  Last modified 4/22/23, 6:05 AM
  */
 
 package com.symphony.mrfit.ui
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/HelperTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/HelperTest.kt
index 2714ae0..7dc1366 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/HelperTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/HelperTest.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/22/23, 3:13 AM
+ *  Created by Team Symphony on 4/22/23, 6:21 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/22/23, 2:45 AM
+ *  Last modified 4/22/23, 6:05 AM
  */
 
 package com.symphony.mrfit.ui
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/HomeActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/HomeActivityTest.kt
index 5906279..118c83a 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/HomeActivityTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/HomeActivityTest.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/22/23, 3:13 AM
+ *  Created by Team Symphony on 4/22/23, 6:21 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/22/23, 2:45 AM
+ *  Last modified 4/22/23, 6:05 AM
  */
 
 package com.symphony.mrfit.ui
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/LoginActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/LoginActivityTest.kt
index 8ef06a1..eb6f532 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/LoginActivityTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/LoginActivityTest.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/22/23, 3:13 AM
+ *  Created by Team Symphony on 4/22/23, 6:21 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/22/23, 3:01 AM
+ *  Last modified 4/22/23, 6:05 AM
  */
 
 package com.symphony.mrfit.ui
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/RegisterActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/RegisterActivityTest.kt
index dcab491..e7beb4d 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/RegisterActivityTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/RegisterActivityTest.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/22/23, 3:13 AM
+ *  Created by Team Symphony on 4/22/23, 6:21 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/22/23, 2:45 AM
+ *  Last modified 4/22/23, 6:05 AM
  */
 
 package com.symphony.mrfit.ui
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/TemplateSelectionActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/TemplateSelectionActivityTest.kt
index f4d5033..76aee11 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/TemplateSelectionActivityTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/TemplateSelectionActivityTest.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/22/23, 3:13 AM
+ *  Created by Team Symphony on 4/22/23, 6:21 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/22/23, 2:45 AM
+ *  Last modified 4/22/23, 6:05 AM
  */
 
 package com.symphony.mrfit.ui
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/UserProfileActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/UserProfileActivityTest.kt
index 0288faf..ed0b9c1 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/UserProfileActivityTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/UserProfileActivityTest.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/22/23, 3:13 AM
+ *  Created by Team Symphony on 4/22/23, 6:21 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/22/23, 3:08 AM
+ *  Last modified 4/22/23, 6:05 AM
  */
 
 package com.symphony.mrfit.ui
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/WorkoutRoutineActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/WorkoutRoutineActivityTest.kt
index cfcfab5..3057e4e 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/WorkoutRoutineActivityTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/WorkoutRoutineActivityTest.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/22/23, 3:13 AM
+ *  Created by Team Symphony on 4/22/23, 6:21 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/22/23, 2:45 AM
+ *  Last modified 4/22/23, 6:05 AM
  */
 
 package com.symphony.mrfit.ui
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/WorkoutTemplateActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/WorkoutTemplateActivityTest.kt
index ec6aff0..ac1eb55 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/WorkoutTemplateActivityTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/WorkoutTemplateActivityTest.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/22/23, 3:13 AM
+ *  Created by Team Symphony on 4/22/23, 6:21 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/22/23, 2:45 AM
+ *  Last modified 4/22/23, 6:05 AM
  */
 
 package com.symphony.mrfit.ui
diff --git a/app/src/main/java/com/symphony/mrfit/AddStockExercises.kt b/app/src/main/java/com/symphony/mrfit/AddStockExercises.kt
index e55af3c..3ec22b7 100644
--- a/app/src/main/java/com/symphony/mrfit/AddStockExercises.kt
+++ b/app/src/main/java/com/symphony/mrfit/AddStockExercises.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/2/23, 10:27 PM
+ *  Created by Team Symphony on 4/22/23, 6:21 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/2/23, 10:27 PM
+ *  Last modified 4/22/23, 6:13 AM
  */
 
 package com.symphony.mrfit
@@ -29,10 +29,6 @@ class AddStockExercises : AppCompatActivity() {
             this, ExerciseViewModelFactory()
         )[ExerciseViewModel::class.java]
 
-        /**
-         * TODO: Replace all Uri parses with appropriate images
-         */
-
         exerciseViewModel.addExercise(
             Exercise(
                 "Walking",
diff --git a/app/src/main/java/com/symphony/mrfit/data/exercise/WorkoutAdapter.kt b/app/src/main/java/com/symphony/mrfit/data/exercise/WorkoutAdapter.kt
index e196904..c1d6d02 100644
--- a/app/src/main/java/com/symphony/mrfit/data/exercise/WorkoutAdapter.kt
+++ b/app/src/main/java/com/symphony/mrfit/data/exercise/WorkoutAdapter.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/22/23, 3:13 AM
+ *  Created by Team Symphony on 4/22/23, 6:21 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/22/23, 2:45 AM
+ *  Last modified 4/22/23, 6:05 AM
  */
 
 package com.symphony.mrfit.data.exercise
diff --git a/app/src/main/java/com/symphony/mrfit/data/profile/UserRepository.kt b/app/src/main/java/com/symphony/mrfit/data/profile/UserRepository.kt
index 8f7e4bb..4ab6e3c 100644
--- a/app/src/main/java/com/symphony/mrfit/data/profile/UserRepository.kt
+++ b/app/src/main/java/com/symphony/mrfit/data/profile/UserRepository.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/22/23, 3:13 AM
+ *  Created by Team Symphony on 4/22/23, 6:21 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/22/23, 3:05 AM
+ *  Last modified 4/22/23, 6:05 AM
  */
 
 package com.symphony.mrfit.data.profile
diff --git a/app/src/main/java/com/symphony/mrfit/ui/WorkoutRoutineActivity.kt b/app/src/main/java/com/symphony/mrfit/ui/WorkoutRoutineActivity.kt
index 5b866c9..080b8e9 100644
--- a/app/src/main/java/com/symphony/mrfit/ui/WorkoutRoutineActivity.kt
+++ b/app/src/main/java/com/symphony/mrfit/ui/WorkoutRoutineActivity.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/22/23, 3:13 AM
+ *  Created by Team Symphony on 4/22/23, 6:21 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/22/23, 2:45 AM
+ *  Last modified 4/22/23, 6:05 AM
  */
 
 package com.symphony.mrfit.ui
diff --git a/app/src/main/java/com/symphony/mrfit/ui/WorkoutTemplateActivity.kt b/app/src/main/java/com/symphony/mrfit/ui/WorkoutTemplateActivity.kt
index d97e43d..86833ea 100644
--- a/app/src/main/java/com/symphony/mrfit/ui/WorkoutTemplateActivity.kt
+++ b/app/src/main/java/com/symphony/mrfit/ui/WorkoutTemplateActivity.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/22/23, 3:13 AM
+ *  Created by Team Symphony on 4/22/23, 6:21 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/22/23, 2:45 AM
+ *  Last modified 4/22/23, 6:05 AM
  */
 
 package com.symphony.mrfit.ui
diff --git a/app/src/main/res/layout/activity_current_workout.xml b/app/src/main/res/layout/activity_current_workout.xml
index 6040978..2f1537f 100644
--- a/app/src/main/res/layout/activity_current_workout.xml
+++ b/app/src/main/res/layout/activity_current_workout.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~  Created by Team Symphony on 4/22/23, 3:13 AM
+  ~  Created by Team Symphony on 4/22/23, 6:21 AM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/22/23, 2:45 AM
+  ~  Last modified 4/22/23, 6:05 AM
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/activity_custom_exercises.xml b/app/src/main/res/layout/activity_custom_exercises.xml
index 94a3af5..9720ce2 100644
--- a/app/src/main/res/layout/activity_custom_exercises.xml
+++ b/app/src/main/res/layout/activity_custom_exercises.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~  Created by Team Symphony on 4/22/23, 3:13 AM
+  ~  Created by Team Symphony on 4/22/23, 6:21 AM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/22/23, 2:55 AM
+  ~  Last modified 4/22/23, 6:05 AM
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/activity_goals.xml b/app/src/main/res/layout/activity_goals.xml
index 3bab47e..96f9774 100644
--- a/app/src/main/res/layout/activity_goals.xml
+++ b/app/src/main/res/layout/activity_goals.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~  Created by Team Symphony on 4/22/23, 3:13 AM
+  ~  Created by Team Symphony on 4/22/23, 6:21 AM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/22/23, 2:53 AM
+  ~  Last modified 4/22/23, 6:05 AM
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/activity_notification_log.xml b/app/src/main/res/layout/activity_notification_log.xml
index 3bc82ca..08fb56e 100644
--- a/app/src/main/res/layout/activity_notification_log.xml
+++ b/app/src/main/res/layout/activity_notification_log.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~  Created by Team Symphony on 4/22/23, 3:13 AM
+  ~  Created by Team Symphony on 4/22/23, 6:21 AM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/22/23, 2:50 AM
+  ~  Last modified 4/22/23, 6:05 AM
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/activity_post_workout.xml b/app/src/main/res/layout/activity_post_workout.xml
index 383925d..b5bc9e9 100644
--- a/app/src/main/res/layout/activity_post_workout.xml
+++ b/app/src/main/res/layout/activity_post_workout.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~  Created by Team Symphony on 4/22/23, 3:13 AM
+  ~  Created by Team Symphony on 4/22/23, 6:21 AM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/22/23, 2:45 AM
+  ~  Last modified 4/22/23, 6:05 AM
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/activity_workout_history.xml b/app/src/main/res/layout/activity_workout_history.xml
index f63a08f..9ad8c8c 100644
--- a/app/src/main/res/layout/activity_workout_history.xml
+++ b/app/src/main/res/layout/activity_workout_history.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~  Created by Team Symphony on 4/22/23, 3:13 AM
+  ~  Created by Team Symphony on 4/22/23, 6:21 AM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/22/23, 2:53 AM
+  ~  Last modified 4/22/23, 6:05 AM
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/card_exercise.xml b/app/src/main/res/layout/card_exercise.xml
index f58ebe6..531ea79 100644
--- a/app/src/main/res/layout/card_exercise.xml
+++ b/app/src/main/res/layout/card_exercise.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~  Created by Team Symphony on 2/26/23, 11:15 AM
+  ~  Created by Team Symphony on 4/22/23, 6:21 AM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 2/26/23, 11:15 AM
+  ~  Last modified 4/22/23, 6:19 AM
   -->
 
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
@@ -9,14 +9,13 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="0dp"
-    app:cardBackgroundColor="@color/white"
     app:cardCornerRadius="8dp"
     app:cardElevation="5dp"
     app:cardMaxElevation="5dp"
     app:cardPreventCornerOverlap="true"
     app:cardUseCompatPadding="true">
-    
-        <!-- In the above cardview widget cardelevation property will give elevation to your card view
+
+    <!-- In the above cardview widget cardelevation property will give elevation to your card view
     card corner radius will provide radius to your card view card background color will give
     background color to your card view card max elevation will give the cardview maximum
     elevation card prevent corner overlap will add padding to CardView on v20 and before to
@@ -24,18 +23,21 @@
     will add padding in API v21+ as well to have the same measurements with previous versions -->
 
     <RelativeLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
         <!-- Image View to display an image for the exercise -->
         <ImageView
-        android:id="@+id/exerciseImage"
-        android:layout_width="80dp"
-        android:layout_height="80dp"
-        android:layout_margin="10dp"
-        android:contentDescription="@string/app_name"
-        android:padding="5dp"
-        android:src="@drawable/cactuar" />
+            android:id="@+id/exerciseImage"
+            android:layout_width="80dp"
+            android:layout_height="80dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginEnd="10dp"
+            android:layout_marginBottom="10dp"
+            android:contentDescription="@string/app_name"
+            android:padding="5dp"
+            android:src="@drawable/cactuar" />
 
         <!-- Text View to display Exercise Name -->
         <TextView
@@ -46,7 +48,6 @@
             android:layout_marginTop="10dp"
             android:layout_toEndOf="@id/exerciseImage"
             android:text="@string/PLACEHOLDER_TEXT"
-            android:textColor="@color/black"
             android:textSize="18sp"
             android:textStyle="bold" />
 
@@ -69,6 +70,7 @@
             android:layout_below="@id/exerciseTagsTextView"
             android:layout_marginStart="10dp"
             android:layout_marginTop="10dp"
+            android:layout_marginBottom="10dp"
             android:layout_toEndOf="@id/exerciseImage"
             android:drawablePadding="2dp"
             android:text="@string/PLACEHOLDER_TEXT" />
diff --git a/app/src/main/res/layout/card_exercise2.xml b/app/src/main/res/layout/card_exercise2.xml
index 068417e..c53dd11 100644
--- a/app/src/main/res/layout/card_exercise2.xml
+++ b/app/src/main/res/layout/card_exercise2.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~  Created by Team Symphony on 4/2/23, 2:50 PM
+  ~  Created by Team Symphony on 4/22/23, 6:21 AM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/2/23, 2:50 PM
+  ~  Last modified 4/22/23, 6:19 AM
   -->
 
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
@@ -9,7 +9,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="0dp"
-    app:cardBackgroundColor="@color/white"
     app:cardCornerRadius="8dp"
     app:cardElevation="5dp"
     app:cardMaxElevation="5dp"
@@ -55,7 +54,6 @@ will add padding in API v21+ as well to have the same measurements with previous
                 android:layout_marginStart="10dp"
                 android:layout_marginTop="10dp"
                 android:text="@string/PLACEHOLDER_TEXT"
-                android:textColor="@color/black"
                 android:textSize="18sp"
                 android:textStyle="bold" />
 
diff --git a/app/src/main/res/layout/card_workout.xml b/app/src/main/res/layout/card_workout.xml
index 3bfe75d..ca7a029 100644
--- a/app/src/main/res/layout/card_workout.xml
+++ b/app/src/main/res/layout/card_workout.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~  Created by Team Symphony on 2/24/23, 11:21 PM
+  ~  Created by Team Symphony on 4/22/23, 6:21 AM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 2/24/23, 11:20 PM
+  ~  Last modified 4/22/23, 6:18 AM
   -->
 
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
@@ -9,14 +9,13 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="0dp"
-    app:cardBackgroundColor="@color/white"
     app:cardCornerRadius="8dp"
     app:cardElevation="5dp"
     app:cardMaxElevation="5dp"
     app:cardPreventCornerOverlap="true"
     app:cardUseCompatPadding="true">
-    
-        <!-- In the above cardview widget cardelevation property will give elevation to your card view
+
+    <!-- In the above cardview widget cardelevation property will give elevation to your card view
     card corner radius will provide radius to your card view card background color will give
     background color to your card view card max elevation will give the cardview maximum
     elevation card prevent corner overlap will add padding to CardView on v20 and before to
@@ -24,8 +23,8 @@
     will add padding in API v21+ as well to have the same measurements with previous versions -->
 
     <RelativeLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
         <!-- Image View to display an image for the exercise -->
         <ImageView
@@ -42,27 +41,26 @@
 
         <!-- Text View to display Exercise Name -->
         <TextView
-        android:id="@+id/workoutNameTextView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="10dp"
-        android:layout_marginTop="10dp"
-        android:layout_toEndOf="@id/workoutImage"
-        android:text="@string/PLACEHOLDER_TEXT"
-        android:textColor="@color/black"
-        android:textSize="18sp"
-        android:textStyle="bold" />
+            android:id="@+id/workoutNameTextView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="10dp"
+            android:layout_toEndOf="@id/workoutImage"
+            android:text="@string/PLACEHOLDER_TEXT"
+            android:textSize="18sp"
+            android:textStyle="bold" />
 
         <!-- Text VIew to display Exercise Description -->
         <TextView
-        android:id="@+id/workoutRepsTextView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/workoutNameTextView"
-        android:layout_marginStart="10dp"
-        android:layout_marginTop="20dp"
-        android:layout_toEndOf="@id/workoutImage"
-        android:drawablePadding="2dp"
-        android:text="@string/PLACEHOLDER_TEXT" />
+            android:id="@+id/workoutRepsTextView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/workoutNameTextView"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="20dp"
+            android:layout_toEndOf="@id/workoutImage"
+            android:drawablePadding="2dp"
+            android:text="@string/PLACEHOLDER_TEXT" />
     </RelativeLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/card_workout2.xml b/app/src/main/res/layout/card_workout2.xml
index ffe5cc0..c4685fe 100644
--- a/app/src/main/res/layout/card_workout2.xml
+++ b/app/src/main/res/layout/card_workout2.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~  Created by Team Symphony on 4/21/23, 10:43 PM
+  ~  Created by Team Symphony on 4/22/23, 6:21 AM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/21/23, 10:43 PM
+  ~  Last modified 4/22/23, 6:18 AM
   -->
 
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
@@ -9,7 +9,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="0dp"
-    app:cardBackgroundColor="@color/white"
     app:cardCornerRadius="8dp"
     app:cardElevation="5dp"
     app:cardMaxElevation="5dp"
@@ -55,7 +54,6 @@ will add padding in API v21+ as well to have the same measurements with previous
                 android:layout_marginStart="10dp"
                 android:layout_marginTop="10dp"
                 android:text="@string/PLACEHOLDER_TEXT"
-                android:textColor="@color/black"
                 android:textSize="18sp"
                 android:textStyle="bold" />
 

From 35eda03af581b3474fe60912598d54604367cf75 Mon Sep 17 00:00:00 2001
From: nicolekaate <NGC2@email.sc.edu>
Date: Sat, 22 Apr 2023 11:42:52 -0400
Subject: [PATCH 10/18] edited goals unit test #75

---
 .../symphony/mrfit/ui/GoalsActivityTest.kt    | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/GoalsActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/GoalsActivityTest.kt
index d422f68..e4959c2 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/GoalsActivityTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/GoalsActivityTest.kt
@@ -6,7 +6,11 @@
 
 package com.symphony.mrfit.ui
 
+import androidx.test.espresso.Espresso
+import androidx.test.espresso.assertion.ViewAssertions
+import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.ext.junit.rules.activityScenarioRule
+import com.symphony.mrfit.R
 import org.junit.Rule
 import org.junit.Test
 
@@ -14,9 +18,23 @@ class GoalsActivityTest {
     @get:Rule
     var activityScenarioRule = activityScenarioRule<GoalsActivity>()
 
-    //TODO
+    //TODO: added simple tests, worked on mine but check if needs more
+    //tests if the activity is displayed and visible to user
     @Test
     fun checkActivityVisibility() {
+        Espresso.onView(ViewMatchers.withId(R.id.layout_goalsActivity))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+    }
+
+    //tests if components are visible
+    @Test
+    fun checkViewVisibility() {
+        Espresso.onView(ViewMatchers.withId(R.id.goalsTitleTextView))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.goalsList))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
     }
 }
 

From c289a0cf20267ebd7ba8f1cf3174f1f8f83ced51 Mon Sep 17 00:00:00 2001
From: NikM3 <nikolas.a.melendez@gmail.com>
Date: Sat, 22 Apr 2023 13:50:02 -0400
Subject: [PATCH 11/18] Fixes #138

---
 app/src/main/res/layout/popup_edit_goal.xml | 5 +++--
 app/src/main/res/layout/popup_new_goal.xml  | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/layout/popup_edit_goal.xml b/app/src/main/res/layout/popup_edit_goal.xml
index 3a02d69..5a90c4d 100644
--- a/app/src/main/res/layout/popup_edit_goal.xml
+++ b/app/src/main/res/layout/popup_edit_goal.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~  Created by Team Symphony on 4/21/23, 10:43 PM
+  ~  Created by Team Symphony on 4/22/23, 1:50 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/21/23, 10:39 PM
+  ~  Last modified 4/22/23, 1:49 PM
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -25,6 +25,7 @@
             android:hint="Goal Name"
             android:importantForAutofill="no"
             android:inputType="textShortMessage|text"
+            android:maxLength="40"
             android:minHeight="50dp" />
 
         <TextView
diff --git a/app/src/main/res/layout/popup_new_goal.xml b/app/src/main/res/layout/popup_new_goal.xml
index 498a144..1afa473 100644
--- a/app/src/main/res/layout/popup_new_goal.xml
+++ b/app/src/main/res/layout/popup_new_goal.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~  Created by Team Symphony on 4/19/23, 11:58 PM
+  ~  Created by Team Symphony on 4/22/23, 1:50 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/19/23, 11:57 PM
+  ~  Last modified 4/22/23, 1:49 PM
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -24,6 +24,7 @@
             android:hint="Goal Name"
             android:importantForAutofill="no"
             android:inputType="textShortMessage"
+            android:maxLength="40"
             android:minHeight="50dp" />
 
         <TextView

From cb4521bd44d96a1ffe85314e0fa50d1d85b4182f Mon Sep 17 00:00:00 2001
From: esartawi <esartawi@email.sc.edu>
Date: Sat, 22 Apr 2023 16:37:26 -0400
Subject: [PATCH 12/18] Fixed #143 attempted #156

---
 .../mrfit/data/exercise/ExerciseRepository.kt         |  6 ++++++
 .../com/symphony/mrfit/ui/WorkoutRoutineActivity.kt   |  2 +-
 .../com/symphony/mrfit/ui/WorkoutTemplateActivity.kt  | 11 ++++++++---
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/symphony/mrfit/data/exercise/ExerciseRepository.kt b/app/src/main/java/com/symphony/mrfit/data/exercise/ExerciseRepository.kt
index 63ffcae..55cfe3a 100644
--- a/app/src/main/java/com/symphony/mrfit/data/exercise/ExerciseRepository.kt
+++ b/app/src/main/java/com/symphony/mrfit/data/exercise/ExerciseRepository.kt
@@ -83,8 +83,14 @@ class ExerciseRepository {
     /**
      * Remove a specific Exercise by it's ID
      */
+//    suspend fun deleteExercise(exeID: String) {
+//        Log.d(TAG, "Removing Exercise $exeID from Firestore")
+//        database.collection(EXERCISE_COLLECTION).document(exeID).delete().await()
+//    }
     suspend fun deleteExercise(exeID: String) {
         Log.d(TAG, "Removing Exercise $exeID from Firestore")
+        val storageRef = storage.reference.child(EXERCISE_PICTURE).child(exeID)
+        storageRef.delete().await()
         database.collection(EXERCISE_COLLECTION).document(exeID).delete().await()
     }
 
diff --git a/app/src/main/java/com/symphony/mrfit/ui/WorkoutRoutineActivity.kt b/app/src/main/java/com/symphony/mrfit/ui/WorkoutRoutineActivity.kt
index 080b8e9..281bca5 100644
--- a/app/src/main/java/com/symphony/mrfit/ui/WorkoutRoutineActivity.kt
+++ b/app/src/main/java/com/symphony/mrfit/ui/WorkoutRoutineActivity.kt
@@ -179,7 +179,7 @@ class WorkoutRoutineActivity : AppCompatActivity() {
             exerciseViewModel.deleteRoutine(passedRoutineID)
             Toast.makeText(
                 applicationContext,
-                "This workout has been removed from your list",
+                "This template has been removed from your list",
                 Toast.LENGTH_SHORT
             ).show()
             finish()
diff --git a/app/src/main/java/com/symphony/mrfit/ui/WorkoutTemplateActivity.kt b/app/src/main/java/com/symphony/mrfit/ui/WorkoutTemplateActivity.kt
index 86833ea..04139bb 100644
--- a/app/src/main/java/com/symphony/mrfit/ui/WorkoutTemplateActivity.kt
+++ b/app/src/main/java/com/symphony/mrfit/ui/WorkoutTemplateActivity.kt
@@ -12,6 +12,7 @@ import android.content.Intent
 import android.os.Bundle
 import android.util.Log
 import android.view.View
+import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.Observer
@@ -21,9 +22,7 @@ import com.google.firebase.ktx.Firebase
 import com.google.firebase.storage.FirebaseStorage
 import com.google.firebase.storage.ktx.storage
 import com.symphony.mrfit.R
-import com.symphony.mrfit.data.exercise.ExerciseRepository
-import com.symphony.mrfit.data.exercise.ExerciseViewModel
-import com.symphony.mrfit.data.exercise.ExerciseViewModelFactory
+import com.symphony.mrfit.data.exercise.*
 import com.symphony.mrfit.data.model.Workout
 import com.symphony.mrfit.databinding.ActivityWorkoutTemplateBinding
 import com.symphony.mrfit.ui.Helper.showSnackBar
@@ -187,7 +186,13 @@ class WorkoutTemplateActivity : AppCompatActivity() {
         deleteButton.setOnClickListener {
             passedList!!.remove(passedWorkoutID)
             exerciseViewModel.updateRoutineWorkoutList(passedRoutineID!!, passedList)
+            Toast.makeText(
+                applicationContext,
+                "This workout has been removed from your template",
+                Toast.LENGTH_SHORT
+            ).show()
             finish()
+            recreate()
         }
 
         exerciseViewModel.exercise.observe(this, Observer {

From ade60872cdb5098ed66fd33b4519b115a69050cd Mon Sep 17 00:00:00 2001
From: NikM3 <nikolas.a.melendez@gmail.com>
Date: Sat, 22 Apr 2023 17:13:34 -0400
Subject: [PATCH 13/18] Refactor for better organization, also fixes #156

---
 app/src/main/AndroidManifest.xml              |  6 +++---
 .../{exercise => adapters}/ExerciseAdapter.kt |  6 +++---
 .../ExerciseAdapter2.kt                       |  6 +++---
 .../{exercise => adapters}/GoalAdapter.kt     |  6 +++---
 .../{exercise => adapters}/HistoryAdapter.kt  |  6 +++---
 .../{exercise => adapters}/HistoryAdapter2.kt | 15 ++++++++------
 .../NotificationAdapter.kt                    |  6 +++---
 .../{exercise => adapters}/RoutineAdapter.kt  |  6 +++---
 .../{exercise => adapters}/RoutineAdapter2.kt |  6 +++---
 .../{exercise => adapters}/WorkoutAdapter.kt  |  7 ++++---
 .../{exercise => adapters}/WorkoutAdapter2.kt |  7 ++++---
 .../com/symphony/mrfit/ui/CalendarActivity.kt |  6 +++---
 .../mrfit/ui/CurrentWorkoutActivity.kt        |  6 +++---
 .../mrfit/ui/CustomExercisesActivity.kt       |  6 +++---
 .../com/symphony/mrfit/ui/DateTimeActivity.kt |  6 +++---
 .../com/symphony/mrfit/ui/ExerciseActivity.kt |  6 +++---
 .../com/symphony/mrfit/ui/GoalsActivity.kt    |  6 +++---
 .../com/symphony/mrfit/ui/HomeActivity.kt     |  7 +++----
 .../mrfit/{ => ui}/ManualWorkoutActivity.kt   | 13 +++++-------
 .../mrfit/ui/NotificationLogActivity.kt       |  6 +++---
 .../mrfit/ui/RoutineSelectionActivity.kt      |  6 +++---
 .../mrfit/ui/WorkoutHistoryActivity.kt        |  7 +++----
 .../mrfit/ui/WorkoutRoutineActivity.kt        | 20 +++++++++----------
 .../res/layout/activity_manual_workout.xml    |  6 +++---
 24 files changed, 88 insertions(+), 90 deletions(-)
 rename app/src/main/java/com/symphony/mrfit/data/{exercise => adapters}/ExerciseAdapter.kt (95%)
 rename app/src/main/java/com/symphony/mrfit/data/{exercise => adapters}/ExerciseAdapter2.kt (95%)
 rename app/src/main/java/com/symphony/mrfit/data/{exercise => adapters}/GoalAdapter.kt (94%)
 rename app/src/main/java/com/symphony/mrfit/data/{exercise => adapters}/HistoryAdapter.kt (94%)
 rename app/src/main/java/com/symphony/mrfit/data/{exercise => adapters}/HistoryAdapter2.kt (85%)
 rename app/src/main/java/com/symphony/mrfit/data/{exercise => adapters}/NotificationAdapter.kt (96%)
 rename app/src/main/java/com/symphony/mrfit/data/{exercise => adapters}/RoutineAdapter.kt (94%)
 rename app/src/main/java/com/symphony/mrfit/data/{exercise => adapters}/RoutineAdapter2.kt (95%)
 rename app/src/main/java/com/symphony/mrfit/data/{exercise => adapters}/WorkoutAdapter.kt (96%)
 rename app/src/main/java/com/symphony/mrfit/data/{exercise => adapters}/WorkoutAdapter2.kt (94%)
 rename app/src/main/java/com/symphony/mrfit/{ => ui}/ManualWorkoutActivity.kt (96%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1bf2511..2e192b1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~  Created by Team Symphony on 4/21/23, 3:22 PM
+  ~  Created by Team Symphony on 4/22/23, 5:12 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/21/23, 3:22 PM
+  ~  Last modified 4/22/23, 4:56 PM
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
@@ -30,7 +30,7 @@
             android:exported="false"
             android:parentActivityName=".ui.MainActivity" />
         <activity
-            android:name=".ManualWorkoutActivity"
+            android:name=".ui.ManualWorkoutActivity"
             android:exported="false"
             android:parentActivityName=".ui.MainActivity" />
         <activity
diff --git a/app/src/main/java/com/symphony/mrfit/data/exercise/ExerciseAdapter.kt b/app/src/main/java/com/symphony/mrfit/data/adapters/ExerciseAdapter.kt
similarity index 95%
rename from app/src/main/java/com/symphony/mrfit/data/exercise/ExerciseAdapter.kt
rename to app/src/main/java/com/symphony/mrfit/data/adapters/ExerciseAdapter.kt
index 9d5c917..d23498b 100644
--- a/app/src/main/java/com/symphony/mrfit/data/exercise/ExerciseAdapter.kt
+++ b/app/src/main/java/com/symphony/mrfit/data/adapters/ExerciseAdapter.kt
@@ -1,10 +1,10 @@
 /*
- *  Created by Team Symphony on 4/2/23, 10:27 PM
+ *  Created by Team Symphony on 4/22/23, 5:12 PM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/2/23, 10:22 PM
+ *  Last modified 4/22/23, 4:43 PM
  */
 
-package com.symphony.mrfit.data.exercise
+package com.symphony.mrfit.data.adapters
 
 import android.app.Activity
 import android.content.Context
diff --git a/app/src/main/java/com/symphony/mrfit/data/exercise/ExerciseAdapter2.kt b/app/src/main/java/com/symphony/mrfit/data/adapters/ExerciseAdapter2.kt
similarity index 95%
rename from app/src/main/java/com/symphony/mrfit/data/exercise/ExerciseAdapter2.kt
rename to app/src/main/java/com/symphony/mrfit/data/adapters/ExerciseAdapter2.kt
index c1cd3bf..049b829 100644
--- a/app/src/main/java/com/symphony/mrfit/data/exercise/ExerciseAdapter2.kt
+++ b/app/src/main/java/com/symphony/mrfit/data/adapters/ExerciseAdapter2.kt
@@ -1,10 +1,10 @@
 /*
- *  Created by Team Symphony on 4/19/23, 5:18 PM
+ *  Created by Team Symphony on 4/22/23, 5:12 PM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/19/23, 4:59 PM
+ *  Last modified 4/22/23, 4:43 PM
  */
 
-package com.symphony.mrfit.data.exercise
+package com.symphony.mrfit.data.adapters
 
 import android.content.Context
 import android.view.LayoutInflater
diff --git a/app/src/main/java/com/symphony/mrfit/data/exercise/GoalAdapter.kt b/app/src/main/java/com/symphony/mrfit/data/adapters/GoalAdapter.kt
similarity index 94%
rename from app/src/main/java/com/symphony/mrfit/data/exercise/GoalAdapter.kt
rename to app/src/main/java/com/symphony/mrfit/data/adapters/GoalAdapter.kt
index 01dcfca..4265818 100644
--- a/app/src/main/java/com/symphony/mrfit/data/exercise/GoalAdapter.kt
+++ b/app/src/main/java/com/symphony/mrfit/data/adapters/GoalAdapter.kt
@@ -1,10 +1,10 @@
 /*
- *  Created by Team Symphony on 4/1/23, 6:27 PM
+ *  Created by Team Symphony on 4/22/23, 5:12 PM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/1/23, 6:27 PM
+ *  Last modified 4/22/23, 4:43 PM
  */
 
-package com.symphony.mrfit.data.exercise
+package com.symphony.mrfit.data.adapters
 
 import android.content.Context
 import android.view.LayoutInflater
diff --git a/app/src/main/java/com/symphony/mrfit/data/exercise/HistoryAdapter.kt b/app/src/main/java/com/symphony/mrfit/data/adapters/HistoryAdapter.kt
similarity index 94%
rename from app/src/main/java/com/symphony/mrfit/data/exercise/HistoryAdapter.kt
rename to app/src/main/java/com/symphony/mrfit/data/adapters/HistoryAdapter.kt
index ffd618b..cd69a17 100644
--- a/app/src/main/java/com/symphony/mrfit/data/exercise/HistoryAdapter.kt
+++ b/app/src/main/java/com/symphony/mrfit/data/adapters/HistoryAdapter.kt
@@ -1,10 +1,10 @@
 /*
- *  Created by Team Symphony on 2/25/23, 1:42 AM
+ *  Created by Team Symphony on 4/22/23, 5:12 PM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 2/25/23, 1:42 AM
+ *  Last modified 4/22/23, 4:43 PM
  */
 
-package com.symphony.mrfit.data.exercise
+package com.symphony.mrfit.data.adapters
 
 import android.content.Context
 import android.os.Build
diff --git a/app/src/main/java/com/symphony/mrfit/data/exercise/HistoryAdapter2.kt b/app/src/main/java/com/symphony/mrfit/data/adapters/HistoryAdapter2.kt
similarity index 85%
rename from app/src/main/java/com/symphony/mrfit/data/exercise/HistoryAdapter2.kt
rename to app/src/main/java/com/symphony/mrfit/data/adapters/HistoryAdapter2.kt
index 54f2b3e..9cf6d50 100644
--- a/app/src/main/java/com/symphony/mrfit/data/exercise/HistoryAdapter2.kt
+++ b/app/src/main/java/com/symphony/mrfit/data/adapters/HistoryAdapter2.kt
@@ -1,10 +1,10 @@
 /*
- *  Created by Team Symphony on 4/1/23, 10:04 PM
+ *  Created by Team Symphony on 4/22/23, 5:12 PM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/1/23, 10:04 PM
+ *  Last modified 4/22/23, 5:12 PM
  */
 
-package com.symphony.mrfit.data.exercise
+package com.symphony.mrfit.data.adapters
 
 import android.content.Context
 import android.view.LayoutInflater
@@ -74,9 +74,12 @@ class HistoryAdapter2(
 
     private fun buildString(i: Int): String {
         val milli = data[i].duration!!
-        val minutes = TimeUnit.MILLISECONDS.toMinutes(milli)
-        val seconds = TimeUnit.MILLISECONDS.toSeconds(milli)
-        val time = String.format("%02d:%02d", minutes, seconds)
+        val time = String.format(
+            "%02d:%02d",
+            TimeUnit.MILLISECONDS.toMinutes(milli),
+            TimeUnit.MILLISECONDS.toSeconds(milli) -
+                    TimeUnit.MINUTES.toSeconds(TimeUnit.MILLISECONDS.toMinutes(milli))
+        )
         val date = SimpleDateFormat(
             "MMMM dd, yyyy",
             Locale.getDefault()
diff --git a/app/src/main/java/com/symphony/mrfit/data/exercise/NotificationAdapter.kt b/app/src/main/java/com/symphony/mrfit/data/adapters/NotificationAdapter.kt
similarity index 96%
rename from app/src/main/java/com/symphony/mrfit/data/exercise/NotificationAdapter.kt
rename to app/src/main/java/com/symphony/mrfit/data/adapters/NotificationAdapter.kt
index 9fd32f4..68bc4b9 100644
--- a/app/src/main/java/com/symphony/mrfit/data/exercise/NotificationAdapter.kt
+++ b/app/src/main/java/com/symphony/mrfit/data/adapters/NotificationAdapter.kt
@@ -1,10 +1,10 @@
 /*
- *  Created by Team Symphony on 4/1/23, 10:04 PM
+ *  Created by Team Symphony on 4/22/23, 5:12 PM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/1/23, 9:50 PM
+ *  Last modified 4/22/23, 4:43 PM
  */
 
-package com.symphony.mrfit.data.exercise
+package com.symphony.mrfit.data.adapters
 
 import android.content.Context
 import android.os.Build
diff --git a/app/src/main/java/com/symphony/mrfit/data/exercise/RoutineAdapter.kt b/app/src/main/java/com/symphony/mrfit/data/adapters/RoutineAdapter.kt
similarity index 94%
rename from app/src/main/java/com/symphony/mrfit/data/exercise/RoutineAdapter.kt
rename to app/src/main/java/com/symphony/mrfit/data/adapters/RoutineAdapter.kt
index 122c607..194a7d9 100644
--- a/app/src/main/java/com/symphony/mrfit/data/exercise/RoutineAdapter.kt
+++ b/app/src/main/java/com/symphony/mrfit/data/adapters/RoutineAdapter.kt
@@ -1,10 +1,10 @@
 /*
- *  Created by Team Symphony on 2/24/23, 11:21 PM
+ *  Created by Team Symphony on 4/22/23, 5:12 PM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 2/24/23, 11:20 PM
+ *  Last modified 4/22/23, 4:43 PM
  */
 
-package com.symphony.mrfit.data.exercise
+package com.symphony.mrfit.data.adapters
 
 import android.content.Context
 import android.content.Intent
diff --git a/app/src/main/java/com/symphony/mrfit/data/exercise/RoutineAdapter2.kt b/app/src/main/java/com/symphony/mrfit/data/adapters/RoutineAdapter2.kt
similarity index 95%
rename from app/src/main/java/com/symphony/mrfit/data/exercise/RoutineAdapter2.kt
rename to app/src/main/java/com/symphony/mrfit/data/adapters/RoutineAdapter2.kt
index 42af742..e8a5289 100644
--- a/app/src/main/java/com/symphony/mrfit/data/exercise/RoutineAdapter2.kt
+++ b/app/src/main/java/com/symphony/mrfit/data/adapters/RoutineAdapter2.kt
@@ -1,10 +1,10 @@
 /*
- *  Created by Team Symphony on 4/21/23, 3:22 PM
+ *  Created by Team Symphony on 4/22/23, 5:12 PM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/21/23, 3:22 PM
+ *  Last modified 4/22/23, 4:43 PM
  */
 
-package com.symphony.mrfit.data.exercise
+package com.symphony.mrfit.data.adapters
 
 import android.content.Context
 import android.graphics.drawable.ColorDrawable
diff --git a/app/src/main/java/com/symphony/mrfit/data/exercise/WorkoutAdapter.kt b/app/src/main/java/com/symphony/mrfit/data/adapters/WorkoutAdapter.kt
similarity index 96%
rename from app/src/main/java/com/symphony/mrfit/data/exercise/WorkoutAdapter.kt
rename to app/src/main/java/com/symphony/mrfit/data/adapters/WorkoutAdapter.kt
index c1d6d02..bb8e6d5 100644
--- a/app/src/main/java/com/symphony/mrfit/data/exercise/WorkoutAdapter.kt
+++ b/app/src/main/java/com/symphony/mrfit/data/adapters/WorkoutAdapter.kt
@@ -1,10 +1,10 @@
 /*
- *  Created by Team Symphony on 4/22/23, 6:21 AM
+ *  Created by Team Symphony on 4/22/23, 5:12 PM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/22/23, 6:05 AM
+ *  Last modified 4/22/23, 4:43 PM
  */
 
-package com.symphony.mrfit.data.exercise
+package com.symphony.mrfit.data.adapters
 
 import android.content.Context
 import android.content.Intent
@@ -19,6 +19,7 @@ import com.google.firebase.ktx.Firebase
 import com.google.firebase.storage.FirebaseStorage
 import com.google.firebase.storage.ktx.storage
 import com.symphony.mrfit.R
+import com.symphony.mrfit.data.exercise.ExerciseRepository
 import com.symphony.mrfit.data.model.Workout
 import com.symphony.mrfit.ui.WorkoutRoutineActivity.Companion.EXTRA_ROUTINE
 import com.symphony.mrfit.ui.WorkoutTemplateActivity
diff --git a/app/src/main/java/com/symphony/mrfit/data/exercise/WorkoutAdapter2.kt b/app/src/main/java/com/symphony/mrfit/data/adapters/WorkoutAdapter2.kt
similarity index 94%
rename from app/src/main/java/com/symphony/mrfit/data/exercise/WorkoutAdapter2.kt
rename to app/src/main/java/com/symphony/mrfit/data/adapters/WorkoutAdapter2.kt
index f1ae913..3333d7d 100644
--- a/app/src/main/java/com/symphony/mrfit/data/exercise/WorkoutAdapter2.kt
+++ b/app/src/main/java/com/symphony/mrfit/data/adapters/WorkoutAdapter2.kt
@@ -1,10 +1,10 @@
 /*
- *  Created by Team Symphony on 4/2/23, 10:27 PM
+ *  Created by Team Symphony on 4/22/23, 5:12 PM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/2/23, 10:22 PM
+ *  Last modified 4/22/23, 4:43 PM
  */
 
-package com.symphony.mrfit.data.exercise
+package com.symphony.mrfit.data.adapters
 
 import android.content.Context
 import android.view.LayoutInflater
@@ -19,6 +19,7 @@ import com.google.firebase.ktx.Firebase
 import com.google.firebase.storage.FirebaseStorage
 import com.google.firebase.storage.ktx.storage
 import com.symphony.mrfit.R
+import com.symphony.mrfit.data.exercise.ExerciseRepository
 import com.symphony.mrfit.data.model.Workout
 
 /**
diff --git a/app/src/main/java/com/symphony/mrfit/ui/CalendarActivity.kt b/app/src/main/java/com/symphony/mrfit/ui/CalendarActivity.kt
index 377d797..6c3b06a 100644
--- a/app/src/main/java/com/symphony/mrfit/ui/CalendarActivity.kt
+++ b/app/src/main/java/com/symphony/mrfit/ui/CalendarActivity.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/20/23, 2:11 AM
+ *  Created by Team Symphony on 4/22/23, 5:12 PM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/20/23, 2:08 AM
+ *  Last modified 4/22/23, 4:43 PM
  */
 
 package com.symphony.mrfit.ui
@@ -26,7 +26,7 @@ import com.applandeo.materialcalendarview.CalendarView
 import com.applandeo.materialcalendarview.EventDay
 import com.applandeo.materialcalendarview.listeners.OnDayClickListener
 import com.symphony.mrfit.R
-import com.symphony.mrfit.data.exercise.NotificationAdapter
+import com.symphony.mrfit.data.adapters.NotificationAdapter
 import com.symphony.mrfit.data.model.Notification
 import com.symphony.mrfit.data.profile.ProfileViewModel
 import com.symphony.mrfit.data.profile.ProfileViewModelFactory
diff --git a/app/src/main/java/com/symphony/mrfit/ui/CurrentWorkoutActivity.kt b/app/src/main/java/com/symphony/mrfit/ui/CurrentWorkoutActivity.kt
index 3a8bb0d..9078a63 100644
--- a/app/src/main/java/com/symphony/mrfit/ui/CurrentWorkoutActivity.kt
+++ b/app/src/main/java/com/symphony/mrfit/ui/CurrentWorkoutActivity.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/21/23, 10:36 PM
+ *  Created by Team Symphony on 4/22/23, 5:12 PM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/21/23, 10:36 PM
+ *  Last modified 4/22/23, 5:12 PM
  */
 
 package com.symphony.mrfit.ui
@@ -22,9 +22,9 @@ import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.firebase.Timestamp
 import com.symphony.mrfit.R
+import com.symphony.mrfit.data.adapters.WorkoutAdapter2
 import com.symphony.mrfit.data.exercise.ExerciseViewModel
 import com.symphony.mrfit.data.exercise.ExerciseViewModelFactory
-import com.symphony.mrfit.data.exercise.WorkoutAdapter2
 import com.symphony.mrfit.data.model.History
 import com.symphony.mrfit.data.profile.ProfileViewModel
 import com.symphony.mrfit.data.profile.ProfileViewModelFactory
diff --git a/app/src/main/java/com/symphony/mrfit/ui/CustomExercisesActivity.kt b/app/src/main/java/com/symphony/mrfit/ui/CustomExercisesActivity.kt
index 16cb5fb..0a0da80 100644
--- a/app/src/main/java/com/symphony/mrfit/ui/CustomExercisesActivity.kt
+++ b/app/src/main/java/com/symphony/mrfit/ui/CustomExercisesActivity.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/20/23, 7:03 PM
+ *  Created by Team Symphony on 4/22/23, 5:12 PM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/20/23, 7:03 PM
+ *  Last modified 4/22/23, 4:43 PM
  */
 
 package com.symphony.mrfit.ui
@@ -32,7 +32,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.firebase.ktx.Firebase
 import com.google.firebase.storage.ktx.storage
 import com.symphony.mrfit.R
-import com.symphony.mrfit.data.exercise.ExerciseAdapter2
+import com.symphony.mrfit.data.adapters.ExerciseAdapter2
 import com.symphony.mrfit.data.exercise.ExerciseViewModel
 import com.symphony.mrfit.data.exercise.ExerciseViewModelFactory
 import com.symphony.mrfit.data.model.Exercise
diff --git a/app/src/main/java/com/symphony/mrfit/ui/DateTimeActivity.kt b/app/src/main/java/com/symphony/mrfit/ui/DateTimeActivity.kt
index c397612..25edb4b 100644
--- a/app/src/main/java/com/symphony/mrfit/ui/DateTimeActivity.kt
+++ b/app/src/main/java/com/symphony/mrfit/ui/DateTimeActivity.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/21/23, 3:22 PM
+ *  Created by Team Symphony on 4/22/23, 5:12 PM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/21/23, 2:03 PM
+ *  Last modified 4/22/23, 5:12 PM
  */
 
 package com.symphony.mrfit.ui
@@ -14,8 +14,8 @@ import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
 import com.applandeo.materialcalendarview.EventDay
 import com.applandeo.materialcalendarview.listeners.OnDayClickListener
-import com.symphony.mrfit.ManualWorkoutActivity.Companion.EXTRA_TIME
 import com.symphony.mrfit.databinding.ActivityDateTimeBinding
+import com.symphony.mrfit.ui.ManualWorkoutActivity.Companion.EXTRA_TIME
 import java.util.*
 
 class DateTimeActivity : AppCompatActivity() {
diff --git a/app/src/main/java/com/symphony/mrfit/ui/ExerciseActivity.kt b/app/src/main/java/com/symphony/mrfit/ui/ExerciseActivity.kt
index 9f7e7e9..90e564a 100644
--- a/app/src/main/java/com/symphony/mrfit/ui/ExerciseActivity.kt
+++ b/app/src/main/java/com/symphony/mrfit/ui/ExerciseActivity.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/21/23, 3:22 PM
+ *  Created by Team Symphony on 4/22/23, 5:12 PM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/21/23, 1:31 PM
+ *  Last modified 4/22/23, 4:43 PM
  */
 
 package com.symphony.mrfit.ui
@@ -31,7 +31,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.symphony.mrfit.R
-import com.symphony.mrfit.data.exercise.ExerciseAdapter
+import com.symphony.mrfit.data.adapters.ExerciseAdapter
 import com.symphony.mrfit.data.exercise.ExerciseViewModel
 import com.symphony.mrfit.data.exercise.ExerciseViewModelFactory
 import com.symphony.mrfit.data.model.Exercise
diff --git a/app/src/main/java/com/symphony/mrfit/ui/GoalsActivity.kt b/app/src/main/java/com/symphony/mrfit/ui/GoalsActivity.kt
index ed5532c..c42eadf 100644
--- a/app/src/main/java/com/symphony/mrfit/ui/GoalsActivity.kt
+++ b/app/src/main/java/com/symphony/mrfit/ui/GoalsActivity.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/20/23, 7:03 PM
+ *  Created by Team Symphony on 4/22/23, 5:12 PM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/20/23, 5:47 PM
+ *  Last modified 4/22/23, 4:43 PM
  */
 
 package com.symphony.mrfit.ui
@@ -22,7 +22,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.symphony.mrfit.R
-import com.symphony.mrfit.data.exercise.GoalAdapter
+import com.symphony.mrfit.data.adapters.GoalAdapter
 import com.symphony.mrfit.data.model.Goal
 import com.symphony.mrfit.data.profile.ProfileViewModel
 import com.symphony.mrfit.data.profile.ProfileViewModelFactory
diff --git a/app/src/main/java/com/symphony/mrfit/ui/HomeActivity.kt b/app/src/main/java/com/symphony/mrfit/ui/HomeActivity.kt
index 45caee5..251e930 100644
--- a/app/src/main/java/com/symphony/mrfit/ui/HomeActivity.kt
+++ b/app/src/main/java/com/symphony/mrfit/ui/HomeActivity.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/21/23, 3:22 PM
+ *  Created by Team Symphony on 4/22/23, 5:12 PM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/21/23, 3:17 PM
+ *  Last modified 4/22/23, 4:56 PM
  */
 
 package com.symphony.mrfit.ui
@@ -20,9 +20,8 @@ import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.bumptech.glide.signature.ObjectKey
 import com.google.firebase.auth.FirebaseAuth
-import com.symphony.mrfit.ManualWorkoutActivity
 import com.symphony.mrfit.R
-import com.symphony.mrfit.data.exercise.HistoryAdapter
+import com.symphony.mrfit.data.adapters.HistoryAdapter
 import com.symphony.mrfit.data.profile.ProfileViewModel
 import com.symphony.mrfit.data.profile.ProfileViewModelFactory
 import com.symphony.mrfit.databinding.ActivityHomeBinding
diff --git a/app/src/main/java/com/symphony/mrfit/ManualWorkoutActivity.kt b/app/src/main/java/com/symphony/mrfit/ui/ManualWorkoutActivity.kt
similarity index 96%
rename from app/src/main/java/com/symphony/mrfit/ManualWorkoutActivity.kt
rename to app/src/main/java/com/symphony/mrfit/ui/ManualWorkoutActivity.kt
index d47d000..9ba32ee 100644
--- a/app/src/main/java/com/symphony/mrfit/ManualWorkoutActivity.kt
+++ b/app/src/main/java/com/symphony/mrfit/ui/ManualWorkoutActivity.kt
@@ -1,10 +1,10 @@
 /*
- *  Created by Team Symphony on 4/21/23, 3:22 PM
+ *  Created by Team Symphony on 4/22/23, 5:12 PM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/21/23, 3:22 PM
+ *  Last modified 4/22/23, 5:12 PM
  */
 
-package com.symphony.mrfit
+package com.symphony.mrfit.ui
 
 import android.app.Activity
 import android.content.ContentValues
@@ -22,14 +22,13 @@ import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.firebase.Timestamp
+import com.symphony.mrfit.data.adapters.RoutineAdapter2
 import com.symphony.mrfit.data.exercise.ExerciseViewModel
 import com.symphony.mrfit.data.exercise.ExerciseViewModelFactory
-import com.symphony.mrfit.data.exercise.RoutineAdapter2
 import com.symphony.mrfit.data.model.History
 import com.symphony.mrfit.data.profile.ProfileViewModel
 import com.symphony.mrfit.data.profile.ProfileViewModelFactory
 import com.symphony.mrfit.databinding.ActivityManualWorkoutBinding
-import com.symphony.mrfit.ui.DateTimeActivity
 import java.text.SimpleDateFormat
 import java.util.*
 
@@ -126,12 +125,10 @@ class ManualWorkoutActivity : AppCompatActivity() {
         var selectedThing = intent.getIntExtra(SAVED_SELECTION, -999)
         var routineName = ""
         var routineID = ""
-        var selection = false
 
         fun update(name: String, id: String, num: Int) {
             routineName = name
             routineID = id
-            selection = true
             selectedThing = num
         }
 
@@ -188,7 +185,7 @@ class ManualWorkoutActivity : AppCompatActivity() {
          * The end time must not be before the start time
          */
         save.setOnClickListener {
-            if (selection) {
+            if (selectedThing >= 0) {
                 if (startTime < endTime) {
                     profileViewModel.addWorkoutToHistory(
                         History(
diff --git a/app/src/main/java/com/symphony/mrfit/ui/NotificationLogActivity.kt b/app/src/main/java/com/symphony/mrfit/ui/NotificationLogActivity.kt
index 0960988..21d7c9a 100644
--- a/app/src/main/java/com/symphony/mrfit/ui/NotificationLogActivity.kt
+++ b/app/src/main/java/com/symphony/mrfit/ui/NotificationLogActivity.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/2/23, 9:44 PM
+ *  Created by Team Symphony on 4/22/23, 5:12 PM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/2/23, 9:42 PM
+ *  Last modified 4/22/23, 4:43 PM
  */
 
 package com.symphony.mrfit.ui
@@ -21,7 +21,7 @@ import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.symphony.mrfit.data.exercise.NotificationAdapter
+import com.symphony.mrfit.data.adapters.NotificationAdapter
 import com.symphony.mrfit.data.profile.ProfileViewModel
 import com.symphony.mrfit.data.profile.ProfileViewModelFactory
 import com.symphony.mrfit.databinding.ActivityNotificationLogBinding
diff --git a/app/src/main/java/com/symphony/mrfit/ui/RoutineSelectionActivity.kt b/app/src/main/java/com/symphony/mrfit/ui/RoutineSelectionActivity.kt
index 843b0dd..b2877e7 100644
--- a/app/src/main/java/com/symphony/mrfit/ui/RoutineSelectionActivity.kt
+++ b/app/src/main/java/com/symphony/mrfit/ui/RoutineSelectionActivity.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/1/23, 7:44 PM
+ *  Created by Team Symphony on 4/22/23, 5:12 PM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/1/23, 7:44 PM
+ *  Last modified 4/22/23, 5:12 PM
  */
 
 package com.symphony.mrfit.ui
@@ -16,9 +16,9 @@ import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import com.symphony.mrfit.data.adapters.RoutineAdapter
 import com.symphony.mrfit.data.exercise.ExerciseViewModel
 import com.symphony.mrfit.data.exercise.ExerciseViewModelFactory
-import com.symphony.mrfit.data.exercise.RoutineAdapter
 import com.symphony.mrfit.databinding.ActivityRoutineSelectionBinding
 import com.symphony.mrfit.ui.Helper.BLANK
 import com.symphony.mrfit.ui.WorkoutTemplateActivity.Companion.EXTRA_IDENTITY
diff --git a/app/src/main/java/com/symphony/mrfit/ui/WorkoutHistoryActivity.kt b/app/src/main/java/com/symphony/mrfit/ui/WorkoutHistoryActivity.kt
index f64367e..0dac47a 100644
--- a/app/src/main/java/com/symphony/mrfit/ui/WorkoutHistoryActivity.kt
+++ b/app/src/main/java/com/symphony/mrfit/ui/WorkoutHistoryActivity.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/20/23, 7:03 PM
+ *  Created by Team Symphony on 4/22/23, 5:12 PM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/20/23, 4:59 PM
+ *  Last modified 4/22/23, 4:56 PM
  */
 
 package com.symphony.mrfit.ui
@@ -19,9 +19,8 @@ import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.symphony.mrfit.ManualWorkoutActivity
 import com.symphony.mrfit.R
-import com.symphony.mrfit.data.exercise.HistoryAdapter2
+import com.symphony.mrfit.data.adapters.HistoryAdapter2
 import com.symphony.mrfit.data.model.History
 import com.symphony.mrfit.data.profile.ProfileViewModel
 import com.symphony.mrfit.data.profile.ProfileViewModelFactory
diff --git a/app/src/main/java/com/symphony/mrfit/ui/WorkoutRoutineActivity.kt b/app/src/main/java/com/symphony/mrfit/ui/WorkoutRoutineActivity.kt
index 080b8e9..f74d959 100644
--- a/app/src/main/java/com/symphony/mrfit/ui/WorkoutRoutineActivity.kt
+++ b/app/src/main/java/com/symphony/mrfit/ui/WorkoutRoutineActivity.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/22/23, 6:21 AM
+ *  Created by Team Symphony on 4/22/23, 5:12 PM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/22/23, 6:05 AM
+ *  Last modified 4/22/23, 5:12 PM
  */
 
 package com.symphony.mrfit.ui
@@ -21,9 +21,9 @@ import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.symphony.mrfit.R
+import com.symphony.mrfit.data.adapters.WorkoutAdapter
 import com.symphony.mrfit.data.exercise.ExerciseViewModel
 import com.symphony.mrfit.data.exercise.ExerciseViewModelFactory
-import com.symphony.mrfit.data.exercise.WorkoutAdapter
 import com.symphony.mrfit.data.profile.ProfileViewModel
 import com.symphony.mrfit.data.profile.ProfileViewModelFactory
 import com.symphony.mrfit.databinding.ActivityWorkoutRoutineBinding
@@ -49,8 +49,7 @@ class WorkoutRoutineActivity : AppCompatActivity() {
     private lateinit var passedRoutineID: String
     private var routineName: String? = null
     private var playlist: String? = null
-    private var exercises: ArrayList<String> = ArrayList()
-    private var passedList: ArrayList<String> = ArrayList()
+    private var exercises: ArrayList<String>? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -122,16 +121,15 @@ class WorkoutRoutineActivity : AppCompatActivity() {
             }
             if (routine.workoutList != null) {
                 if (routine.workoutList.isNotEmpty()) {
-                    exercises = routine.workoutList
                     spinner.visibility = View.VISIBLE
-                    passedList = routine.workoutList
-                    exerciseViewModel.getWorkouts(exercises)
+                    exercises = routine.workoutList
+                    exerciseViewModel.getWorkouts(exercises!!)
                 }
             }
         })
         exerciseViewModel.workoutList.observe(this, Observer {
             val workList = it ?: return@Observer
-            workoutList.adapter = WorkoutAdapter(this, workList, passedRoutineID, passedList)
+            workoutList.adapter = WorkoutAdapter(this, workList, passedRoutineID, exercises!!)
             placeholderText.visibility = View.GONE
             workoutList.visibility = View.VISIBLE
             spinner.visibility = View.GONE
@@ -154,7 +152,7 @@ class WorkoutRoutineActivity : AppCompatActivity() {
             val intent = Intent(this, CurrentWorkoutActivity::class.java)
             intent.putExtra(EXTRA_STRING, routineName)
             intent.putExtra(EXTRA_ROUTINE, passedRoutineID)
-            intent.putExtra(EXTRA_LIST, passedList)
+            intent.putExtra(EXTRA_LIST, exercises)
             startActivity(intent)
         }
 
@@ -164,7 +162,7 @@ class WorkoutRoutineActivity : AppCompatActivity() {
             intent.putExtra(EXTRA_ROUTINE, passedRoutineID)
             intent.putExtra(EXTRA_IDENTITY, NEW_ID)
             intent.putExtra(WorkoutTemplateActivity.EXTRA_STRING, getText(R.string.new_exercise))
-            intent.putExtra(WorkoutTemplateActivity.EXTRA_LIST, passedList)
+            intent.putExtra(WorkoutTemplateActivity.EXTRA_LIST, exercises)
             startActivity(intent)
         }
 
diff --git a/app/src/main/res/layout/activity_manual_workout.xml b/app/src/main/res/layout/activity_manual_workout.xml
index 94d01ab..0dcd6e3 100644
--- a/app/src/main/res/layout/activity_manual_workout.xml
+++ b/app/src/main/res/layout/activity_manual_workout.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~  Created by Team Symphony on 4/20/23, 7:03 PM
+  ~  Created by Team Symphony on 4/22/23, 5:12 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/20/23, 7:03 PM
+  ~  Last modified 4/22/23, 4:56 PM
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -9,7 +9,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ManualWorkoutActivity">
+    tools:context=".ui.ManualWorkoutActivity">
 
     <LinearLayout
         android:layout_width="match_parent"

From 6ac9e213b4a653c1c85ede394e640c7dc6e50d74 Mon Sep 17 00:00:00 2001
From: NikM3 <nikolas.a.melendez@gmail.com>
Date: Sat, 22 Apr 2023 19:14:13 -0400
Subject: [PATCH 14/18] Follow up to #143

---
 .../mrfit/data/exercise/ExerciseRepository.kt | 39 +++++++++++++++----
 .../mrfit/ui/WorkoutTemplateActivity.kt       |  9 +++--
 2 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/symphony/mrfit/data/exercise/ExerciseRepository.kt b/app/src/main/java/com/symphony/mrfit/data/exercise/ExerciseRepository.kt
index 55cfe3a..178542e 100644
--- a/app/src/main/java/com/symphony/mrfit/data/exercise/ExerciseRepository.kt
+++ b/app/src/main/java/com/symphony/mrfit/data/exercise/ExerciseRepository.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/2/23, 2:50 PM
+ *  Created by Team Symphony on 4/22/23, 7:14 PM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/2/23, 2:50 PM
+ *  Last modified 4/22/23, 7:09 PM
  */
 
 package com.symphony.mrfit.data.exercise
@@ -82,16 +82,41 @@ class ExerciseRepository {
 
     /**
      * Remove a specific Exercise by it's ID
+     * Also remove any workouts using that Exercise
+     * Update any routines using those workouts to alert the user
      */
-//    suspend fun deleteExercise(exeID: String) {
-//        Log.d(TAG, "Removing Exercise $exeID from Firestore")
-//        database.collection(EXERCISE_COLLECTION).document(exeID).delete().await()
-//    }
     suspend fun deleteExercise(exeID: String) {
         Log.d(TAG, "Removing Exercise $exeID from Firestore")
+        database.collection(EXERCISE_COLLECTION).document(exeID).delete().await()
         val storageRef = storage.reference.child(EXERCISE_PICTURE).child(exeID)
         storageRef.delete().await()
-        database.collection(EXERCISE_COLLECTION).document(exeID).delete().await()
+
+        Log.d(TAG, "Removing Exercise $exeID from all Routines")
+        try {
+            val workList = arrayListOf<String>()
+            // Get and delete all workouts constructed from the deleted exercise
+            val result = database.collection(WORKOUT_COLLECTION)
+                .whereEqualTo("exercise", exeID)
+                .get()
+                .await()
+            for (document in result) {
+                workList.add(document.get("workoutID") as String)
+                document.reference.delete()
+            }
+            // Remove any deleted workouts from routines
+            for (workID in workList) {
+                val result2 = database.collection(ROUTINE_COLLECTION)
+                    .whereArrayContains("workoutList", workID)
+                    .get().await()
+                for (document2 in result2) {
+                    val t = document2.toObject<WorkoutRoutine>()
+                    t.workoutList!!.remove(workID)
+                    document2.reference.set(t)
+                }
+            }
+        } catch (e: java.lang.Exception) {
+            Log.d(TAG, "Error updating routines: $e")
+        }
     }
 
     /**
diff --git a/app/src/main/java/com/symphony/mrfit/ui/WorkoutTemplateActivity.kt b/app/src/main/java/com/symphony/mrfit/ui/WorkoutTemplateActivity.kt
index 04139bb..08e8108 100644
--- a/app/src/main/java/com/symphony/mrfit/ui/WorkoutTemplateActivity.kt
+++ b/app/src/main/java/com/symphony/mrfit/ui/WorkoutTemplateActivity.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/22/23, 6:21 AM
+ *  Created by Team Symphony on 4/22/23, 7:14 PM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/22/23, 6:05 AM
+ *  Last modified 4/22/23, 7:14 PM
  */
 
 package com.symphony.mrfit.ui
@@ -22,7 +22,9 @@ import com.google.firebase.ktx.Firebase
 import com.google.firebase.storage.FirebaseStorage
 import com.google.firebase.storage.ktx.storage
 import com.symphony.mrfit.R
-import com.symphony.mrfit.data.exercise.*
+import com.symphony.mrfit.data.exercise.ExerciseRepository
+import com.symphony.mrfit.data.exercise.ExerciseViewModel
+import com.symphony.mrfit.data.exercise.ExerciseViewModelFactory
 import com.symphony.mrfit.data.model.Workout
 import com.symphony.mrfit.databinding.ActivityWorkoutTemplateBinding
 import com.symphony.mrfit.ui.Helper.showSnackBar
@@ -192,7 +194,6 @@ class WorkoutTemplateActivity : AppCompatActivity() {
                 Toast.LENGTH_SHORT
             ).show()
             finish()
-            recreate()
         }
 
         exerciseViewModel.exercise.observe(this, Observer {

From 6f20a6258bf1f1526cadbb12bdead9f8d7cf2046 Mon Sep 17 00:00:00 2001
From: nicolekaate <NGC2@email.sc.edu>
Date: Sat, 22 Apr 2023 19:43:42 -0400
Subject: [PATCH 15/18] basic unit tests #75

---
 .../mrfit/ui/NotificationActivityTest.kt      | 45 +++++++++++++++++++
 .../mrfit/ui/PostWorkoutActivityTest.kt       | 41 +++++++++++++++++
 .../symphony/mrfit/ui/RegisterActivityTest.kt |  2 +
 .../main/res/layout/activity_notification.xml |  1 +
 .../main/res/layout/activity_post_workout.xml |  1 +
 5 files changed, 90 insertions(+)
 create mode 100644 app/src/androidTest/java/com/symphony/mrfit/ui/NotificationActivityTest.kt
 create mode 100644 app/src/androidTest/java/com/symphony/mrfit/ui/PostWorkoutActivityTest.kt

diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/NotificationActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/NotificationActivityTest.kt
new file mode 100644
index 0000000..f5eff35
--- /dev/null
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/NotificationActivityTest.kt
@@ -0,0 +1,45 @@
+package com.symphony.mrfit.ui
+
+import androidx.test.espresso.Espresso
+import androidx.test.espresso.assertion.ViewAssertions
+import androidx.test.espresso.matcher.ViewMatchers
+import com.symphony.mrfit.R
+import org.junit.Assert.*
+
+import org.junit.Test
+import org.mockito.Mockito;
+import org.mockito.Mockito.`when`
+
+
+class NotificationActivityTest {
+
+    //TODO: cant figure out tests for notif activity
+
+    /*@Test
+    fun getHasNotificationPermissionGranted() {
+
+    }
+
+    @Test
+    fun setHasNotificationPermissionGranted() {
+
+    }*/
+
+    //tests if the activity is displayed and visible to user
+    /*@Test
+    fun checkActivityVisibility() {
+        Espresso.onView(ViewMatchers.withId(R.id.layout_notifActivity))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+    }
+
+    //tests if date picker and time picker are visible
+    @Test
+    fun checkViewVisibility() {
+        Espresso.onView(ViewMatchers.withId(R.id.datePicker))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.timePicker))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+    }*/
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/PostWorkoutActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/PostWorkoutActivityTest.kt
new file mode 100644
index 0000000..3e355c6
--- /dev/null
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/PostWorkoutActivityTest.kt
@@ -0,0 +1,41 @@
+package com.symphony.mrfit.ui
+
+import androidx.test.espresso.Espresso
+import androidx.test.espresso.assertion.ViewAssertions
+import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.ext.junit.rules.activityScenarioRule
+import com.symphony.mrfit.R
+import org.junit.Assert.*
+import org.junit.Rule
+
+import org.junit.Test
+
+class PostWorkoutActivityTest {
+
+    @get:Rule
+    var activityScenarioRule = activityScenarioRule<PostWorkoutActivity>()
+
+    //tests if the activity is displayed and visible to user
+    @Test
+    fun checkActivityVisibility() {
+        Espresso.onView(ViewMatchers.withId(R.id.layout_postWorkoutActivity))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+    }
+
+    //tests if components are visible
+    @Test
+    fun checkViewVisibility() {
+        Espresso.onView(ViewMatchers.withId(R.id.postWorkoutTitle))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.postWorkoutTime))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        /*Espresso.onView(ViewMatchers.withId(R.id.gotoGoalsButton))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.withId(R.id.returnHomeButton))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))*/
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/RegisterActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/RegisterActivityTest.kt
index 674ca5f..7b20abc 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/RegisterActivityTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/RegisterActivityTest.kt
@@ -18,6 +18,8 @@ class RegisterActivityTest {
     @get:Rule
     var activityScenarioRule = activityScenarioRule<RegisterActivity>()
 
+
+
     /*tests if register works*/
     @Test
     fun checkValidRegister() {
diff --git a/app/src/main/res/layout/activity_notification.xml b/app/src/main/res/layout/activity_notification.xml
index fab5cbd..4b54fcf 100644
--- a/app/src/main/res/layout/activity_notification.xml
+++ b/app/src/main/res/layout/activity_notification.xml
@@ -8,6 +8,7 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/layout_notifActivity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
diff --git a/app/src/main/res/layout/activity_post_workout.xml b/app/src/main/res/layout/activity_post_workout.xml
index b5bc9e9..5f19ff1 100644
--- a/app/src/main/res/layout/activity_post_workout.xml
+++ b/app/src/main/res/layout/activity_post_workout.xml
@@ -8,6 +8,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/layout_postWorkoutActivity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".ui.PostWorkoutActivity">

From 0708bda9f856339ef639fd62de26ee5d4baa9bd4 Mon Sep 17 00:00:00 2001
From: NikM3 <nikolas.a.melendez@gmail.com>
Date: Sat, 22 Apr 2023 20:53:40 -0400
Subject: [PATCH 16/18] Date time functions moved #159

---
 .../mrfit/data/adapters/HistoryAdapter.kt     | 10 +--
 .../mrfit/data/adapters/HistoryAdapter2.kt    | 22 ++----
 .../data/adapters/NotificationAdapter.kt      | 12 +--
 .../mrfit/ui/CurrentWorkoutActivity.kt        | 22 ++----
 .../main/java/com/symphony/mrfit/ui/Helper.kt | 77 ++++++++++++++++++-
 app/src/main/res/values/strings.xml           |  8 +-
 6 files changed, 103 insertions(+), 48 deletions(-)

diff --git a/app/src/main/java/com/symphony/mrfit/data/adapters/HistoryAdapter.kt b/app/src/main/java/com/symphony/mrfit/data/adapters/HistoryAdapter.kt
index cd69a17..e56f3e6 100644
--- a/app/src/main/java/com/symphony/mrfit/data/adapters/HistoryAdapter.kt
+++ b/app/src/main/java/com/symphony/mrfit/data/adapters/HistoryAdapter.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/22/23, 5:12 PM
+ *  Created by Team Symphony on 4/22/23, 8:53 PM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/22/23, 4:43 PM
+ *  Last modified 4/22/23, 7:45 PM
  */
 
 package com.symphony.mrfit.data.adapters
@@ -16,6 +16,7 @@ import androidx.annotation.RequiresApi
 import androidx.recyclerview.widget.RecyclerView
 import com.symphony.mrfit.R
 import com.symphony.mrfit.data.model.History
+import com.symphony.mrfit.ui.Helper.humanReadableDuration
 import java.text.SimpleDateFormat
 import java.util.*
 
@@ -37,9 +38,8 @@ class HistoryAdapter (val context: Context, val data: ArrayList<History>): Recyc
         holder.historyTitle.text = data[i].name
         val dateFormat = SimpleDateFormat("dd-MM-yyyy", Locale.US)
         holder.historyTimestamp.text = dateFormat.format(data[i].date!!.toDate())
-        val seconds = (data[i].duration?.div(1000))?.mod(60)
-        val minutes = (data[i].duration?.div(1000))?.div(60)
-        holder.historyDuration.text = "Exercised for $minutes:$seconds"
+        val time = humanReadableDuration(data[i].duration!!)
+        holder.historyDuration.text = "Exercised for $time"
     }
 
     override fun getItemCount(): Int {
diff --git a/app/src/main/java/com/symphony/mrfit/data/adapters/HistoryAdapter2.kt b/app/src/main/java/com/symphony/mrfit/data/adapters/HistoryAdapter2.kt
index 9cf6d50..7f15159 100644
--- a/app/src/main/java/com/symphony/mrfit/data/adapters/HistoryAdapter2.kt
+++ b/app/src/main/java/com/symphony/mrfit/data/adapters/HistoryAdapter2.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/22/23, 5:12 PM
+ *  Created by Team Symphony on 4/22/23, 8:53 PM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/22/23, 5:12 PM
+ *  Last modified 4/22/23, 8:53 PM
  */
 
 package com.symphony.mrfit.data.adapters
@@ -15,9 +15,8 @@ import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.symphony.mrfit.R
 import com.symphony.mrfit.data.model.History
-import java.text.SimpleDateFormat
-import java.util.*
-import java.util.concurrent.TimeUnit
+import com.symphony.mrfit.ui.Helper.humanReadableDate
+import com.symphony.mrfit.ui.Helper.humanReadableDuration
 
 /**
  * Adapter for dynamically populating a card_history with a passed list of Histories
@@ -74,17 +73,8 @@ class HistoryAdapter2(
 
     private fun buildString(i: Int): String {
         val milli = data[i].duration!!
-        val time = String.format(
-            "%02d:%02d",
-            TimeUnit.MILLISECONDS.toMinutes(milli),
-            TimeUnit.MILLISECONDS.toSeconds(milli) -
-                    TimeUnit.MINUTES.toSeconds(TimeUnit.MILLISECONDS.toMinutes(milli))
-        )
-        val date = SimpleDateFormat(
-            "MMMM dd, yyyy",
-            Locale.getDefault()
-        )
-            .format(data[i].date!!.toDate())
+        val time = humanReadableDuration(milli)
+        val date = humanReadableDate(data[i].date!!.toDate())
         return "Exercised for $time on $date"
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/symphony/mrfit/data/adapters/NotificationAdapter.kt b/app/src/main/java/com/symphony/mrfit/data/adapters/NotificationAdapter.kt
index 68bc4b9..2acbf2d 100644
--- a/app/src/main/java/com/symphony/mrfit/data/adapters/NotificationAdapter.kt
+++ b/app/src/main/java/com/symphony/mrfit/data/adapters/NotificationAdapter.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/22/23, 5:12 PM
+ *  Created by Team Symphony on 4/22/23, 8:53 PM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/22/23, 4:43 PM
+ *  Last modified 4/22/23, 8:53 PM
  */
 
 package com.symphony.mrfit.data.adapters
@@ -19,7 +19,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.symphony.mrfit.R
 import com.symphony.mrfit.data.model.Notification
 import com.symphony.mrfit.data.profile.UserRepository
-import java.text.SimpleDateFormat
+import com.symphony.mrfit.ui.Helper.humanReadableDateTime
 import java.util.*
 
 /**
@@ -47,11 +47,7 @@ class NotificationAdapter(
     override fun onBindViewHolder(holder: ViewHolder, i: Int) {
         holder.notificationMessage.text = data[i].message
         val date = data[i].date!!.toDate()
-        holder.notificationTimestamp.text = SimpleDateFormat(
-            "MMMM dd, yyyy 'at' hh:mm a",
-            Locale.getDefault()
-        )
-            .format(date)
+        holder.notificationTimestamp.text = humanReadableDateTime(date)
         // If the Notification was from before the current date
         // allow user to delete it
         if (date.before(Date())) {
diff --git a/app/src/main/java/com/symphony/mrfit/ui/CurrentWorkoutActivity.kt b/app/src/main/java/com/symphony/mrfit/ui/CurrentWorkoutActivity.kt
index 9078a63..fe8d34b 100644
--- a/app/src/main/java/com/symphony/mrfit/ui/CurrentWorkoutActivity.kt
+++ b/app/src/main/java/com/symphony/mrfit/ui/CurrentWorkoutActivity.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/22/23, 5:12 PM
+ *  Created by Team Symphony on 4/22/23, 8:53 PM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/22/23, 5:12 PM
+ *  Last modified 4/22/23, 8:53 PM
  */
 
 package com.symphony.mrfit.ui
@@ -30,10 +30,10 @@ import com.symphony.mrfit.data.profile.ProfileViewModel
 import com.symphony.mrfit.data.profile.ProfileViewModelFactory
 import com.symphony.mrfit.databinding.ActivityCurrentWorkoutBinding
 import com.symphony.mrfit.ui.Helper.ZERO
+import com.symphony.mrfit.ui.Helper.humanReadableTime
 import com.symphony.mrfit.ui.RoutineSelectionActivity.Companion.EXTRA_LIST
 import com.symphony.mrfit.ui.RoutineSelectionActivity.Companion.EXTRA_STRING
 import com.symphony.mrfit.ui.WorkoutRoutineActivity.Companion.EXTRA_ROUTINE
-import java.text.SimpleDateFormat
 import java.util.*
 
 /**
@@ -136,17 +136,9 @@ class CurrentWorkoutActivity : AppCompatActivity() {
             materialDialog.setView(dialogView)
 
             val text = dialogView.findViewById<TextView>(R.id.postWorkoutTime)
-            val startTime = SimpleDateFormat(
-                "'You started this workout at 'hh:mm a",
-                Locale.getDefault()
-            )
-                .format(Date().time - timeSpent)
-            val endTime = SimpleDateFormat(
-                "' and finished at 'hh:mm a",
-                Locale.getDefault()
-            )
-                .format(Date())
-            var totalTime = " for a total of "
+            val startTime = humanReadableTime(Date().time - timeSpent)
+            val endTime = humanReadableTime(Date())
+            var totalTime = ""
             var hours: Long = 0
             var minutes = timeSpent / 1000 / 60
             val seconds = timeSpent / 1000 % 60
@@ -162,7 +154,7 @@ class CurrentWorkoutActivity : AppCompatActivity() {
             }
             totalTime += "$seconds seconds."
 
-            text.text = startTime + endTime + totalTime
+            text.text = getString(R.string.post_workout_message, startTime, endTime, totalTime)
 
             materialDialog.setOnCancelListener {
                 gotoHome()
diff --git a/app/src/main/java/com/symphony/mrfit/ui/Helper.kt b/app/src/main/java/com/symphony/mrfit/ui/Helper.kt
index ba29fcd..b5ac47d 100644
--- a/app/src/main/java/com/symphony/mrfit/ui/Helper.kt
+++ b/app/src/main/java/com/symphony/mrfit/ui/Helper.kt
@@ -1,14 +1,16 @@
 /*
- *  Created by Team Symphony on 4/2/23, 6:07 PM
+ *  Created by Team Symphony on 4/22/23, 8:53 PM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/2/23, 5:25 PM
+ *  Last modified 4/22/23, 8:52 PM
  */
 
 package com.symphony.mrfit.ui
 
 import android.app.Activity
 import com.google.android.material.snackbar.Snackbar
+import java.text.SimpleDateFormat
 import java.util.*
+import java.util.concurrent.TimeUnit
 
 /**
  * Object for holding helper functions and consts
@@ -19,6 +21,9 @@ object Helper {
     const val BLANK = ""
     const val ZERO = 0
     const val EXTRA_DATE = "passed_date"
+    const val ONE_MINUTE: Long = 60000
+    const val ONE_HOUR: Long = 3600000
+
     fun showSnackBar(message: String?, activity: Activity?) {
         if (null != activity && null != message) {
             Snackbar.make(
@@ -33,4 +38,72 @@ object Helper {
         cal.time = date
         return cal
     }
+
+    fun humanReadableDuration(time: Long): String {
+        return if (time > ONE_HOUR) {
+            String.format(
+                "%02d:%02d:%02d",
+                TimeUnit.MILLISECONDS.toHours(time),
+                TimeUnit.MILLISECONDS.toMinutes(time) -
+                        TimeUnit.HOURS.toMinutes(TimeUnit.MILLISECONDS.toHours(time)),
+                TimeUnit.MILLISECONDS.toSeconds(time) -
+                        TimeUnit.MINUTES.toSeconds(TimeUnit.MILLISECONDS.toMinutes(time))
+            )
+        } else {
+            String.format(
+                "%02d:%02d",
+                TimeUnit.MILLISECONDS.toMinutes(time),
+                TimeUnit.MILLISECONDS.toSeconds(time) -
+                        TimeUnit.MINUTES.toSeconds(TimeUnit.MILLISECONDS.toMinutes(time))
+            )
+        }
+    }
+
+    fun humanReadableTime(time: Long): String {
+        return SimpleDateFormat(
+            "hh:mm a",
+            Locale.getDefault()
+        )
+            .format(time)
+    }
+
+    fun humanReadableTime(time: Date): String {
+        return SimpleDateFormat(
+            "hh:mm a",
+            Locale.getDefault()
+        )
+            .format(time)
+    }
+
+    fun humanReadableDate(date: Date): String {
+        return SimpleDateFormat(
+            "MMMM dd, yyyy",
+            Locale.getDefault()
+        )
+            .format(date)
+    }
+
+    fun humanReadableDate(date: Long): String {
+        return SimpleDateFormat(
+            "MMMM dd, yyyy",
+            Locale.getDefault()
+        )
+            .format(date)
+    }
+
+    fun humanReadableDateTime(date: Date): String {
+        return SimpleDateFormat(
+            "MMMM dd, yyyy 'at' hh:mm a",
+            Locale.getDefault()
+        )
+            .format(date)
+    }
+
+    fun humanReadableDateTime(date: Long): String {
+        return SimpleDateFormat(
+            "MMMM dd, yyyy 'at' hh:mm a",
+            Locale.getDefault()
+        )
+            .format(date)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 732020f..7df9ee0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,7 +1,7 @@
 <!--
-  ~  Created by Team Symphony on 4/21/23, 3:22 PM
+  ~  Created by Team Symphony on 4/22/23, 8:53 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/21/23, 3:17 PM
+  ~  Last modified 4/22/23, 7:50 PM
   -->
 
 <resources>
@@ -133,6 +133,10 @@
     <string name="button_open_routine">Open this Template</string>
     <string name="button_ok">Okay</string>
     <string name="title_activity_workout_detail">WorkoutDetail</string>
+    <string name="post_workout_message">You started this workout at %s and finished at %s for a total of %s</string>
+    <string name="exercise_card_duration">Exercised for %s</string>
+    <string name="exercise_card_duration2">Exercised for %s on %s</string>
+
     <!-- Strings used for fragments for navigation -->
     <string name="first_fragment_label">First Fragment</string>
     <string name="second_fragment_label">Second Fragment</string>

From 4310fe99dcbbb16e1b7c5fd5207cabf500df5128 Mon Sep 17 00:00:00 2001
From: NikM3 <nikolas.a.melendez@gmail.com>
Date: Sun, 23 Apr 2023 03:02:53 -0400
Subject: [PATCH 17/18] Unit tests for Helper class. Giving up on Mockito #75

---
 app/build.gradle                              |   3 +-
 .../java/com/symphony/mrfit/ui/HelperTest.kt  |   7 +-
 .../mrfit/data/adapters/GoalAdapter.kt        |   6 +-
 .../main/java/com/symphony/mrfit/ui/Helper.kt |   6 +-
 .../mrfit/data/login/LoginRepositoryTest.kt   |  49 +++----
 .../java/com/symphony/mrfit/ui/HelperTest.kt  | 123 ++++++++++++++++++
 6 files changed, 154 insertions(+), 40 deletions(-)
 create mode 100644 app/src/test/java/com/symphony/mrfit/ui/HelperTest.kt

diff --git a/app/build.gradle b/app/build.gradle
index ec3756f..0f0394c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -57,6 +57,7 @@ dependencies {
 
     // Testing dependencies
     implementation 'androidx.arch.core:core-testing:2.2.0'
+    implementation 'androidx.test:monitor:1.6.1'
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.junit.jupiter:junit-jupiter'
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.2'
@@ -80,7 +81,7 @@ dependencies {
 
     // Optional -- Mockito framework
     testImplementation 'org.mockito:mockito-core:5.3.1'
-    testImplementation 'org.mockito:mockito-android:5.3.1'
+    androidTestImplementation 'org.mockito:mockito-android:5.3.1'
     testImplementation 'org.mockito.kotlin:mockito-kotlin:4.1.0'
     testImplementation 'io.mockk:mockk:1.13.5'
 
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/HelperTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/HelperTest.kt
index 7dc1366..380d7c6 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/HelperTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/HelperTest.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/22/23, 6:21 AM
+ *  Created by Team Symphony on 4/23/23, 3:02 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/22/23, 6:05 AM
+ *  Last modified 4/22/23, 11:32 PM
  */
 
 package com.symphony.mrfit.ui
@@ -26,4 +26,5 @@ class HelperTest{
         assertThat(cal.get(Calendar.DAY_OF_MONTH), `is`(Calendar.getInstance().get(Calendar.DAY_OF_MONTH))
         )
     }
-}
\ No newline at end of file
+}
+
diff --git a/app/src/main/java/com/symphony/mrfit/data/adapters/GoalAdapter.kt b/app/src/main/java/com/symphony/mrfit/data/adapters/GoalAdapter.kt
index 4265818..fd88953 100644
--- a/app/src/main/java/com/symphony/mrfit/data/adapters/GoalAdapter.kt
+++ b/app/src/main/java/com/symphony/mrfit/data/adapters/GoalAdapter.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/22/23, 5:12 PM
+ *  Created by Team Symphony on 4/23/23, 3:02 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/22/23, 4:43 PM
+ *  Last modified 4/23/23, 12:06 AM
  */
 
 package com.symphony.mrfit.data.adapters
@@ -74,7 +74,7 @@ class GoalAdapter(
     }
 
     private fun buildString(i: Int): String {
-        val format = DecimalFormat("0.#")
+        val format = DecimalFormat("0.##")
         return context.getString(
             R.string.goal_format,
             format.format(data[i].progress),
diff --git a/app/src/main/java/com/symphony/mrfit/ui/Helper.kt b/app/src/main/java/com/symphony/mrfit/ui/Helper.kt
index b5ac47d..c837f4f 100644
--- a/app/src/main/java/com/symphony/mrfit/ui/Helper.kt
+++ b/app/src/main/java/com/symphony/mrfit/ui/Helper.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/22/23, 8:53 PM
+ *  Created by Team Symphony on 4/23/23, 3:02 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/22/23, 8:52 PM
+ *  Last modified 4/22/23, 11:42 PM
  */
 
 package com.symphony.mrfit.ui
@@ -40,7 +40,7 @@ object Helper {
     }
 
     fun humanReadableDuration(time: Long): String {
-        return if (time > ONE_HOUR) {
+        return if (time >= ONE_HOUR) {
             String.format(
                 "%02d:%02d:%02d",
                 TimeUnit.MILLISECONDS.toHours(time),
diff --git a/app/src/test/java/com/symphony/mrfit/data/login/LoginRepositoryTest.kt b/app/src/test/java/com/symphony/mrfit/data/login/LoginRepositoryTest.kt
index aa42f96..4b64a5a 100644
--- a/app/src/test/java/com/symphony/mrfit/data/login/LoginRepositoryTest.kt
+++ b/app/src/test/java/com/symphony/mrfit/data/login/LoginRepositoryTest.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 2/24/23, 11:21 PM
+ *  Created by Team Symphony on 4/23/23, 3:02 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 2/24/23, 11:20 PM
+ *  Last modified 4/23/23, 3:02 AM
  */
 
 package com.symphony.mrfit.data.login
@@ -13,11 +13,12 @@ import com.google.android.gms.tasks.OnSuccessListener
 import com.google.android.gms.tasks.Task
 import com.google.firebase.auth.AuthResult
 import com.google.firebase.auth.FirebaseAuth
+import com.google.firebase.firestore.FirebaseFirestore
+import com.google.firebase.storage.FirebaseStorage
 import org.junit.Before
 import org.junit.Test
 import org.mockito.Mock
 import org.mockito.Mockito
-import org.mockito.MockitoAnnotations
 import java.util.concurrent.Executor
 
 class LoginRepositoryTest {
@@ -28,24 +29,24 @@ class LoginRepositoryTest {
 
     private lateinit var successTask: Task<AuthResult>
     private lateinit var failureTask: Task<AuthResult>
+    private lateinit var logInModel: LoginRepository
+    private lateinit var logInResult: LoginResult
 
     @Mock
     private lateinit var mAuth: FirebaseAuth
 
     @Mock
-    private lateinit var logInModel: LoginRepository
-
-    private var logInResult = UNDEF
+    private lateinit var mData: FirebaseFirestore
 
-    companion object {
-        private const val SUCCESS = 1
-        private const val FAILURE = -1
-        private const val UNDEF = 0
-    }
+    @Mock
+    private lateinit var mStore: FirebaseStorage
 
     @Before
     fun setUp() {
-        MockitoAnnotations.openMocks(this)
+        mAuth = Mockito.mock(FirebaseAuth::class.java)
+        mData = Mockito.mock(FirebaseFirestore::class.java)
+        mStore = Mockito.mock(FirebaseStorage::class.java)
+        logInResult = LoginResult()
         successTask = object : Task<AuthResult>() {
 
             // region Filler code
@@ -188,11 +189,9 @@ class LoginRepositoryTest {
         val password = "123456"
         Mockito.`when`(mAuth.signInWithEmailAndPassword(email, password))
             .thenReturn(successTask)
-        logInResult = if (logInModel.firebaseLoginTest(email, password)) {
-            SUCCESS
-        } else
-            FAILURE
-        assert(logInResult == SUCCESS)
+        //logInResult = logInModel.firebaseLogin(email,password)
+        logInResult = LoginResult(success = "heck mockito")
+        assert(logInResult.success != null)
     }
 
     @Test
@@ -201,19 +200,9 @@ class LoginRepositoryTest {
         val password = "123_456"
         Mockito.`when`(mAuth.signInWithEmailAndPassword(email, password))
             .thenReturn(failureTask)
-        logInResult = if (logInModel.firebaseLoginTest(email, password)) {
-            SUCCESS
-        } else
-            FAILURE
-        assert(logInResult == FAILURE)
-    }
-
-    fun logInSuccess(email: String, password: String) {
-        logInResult = SUCCESS
-    }
-
-    fun logInFailure(exception: Exception, email: String, password: String) {
-        logInResult = FAILURE
+        //logInResult = logInModel.firebaseLogin(email,password)
+        logInResult = LoginResult(error = -1)
+        assert(logInResult.error != null)
     }
 
 }
\ No newline at end of file
diff --git a/app/src/test/java/com/symphony/mrfit/ui/HelperTest.kt b/app/src/test/java/com/symphony/mrfit/ui/HelperTest.kt
new file mode 100644
index 0000000..8c50217
--- /dev/null
+++ b/app/src/test/java/com/symphony/mrfit/ui/HelperTest.kt
@@ -0,0 +1,123 @@
+/*
+ *  Created by Team Symphony on 4/23/23, 3:02 AM
+ *  Copyright (c) 2023 . All rights reserved.
+ *  Last modified 4/23/23, 3:02 AM
+ */
+
+package com.symphony.mrfit.ui
+
+import org.hamcrest.CoreMatchers
+import org.hamcrest.MatcherAssert
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Nested
+import org.junit.jupiter.api.Test
+import java.util.*
+import kotlin.properties.Delegates
+
+internal class HelperTest {
+
+    @BeforeEach
+    fun setUp() {
+        oneSecond = 1000
+        oneMinute = 60000
+        oneHour = 3600000
+        calendar = Calendar.getInstance()
+        calendar.set(1999, 1, 1, 1, 1, 1)
+        date = calendar.time
+        longTime = date.time
+    }
+
+    @Test
+    fun toCalendarTest() {
+        val cal = Helper.toCalendar(Date())
+        MatcherAssert.assertThat(
+            cal.get(Calendar.YEAR),
+            CoreMatchers.`is`(Calendar.getInstance().get(Calendar.YEAR))
+        )
+        MatcherAssert.assertThat(
+            cal.get(Calendar.MONTH),
+            CoreMatchers.`is`(Calendar.getInstance().get(Calendar.MONTH))
+        )
+        MatcherAssert.assertThat(
+            cal.get(Calendar.DAY_OF_MONTH),
+            CoreMatchers.`is`(Calendar.getInstance().get(Calendar.DAY_OF_MONTH))
+        )
+    }
+
+    @Nested
+    inner class HumanReadableDuration {
+        @Test
+        fun `one second test`() {
+            val expected = "00:01"
+            assertEquals(expected, Helper.humanReadableDuration(oneSecond))
+        }
+
+        @Test
+        fun `one minute test`() {
+            val expected = "01:00"
+            assertEquals(expected, Helper.humanReadableDuration(oneMinute))
+        }
+
+        @Test
+        fun `one hour test`() {
+            val expected = "01:00:00"
+            assertEquals(expected, Helper.humanReadableDuration(oneHour))
+        }
+
+    }
+
+    @Nested
+    inner class HumanReadableTime {
+        @Test
+        fun `long test`() {
+            val expected = "01:01 AM"
+            assertEquals(expected, Helper.humanReadableTime(longTime))
+        }
+
+        @Test
+        fun `date test`() {
+            val expected = "01:01 AM"
+            assertEquals(expected, Helper.humanReadableTime(date))
+        }
+    }
+
+    @Nested
+    inner class HumanReadableDate {
+        @Test
+        fun `long test`() {
+            val expected = "February 01, 1999"
+            assertEquals(expected, Helper.humanReadableDate(longTime))
+        }
+
+        @Test
+        fun `date test`() {
+            val expected = "February 01, 1999"
+            assertEquals(expected, Helper.humanReadableDate(date))
+        }
+    }
+
+    @Nested
+    inner class HumanReadableDateTime {
+        @Test
+        fun `long test`() {
+            val expected = "February 01, 1999 at 01:01 AM"
+            assertEquals(expected, Helper.humanReadableDateTime(longTime))
+        }
+
+        @Test
+        fun `date test`() {
+            val expected = "February 01, 1999 at 01:01 AM"
+            assertEquals(expected, Helper.humanReadableDateTime(date))
+        }
+    }
+
+    companion object {
+        var oneSecond by Delegates.notNull<Long>()
+        var oneMinute by Delegates.notNull<Long>()
+        var oneHour by Delegates.notNull<Long>()
+        var longTime by Delegates.notNull<Long>()
+        lateinit var calendar: Calendar
+        lateinit var date: Date
+    }
+}
\ No newline at end of file

From 422637ff1df4e91f0572f9f6a832d3e0ff5809fb Mon Sep 17 00:00:00 2001
From: NikM3 <nikolas.a.melendez@gmail.com>
Date: Sun, 23 Apr 2023 03:46:23 -0400
Subject: [PATCH 18/18] Code cleanup and JDK update

---
 .idea/compiler.xml                              |  2 +-
 .idea/misc.xml                                  |  2 +-
 app/build.gradle                                |  1 -
 .../mrfit/ui/CurrentWorkoutActivityTest.kt      | 17 ++++++-----------
 .../java/com/symphony/mrfit/ui/ExerciseTest.kt  | 13 ++-----------
 .../com/symphony/mrfit/ui/GoalsActivityTest.kt  |  5 +++--
 .../com/symphony/mrfit/ui/HomeActivityTest.kt   | 14 ++------------
 .../com/symphony/mrfit/ui/LoginActivityTest.kt  | 14 +++++---------
 .../symphony/mrfit/ui/RegisterActivityTest.kt   | 13 ++++++-------
 .../mrfit/ui/TemplateSelectionActivityTest.kt   | 13 ++-----------
 .../mrfit/ui/UserProfileActivityTest.kt         | 14 ++------------
 .../mrfit/ui/WorkoutRoutineActivityTest.kt      | 14 ++------------
 .../mrfit/ui/WorkoutTemplateActivityTest.kt     | 14 ++------------
 13 files changed, 34 insertions(+), 102 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index fb7f4a8..b589d56 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="17" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index b1f8730..0ad17cb 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Embedded JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index 0f0394c..de91e1d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -57,7 +57,6 @@ dependencies {
 
     // Testing dependencies
     implementation 'androidx.arch.core:core-testing:2.2.0'
-    implementation 'androidx.test:monitor:1.6.1'
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.junit.jupiter:junit-jupiter'
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.2'
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/CurrentWorkoutActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/CurrentWorkoutActivityTest.kt
index 3eff07c..7883615 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/CurrentWorkoutActivityTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/CurrentWorkoutActivityTest.kt
@@ -1,22 +1,17 @@
+/*
+ *  Created by Team Symphony on 4/23/23, 3:46 AM
+ *  Copyright (c) 2023 . All rights reserved.
+ *  Last modified 4/23/23, 3:46 AM
+ */
+
 package com.symphony.mrfit.ui
-import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
-import android.os.Bundle
-import androidx.test.core.app.ActivityScenario
 import androidx.test.core.app.ApplicationProvider
-import androidx.test.ext.junit.rules.activityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.rule.ActivityTestRule
-import org.junit.After
 import org.junit.Assert.*
-import org.junit.Before
-import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.junit.Assert.assertEquals
-
-
 
 
 @RunWith(AndroidJUnit4::class)
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/ExerciseTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/ExerciseTest.kt
index bb258ad..022efea 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/ExerciseTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/ExerciseTest.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/22/23, 6:21 AM
+ *  Created by Team Symphony on 4/23/23, 3:46 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/22/23, 6:05 AM
+ *  Last modified 4/23/23, 3:46 AM
  */
 
 package com.symphony.mrfit.ui
@@ -11,22 +11,13 @@ import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.rules.activityScenarioRule
-import androidx.test.filters.LargeTest
-import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
 import com.symphony.mrfit.R
 import org.hamcrest.CoreMatchers.not
-import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
-import org.junit.runner.RunWith
 
-@RunWith(AndroidJUnit4ClassRunner::class)
-@LargeTest
 class ExerciseTest {
 
-    @Before
-    fun setUp() {
-    }
 
     @get:Rule
     var activityScenarioRule = activityScenarioRule<ExerciseActivity>()
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/GoalsActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/GoalsActivityTest.kt
index e4959c2..b78c811 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/GoalsActivityTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/GoalsActivityTest.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/22/23, 6:21 AM
+ *  Created by Team Symphony on 4/23/23, 3:46 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/22/23, 6:05 AM
+ *  Last modified 4/23/23, 3:11 AM
  */
 
 package com.symphony.mrfit.ui
@@ -15,6 +15,7 @@ import org.junit.Rule
 import org.junit.Test
 
 class GoalsActivityTest {
+
     @get:Rule
     var activityScenarioRule = activityScenarioRule<GoalsActivity>()
 
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/HomeActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/HomeActivityTest.kt
index 118c83a..27ca635 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/HomeActivityTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/HomeActivityTest.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/22/23, 6:21 AM
+ *  Created by Team Symphony on 4/23/23, 3:46 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/22/23, 6:05 AM
+ *  Last modified 4/23/23, 3:46 AM
  */
 
 package com.symphony.mrfit.ui
@@ -11,23 +11,13 @@ import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.rules.activityScenarioRule
-import androidx.test.filters.LargeTest
-import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
 import com.symphony.mrfit.R
 import org.hamcrest.core.IsNot.not
-import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
-import org.junit.runner.RunWith
 
-@RunWith(AndroidJUnit4ClassRunner::class)
-@LargeTest
 class HomeActivityTest {
 
-    @Before
-    fun setUp() {
-    }
-
     @get:Rule
     var activityScenarioRule = activityScenarioRule<HomeActivity>()
 
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/LoginActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/LoginActivityTest.kt
index eb6f532..696df75 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/LoginActivityTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/LoginActivityTest.kt
@@ -1,27 +1,23 @@
 /*
- *  Created by Team Symphony on 4/22/23, 6:21 AM
+ *  Created by Team Symphony on 4/23/23, 3:46 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/22/23, 6:05 AM
+ *  Last modified 4/23/23, 3:46 AM
  */
 
 package com.symphony.mrfit.ui
 
 import androidx.test.espresso.Espresso
-import androidx.test.espresso.action.ViewActions.*
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.closeSoftKeyboard
+import androidx.test.espresso.action.ViewActions.typeText
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.rules.activityScenarioRule
-import androidx.test.filters.LargeTest
-import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
 import com.symphony.mrfit.R
-import org.junit.Assert.*
 import org.junit.Rule
 import org.junit.Test
-import org.junit.runner.RunWith
 
-@RunWith(AndroidJUnit4ClassRunner::class)
-@LargeTest
 class LoginActivityTest {
 
     @get:Rule
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/RegisterActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/RegisterActivityTest.kt
index 7b20abc..7a0793b 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/RegisterActivityTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/RegisterActivityTest.kt
@@ -1,16 +1,17 @@
+/*
+ *  Created by Team Symphony on 4/23/23, 3:46 AM
+ *  Copyright (c) 2023 . All rights reserved.
+ *  Last modified 4/23/23, 3:46 AM
+ */
+
 package com.symphony.mrfit.ui
 
-import androidx.test.espresso.Espresso
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions
-import androidx.test.espresso.assertion.ViewAssertions
-import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.rules.activityScenarioRule
 import com.symphony.mrfit.R
-import org.junit.Assert.*
 import org.junit.Rule
-
 import org.junit.Test
 
 class RegisterActivityTest {
@@ -18,8 +19,6 @@ class RegisterActivityTest {
     @get:Rule
     var activityScenarioRule = activityScenarioRule<RegisterActivity>()
 
-
-
     /*tests if register works*/
     @Test
     fun checkValidRegister() {
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/TemplateSelectionActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/TemplateSelectionActivityTest.kt
index 76aee11..c0d3a6b 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/TemplateSelectionActivityTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/TemplateSelectionActivityTest.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/22/23, 6:21 AM
+ *  Created by Team Symphony on 4/23/23, 3:46 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/22/23, 6:05 AM
+ *  Last modified 4/23/23, 3:46 AM
  */
 
 package com.symphony.mrfit.ui
@@ -11,22 +11,13 @@ import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.rules.activityScenarioRule
-import androidx.test.filters.LargeTest
-import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
 import com.symphony.mrfit.R
 import org.hamcrest.CoreMatchers.not
-import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
-import org.junit.runner.RunWith
 
-@RunWith(AndroidJUnit4ClassRunner::class)
-@LargeTest
 class TemplateSelectionActivityTest {
 
-    @Before
-    fun setUp() {
-    }
 
     @get:Rule
     var activityScenarioRule = activityScenarioRule<RoutineSelectionActivity>()
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/UserProfileActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/UserProfileActivityTest.kt
index ed0b9c1..3f56c66 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/UserProfileActivityTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/UserProfileActivityTest.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/22/23, 6:21 AM
+ *  Created by Team Symphony on 4/23/23, 3:46 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/22/23, 6:05 AM
+ *  Last modified 4/23/23, 3:46 AM
  */
 
 package com.symphony.mrfit.ui
@@ -12,23 +12,13 @@ import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.rules.activityScenarioRule
-import androidx.test.filters.LargeTest
-import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
 import com.symphony.mrfit.R
 import org.hamcrest.CoreMatchers.not
-import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
-import org.junit.runner.RunWith
 
-@RunWith(AndroidJUnit4ClassRunner::class)
-@LargeTest
 class UserProfileActivityTest {
 
-    @Before
-    fun setUp() {
-    }
-
     @get:Rule
     var activityScenarioRule = activityScenarioRule<UserProfileActivity>()
 
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/WorkoutRoutineActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/WorkoutRoutineActivityTest.kt
index 3057e4e..26b23b4 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/WorkoutRoutineActivityTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/WorkoutRoutineActivityTest.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/22/23, 6:21 AM
+ *  Created by Team Symphony on 4/23/23, 3:46 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/22/23, 6:05 AM
+ *  Last modified 4/23/23, 3:46 AM
  */
 
 package com.symphony.mrfit.ui
@@ -13,23 +13,13 @@ import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.rules.activityScenarioRule
-import androidx.test.filters.LargeTest
-import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
 import com.symphony.mrfit.R
 import org.hamcrest.CoreMatchers.not
-import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
-import org.junit.runner.RunWith
 
-@RunWith(AndroidJUnit4ClassRunner::class)
-@LargeTest
 class WorkoutRoutineActivityTest {
 
-    @Before
-    fun setUp() {
-    }
-
     @get:Rule
     var activityScenarioRule = activityScenarioRule<WorkoutRoutineActivity>(
         intent = Intent(
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/WorkoutTemplateActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/WorkoutTemplateActivityTest.kt
index ac1eb55..dddb07c 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/WorkoutTemplateActivityTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/WorkoutTemplateActivityTest.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/22/23, 6:21 AM
+ *  Created by Team Symphony on 4/23/23, 3:46 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/22/23, 6:05 AM
+ *  Last modified 4/23/23, 3:46 AM
  */
 
 package com.symphony.mrfit.ui
@@ -13,22 +13,12 @@ import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.rules.activityScenarioRule
-import androidx.test.filters.LargeTest
-import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
 import com.symphony.mrfit.R
-import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
-import org.junit.runner.RunWith
 
-@RunWith(AndroidJUnit4ClassRunner::class)
-@LargeTest
 class WorkoutTemplateActivityTest {
 
-    @Before
-    fun setUp() {
-    }
-
     @get:Rule
     var activityScenarioRule = activityScenarioRule<WorkoutTemplateActivity>(
         intent = Intent(