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 @@
-
+
\ No newline at end of file
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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 @@
diff --git a/ACE_Application/.idea/misc.xml b/ACE_Application/.idea/misc.xml
index f886cdf..0a18ad6 100644
--- a/ACE_Application/.idea/misc.xml
+++ b/ACE_Application/.idea/misc.xml
@@ -3,13 +3,17 @@
-
+
diff --git a/ACE_Application/.idea/workspace.xml b/ACE_Application/.idea/workspace.xml
index 1ddca78..09770df 100644
--- a/ACE_Application/.idea/workspace.xml
+++ b/ACE_Application/.idea/workspace.xml
@@ -1,26 +1,70 @@
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -41,6 +85,11 @@
+
+
+
+
+
@@ -60,8 +109,6 @@
-
-
@@ -113,4 +160,16 @@
+
+
+
+
+
+
\ 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..1b28e8d 100644
--- a/ACE_Application/app/src/main/AndroidManifest.xml
+++ b/ACE_Application/app/src/main/AndroidManifest.xml
@@ -10,14 +10,15 @@
android:supportsRtl="true"
android:theme="@style/Theme.ACE_Club_Application">
-
+
+
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/HomePageActivity.java
similarity index 84%
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 fff31ef..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,12 +6,12 @@
import android.content.Intent;
import android.os.Bundle;
-public class DisplayMessageActivity extends AppCompatActivity {
-
+public class HomePageActivity 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..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
@@ -6,17 +6,21 @@
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);
+ }
+
+ public void goHome(View view) {
+ Intent intent = new Intent(this, HomePageActivity.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 @@
-
+
+
+
+
+
+
+
+
+
\ 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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 @@
+
\ 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..a9545b1 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,40 @@
-
+ android:layout_height="match_parent">
-
+ app:layout_constraintTop_toTopOf="parent" />
-
-
-
+ app:layout_constraintTop_toTopOf="parent" />
-
\ 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 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file