From 4680103dd2633f97eaf66e4469d841d735527ced Mon Sep 17 00:00:00 2001 From: Aaron Sun Date: Thu, 8 Oct 2020 20:59:15 -0700 Subject: [PATCH] Can now display auth error message --- .../listify/ui/ForgotPasswordPage.java | 3 ++ .../com/example/listify/ui/LoginPage.java | 7 +++-- .../com/example/listify/ui/SignupPage.java | 3 ++ .../example/listify/ui/home/HomeFragment.java | 8 +++--- .../main/res/layout/activity_forgotpswd.xml | 23 ++++++++++----- .../src/main/res/layout/activity_login.xml | 17 ++++++++--- .../src/main/res/layout/activity_signup.xml | 28 +++++++++++++------ 7 files changed, 63 insertions(+), 26 deletions(-) diff --git a/Listify/app/src/main/java/com/example/listify/ui/ForgotPasswordPage.java b/Listify/app/src/main/java/com/example/listify/ui/ForgotPasswordPage.java index 67ec49b..a06d23a 100644 --- a/Listify/app/src/main/java/com/example/listify/ui/ForgotPasswordPage.java +++ b/Listify/app/src/main/java/com/example/listify/ui/ForgotPasswordPage.java @@ -6,6 +6,7 @@ import android.util.Log; import android.view.View; import android.widget.Button; import android.widget.EditText; +import android.widget.TextView; import com.example.listify.R; import static com.example.listify.MainActivity.am; @@ -38,6 +39,8 @@ public class ForgotPasswordPage extends AppCompatActivity implements CodePage.Co } catch (Exception e) { Log.i("Authentication", e.toString()); + TextView invalidCred = findViewById(R.id.textView6); + invalidCred.setText("Password criteria not met. Please try again."); } openDialog(); } diff --git a/Listify/app/src/main/java/com/example/listify/ui/LoginPage.java b/Listify/app/src/main/java/com/example/listify/ui/LoginPage.java index 30199ba..65e3ce0 100644 --- a/Listify/app/src/main/java/com/example/listify/ui/LoginPage.java +++ b/Listify/app/src/main/java/com/example/listify/ui/LoginPage.java @@ -6,6 +6,7 @@ import android.util.Log; import android.view.View; import android.widget.Button; import android.widget.EditText; +import android.widget.TextView; import com.example.listify.R; import com.example.listify.AuthManager; @@ -57,8 +58,10 @@ public class LoginPage extends AppCompatActivity { Intent intent = new Intent(LoginPage.this, MainActivity.class); startActivity(intent); } - catch(Exception ex) { - //Display "Incorrect email or password" message + catch(Exception e) { + Log.i("Authentication", e.toString()); + TextView invalidCred = findViewById(R.id.textView5); + invalidCred.setText("Incorrect email or password. Please try again."); } } }); 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 af945e0..fe90cfc 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 @@ -6,6 +6,7 @@ import android.util.Log; import android.view.View; import android.widget.Button; import android.widget.EditText; +import android.widget.TextView; import com.example.listify.R; import com.example.listify.AuthManager; @@ -47,6 +48,8 @@ public class SignupPage extends AppCompatActivity implements CodePage.CodeDialog } catch (Exception e) { Log.i("Authentication", e.toString()); + TextView invalidCred = findViewById(R.id.textView3); + invalidCred.setText("Invalid credentials. Please try again."); return; } 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 a581b15..6e7b513 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 @@ -44,10 +44,10 @@ public class HomeFragment extends Fragment { toListPage.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Intent intent = new Intent(HomeFragment.this.getActivity(), com.example.listify.ListPage.class); - startActivity(intent); + //Intent intent = new Intent(HomeFragment.this.getActivity(), com.example.listify.ListPage.class); + //startActivity(intent); - /*try { + try { Properties configs = new Properties(); try { configs = AuthManager.loadProperties(getContext(), "android.resource://" + getActivity().getPackageName() + "/raw/auths.json"); @@ -59,7 +59,7 @@ public class HomeFragment extends Fragment { } catch (Exception e) { Log.i("Authentication", e.toString()); - }*/ + } } }); diff --git a/Listify/app/src/main/res/layout/activity_forgotpswd.xml b/Listify/app/src/main/res/layout/activity_forgotpswd.xml index 413d087..8e4055c 100644 --- a/Listify/app/src/main/res/layout/activity_forgotpswd.xml +++ b/Listify/app/src/main/res/layout/activity_forgotpswd.xml @@ -9,10 +9,10 @@ android:id="@+id/button1" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="27dp" - android:text="Button" - app:layout_constraintEnd_toEndOf="@+id/editTextTextPassword2" - app:layout_constraintStart_toStartOf="@+id/editTextTextPassword2" + android:layout_marginTop="52dp" + android:text="Submit" + app:layout_constraintEnd_toStartOf="@+id/textView6" + app:layout_constraintStart_toStartOf="@+id/textView6" app:layout_constraintTop_toBottomOf="@+id/editTextTextPassword2" /> + + \ No newline at end of file diff --git a/Listify/app/src/main/res/layout/activity_login.xml b/Listify/app/src/main/res/layout/activity_login.xml index bd20e17..a81dbf6 100644 --- a/Listify/app/src/main/res/layout/activity_login.xml +++ b/Listify/app/src/main/res/layout/activity_login.xml @@ -12,8 +12,8 @@ android:layout_height="wrap_content" android:layout_marginTop="53dp" android:text="Log in" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toStartOf="@+id/textView5" + app:layout_constraintStart_toStartOf="@+id/textView5" app:layout_constraintTop_toBottomOf="@+id/button2" />