From fdf27b9e6222282e97d7ce2c00fde1cd9e194a99 Mon Sep 17 00:00:00 2001 From: Aaron Sun Date: Wed, 21 Oct 2020 12:22:42 -0700 Subject: [PATCH] User can now log out and also automatically gets logged in after signing up --- .../java/com/example/listify/ui/SignupPage.java | 13 +++++++++---- .../com/example/listify/ui/home/HomeFragment.java | 7 ++++++- Listify/app/src/main/res/layout/fragment_home.xml | 2 +- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/Listify/app/src/main/java/com/example/listify/ui/SignupPage.java b/Listify/app/src/main/java/com/example/listify/ui/SignupPage.java index a35e678..a5400c7 100644 --- a/Listify/app/src/main/java/com/example/listify/ui/SignupPage.java +++ b/Listify/app/src/main/java/com/example/listify/ui/SignupPage.java @@ -19,6 +19,10 @@ public class SignupPage extends AppCompatActivity implements CodePage.CodeDialog private Button button1; //Log in page button private Button button2; //Sign up button + String email; + String password; + String confirmPassword; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -41,9 +45,9 @@ public class SignupPage extends AppCompatActivity implements CodePage.CodeDialog EditText passwordText = (EditText) findViewById(R.id.editTextTextPassword); EditText confirmPasswordText = (EditText) findViewById(R.id.editTextTextPassword2); - String email = emailText.getText().toString(); - String password = passwordText.getText().toString(); - String confirmPassword = confirmPasswordText.getText().toString(); + email = emailText.getText().toString(); + password = passwordText.getText().toString(); + confirmPassword = confirmPasswordText.getText().toString(); if(!password.equals(confirmPassword)) { TextView invalidCred = findViewById(R.id.textView3); @@ -76,7 +80,8 @@ public class SignupPage extends AppCompatActivity implements CodePage.CodeDialog if(!cancel) { try { am.confirmSignUp(code); - Intent intent = new Intent(SignupPage.this, LoginPage.class); + am.signIn(email, password); + Intent intent = new Intent(SignupPage.this, MainActivity.class); startActivity(intent); } catch (Exception e) { diff --git a/Listify/app/src/main/java/com/example/listify/ui/home/HomeFragment.java b/Listify/app/src/main/java/com/example/listify/ui/home/HomeFragment.java index fcca309..985d430 100644 --- a/Listify/app/src/main/java/com/example/listify/ui/home/HomeFragment.java +++ b/Listify/app/src/main/java/com/example/listify/ui/home/HomeFragment.java @@ -39,6 +39,12 @@ public class HomeFragment extends Fragment { toLoginPage.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + try { + am.signOutUser(); + } + catch (Exception e) { + Log.i("Authentication", e.toString()); + } Intent intent = new Intent(getActivity(), com.example.listify.ui.LoginPage.class); startActivity(intent); } @@ -68,7 +74,6 @@ public class HomeFragment extends Fragment { } Requestor requestor = new Requestor(am, configs.getProperty("apiKey")); am.deleteUser(requestor); - Intent intent = new Intent(getActivity(), com.example.listify.ui.LoginPage.class); startActivity(intent); } diff --git a/Listify/app/src/main/res/layout/fragment_home.xml b/Listify/app/src/main/res/layout/fragment_home.xml index ecc63ce..2726aad 100644 --- a/Listify/app/src/main/res/layout/fragment_home.xml +++ b/Listify/app/src/main/res/layout/fragment_home.xml @@ -11,7 +11,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="40dp" - android:text="Log in" + android:text="Log out" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" />