From 5950d6784cfe3c02e8a684b1c0a105a2af3569f4 Mon Sep 17 00:00:00 2001 From: Preyea Regmi Date: Fri, 23 Aug 2019 14:24:12 +0900 Subject: [PATCH] Validation rule updated for editing mode --- .../ReceiverInfoV3Model.java | 32 +++ .../RecipientAddV3ContractInterface.java | 43 ++-- .../RecipientDetailValidatorV3.java | 213 +++++++++++++----- .../add/RecipientAddV3Presenter.java | 32 ++- .../RecipientAddEditV3Activity.java | 52 +++-- .../layout/activity_recipient_add_edit_v3.xml | 2 +- 6 files changed, 265 insertions(+), 109 deletions(-) diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientlistingV3/ReceiverInfoV3Model.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientlistingV3/ReceiverInfoV3Model.java index d1091805..8afa625e 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientlistingV3/ReceiverInfoV3Model.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientlistingV3/ReceiverInfoV3Model.java @@ -499,4 +499,36 @@ public class ReceiverInfoV3Model implements Parcelable { public void updateRelation(DropDownDTO selectedRelation) { setRelationshipId(selectedRelation.getId()); } + + public void clearData() + { + this.firstName = ""; + this.middleName = ""; + this.lastName = ""; + this.localFirstName = ""; + this.localMiddleName = ""; + this.localLastName = ""; + this.fullName = ""; + this.localFullName = ""; + this.paymentMethod = null; + this.agent = null; + this.receiverId = ""; + this.country = ""; + this.countryId = ""; + this.countryCode = ""; + this.address = ""; + this.state = ""; + this.stateId = ""; + this.city = ""; + this.email = ""; + this.mobile = ""; + this.relationship = ""; + this.relationshipId = ""; + this.district = ""; + this.districtId = ""; + this.purposeOfRemit = ""; + this.purposeOfRemitId = ""; + this.idType = ""; + this.idNumber = ""; + } } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/RecipientAddV3ContractInterface.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/RecipientAddV3ContractInterface.java index edcee395..24b7c0ff 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/RecipientAddV3ContractInterface.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/RecipientAddV3ContractInterface.java @@ -12,7 +12,7 @@ public interface RecipientAddV3ContractInterface extends BaseContractInterface void hideAllViewExceptCountry(); - void hideAllFormInputFields(); + void hideAllFormFieldsExceptCountryAndPaymentMethod(); void updateValueToWidgetSelectedCountry(String countryName); @@ -69,48 +69,51 @@ public interface RecipientAddV3ContractInterface extends BaseContractInterface void updateValueToWidgetTransferReason(String value); - void updateValidationRuleToWidgetBankName(Boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration keyboardTypeFromKeyword); + void updateValidationRuleToWidgetBankName(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration keyboardTypeFromKeyword); - void updateValidationRuleToWidgetBranchName(Boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration keyboardTypeFromKeyword); + void updateValidationRuleToWidgetBranchName(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration keyboardTypeFromKeyword); - void updateValidationRuleToWidgetAccountNo(Boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration keyboardTypeFromKeyword); + void updateValidationRuleToWidgetAccountNo(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration keyboardTypeFromKeyword); - void updateValidationRuleToWidgetIDType(Boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration keyboardTypeFromKeyword); + void updateValidationRuleToWidgetIDType(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration keyboardTypeFromKeyword); - void updateValidationRuleToWidgetIDNumber(Boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration keyboardTypeFromKeyword); + void updateValidationRuleToWidgetIDNumber(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration keyboardTypeFromKeyword); - void updateValidationRuleToWidgetFirstName(Boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration keyboardTypeFromKeyword); + void updateValidationRuleToWidgetFirstName(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration keyboardTypeFromKeyword); - void updateValidationRuleToWidgetMiddleName(Boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration keyboardTypeFromKeyword); + void updateValidationRuleToWidgetMiddleName(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration keyboardTypeFromKeyword); - void updateValidationRuleToWidgetLastName(Boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration keyboardTypeFromKeyword); + void updateValidationRuleToWidgetLastName(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration keyboardTypeFromKeyword); - void updateValidationRuleToWidgetFullName(Boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration keyboardTypeFromKeyword); + void updateValidationRuleToWidgetFullName(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration keyboardTypeFromKeyword); - void updateValidationRuleToWidgetLocalFirstName(Boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration keyboardTypeFromKeyword); + void updateValidationRuleToWidgetLocalFirstName(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration keyboardTypeFromKeyword); - void updateValidationRuleToWidgetLocalMiddleName(Boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration keyboardTypeFromKeyword); + void updateValidationRuleToWidgetLocalMiddleName(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration keyboardTypeFromKeyword); - void updateValidationRuleToWidgetLocalLastName(Boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration keyboardTypeFromKeyword); + void updateValidationRuleToWidgetLocalLastName(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration keyboardTypeFromKeyword); void updateValidationRuleToWidgetLocalFullName(boolean visiblity, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration); - void updateValidationRuleToWidgetMobileNumber(Boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration keyboardTypeFromKeyword); + void updateValidationRuleToWidgetMobileNumber(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration keyboardTypeFromKeyword); - void updateValidationRuleToWidgetProvince(Boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration keyboardTypeFromKeyword); + void updateValidationRuleToWidgetProvince(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration keyboardTypeFromKeyword); - void updateValidationRuleToWidgetDistrict(Boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration keyboardTypeFromKeyword); + void updateValidationRuleToWidgetDistrict(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration keyboardTypeFromKeyword); - void updateValidationRuleToWidgetCity(Boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration keyboardTypeFromKeyword); + void updateValidationRuleToWidgetCity(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration keyboardTypeFromKeyword); - void updateValidationRuleToWidgetAddress(Boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration keyboardTypeFromKeyword); + void updateValidationRuleToWidgetAddress(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration keyboardTypeFromKeyword); - void updateValidationRuleToWidgetRelation(Boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration keyboardTypeFromKeyword); + void updateValidationRuleToWidgetRelation(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration keyboardTypeFromKeyword); + + void updateValidationRuleToWidgetTransferReason(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration keyboardTypeFromKeyword); + + void updateValidationRuleToWidgetEmail(boolean isFieldRequired, EditTextConfigurationFactory.EditTextConfiguration keyboardTypeFromKeyword); - void updateValidationRuleToWidgetTransferReason(Boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration keyboardTypeFromKeyword); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/RecipientDetailValidatorV3.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/RecipientDetailValidatorV3.java index 4777e997..484d08b3 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/RecipientDetailValidatorV3.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/RecipientDetailValidatorV3.java @@ -60,19 +60,15 @@ public class RecipientDetailValidatorV3 { this.view = view; validationRuleModelMap = new HashMap<>(); - mockTestinData(); + } - public void clearValidationRule() - { - if(validationRuleModelMap!=null&&validationRuleModelMap.size()>1) + public void clearValidationRule() { + if (validationRuleModelMap != null && validationRuleModelMap.size() > 1) validationRuleModelMap.clear(); } - private void mockTestinData() { - this.recipientInfo.setFullName("Some Random value"); - } public ReceiverInfoV3Model getRecipientDetail() { return recipientInfo; @@ -96,6 +92,7 @@ public class RecipientDetailValidatorV3 { * @param rule */ public void applyDynamicValidationRuleToView(ValidationRuleModel rule) { + if (rule == null) throw new IllegalArgumentException("Validation rule cannot be null"); @@ -105,7 +102,6 @@ public class RecipientDetailValidatorV3 { case FIELD_BANK_NAME: //TODO Add Respective value when avialable in reciever info - view.updateValueToWidgetBankName(""); view.updateValidationRuleToWidgetBankName(isFieldRequired, EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(), rule.getMaxFieldLengthInt())); @@ -115,7 +111,6 @@ public class RecipientDetailValidatorV3 { case FIELD_BRANCH_NAME: //TODO Add Respective value when avialable in reciever info - view.updateValueToWidgetBranchName(""); view.updateValidationRuleToWidgetBranchName(isFieldRequired, EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(), rule.getMaxFieldLengthInt())); @@ -126,7 +121,6 @@ public class RecipientDetailValidatorV3 { case FIELD_ACCOUNT_NO: //TODO Add Respective value when avialable in reciever info - view.updateValueToWidgetAccountNo(""); view.updateValidationRuleToWidgetAccountNo(isFieldRequired, EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(), rule.getMaxFieldLengthInt())); @@ -136,7 +130,6 @@ public class RecipientDetailValidatorV3 { case FIELD_ID_TYPE: //TODO Add Respective value when avialable in reciever info - view.updateValueToWidgetIDType(""); view.updateValidationRuleToWidgetIDType(isFieldRequired, EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(), rule.getMaxFieldLengthInt())); @@ -146,7 +139,6 @@ public class RecipientDetailValidatorV3 { case FIELD_ID_NUMBER: //TODO Add Respective value when avialable in reciever info - view.updateValueToWidgetIDNumber(""); view.updateValidationRuleToWidgetIDNumber(isFieldRequired, EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(), rule.getMaxFieldLengthInt())); @@ -156,7 +148,6 @@ public class RecipientDetailValidatorV3 { case FIELD_FIRST_NAME: //TODO Add Respective value when avialable in reciever info - view.updateValueToWidgetFirstName(""); view.updateValidationRuleToWidgetFirstName(isFieldRequired, EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(), rule.getMaxFieldLengthInt())); @@ -167,7 +158,6 @@ public class RecipientDetailValidatorV3 { case FIELD_MIDDLE_NAME: //TODO Add Respective value when avialable in reciever info - view.updateValueToWidgetMiddleName(""); view.updateValidationRuleToWidgetMiddleName(isFieldRequired, EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(), rule.getMaxFieldLengthInt())); @@ -178,7 +168,6 @@ public class RecipientDetailValidatorV3 { case FIELD_LAST_NAME: //TODO Add Respective value when avialable in reciever info - view.updateValueToWidgetLastName(""); view.updateValidationRuleToWidgetLastName(isFieldRequired, EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(), rule.getMaxFieldLengthInt())); @@ -189,7 +178,6 @@ public class RecipientDetailValidatorV3 { case FIELD_FULL_NAME: //TODO Add Respective value when avialable in reciever info - view.updateValueToWidgetFullName(recipientInfo.getFullName()); view.updateValidationRuleToWidgetFullName(isFieldRequired, EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(), rule.getMaxFieldLengthInt())); @@ -199,7 +187,6 @@ public class RecipientDetailValidatorV3 { case FIELD_FIRST_NAME_IN_LOCAL: //TODO Add Respective value when avialable in reciever info - view.updateValueToWidgetLocalFirstName(""); view.updateValidationRuleToWidgetLocalFirstName(isFieldRequired, EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(), rule.getMaxFieldLengthInt())); @@ -209,7 +196,6 @@ public class RecipientDetailValidatorV3 { case FIELD_MIDDLE_NAME_IN_LOCAL: //TODO Add Respective value when avialable in reciever info - view.updateValueToWidgetLocalMiddleName(""); view.updateValidationRuleToWidgetLocalMiddleName(isFieldRequired, EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(), rule.getMaxFieldLengthInt())); @@ -219,7 +205,6 @@ public class RecipientDetailValidatorV3 { case FIELD_LAST_NAME_IN_LOCAL: //TODO Add Respective value when avialable in reciever info - view.updateValueToWidgetLocalLastName(""); view.updateValidationRuleToWidgetLocalLastName(isFieldRequired, EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(), rule.getMaxFieldLengthInt())); @@ -229,7 +214,6 @@ public class RecipientDetailValidatorV3 { case FIELD_LOCAL_NAME: //TODO Add Respective value when avialable in reciever info - view.updateValueToWidgetLocalFullName(""); view.updateValidationRuleToWidgetLocalFullName(isFieldRequired, EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(), rule.getMaxFieldLengthInt())); @@ -239,7 +223,6 @@ public class RecipientDetailValidatorV3 { case FIELD_MOBILE_NUMBER: //TODO Add Respective value when avialable in reciever info - view.updateValueToWidgetMobileNumber(""); view.updateValidationRuleToWidgetMobileNumber(isFieldRequired, EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(), rule.getMaxFieldLengthInt())); @@ -249,7 +232,6 @@ public class RecipientDetailValidatorV3 { case FIELD_PROVINCE: //TODO Add Respective value when avialable in reciever info - view.updateValueToWidgetProvince(""); view.updateValidationRuleToWidgetProvince(isFieldRequired, EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(), rule.getMaxFieldLengthInt())); @@ -259,7 +241,6 @@ public class RecipientDetailValidatorV3 { case FIELD_DISTRICT: //TODO Add Respective value when avialable in reciever info - view.updateValueToWidgetDistrict(""); view.updateValidationRuleToWidgetDistrict(isFieldRequired, EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(), rule.getMaxFieldLengthInt())); @@ -269,7 +250,6 @@ public class RecipientDetailValidatorV3 { case FIELD_CITY: //TODO Add Respective value when avialable in reciever info - view.updateValueToWidgetCity(""); view.updateValidationRuleToWidgetCity(isFieldRequired, EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(), rule.getMaxFieldLengthInt())); @@ -279,7 +259,6 @@ public class RecipientDetailValidatorV3 { case FIELD_ADDRESS: //TODO Add Respective value when avialable in reciever info - view.updateValueToWidgetAddress(""); view.updateValidationRuleToWidgetAddress(isFieldRequired, EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(), rule.getMaxFieldLengthInt())); @@ -289,7 +268,6 @@ public class RecipientDetailValidatorV3 { case FIELD_REALATION_GROUP: //TODO Add Respective value when avialable in reciever info - view.updateValueToWidgetRelation(""); view.updateValidationRuleToWidgetRelation(isFieldRequired, EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(), rule.getMaxFieldLengthInt())); @@ -299,7 +277,6 @@ public class RecipientDetailValidatorV3 { case FIELD_TRANSFER_REASON: //TODO Add Respective value when avialable in reciever info - view.updateValueToWidgetTransferReason(""); view.updateValidationRuleToWidgetTransferReason(isFieldRequired, EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(), rule.getMaxFieldLengthInt())); @@ -309,8 +286,7 @@ public class RecipientDetailValidatorV3 { case FIELD_EMAIL: //TODO Add Respective value when avialable in reciever info - view.updateValueToWidgetTransferReason(""); - view.updateValidationRuleToWidgetTransferReason(isFieldRequired, + view.updateValidationRuleToWidgetEmail(isFieldRequired, EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(), rule.getMaxFieldLengthInt())); if (isFieldRequired) @@ -322,6 +298,7 @@ public class RecipientDetailValidatorV3 { /** * Iterate through all validaiton rule and if and only if all validation rule is satisfied, enable submit button + * Invoke this validation on data change event */ private void validateAll() { @@ -340,19 +317,120 @@ public class RecipientDetailValidatorV3 { } + public void validateAllRequiredFieldsExplicitly() { + boolean areAllFormValid = true; + + Iterator it = validationRuleModelMap.entrySet().iterator(); + while (it.hasNext()) { + Map.Entry pair = (Map.Entry) it.next(); + + ValidationRuleModel rule = pair.getValue(); + + switch (rule.getField()) { + case FIELD_BANK_NAME: + + break; + + case FIELD_BRANCH_NAME: + + break; + + + case FIELD_ACCOUNT_NO: + if (recipientInfo.getAgent() != null) + validateAccountNo(recipientInfo.getAgent().getAccountNo()); + break; + + case FIELD_ID_TYPE: + + break; + + case FIELD_ID_NUMBER: + validateIdNumber(recipientInfo.getIdNumber()); + break; + + case FIELD_FIRST_NAME: + validateFirstName(recipientInfo.getFirstName()); + break; + + + case FIELD_MIDDLE_NAME: + validateMiddleName(recipientInfo.getMiddleName()); + break; + + + case FIELD_LAST_NAME: + validateLastName(recipientInfo.getLastName()); + break; + + + case FIELD_FULL_NAME: + validateFullName(recipientInfo.getFullName()); + break; + + case FIELD_FIRST_NAME_IN_LOCAL: + validateFirstNameLocal(recipientInfo.getLocalFirstName()); + break; + + case FIELD_MIDDLE_NAME_IN_LOCAL: + validateMiddleNameLocal(recipientInfo.getLocalMiddleName()); + break; + + case FIELD_LAST_NAME_IN_LOCAL: + validateLastName(recipientInfo.getLocalLastName()); + break; + + case FIELD_LOCAL_NAME: + validateLocalFullName(recipientInfo.getLocalFullName()); + break; + + case FIELD_MOBILE_NUMBER: + validateMobileNumber(recipientInfo.getMobile()); + break; + + case FIELD_PROVINCE: + + break; + + case FIELD_DISTRICT: + + break; + + case FIELD_CITY: + validateCity(recipientInfo.getCity()); + break; + + case FIELD_ADDRESS: + validateAddress(recipientInfo.getAddress()); + break; + + case FIELD_REALATION_GROUP: + + break; + + case FIELD_TRANSFER_REASON: + + break; + + case FIELD_EMAIL: + validateEmail(recipientInfo.getEmail()); + break; + } + } + } + public void validateAccountNo(String text) { ValidationRuleModel validationRuleModel = validationRuleModelMap.get(FIELD_ACCOUNT_NO); if (validationRuleModel != null) { String error = validationRuleModel.validateValueAndReturnErrorMessageOnFail(text); if (error == null) { - recipientInfo.setFullName(text); + //TODO update recipientInfo if required view.setErrorOnWidgetAccountNo(null); validateAll(); } else { view.setSubmitButtonEnabled(false); //TODO update recipientInfo if required - recipientInfo.setFullName(""); view.setErrorOnWidgetAccountNo(error); } } @@ -364,13 +442,14 @@ public class RecipientDetailValidatorV3 { if (validationRuleModel != null) { String error = validationRuleModel.validateValueAndReturnErrorMessageOnFail(text); if (error == null) { - recipientInfo.setFullName(text); + //TODO update recipientInfo if required + recipientInfo.setFirstName(text); view.setErrorOnWidgetFirstName(null); validateAll(); } else { view.setSubmitButtonEnabled(false); //TODO update recipientInfo if required - recipientInfo.setFullName(""); + recipientInfo.setFirstName(""); view.setErrorOnWidgetFirstName(error); } } @@ -381,13 +460,14 @@ public class RecipientDetailValidatorV3 { if (validationRuleModel != null) { String error = validationRuleModel.validateValueAndReturnErrorMessageOnFail(text); if (error == null) { - recipientInfo.setFullName(text); + //TODO update recipientInfo if required + recipientInfo.setMiddleName(text); view.setErrorOnWidgetMiddleName(null); validateAll(); } else { view.setSubmitButtonEnabled(false); //TODO update recipientInfo if required - recipientInfo.setFullName(""); + recipientInfo.setMiddleName(""); view.setErrorOnWidgetMiddleName(error); } } @@ -398,13 +478,14 @@ public class RecipientDetailValidatorV3 { if (validationRuleModel != null) { String error = validationRuleModel.validateValueAndReturnErrorMessageOnFail(text); if (error == null) { - recipientInfo.setFullName(text); + //TODO update recipientInfo if required + recipientInfo.setLastName(text); view.setErrorOnWidgetLastName(null); validateAll(); } else { view.setSubmitButtonEnabled(false); //TODO update recipientInfo if required - recipientInfo.setFullName(""); + recipientInfo.setLastName(""); view.setErrorOnWidgetLastName(error); } } @@ -436,13 +517,14 @@ public class RecipientDetailValidatorV3 { if (validationRuleModel != null) { String error = validationRuleModel.validateValueAndReturnErrorMessageOnFail(text); if (error == null) { - recipientInfo.setFullName(text); + //TODO update recipientInfo if required + recipientInfo.setCity(text); view.setErrorOnWidgetCity(null); validateAll(); } else { view.setSubmitButtonEnabled(false); //TODO update recipientInfo if required - recipientInfo.setFullName(""); + recipientInfo.setCity(""); view.setErrorOnWidgetCity(error); } } @@ -454,13 +536,14 @@ public class RecipientDetailValidatorV3 { if (validationRuleModel != null) { String error = validationRuleModel.validateValueAndReturnErrorMessageOnFail(text); if (error == null) { - recipientInfo.setFullName(text); + //TODO update recipientInfo if required + recipientInfo.setAddress(text); view.setErrorOnWidgetAddress(null); validateAll(); } else { view.setSubmitButtonEnabled(false); //TODO update recipientInfo if required - recipientInfo.setFullName(""); + recipientInfo.setAddress(""); view.setErrorOnWidgetAddress(error); } } @@ -472,13 +555,14 @@ public class RecipientDetailValidatorV3 { if (validationRuleModel != null) { String error = validationRuleModel.validateValueAndReturnErrorMessageOnFail(text); if (error == null) { - recipientInfo.setFullName(text); + //TODO update recipientInfo if required + recipientInfo.setMobile(text); view.setErrorOnWidgetMobileNumber(null); validateAll(); } else { view.setSubmitButtonEnabled(false); //TODO update recipientInfo if required - recipientInfo.setFullName(""); + recipientInfo.setMobile(""); view.setErrorOnWidgetMobileNumber(error); } } @@ -490,13 +574,13 @@ public class RecipientDetailValidatorV3 { if (validationRuleModel != null) { String error = validationRuleModel.validateValueAndReturnErrorMessageOnFail(text); if (error == null) { - recipientInfo.setFullName(text); + recipientInfo.setEmail(text); view.setErrorOnWidgetEmail(null); validateAll(); } else { view.setSubmitButtonEnabled(false); //TODO update recipientInfo if required - recipientInfo.setFullName(""); + recipientInfo.setEmail(""); view.setErrorOnWidgetEmail(error); } } @@ -508,13 +592,14 @@ public class RecipientDetailValidatorV3 { if (validationRuleModel != null) { String error = validationRuleModel.validateValueAndReturnErrorMessageOnFail(text); if (error == null) { - recipientInfo.setFullName(text); + //TODO update recipientInfo if required + recipientInfo.setIdNumber(text); view.setErrorOnWidgetIDNumber(null); validateAll(); } else { view.setSubmitButtonEnabled(false); //TODO update recipientInfo if required - recipientInfo.setFullName(""); + recipientInfo.setIdNumber(""); view.setErrorOnWidgetIDNumber(error); } } @@ -526,13 +611,14 @@ public class RecipientDetailValidatorV3 { if (validationRuleModel != null) { String error = validationRuleModel.validateValueAndReturnErrorMessageOnFail(text); if (error == null) { - recipientInfo.setFullName(text); + //TODO update recipientInfo if required + recipientInfo.setLocalFirstName(text); view.setErrorOnWidgetLocalFirstName(null); validateAll(); } else { view.setSubmitButtonEnabled(false); //TODO update recipientInfo if required - recipientInfo.setFullName(""); + recipientInfo.setLocalFirstName(""); view.setErrorOnWidgetLocalFirstName(error); } } @@ -544,13 +630,14 @@ public class RecipientDetailValidatorV3 { if (validationRuleModel != null) { String error = validationRuleModel.validateValueAndReturnErrorMessageOnFail(text); if (error == null) { - recipientInfo.setFullName(text); + //TODO update recipientInfo if required + recipientInfo.setLocalMiddleName(text); view.setErrorOnWidgetLocalMiddleName(null); validateAll(); } else { view.setSubmitButtonEnabled(false); //TODO update recipientInfo if required - recipientInfo.setFullName(""); + recipientInfo.setLocalMiddleName(""); view.setErrorOnWidgetLocalMiddleName(error); } } @@ -563,13 +650,13 @@ public class RecipientDetailValidatorV3 { String error = validationRuleModel.validateValueAndReturnErrorMessageOnFail(text); if (error == null) { //TODO update appropriate recipientInfo field - recipientInfo.setFullName(text); + recipientInfo.setLocalLastName(text); view.setErrorOnWidgetLocalLastName(null); validateAll(); } else { view.setSubmitButtonEnabled(false); //TODO update appropriate recipientInfo field - recipientInfo.setFullName(""); + recipientInfo.setLocalLastName(""); view.setErrorOnWidgetLocalLastName(error); } } @@ -580,13 +667,15 @@ public class RecipientDetailValidatorV3 { if (validationRuleModel != null) { String error = validationRuleModel.validateValueAndReturnErrorMessageOnFail(fullName); if (error == null) { + //TODO update appropriate recipientInfo field recipientInfo.setLocalFullName(fullName); view.setErrorOnWidgetLocalFullName(null); validateAll(); } else { - //Current implmentation will override existing information data + view.setSubmitButtonEnabled(false); + //TODO update appropriate recipientInfo field recipientInfo.setLocalFullName(""); - view.setErrorOnWidgetFullName(error); + view.setErrorOnWidgetLocalFullName(error); } } @@ -611,6 +700,7 @@ public class RecipientDetailValidatorV3 { if (validationRuleModel != null) { recipientInfo.updateSelectedBank(selectedBank); validationRuleModel.updateValidity(true); + validateAll(); } } @@ -619,7 +709,7 @@ public class RecipientDetailValidatorV3 { if (validationRuleModel != null) { recipientInfo.updateBranch(selectedBranch); validationRuleModel.updateValidity(true); - + validateAll(); } } @@ -628,7 +718,7 @@ public class RecipientDetailValidatorV3 { if (validationRuleModel != null) { recipientInfo.updateProvince(selectedProvinces); validationRuleModel.updateValidity(true); - + validateAll(); } } @@ -637,7 +727,7 @@ public class RecipientDetailValidatorV3 { if (validationRuleModel != null) { recipientInfo.updateDistrict(selectedDistrict); validationRuleModel.updateValidity(true); - + validateAll(); } } @@ -646,6 +736,7 @@ public class RecipientDetailValidatorV3 { if (validationRuleModel != null) { recipientInfo.updateTransferReason(selectedTransferReason); validationRuleModel.updateValidity(true); + validateAll(); } } @@ -655,7 +746,7 @@ public class RecipientDetailValidatorV3 { if (validationRuleModel != null) { recipientInfo.updateIdType(selectedIDType); validationRuleModel.updateValidity(true); - + validateAll(); } } @@ -664,7 +755,9 @@ public class RecipientDetailValidatorV3 { if (validationRuleModel != null) { recipientInfo.updateRelation(selectedRelation); validationRuleModel.updateValidity(true); - + validateAll(); } } + + } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/add/RecipientAddV3Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/add/RecipientAddV3Presenter.java index 1bab6085..83e37962 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/add/RecipientAddV3Presenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/add/RecipientAddV3Presenter.java @@ -13,6 +13,7 @@ import com.gmeremit.online.gmeremittance_native.recipientV3.model.recipientadded import com.gmeremit.online.gmeremittance_native.recipientV3.model.recipientaddeditV3.dynamicvalidation.PayoutProvincesModel; import com.gmeremit.online.gmeremittance_native.recipientV3.model.recipientaddeditV3.dynamicvalidation.ValidationRuleModel; import com.gmeremit.online.gmeremittance_native.recipientV3.model.recipientlistingV3.PaymentMethodV3Model; +import com.gmeremit.online.gmeremittance_native.recipientV3.model.recipientlistingV3.ReceiverInfoV3Model; import com.gmeremit.online.gmeremittance_native.recipientV3.presenter.recipientaddeditV3.RecipientAddV3ContractInterface; import com.gmeremit.online.gmeremittance_native.recipientV3.presenter.recipientaddeditV3.RecipientDetailValidatorV3; import com.gmeremit.online.gmeremittance_native.utils.Constants; @@ -51,10 +52,27 @@ public class RecipientAddV3Presenter extends BasePresenter implements RecipientA public RecipientAddV3Presenter(RecipientAddV3GatewayInterface gateway,RecipientAddV3ContractInterface view ) { this.view = view; this.gateway = gateway; - this.validator = new RecipientDetailValidatorV3(view, null); + ReceiverInfoV3Model preselectedRecieverInfo=mockTestinData(); + this.validator = new RecipientDetailValidatorV3(view, preselectedRecieverInfo); + seedExistingDatatoView(preselectedRecieverInfo); init(); } + private void seedExistingDatatoView(ReceiverInfoV3Model preselectedRecieverInfo) { + + view.updateValueToWidgetFullName(preselectedRecieverInfo.getFullName()); + + + } + + private ReceiverInfoV3Model mockTestinData() { + + ReceiverInfoV3Model receiverInfoV3Model=new ReceiverInfoV3Model(); + + receiverInfoV3Model.setFullName("Some test data"); + + return receiverInfoV3Model; + } private void init() { this.compositeDisposable = new CompositeDisposable(); @@ -91,6 +109,7 @@ public class RecipientAddV3Presenter extends BasePresenter implements RecipientA DynamicValidationModel validationModel=this.gateway.getMockedAllValidationRuleList(view.getContext()); validator.updateDynamicValidationModel(validationModel); applyValidationRulesToView(validationModel.getValidationRuleList()); + validator.validateAllRequiredFieldsExplicitly(); } @@ -139,7 +158,6 @@ public class RecipientAddV3Presenter extends BasePresenter implements RecipientA if (data != null) { view.registerTextWatchers(false); validator.clearValidationRule(); - view.setSubmitButtonEnabled(false); for (ValidationRuleModel rule : data) { validator.applyDynamicValidationRuleToView(rule); } @@ -155,12 +173,11 @@ public class RecipientAddV3Presenter extends BasePresenter implements RecipientA @Override public void onCountryServiceSelected(CountryServiceModel selectedCountry) { this.selectedCountry=selectedCountry; - //TODO dont update directly; - validator.getRecipientDetail().updateSelectedCountryAndClearRelatedData(selectedCountry); + view.updateValueToWidgetSelectedCountry(selectedCountry.getCountryName()); view.showSelectedCountryFlag(CountryFlagMapper.getFlagFromCountryCode(selectedCountry.getCountryCode())); - view.updateValueToWidgetSelectedPaymentMethod(null); - view.updateValidationRuleToWidgetPaymentMethodSelection(true); + view.updateValueToWidgetSelectedPaymentMethod(""); + view.hideAllFormFieldsExceptCountryAndPaymentMethod(); } @@ -172,7 +189,8 @@ public class RecipientAddV3Presenter extends BasePresenter implements RecipientA */ @Override public void onServiceTypeSelected(ServiceTypeModel selectedServiceType) { - //TODO dont update directly; +// validator.clearExistinInfoExceptRecipientId(); + validator.getRecipientDetail().updateSelectedCountryAndClearRelatedData(selectedCountry); validator.getRecipientDetail().setPaymentMethod(new PaymentMethodV3Model(selectedServiceType.getId(),selectedServiceType.getText(),selectedServiceType.getDescription())); view.updateValueToWidgetSelectedPaymentMethod(selectedServiceType.getDescription()); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/view/recipientaddeditV3/RecipientAddEditV3Activity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/view/recipientaddeditV3/RecipientAddEditV3Activity.java index 0f5fcbed..226ce2f1 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/view/recipientaddeditV3/RecipientAddEditV3Activity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/view/recipientaddeditV3/RecipientAddEditV3Activity.java @@ -360,11 +360,13 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien } @Override - public void hideAllFormInputFields() { - hideViewFromIndexId(1); + public void hideAllFormFieldsExceptCountryAndPaymentMethod() { + receiverPaymentMethodViewContainer.setVisibility(View.VISIBLE); + hideViewFromIndexId(3); } + @Override public void updateValueToWidgetSelectedPaymentMethod(String description) { Log.d(this.getClass().getSimpleName(),"Selected method type: "+description); @@ -490,7 +492,7 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien @Override - public void updateValidationRuleToWidgetBankName(Boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { + public void updateValidationRuleToWidgetBankName(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { editTextConfiguration.applyConfigurationSetting(recieverBankSelectionFormInputField.getEditTextView()); if (fieldRequired) { receiverBankViewContainer.setVisibility(View.VISIBLE); @@ -499,7 +501,7 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien } @Override - public void updateValidationRuleToWidgetBranchName(Boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { + public void updateValidationRuleToWidgetBranchName(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { editTextConfiguration.applyConfigurationSetting(recieverBranchSelectionFormInputField.getEditTextView()); if (fieldRequired) { receiverBranchViewContainer.setVisibility(View.VISIBLE); @@ -508,7 +510,7 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien } @Override - public void updateValidationRuleToWidgetAccountNo(Boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { + public void updateValidationRuleToWidgetAccountNo(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { editTextConfiguration.applyConfigurationSetting(recieverAccountNoFormInputField.getEditTextView()); if (fieldRequired) { recieverAccountNoFormInputField.setVisibility(View.VISIBLE); @@ -517,7 +519,7 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien } @Override - public void updateValidationRuleToWidgetIDType(Boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { + public void updateValidationRuleToWidgetIDType(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { editTextConfiguration.applyConfigurationSetting(recieverIDTypeSelectionFormInputField.getEditTextView()); if (fieldRequired) { receiverIDTypeViewContainer.setVisibility(View.VISIBLE); @@ -526,7 +528,7 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien } @Override - public void updateValidationRuleToWidgetIDNumber(Boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { + public void updateValidationRuleToWidgetIDNumber(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { editTextConfiguration.applyConfigurationSetting(recieverIdNumberFormInputField.getEditTextView()); if (fieldRequired) { recieverIdNumberFormInputField.setVisibility(View.VISIBLE); @@ -535,7 +537,7 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien } @Override - public void updateValidationRuleToWidgetFirstName(Boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { + public void updateValidationRuleToWidgetFirstName(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { editTextConfiguration.applyConfigurationSetting(recieverFirstNameFormInputField.getEditTextView()); if (fieldRequired) { recieverFirstNameFormInputField.setVisibility(View.VISIBLE); @@ -544,7 +546,7 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien } @Override - public void updateValidationRuleToWidgetMiddleName(Boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { + public void updateValidationRuleToWidgetMiddleName(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { editTextConfiguration.applyConfigurationSetting(recieverMiddleNameFormInputField.getEditTextView()); if (fieldRequired) { recieverMiddleNameFormInputField.setVisibility(View.VISIBLE); @@ -553,7 +555,7 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien } @Override - public void updateValidationRuleToWidgetLastName(Boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { + public void updateValidationRuleToWidgetLastName(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { editTextConfiguration.applyConfigurationSetting(recieverLastNameFormInputField.getEditTextView()); if (fieldRequired) { recieverLastNameFormInputField.setVisibility(View.VISIBLE); @@ -562,7 +564,7 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien } @Override - public void updateValidationRuleToWidgetFullName(Boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { + public void updateValidationRuleToWidgetFullName(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { editTextConfiguration.applyConfigurationSetting(recieverFullNameFormInputField.getEditTextView()); if (fieldRequired) { recieverFullNameFormInputField.setVisibility(View.VISIBLE); @@ -571,7 +573,7 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien } @Override - public void updateValidationRuleToWidgetLocalFirstName(Boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { + public void updateValidationRuleToWidgetLocalFirstName(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { editTextConfiguration.applyConfigurationSetting(recieverLocalFirstNameFormInputField.getEditTextView()); if (fieldRequired) { recieverLocalFirstNameFormInputField.setVisibility(View.VISIBLE); @@ -580,7 +582,7 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien } @Override - public void updateValidationRuleToWidgetLocalMiddleName(Boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { + public void updateValidationRuleToWidgetLocalMiddleName(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { editTextConfiguration.applyConfigurationSetting(recieverLocalMiddleNameFormInputField.getEditTextView()); if (fieldRequired) { recieverLocalMiddleNameFormInputField.setVisibility(View.VISIBLE); @@ -589,7 +591,7 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien } @Override - public void updateValidationRuleToWidgetLocalLastName(Boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { + public void updateValidationRuleToWidgetLocalLastName(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { editTextConfiguration.applyConfigurationSetting(recieverLocalLastNameFormInputField.getEditTextView()); if (fieldRequired) { recieverLocalLastNameFormInputField.setVisibility(View.VISIBLE); @@ -598,7 +600,7 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien } @Override - public void updateValidationRuleToWidgetMobileNumber(Boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { + public void updateValidationRuleToWidgetMobileNumber(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { editTextConfiguration.applyConfigurationSetting(recieverMobileNoFormInputField.getEditTextView()); if (fieldRequired) { recieverMobileNoFormInputField.setVisibility(View.VISIBLE); @@ -607,7 +609,7 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien } @Override - public void updateValidationRuleToWidgetProvince(Boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { + public void updateValidationRuleToWidgetProvince(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { editTextConfiguration.applyConfigurationSetting(recieverStateSelectionFormInputField.getEditTextView()); if (fieldRequired) { receiverStateViewContainer.setVisibility(View.VISIBLE); @@ -616,7 +618,7 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien } @Override - public void updateValidationRuleToWidgetDistrict(Boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { + public void updateValidationRuleToWidgetDistrict(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { editTextConfiguration.applyConfigurationSetting(recieverDistrictSelectionFormInputField.getEditTextView()); if (fieldRequired) { receiverDistrictViewContainer.setVisibility(View.VISIBLE); @@ -625,7 +627,7 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien } @Override - public void updateValidationRuleToWidgetCity(Boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { + public void updateValidationRuleToWidgetCity(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { editTextConfiguration.applyConfigurationSetting(recieverCityFormInputField.getEditTextView()); if (fieldRequired) { recieverCityFormInputField.setVisibility(View.VISIBLE); @@ -634,7 +636,7 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien } @Override - public void updateValidationRuleToWidgetAddress(Boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { + public void updateValidationRuleToWidgetAddress(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { editTextConfiguration.applyConfigurationSetting(recieverAddressFormInputField.getEditTextView()); if (fieldRequired) { recieverAddressFormInputField.setVisibility(View.VISIBLE); @@ -643,7 +645,7 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien } @Override - public void updateValidationRuleToWidgetRelation(Boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { + public void updateValidationRuleToWidgetRelation(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { editTextConfiguration.applyConfigurationSetting(recieverRelationSelectionFormInputField.getEditTextView()); if (fieldRequired) { receiverRelationViewContainer.setVisibility(View.VISIBLE); @@ -652,7 +654,7 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien } @Override - public void updateValidationRuleToWidgetTransferReason(Boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { + public void updateValidationRuleToWidgetTransferReason(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { editTextConfiguration.applyConfigurationSetting(recieverTransferReasonSelectionFormInputField.getEditTextView()); if (fieldRequired) { receiverTransferReasonViewContainer.setVisibility(View.VISIBLE); @@ -660,6 +662,14 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien receiverTransferReasonViewContainer.setVisibility(GONE); } + @Override + public void updateValidationRuleToWidgetEmail(boolean isFieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { + editTextConfiguration.applyConfigurationSetting(recieverTransferReasonSelectionFormInputField.getEditTextView()); + if (isFieldRequired) { + recieverEmailFormInputField.setVisibility(View.VISIBLE); + } else + recieverEmailFormInputField.setVisibility(GONE); + } @Override diff --git a/app/src/main/res/layout/activity_recipient_add_edit_v3.xml b/app/src/main/res/layout/activity_recipient_add_edit_v3.xml index e45c4b10..ff3ed9d3 100644 --- a/app/src/main/res/layout/activity_recipient_add_edit_v3.xml +++ b/app/src/main/res/layout/activity_recipient_add_edit_v3.xml @@ -416,7 +416,7 @@ android:visibility="visible" app:edFormCursorVisible="false" app:edFormFocusable="false" - app:edFormHint="Select Relation" /> + app:edFormHint="Select Transfer Reason" />