From b8b3eb56005c214467db05e2c489ca905b2d1979 Mon Sep 17 00:00:00 2001
From: brod2240 <brianna.rodriguez2240@gmail.com>
Date: Fri, 8 Apr 2022 22:16:01 -0400
Subject: [PATCH 1/2] Fixed It

Changed confirmation page from main_activity.xml to confirmation_activity.xml
---
 ACE_Application/.idea/compiler.xml            |  2 +-
 ACE_Application/.idea/gradle.xml              |  7 +-
 ACE_Application/.idea/misc.xml                |  4 +-
 ACE_Application/.idea/workspace.xml           | 30 +++++---
 .../app/src/main/AndroidManifest.xml          |  3 +-
 .../app/ConfirmationActivity.java             | 20 +++++-
 .../app/DisplayMessageActivity.java           |  4 +-
 .../app/LoginActivity.java                    | 12 ++++
 .../app/MainActivity.java                     |  7 +-
 .../main/res/layout/activity_confirmation.xml | 68 +++++++++++++++++-
 .../src/main/res/layout/activity_login.xml    | 19 ++++-
 .../app/src/main/res/layout/activity_main.xml | 72 ++++---------------
 12 files changed, 163 insertions(+), 85 deletions(-)

diff --git a/ACE_Application/.idea/compiler.xml b/ACE_Application/.idea/compiler.xml
index 61a9130..fb7f4a8 100644
--- a/ACE_Application/.idea/compiler.xml
+++ b/ACE_Application/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="1.8" />
+    <bytecodeTargetLevel target="11" />
   </component>
 </project>
\ No newline at end of file
diff --git a/ACE_Application/.idea/gradle.xml b/ACE_Application/.idea/gradle.xml
index ec590b7..e9969a1 100644
--- a/ACE_Application/.idea/gradle.xml
+++ b/ACE_Application/.idea/gradle.xml
@@ -3,11 +3,11 @@
   <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>        
-
+      <GradleProjectSettings>
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="11" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
@@ -15,9 +15,6 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-
-        <option name="useQualifiedModuleNames" value="true" />
-
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/ACE_Application/.idea/misc.xml b/ACE_Application/.idea/misc.xml
index f886cdf..aa17b37 100644
--- a/ACE_Application/.idea/misc.xml
+++ b/ACE_Application/.idea/misc.xml
@@ -3,13 +3,15 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
+        <entry key="..\:/Users/brian/Spring2022PhoneAppProject/ACE_Application/app/src/main/res/layout/activity_confirmation.xml" value="0.2359375" />
         <entry key="..\:/Users/brian/Spring2022PhoneAppProject/ACE_Application/app/src/main/res/layout/activity_display_message.xml" value="0.246875" />
+        <entry key="..\:/Users/brian/Spring2022PhoneAppProject/ACE_Application/app/src/main/res/layout/activity_login.xml" value="0.2359375" />
         <entry key="..\:/Users/brian/Spring2022PhoneAppProject/ACE_Application/app/src/main/res/layout/activity_main.xml" value="0.176" />
       </map>
     </option>
   </component>
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/ACE_Application/.idea/workspace.xml b/ACE_Application/.idea/workspace.xml
index 1ddca78..5cf740e 100644
--- a/ACE_Application/.idea/workspace.xml
+++ b/ACE_Application/.idea/workspace.xml
@@ -1,21 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="AndroidLayouts">
+    <shared>
+      <config />
+    </shared>
+  </component>
   <component name="AutoImportSettings">
     <option name="autoReloadType" value="NONE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="1158b599-4f0b-4bd1-b3ad-f64b105e4714" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/jarRepositories.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties" beforeDir="false" afterPath="$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties" afterDir="false" />
