diff --git a/android/app/src/main/java/com/example/petstoremobile/adapters/PetAdapter.java b/android/app/src/main/java/com/example/petstoremobile/adapters/PetAdapter.java index 1f33aea4..463295bc 100644 --- a/android/app/src/main/java/com/example/petstoremobile/adapters/PetAdapter.java +++ b/android/app/src/main/java/com/example/petstoremobile/adapters/PetAdapter.java @@ -103,7 +103,7 @@ public class PetAdapter extends RecyclerView.Adapter i binding.tvPetStatus.setText(pet.getPetStatus()); - //Set the status color depending on availability. If available, green, otherwise red + //Set the status color depending on availability. If available, green, If Pending, yellow, otherwise red if (pet.getPetStatus() != null) { switch (pet.getPetStatus()) { case "Available": diff --git a/android/app/src/main/java/com/example/petstoremobile/utils/InputValidator.java b/android/app/src/main/java/com/example/petstoremobile/utils/InputValidator.java index ee79ec9f..0d45ad12 100644 --- a/android/app/src/main/java/com/example/petstoremobile/utils/InputValidator.java +++ b/android/app/src/main/java/com/example/petstoremobile/utils/InputValidator.java @@ -100,12 +100,13 @@ public class InputValidator { return true; } - // Checks if the phone number is valid + // Checks if the phone number is valid in (XXX) XXX-XXXX format public static boolean isValidPhone(EditText field) { String phone = field.getText().toString().trim(); - // Android built in phone validation pattern - if (phone.isEmpty() || !android.util.Patterns.PHONE.matcher(phone).matches()) { - field.setError("Enter a valid phone number"); + // Matches (XXX) XXX-XXXX format + String pattern = "^\\(\\d{3}\\) \\d{3}-\\d{4}$"; + if (phone.isEmpty() || !phone.matches(pattern)) { + field.setError("Enter a valid phone number: (XXX) XXX-XXXX"); field.requestFocus(); return false; }