Skip to content

Brianna #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: test
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ACE_Application/.idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions ACE_Application/.idea/deploymentTargetDropDown.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 2 additions & 5 deletions ACE_Application/.idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion ACE_Application/.idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

75 changes: 67 additions & 8 deletions ACE_Application/.idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions ACE_Application/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,15 @@
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>
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>

</activity>

<activity android:name=".LoginActivity">
Expand Down
Original file line number Diff line number Diff line change
@@ -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);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

*/
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
68 changes: 65 additions & 3 deletions ACE_Application/app/src/main/res/layout/activity_confirmation.xml
Original file line number Diff line number Diff line change
@@ -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>
Loading