+    <list default="true" id="b749fa95-51ac-401a-890f-fd9fb3663d48" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ace_club_application/app/ConfirmationActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ace_club_application/app/ConfirmationActivity.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ace_club_application/app/DisplayMessageActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ace_club_application/app/DisplayMessageActivity.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ace_club_application/app/LoginActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ace_club_application/app/LoginActivity.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ace_club_application/app/MainActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ace_club_application/app/MainActivity.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_confirmation.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_confirmation.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_login.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_login.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[/Users/jonathankahn/.android/avd/Pixel_2_API_32.avd]" />
+  <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[C:\Users\brian\.android\avd\Pixel_2_API_32.avd]" />
   <component name="ExternalProjectsData">
     <projectState path="$PROJECT_DIR$">
       <ProjectState />
@@ -60,8 +73,6 @@
       <option name="FORCE_STOP_RUNNING_APP" value="true" />
       <option name="INSPECTION_WITHOUT_ACTIVITY_RESTART" value="false" />
       <option name="TARGET_SELECTION_MODE" value="DEVICE_AND_SNAPSHOT_COMBO_BOX" />
-      <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
-      <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
       <option name="DEBUGGER_TYPE" value="Auto" />
       <Auto>
         <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
@@ -113,4 +124,7 @@
     </task>
     <servers />
   </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="oldMeFiltersMigrated" value="true" />
+  </component>
 </project>
\ No newline at end of file
diff --git a/ACE_Application/app/src/main/AndroidManifest.xml b/ACE_Application/app/src/main/AndroidManifest.xml
index 551acb3..2e16e66 100644
--- a/ACE_Application/app/src/main/AndroidManifest.xml
+++ b/ACE_Application/app/src/main/AndroidManifest.xml
@@ -13,11 +13,12 @@
             android:name=".DisplayMessageActivity"
             android:exported="false" />
         <activity android:name=".MainActivity">
-            <intent-filter>
+           <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+
         </activity>
 
         <activity android:name=".LoginActivity">
diff --git a/ACE_Application/app/src/main/java/com/ace_club_application/app/ConfirmationActivity.java b/ACE_Application/app/src/main/java/com/ace_club_application/app/ConfirmationActivity.java
index 8d31223..aa269d1 100644
--- a/ACE_Application/app/src/main/java/com/ace_club_application/app/ConfirmationActivity.java
+++ b/ACE_Application/app/src/main/java/com/ace_club_application/app/ConfirmationActivity.java
@@ -1,4 +1,22 @@
 package com.ace_club_application.app;
 
-public class ConfirmationActivity {
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+public class ConfirmationActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_confirmation);
+    }
+
+    public void confirmCode(View view) {
+        Intent intent = new Intent(this,MainActivity.class);
+        startActivity(intent);
+    }
+
 }
diff --git a/ACE_Application/app/src/main/java/com/ace_club_application/app/DisplayMessageActivity.java b/ACE_Application/app/src/main/java/com/ace_club_application/app/DisplayMessageActivity.java
index fff31ef..04c9c47 100644
--- a/ACE_Application/app/src/main/java/com/ace_club_application/app/DisplayMessageActivity.java
+++ b/ACE_Application/app/src/main/java/com/ace_club_application/app/DisplayMessageActivity.java
@@ -7,11 +7,11 @@
 import android.os.Bundle;
 
 public class DisplayMessageActivity extends AppCompatActivity {
-
+   /*
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_display_message);
     }
-
+   */
 }
\ No newline at end of file
diff --git a/ACE_Application/app/src/main/java/com/ace_club_application/app/LoginActivity.java b/ACE_Application/app/src/main/java/com/ace_club_application/app/LoginActivity.java
index f2f40c4..c63f2aa 100644
--- a/ACE_Application/app/src/main/java/com/ace_club_application/app/LoginActivity.java
+++ b/ACE_Application/app/src/main/java/com/ace_club_application/app/LoginActivity.java
@@ -2,7 +2,19 @@
 
 import androidx.appcompat.app.AppCompatActivity;
 
+import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
 
 public class LoginActivity extends AppCompatActivity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_login);
+    }
+
+    public void confirmPage(View view) {
+        Intent intent = new Intent(this, ConfirmationActivity.class);
+        startActivity(intent);
+    }
 }
