diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/presenter/ExistingCustomerRegisterV2PresenterInterface.java b/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/presenter/ExistingCustomerRegisterV2PresenterInterface.java index bfb9b2e8..92682094 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/presenter/ExistingCustomerRegisterV2PresenterInterface.java +++ b/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/presenter/ExistingCustomerRegisterV2PresenterInterface.java @@ -33,6 +33,8 @@ public interface ExistingCustomerRegisterV2PresenterInterface extends BasePresen boolean validateAllRequestForm(); + boolean validateAllRegisterForm(); + interface ExistingRegisterV2ContractInterface extends BaseContractInterface { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/presenter/ExistingCustomerRegisterViewModel.java b/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/presenter/ExistingCustomerRegisterViewModel.java index 91d81081..554a3c9b 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/presenter/ExistingCustomerRegisterViewModel.java +++ b/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/presenter/ExistingCustomerRegisterViewModel.java @@ -326,6 +326,22 @@ public class ExistingCustomerRegisterViewModel extends BaseViewModel implements } } + @Override + public boolean validateAllRegisterForm() { + if ( + registerSubmitValidator.validateReferralCode(registerSubmitValidator.referralCode) && + registerSubmitValidator.validateUserEmail(registerSubmitValidator.userEmailId) && + registerSubmitValidator.validatePassword(registerSubmitValidator.password) && + registerSubmitValidator.validateConfirmPassword(registerSubmitValidator.confirmPassword) && + registerSubmitValidator.validatePin(registerSubmitValidator.pin) && + registerSubmitValidator.validateConfirmPin(registerSubmitValidator.confirmPin) + + ) { + return true; + } + return false; + } + class ExistingCustomerRegisterationRequestValidator { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/view/ExistingCustomerRegistrationSubmitFragment.java b/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/view/ExistingCustomerRegistrationSubmitFragment.java index 6873d596..19708af8 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/view/ExistingCustomerRegistrationSubmitFragment.java +++ b/app/src/main/java/com/swifttech/remit/jmecustomer/features/registerv2/existingcustomer/view/ExistingCustomerRegistrationSubmitFragment.java @@ -36,7 +36,7 @@ public class ExistingCustomerRegistrationSubmitFragment extends BaseFragment { TextInputEditText referralCodeEdTxt; @BindView(R.id.edtUserEmail) - TextInputEditText edtuserEmail; + TextInputEditText eddUserEmail; @BindView(R.id.userId_TxtInputLayout) TextInputLayout userId_TxtInputLayout; @@ -112,7 +112,7 @@ public class ExistingCustomerRegistrationSubmitFragment extends BaseFragment { existingCustomerRegistrationSubmitLiveData = viewModel.getExsitingCustomerRegisterationSubmitViewEvents(new ExistingCustomerRegistrationSubmitLiveData.ExistingCustomerRegistrationSubmitViewBindings( RxTextView.textChanges(referralCodeEdTxt).skipInitialValue(), - RxTextView.textChanges(edtuserEmail).skipInitialValue(), + RxTextView.textChanges(eddUserEmail).skipInitialValue(), RxTextView.textChanges(newPassword_edTxt).skipInitialValue(), RxTextView.textChanges(confirmPassword_edTxt).skipInitialValue(), RxTextView.textChanges(newPin_edTxt).skipInitialValue(), @@ -130,7 +130,7 @@ public class ExistingCustomerRegistrationSubmitFragment extends BaseFragment { } private void onAllFieldValid(FormInputStateDTO formInputStateDTO) { - btn_submit.setEnabled(formInputStateDTO.isValid()); +// btn_submit.setEnabled(formInputStateDTO.isValid()); } private void init() { @@ -154,7 +154,7 @@ public class ExistingCustomerRegistrationSubmitFragment extends BaseFragment { if (state.isValid()) { userId_TxtInputLayout.setError(null); if (state.hasData() && state.getData().length()>0) { - edtuserEmail.setText(state.getData()); + eddUserEmail.setText(state.getData()); } } else userId_TxtInputLayout.setError(state.getErrorMessage()); @@ -206,12 +206,14 @@ public class ExistingCustomerRegistrationSubmitFragment extends BaseFragment { @OnClick(R.id.btn_submit) public void proceedToRegistration() { + if(viewModel.validateAllRegisterForm()){ viewModel.proceedToRegistration(); + } } public void clearFields() { - edtuserEmail.setText(""); + eddUserEmail.setText(""); userId_TxtInputLayout.setError(null); newPassword_edTxt.setText(""); @@ -227,7 +229,7 @@ public class ExistingCustomerRegistrationSubmitFragment extends BaseFragment { confirmPin_TxtInputLayout.setError(null); subscribeToEvents(); - btn_submit.setEnabled(false); +// btn_submit.setEnabled(false); } } diff --git a/app/src/main/res/layout/fragment_existing_customer_registration_submit.xml b/app/src/main/res/layout/fragment_existing_customer_registration_submit.xml index 321b3971..39e78347 100644 --- a/app/src/main/res/layout/fragment_existing_customer_registration_submit.xml +++ b/app/src/main/res/layout/fragment_existing_customer_registration_submit.xml @@ -146,6 +146,7 @@