diff --git a/ACE_Application/app/src/main/java/com/ace_club_application/app/MainActivity.java b/ACE_Application/app/src/main/java/com/ace_club_application/app/MainActivity.java
index c8f9e5e..db4851d 100644
--- a/ACE_Application/app/src/main/java/com/ace_club_application/app/MainActivity.java
+++ b/ACE_Application/app/src/main/java/com/ace_club_application/app/MainActivity.java
@@ -6,17 +6,16 @@
 import android.view.View;
 import android.widget.EditText;
 
-public class MainActivity extends AppCompatActivity {
-    public static final String EXTRA_MESSAGE = "com.example.aceapp.MESSAGE";
 
+public class MainActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
     }
 
-    public void confirmCode(View view) {
-        Intent intent = new Intent(this, DisplayMessageActivity.class);
+    public void goLogin(View view) {
+        Intent intent = new Intent(this, LoginActivity.class);
         startActivity(intent);
     }
 
diff --git a/ACE_Application/app/src/main/res/layout/activity_confirmation.xml b/ACE_Application/app/src/main/res/layout/activity_confirmation.xml
index 61a4490..8501c9a 100644
--- a/ACE_Application/app/src/main/res/layout/activity_confirmation.xml
+++ b/ACE_Application/app/src/main/res/layout/activity_confirmation.xml
@@ -1,6 +1,68 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+<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:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".MainActivity">
+
+    <ImageView
+        android:id="@+id/imageView"
+        android:layout_width="1000px"
+        android:layout_height="2000px"
+        android:layout_marginStart="20dp"
+        android:layout_marginEnd="20dp"
+        android:layout_marginBottom="450dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.6"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.49"
+        app:srcCompat="@drawable/logo" />
+
+    <ImageView
+        android:id="@+id/imageView2"
+        android:layout_width="400dp"
+        android:layout_height="250dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="5dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="20dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.523"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/imageView"
+        app:layout_constraintVertical_bias="0.816"
+        app:srcCompat="@drawable/glenn" />
+
+    <EditText
+        android:id="@+id/editTextNumberPassword2"
+        android:layout_width="300dp"
+        android:layout_height="50dp"
+        android:layout_marginTop="70dp"
+        android:ems="10"
+        android:hint="Enter Verification Code Here"
+        android:inputType="numberPassword"
+        app:layout_constraintBottom_toTopOf="@+id/imageView2"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.466"
+        app:layout_constraintStart_toStartOf="@+id/imageView2"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.723" />
+
+    <Button
+        android:id="@+id/confirmButton"
+        android:layout_width="250dp"
+        android:layout_height="50dp"
+        android:onClick="confirmCode"
+        android:text="Confirm"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="@+id/editTextNumberPassword2"
+        app:layout_constraintStart_toStartOf="@+id/editTextNumberPassword2"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.593"
+        tools:ignore="OnClick" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/ACE_Application/app/src/main/res/layout/activity_login.xml b/ACE_Application/app/src/main/res/layout/activity_login.xml
index 61a4490..a7a6a1d 100644
--- a/ACE_Application/app/src/main/res/layout/activity_login.xml
+++ b/ACE_Application/app/src/main/res/layout/activity_login.xml
@@ -1,6 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <Button
+        android:id="@+id/button3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="158dp"
+        android:layout_marginTop="311dp"
+        android:layout_marginEnd="159dp"
+        android:layout_marginBottom="372dp"
+        android:text="go to confirm"
+        android:onClick="confirmPage"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/ACE_Application/app/src/main/res/layout/activity_main.xml b/ACE_Application/app/src/main/res/layout/activity_main.xml
index 3fef751..f1950db 100644
--- a/ACE_Application/app/src/main/res/layout/activity_main.xml
+++ b/ACE_Application/app/src/main/res/layout/activity_main.xml
@@ -1,67 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    android:layout_height="match_parent">
 
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="1000px"
-        android:layout_height="2000px"
-        android:layout_marginStart="20dp"
-        android:layout_marginEnd="20dp"
-        android:layout_marginBottom="450dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.6"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.49"
-        app:srcCompat="@drawable/logo" />
-
-    <ImageView
-        android:id="@+id/imageView2"
-        android:layout_width="400dp"
-        android:layout_height="250dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="5dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginBottom="20dp"
+    <Button
+        android:id="@+id/button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="173dp"
+        android:layout_marginTop="341dp"
+        android:layout_marginEnd="144dp"
+        android:layout_marginBottom="342dp"
+        android:text="Button"
+        android:onClick="goLogin"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.523"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/imageView"
-        app:layout_constraintVertical_bias="0.816"
-        app:srcCompat="@drawable/glenn" />
-
-    <EditText
-        android:id="@+id/editTextNumberPassword2"
-        android:layout_width="300dp"
-        android:layout_height="50dp"
-        android:layout_marginTop="70dp"
-        android:ems="10"
-        android:hint="Enter Verification Code Here"
-        android:inputType="numberPassword"
-        app:layout_constraintBottom_toTopOf="@+id/imageView2"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.466"
-        app:layout_constraintStart_toStartOf="@+id/imageView2"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.723" />
-
-    <Button
-        android:id="@+id/button2"
-        android:layout_width="250dp"
-        android:layout_height="50dp"
-        android:onClick="confirmCode"
-        android:text="Confirm"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="@+id/editTextNumberPassword2"
-        app:layout_constraintStart_toStartOf="@+id/editTextNumberPassword2"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.593" />
-
+        app:layout_constraintTop_toTopOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 6712773de0cd71599dff6c04b970903909442219 Mon Sep 17 00:00:00 2001
From: brod2240 <brianna.rodriguez2240@gmail.com>
Date: Fri, 29 Apr 2022 13:06:17 -0400
Subject: [PATCH 2/2] Uodates

Did a homepage with the announcements, don't know it it is included here
---
 .../.idea/deploymentTargetDropDown.xml        |  17 +++
 ACE_Application/.idea/misc.xml                |   2 +
 ACE_Application/.idea/workspace.xml           |  59 +++++++-
 .../app/src/main/AndroidManifest.xml          |   2 +-
 ...ageActivity.java => HomePageActivity.java} |   2 +-
 .../app/MainActivity.java                     |   5 +
 .../res/layout/activity_display_message.xml   |  69 ----------
 .../main/res/layout/activity_home_page.xml    | 130 ++++++++++++++++++
 .../app/src/main/res/layout/activity_main.xml |  19 ++-
 .../src/main/res/layout/activity_profile.xml  |  37 +++++
 10 files changed, 263 insertions(+), 79 deletions(-)
 create mode 100644 ACE_Application/.idea/deploymentTargetDropDown.xml
 rename ACE_Application/app/src/main/java/com/ace_club_application/app/{DisplayMessageActivity.java => HomePageActivity.java} (85%)
 delete mode 100644 ACE_Application/app/src/main/res/layout/activity_display_message.xml
 create mode 100644 ACE_Application/app/src/main/res/layout/activity_home_page.xml
 create mode 100644 ACE_Application/app/src/main/res/layout/activity_profile.xml

diff --git a/ACE_Application/.idea/deploymentTargetDropDown.xml b/ACE_Application/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 0000000..1645b35
--- /dev/null
+++ b/ACE_Application/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <targetSelectedWithDropDown>
+      <Target>
+        <type value="QUICK_BOOT_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="VIRTUAL_DEVICE_PATH" />
+            <value value="C:\Users\brian\.android\avd\Pixel_2_API_32.avd" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </targetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2022-04-10T15:45:00.916554800Z" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/ACE_Application/.idea/misc.xml b/ACE_Application/.idea/misc.xml
index aa17b37..0a18ad6 100644
--- a/ACE_Application/.idea/misc.xml
+++ b/ACE_Application/.idea/misc.xml
@@ -5,8 +5,10 @@
       <map>
         <entry key="..\:/Users/brian/Spring2022PhoneAppProject/ACE_Application/app/src/main/res/layout/activity_confirmation.xml" value="0.2359375" />
         <entry key="..\:/Users/brian/Spring2022PhoneAppProject/ACE_Application/app/src/main/res/layout/activity_display_message.xml" value="0.246875" />
+        <entry key="..\:/Users/brian/Spring2022PhoneAppProject/ACE_Application/app/src/main/res/layout/activity_home_page.xml" value="0.264" />
         <entry key="..\:/Users/brian/Spring2022PhoneAppProject/ACE_Application/app/src/main/res/layout/activity_login.xml" value="0.2359375" />
         <entry key="..\:/Users/brian/Spring2022PhoneAppProject/ACE_Application/app/src/main/res/layout/activity_main.xml" value="0.176" />
+        <entry key="..\:/Users/brian/Spring2022PhoneAppProject/ACE_Application/app/src/main/res/layout/activity_profile.xml" value="0.264" />
       </map>
     </option>
   </component>
diff --git a/ACE_Application/.idea/workspace.xml b/ACE_Application/.idea/workspace.xml
index 5cf740e..09770df 100644
--- a/ACE_Application/.idea/workspace.xml
+++ b/ACE_Application/.idea/workspace.xml
@@ -10,17 +10,13 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="b749fa95-51ac-401a-890f-fd9fb3663d48" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_profile.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ace_club_application/app/ConfirmationActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ace_club_application/app/ConfirmationActivity.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ace_club_application/app/DisplayMessageActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ace_club_application/app/DisplayMessageActivity.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ace_club_application/app/LoginActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ace_club_application/app/LoginActivity.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ace_club_application/app/DisplayMessageActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ace_club_application/app/HomePageActivity.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ace_club_application/app/MainActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ace_club_application/app/MainActivity.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_confirmation.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_confirmation.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_login.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_login.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_display_message.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_home_page.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -34,6 +30,41 @@
       <ProjectState />
     </projectState>
   </component>
+  <component name="ExternalProjectsManager">
+    <system id="GRADLE">
+      <state>
+        <projects_view>
+          <tree_state>
+            <expand>
+              <path>
+                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
+                <item name="ACE_Club_Application" type="f1a62948:ProjectNode" />
+              </path>
+              <path>
+                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
+                <item name="ACE_Club_Application" type="f1a62948:ProjectNode" />
+                <item name="app" type="2d1252cf:ModuleNode" />
+              </path>
+              <path>
+                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
+                <item name="ACE_Club_Application" type="f1a62948:ProjectNode" />
+                <item name="app" type="2d1252cf:ModuleNode" />
+                <item name="Dependencies" type="6de06a37:ExternalSystemViewDefaultContributor$MyDependenciesNode" />
+              </path>
+            </expand>
+            <select />
+          </tree_state>
+        </projects_view>
+      </state>
+    </system>
+  </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="layoutResourceFile" />
+      </list>
+    </option>
+  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
   </component>
@@ -54,6 +85,11 @@
     <property name="project.structure.side.proportion" value="0.2" />
     <property name="settings.editor.selected.configurable" value="reference.settingsdialog.project.gradle" />
   </component>
+  <component name="RecentsManager">
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="C:\Users\brian\Spring2022PhoneAppProject\ACE_Application\app\src\main\res\drawable" />
+    </key>
+  </component>
   <component name="RunManager">
     <configuration name="app" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
       <module name="ACE_Club_Application.app" />
@@ -125,6 +161,15 @@
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
     <option name="oldMeFiltersMigrated" value="true" />
   </component>
 </project>
\ No newline at end of file
diff --git a/ACE_Application/app/src/main/AndroidManifest.xml b/ACE_Application/app/src/main/AndroidManifest.xml
index 2e16e66..1b28e8d 100644
--- a/ACE_Application/app/src/main/AndroidManifest.xml
+++ b/ACE_Application/app/src/main/AndroidManifest.xml
@@ -10,7 +10,7 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.ACE_Club_Application">
         <activity
-            android:name=".DisplayMessageActivity"
+            android:name=".HomePageActivity"
             android:exported="false" />
         <activity android:name=".MainActivity">
            <intent-filter>
diff --git a/ACE_Application/app/src/main/java/com/ace_club_application/app/DisplayMessageActivity.java b/ACE_Application/app/src/main/java/com/ace_club_application/app/HomePageActivity.java
similarity index 85%
rename from ACE_Application/app/src/main/java/com/ace_club_application/app/DisplayMessageActivity.java
rename to ACE_Application/app/src/main/java/com/ace_club_application/app/HomePageActivity.java
index 04c9c47..b3d45b5 100644
--- a/ACE_Application/app/src/main/java/com/ace_club_application/app/DisplayMessageActivity.java
+++ b/ACE_Application/app/src/main/java/com/ace_club_application/app/HomePageActivity.java
@@ -6,7 +6,7 @@
 import android.content.Intent;
 import android.os.Bundle;
 
-public class DisplayMessageActivity extends AppCompatActivity {
+public class HomePageActivity extends AppCompatActivity {
    /*
     @Override
     protected void onCreate(Bundle savedInstanceState) {
diff --git a/ACE_Application/app/src/main/java/com/ace_club_application/app/MainActivity.java b/ACE_Application/app/src/main/java/com/ace_club_application/app/MainActivity.java
index db4851d..d76ffc8 100644
--- a/ACE_Application/app/src/main/java/com/ace_club_application/app/MainActivity.java
+++ b/ACE_Application/app/src/main/java/com/ace_club_application/app/MainActivity.java
@@ -19,4 +19,9 @@ public void goLogin(View view) {
         startActivity(intent);
     }
 
+    public void goHome(View view) {
+        Intent intent = new Intent(this, HomePageActivity.class);
+        startActivity(intent);
+    }
+
 }
\ No newline at end of file
diff --git a/ACE_Application/app/src/main/res/layout/activity_display_message.xml b/ACE_Application/app/src/main/res/layout/activity_display_message.xml
deleted file mode 100644
index e22d155..0000000
--- a/ACE_Application/app/src/main/res/layout/activity_display_message.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".DisplayMessageActivity">
-
-    <ImageView
-        android:id="@+id/imageView3"
-        android:layout_width="120dp"
-        android:layout_height="700dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginBottom="400dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.498"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.761"
-        app:srcCompat="@drawable/logo" />
-
-    <ImageView
-        android:id="@+id/imageView4"
-        android:layout_width="75dp"
-        android:layout_height="75dp"
-        android:layout_marginTop="100dp"
-        android:layout_marginEnd="70dp"
-        android:layout_marginBottom="656dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/imageView3"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.69"
-        app:srcCompat="@drawable/gator" />
-
-    <ImageView
-        android:id="@+id/imageView5"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginBottom="16dp"
-        app:layout_constraintBottom_toBottomOf="@+id/imageView3"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.677"
-        app:layout_constraintStart_toEndOf="@+id/imageView3"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.0"
-        app:srcCompat="@drawable/search" />
-
-    <androidx.cardview.widget.CardView
-
-        android:layout_width="375dp"
-        android:layout_height="175dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="48dp"
-        android:layout_marginEnd="16dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/imageView4"
-        app:cardBackgroundColor="@color/purple_700"
-        >
-
-
-    </androidx.cardview.widget.CardView>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/ACE_Application/app/src/main/res/layout/activity_home_page.xml b/ACE_Application/app/src/main/res/layout/activity_home_page.xml
new file mode 100644
index 0000000..1b8351f
--- /dev/null
+++ b/ACE_Application/app/src/main/res/layout/activity_home_page.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".HomePageActivity">
+
+
+    <ImageView
+        android:id="@+id/imageView4"
+        android:layout_width="150dp"
+        android:layout_height="100dp"
+        android:layout_alignParentEnd="true"
+        android:layout_marginEnd="90dp"
+        android:layout_toEndOf="@+id/imageView3"
+        app:srcCompat="@drawable/logo" />
+
+    <ImageView
+        android:id="@+id/imageView3"
+        android:layout_width="75dp"
+        android:layout_height="75dp"
+        app:srcCompat="@drawable/gator" />
+
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:contentDescription="@string/appbar_scrolling_view_behavior">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+
+
+            >
+
+            <androidx.cardview.widget.CardView
+                android:layout_width="350dp"
+                android:layout_height="200dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginTop="120dp"
+                android:layout_marginEnd="20dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.476"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintVertical_bias="0.0"
+                app:cardCornerRadius="20dp"
+                app:cardBackgroundColor="@color/white">
+
+                <TextView
+                    android:id="@+id/textView"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:text="TextView" />
+            </androidx.cardview.widget.CardView>
+
+            <androidx.cardview.widget.CardView
+                android:layout_width="350dp"
+                android:layout_height="200dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginTop="340dp"
+                android:layout_marginEnd="20dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.476"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintVertical_bias="0.0"
+                app:cardCornerRadius="20dp"
+                app:cardBackgroundColor="@color/white">
+
+                <TextView
+                    android:id="@+id/textView2"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:text="TextView" />
+            </androidx.cardview.widget.CardView>
+
+            <androidx.cardview.widget.CardView
+                android:layout_width="350dp"
+                android:layout_height="200dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginTop="560dp"
+                android:layout_marginEnd="20dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.476"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintVertical_bias="0.0"
+                app:cardCornerRadius="20dp"
+                app:cardBackgroundColor="@color/white">
+
+                <TextView
+                    android:id="@+id/textView3"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:text="TextView" />
+            </androidx.cardview.widget.CardView>
+
+            <androidx.cardview.widget.CardView
+                android:layout_width="350dp"
+                android:layout_height="200dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginTop="790dp"
+                android:layout_marginEnd="20dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.476"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintVertical_bias="0.0"
+                app:cardCornerRadius="20dp"
+                app:cardBackgroundColor="@color/white">
+
+                <TextView
+                    android:id="@+id/textView4"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:text="TextView" />
+            </androidx.cardview.widget.CardView>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </ScrollView>
+</RelativeLayout>
\ No newline at end of file
diff --git a/ACE_Application/app/src/main/res/layout/activity_main.xml b/ACE_Application/app/src/main/res/layout/activity_main.xml
index f1950db..a9545b1 100644
--- a/ACE_Application/app/src/main/res/layout/activity_main.xml
+++ b/ACE_Application/app/src/main/res/layout/activity_main.xml
@@ -14,10 +14,27 @@
         android:layout_marginTop="341dp"
         android:layout_marginEnd="144dp"
         android:layout_marginBottom="342dp"
-        android:text="Button"
+        android:text="Login"
         android:onClick="goLogin"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
+
+    <Button
+        android:id="@+id/button2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="173dp"
+        android:layout_marginTop="40dp"
+        android:layout_marginEnd="144dp"
+        android:layout_marginBottom="342dp"
+        android:text="Home"
+        android:onClick="goHome"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/ACE_Application/app/src/main/res/layout/activity_profile.xml b/ACE_Application/app/src/main/res/layout/activity_profile.xml
new file mode 100644
index 0000000..4d90f96
--- /dev/null
+++ b/ACE_Application/app/src/main/res/layout/activity_profile.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+
+    <androidx.cardview.widget.CardView
+        android:layout_width="150dp"
+        android:layout_height="150dp"
+        android:layout_marginStart="128dp"
+        android:layout_marginTop="111dp"
+        android:layout_marginEnd="133dp"
+        app:cardBackgroundColor="@color/purple_700"
+        app:cardCornerRadius="100dp"
+        app:cardElevation="5dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" >
+
+        <androidx.cardview.widget.CardView
+            android:layout_width="match_parent"
+            android:layout_height="75dp"
+            android:layout_marginTop="110dp"
+            app:cardCornerRadius="150dp"
+            />
+
+        <androidx.cardview.widget.CardView
+            android:layout_width="75dp"
+            android:layout_height="75dp"
+            app:cardCornerRadius="100dp"
+            android:layout_marginTop="25dp"
+            android:layout_marginLeft="36dp" />
+    </androidx.cardview.widget.CardView>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file