diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index b34af82c..fe6f4d55 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/loginV2/presenter/LoginV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/loginV2/presenter/LoginV2Presenter.java index 55c2ac9d..e3fea87f 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/loginV2/presenter/LoginV2Presenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/loginV2/presenter/LoginV2Presenter.java @@ -79,8 +79,8 @@ public class LoginV2Presenter extends BaseViewModel implements LoginV2PresenterI } private void mockValidUserLogin() { - loginViewLiveData.setPasswordInputLiveData(new FormInputStateDTO<>(true,null,"123456")); - loginViewLiveData.setUserIdInputLiveData(new FormInputStateDTO<>(true,null,"bamboo")); + loginViewLiveData.setPasswordInputLiveData(new FormInputStateDTO<>(true,null,"1234")); + loginViewLiveData.setUserIdInputLiveData(new FormInputStateDTO<>(true,null,"subedi.msmanoj@gmail.com")); } private void bindView(LoginViewLiveData.LoginViewBindings viewBindings) { @@ -176,8 +176,7 @@ public class LoginV2Presenter extends BaseViewModel implements LoginV2PresenterI private class LoginValidator { private String userId; - private String password="4d544b31a1c58fbd37aac1a7be870bd86aa0b9dfbbab0f66e039dadf91643a4232ce4eb95009f3f1285cbe04c54051b20b59caa341c9c8b715167efad59aaf56d4449300f12ad23954566e260bdc03644267d05d9aad633f91e27273341dfc19ac2260137f83c4e9e74a75efb87e0b8b050dbf77"; - + private String password="4d544b3132bd58cb051d2cc6dfb445ae958f618cf84ace71184d983d8921224fa415c0b754accb7b3c356eef919dd90d0742d250c3be868711de6df6ccdbc886055cca39ad12e1577a3e3c682a5ff6e63fd1eb15"; private boolean validateUserId(CharSequence userID) { if (userID == null || userID.length() < 1) { diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/utils/ValidationUtils.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/utils/ValidationUtils.java index c27ee2cd..4ace132f 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/utils/ValidationUtils.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/utils/ValidationUtils.java @@ -2,6 +2,7 @@ package com.gmeremit.online.gmeremittance_native.recipientV3.utils; import com.gmeremit.online.gmeremittance_native.R; import com.gmeremit.online.gmeremittance_native.customwidgets.GMEFormInputField; +import com.google.android.material.textfield.TextInputLayout; public class ValidationUtils { @@ -17,4 +18,16 @@ public class ValidationUtils { formInputField.setHint(removedOptionalHint); } } + public static void updateHint(TextInputLayout formInputField, Boolean isOptional) + { + String currentHint = formInputField.getHint()+" "; + String optionalString = formInputField.getContext().getString(R.string.optional_hint_text); + if (isOptional) { + if (!currentHint.contains(optionalString)) + formInputField.setHint(currentHint + optionalString); + } else { + String removedOptionalHint = currentHint.replace(optionalString, ""); + formInputField.setHint(removedOptionalHint); + } + } } 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 22b8b763..d9c75b5f 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 @@ -3,12 +3,15 @@ package com.gmeremit.online.gmeremittance_native.recipientV3.view.recipientadded import android.app.Activity; import android.content.Intent; import android.os.Bundle; + import androidx.constraintlayout.widget.ConstraintLayout; import androidx.transition.TransitionManager; + import android.text.InputFilter; import android.util.Log; import android.view.View; import android.view.ViewGroup; +import android.widget.AutoCompleteTextView; import android.widget.Button; import android.widget.ImageView; import android.widget.LinearLayout; @@ -38,6 +41,8 @@ import com.gmeremit.online.gmeremittance_native.recipientV3.utils.EditTextConfig import com.gmeremit.online.gmeremittance_native.recipientV3.utils.ValidationUtils; import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.payoutmode.BankBranchDTO; import com.gmeremit.online.gmeremittance_native.sendmoneyV2.view.payoutmode.PayoutModeBranchListingDialog; +import com.google.android.material.textfield.TextInputEditText; +import com.google.android.material.textfield.TextInputLayout; import butterknife.BindView; import butterknife.ButterKnife; @@ -68,103 +73,166 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien @BindView(R.id.recieverCountrySelectionCountryFlag) ImageView recieverCountrySelectionCountryFlag; - @BindView(R.id.recieverCountrySelectionFormInputField) - GMEFormInputField recieverCountrySelectionFormInputField; - @BindView(R.id.receiverPaymentMethodViewContainer) - View receiverPaymentMethodViewContainer; - @BindView(R.id.recieverPaymentMethodSelectionFormInputField) - GMEFormInputField recieverPaymentMethodSelectionFormInputField; + @BindView(R.id.receiverCountrySelectionWrapper) + TextInputLayout receiverCountrySelectionWrapper; + + @BindView(R.id.ed_receiverCountrySelection) + AutoCompleteTextView ed_receiverCountrySelection; + + + @BindView(R.id.receiverPaymentMethodSelectionWrapper) + TextInputLayout receiverPaymentMethodSelectionWrapper; + + @BindView(R.id.ed_receiverPaymentMethodSelection) + AutoCompleteTextView ed_receiverPaymentMethodSelection; + + + + @BindView(R.id.receiverBankSelectionWrapper) + TextInputLayout receiverBankSelectionWrapper; + + @BindView(R.id.ed_receiverBankSelection) + AutoCompleteTextView ed_receiverBankSelection; + + + + + @BindView(R.id.receiverBranchSelectionWrapper) + TextInputLayout receiverBranchSelectionWrapper; + + @BindView(R.id.ed_receiverBranchSelection) + AutoCompleteTextView ed_receiverBranchSelection; + + @BindView(R.id.receiverAccountNoWrapper) + TextInputLayout receiverAccountNoWrapper; + + @BindView(R.id.ed_receiverAccountNo) + TextInputEditText ed_receiverAccountNo; + + + + @BindView(R.id.receiverFirstNameWrapper) + TextInputLayout receiverFirstNameWrapper; + + @BindView(R.id.ed_receiverFirstName) + TextInputEditText ed_receiverFirstName; + + @BindView(R.id.receiverMiddleNameWrapper) + TextInputLayout receiverMiddleNameWrapper; + + @BindView(R.id.ed_receiverMiddleName) + TextInputEditText ed_receiverMiddleName; - @BindView(R.id.receiverBankViewContainer) - View receiverBankViewContainer; - @BindView(R.id.recieverBankSelectionFormInputField) - GMEFormInputField recieverBankSelectionFormInputField; - @BindView(R.id.receiverBranchViewContainer) - View receiverBranchViewContainer; + @BindView(R.id.receiverLastNameWrapper) + TextInputLayout receiverLastNameWrapper; - @BindView(R.id.recieverBranchSelectionFormInputField) - GMEFormInputField recieverBranchSelectionFormInputField; + @BindView(R.id.ed_receiverLastName) + TextInputEditText ed_receiverLastName; - @BindView(R.id.recieverAccountNoFormInputField) - GMEFormInputField recieverAccountNoFormInputField; + @BindView(R.id.receiverFullNameWrapper) + TextInputLayout receiverFullNameWrapper; - @BindView(R.id.recieverFirstNameFormInputField) - GMEFormInputField recieverFirstNameFormInputField; + @BindView(R.id.ed_receiverFullName) + TextInputEditText ed_receiverFullName; - @BindView(R.id.recieverMiddleNameFormInputField) - GMEFormInputField recieverMiddleNameFormInputField; - @BindView(R.id.recieverLastNameFormInputField) - GMEFormInputField recieverLastNameFormInputField; - @BindView(R.id.recieverFullNameFormInputField) - GMEFormInputField recieverFullNameFormInputField; + @BindView(R.id.receiverLocalFirstNameWrapper) + TextInputLayout receiverLocalFirstNameWrapper; - @BindView(R.id.recieverLocalFirstNameFormInputField) - GMEFormInputField recieverLocalFirstNameFormInputField; + @BindView(R.id.ed_receiverLocalFirstName) + TextInputEditText ed_receiverLocalFirstName; - @BindView(R.id.recieverLocalMiddleNameFormInputField) - GMEFormInputField recieverLocalMiddleNameFormInputField; - @BindView(R.id.recieverLocalLastNameFormInputField) - GMEFormInputField recieverLocalLastNameFormInputField; + @BindView(R.id.receiverLocalMiddleNameWrapper) + TextInputLayout receiverLocalMiddleNameWrapper; + @BindView(R.id.ed_receiverLocalMiddleName) + TextInputEditText ed_receiverLocalMiddleName; - @BindView(R.id.recieverLocalFullNameFormInputField) - GMEFormInputField recieverLocalFullNameFormInputField; - @BindView(R.id.receiverStateViewContainer) - View receiverStateViewContainer; + @BindView(R.id.receiverLocalLastNameWrapper) + TextInputLayout receiverLocalLastNameWrapper; - @BindView(R.id.recieverStateSelectionFormInputField) - GMEFormInputField recieverStateSelectionFormInputField; + @BindView(R.id.ed_receiverLocalLastName) + TextInputEditText ed_receiverLocalLastName; - @BindView(R.id.receiverDistrictViewContainer) - View receiverDistrictViewContainer; - @BindView(R.id.recieverDistrictSelectionFormInputField) - GMEFormInputField recieverDistrictSelectionFormInputField; + @BindView(R.id.receiverLocalFullNameWrapper) + TextInputLayout receiverLocalFullNameWrapper; - @BindView(R.id.recieverCityFormInputField) - GMEFormInputField recieverCityFormInputField; + @BindView(R.id.ed_receiverLocalFullName) + TextInputEditText ed_receiverLocalFullName; - @BindView(R.id.recieverAddressFormInputField) - GMEFormInputField recieverAddressFormInputField; - @BindView(R.id.receiverRelationViewContainer) - View receiverRelationViewContainer; - @BindView(R.id.recieverRelationSelectionFormInputField) - GMEFormInputField recieverRelationSelectionFormInputField; + @BindView(R.id.receiverStateSelectionWrapper) + TextInputLayout receiverStateSelectionWrapper; - @BindView(R.id.recieverMobileNoFormInputField) - GMEFormInputField recieverMobileNoFormInputField; + @BindView(R.id.ed_receiverStateSelection) + AutoCompleteTextView ed_receiverStateSelection; - @BindView(R.id.recieverEmailFormInputField) - GMEFormInputField recieverEmailFormInputField; - @BindView(R.id.receiverTransferReasonViewContainer) - View receiverTransferReasonViewContainer; + @BindView(R.id.receiverDistrictSelectionWrapper) + TextInputLayout receiverDistrictSelectionWrapper; - @BindView(R.id.recieverTransferReasonSelectionFormInputField) - GMEFormInputField recieverTransferReasonSelectionFormInputField; + @BindView(R.id.ed_receiverDistrictSelection) + AutoCompleteTextView ed_receiverDistrictSelection; - @BindView(R.id.receiverIDTypeViewContainer) - View receiverIDTypeViewContainer; - @BindView(R.id.recieverIDTypeSelectionFormInputField) - GMEFormInputField recieverIDTypeSelectionFormInputField; + @BindView(R.id.receiverCityWrapper) + TextInputLayout receiverCityWrapper; - @BindView(R.id.recieverIdNumberFormInputField) - GMEFormInputField recieverIdNumberFormInputField; + @BindView(R.id.ed_receiverCity) + TextInputEditText ed_receiverCity; + + + @BindView(R.id.receiverAddressWrapper) + TextInputLayout receiverAddressWrapper; + + @BindView(R.id.ed_receiverAddress) + TextInputEditText ed_receiverAddress; + + + @BindView(R.id.receiverRelationSelectionWrapper) + TextInputLayout receiverRelationSelectionWrapper; + + @BindView(R.id.ed_receiverRelationSelection) + AutoCompleteTextView ed_receiverRelationSelection; + + + @BindView(R.id.receiverEmailWrapper) + TextInputLayout receiverEmailWrapper; + + @BindView(R.id.ed_receiverEmail) + TextInputEditText ed_receiverEmail; + + @BindView(R.id.receiverTransferReasonSelectionWrapper) + TextInputLayout receiverTransferReasonSelectionWrapper; + + @BindView(R.id.ed_receiverTransferReasonSelection) + AutoCompleteTextView ed_receiverTransferReasonSelection; + + + @BindView(R.id.receiverIDTypeSelectionWrapper) + TextInputLayout receiverIDTypeSelectionWrapper; + + @BindView(R.id.ed_receiverIDTypeSelection) + AutoCompleteTextView ed_receiverIDTypeSelection; + + @BindView(R.id.receiverIdNumberWrapper) + TextInputLayout receiverIdNumberWrapper; + + @BindView(R.id.ed_receiverIdNumber) + TextInputEditText ed_receiverIdNumber; @BindView(R.id.selectedCountryIcon) ImageView selectedCountryIcon; @@ -175,16 +243,24 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien @BindView(R.id.selectedCountryMobilePrefix) TextView selectedCountryMobilePrefix; + @BindView(R.id.receiverMobileNoWrapper) + TextInputLayout receiverMobileNoWrapper; + + @BindView(R.id.ed_receiverMobileNo) + TextInputEditText ed_receiverMobileNo; + @BindView(R.id.recieverNativeCountryViewContainer) ViewGroup recieverNativeCountryViewContainer; - @BindView(R.id.recieverNativeCountrySelectionCountryFlag) - ImageView recieverNativeCountrySelectionCountryFlag; + @BindView(R.id.receiverNativeCountrySelectionWrapper) + TextInputLayout receiverNativeCountrySelectionWrapper; - @BindView(R.id.recieverNativeCountrySelectionFormInputField) - GMEFormInputField recieverNativeCountrySelectionFormInputField; + @BindView(R.id.ed_receiverNativeCountrySelection) + AutoCompleteTextView ed_receiverNativeCountrySelection; + @BindView(R.id.recieverNativeCountrySelectionCountryFlag) + ImageView recieverNativeCountrySelectionCountryFlag; @BindView(R.id.iv_back) View iv_back; @@ -261,16 +337,15 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien } private void removeInputFiltersByDefault() { - recieverPaymentMethodSelectionFormInputField.setInputFilters(new InputFilter[]{}); + ed_receiverPaymentMethodSelection.setFilters(new InputFilter[]{}); - recieverLocalFullNameFormInputField.setInputFilters(new InputFilter[]{}); - recieverLocalLastNameFormInputField.setInputFilters(new InputFilter[]{}); - recieverLocalMiddleNameFormInputField.setInputFilters(new InputFilter[]{}); - recieverLocalFirstNameFormInputField.setInputFilters(new InputFilter[]{}); + ed_receiverLocalFullName.setFilters(new InputFilter[]{}); + ed_receiverLocalLastName.setFilters(new InputFilter[]{}); + ed_receiverLocalMiddleName.setFilters(new InputFilter[]{}); + ed_receiverLocalFirstName.setFilters(new InputFilter[]{}); } - private void initTextWatchers() { Log.d(TAG, "Textwatcher Init"); @@ -297,44 +372,44 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien @Override public void registerTextWatchers(boolean action) { if (action) { - recieverAccountNoFormInputField.addTextWatchers(recieverAccountNoTextWatcher); + ed_receiverAccountNo.addTextChangedListener(recieverAccountNoTextWatcher); - recieverFirstNameFormInputField.addTextWatchers(recieverFirstNameTextWatcher); - recieverMiddleNameFormInputField.addTextWatchers(recieverMiddleNameTextWatcher); - recieverLastNameFormInputField.addTextWatchers(recieverLastNameTextWatcher); - recieverFullNameFormInputField.addTextWatchers(recieverFullNameTextWatcher); + ed_receiverFirstName.addTextChangedListener(recieverFirstNameTextWatcher); + ed_receiverMiddleName.addTextChangedListener(recieverMiddleNameTextWatcher); + ed_receiverLastName.addTextChangedListener(recieverLastNameTextWatcher); + ed_receiverFullName.addTextChangedListener(recieverFullNameTextWatcher); - recieverLocalFirstNameFormInputField.addTextWatchers(recieverFirstNameLocalTextWatcher); - recieverLocalMiddleNameFormInputField.addTextWatchers(recieverMiddleNameLocalTextWatcher); - recieverLocalLastNameFormInputField.addTextWatchers(recieverLastNameLocalTextWatcher); - recieverLocalFullNameFormInputField.addTextWatchers(recieverLocalFullNameTextWatcher); + ed_receiverLocalFirstName.addTextChangedListener(recieverFirstNameLocalTextWatcher); + ed_receiverLocalMiddleName.addTextChangedListener(recieverMiddleNameLocalTextWatcher); + ed_receiverLocalLastName.addTextChangedListener(recieverLastNameLocalTextWatcher); + ed_receiverLocalFullName.addTextChangedListener(recieverLocalFullNameTextWatcher); - recieverCityFormInputField.addTextWatchers(recieverCityTextWatcher); - recieverAddressFormInputField.addTextWatchers(recieverAddressTextWatcher); - recieverMobileNoFormInputField.addTextWatchers(recieverMobileNoTextWatcher); - recieverEmailFormInputField.addTextWatchers(recieverEmailTextWatcher); - recieverIdNumberFormInputField.addTextWatchers(recieverIdNumberTextWatcher); + ed_receiverCity.addTextChangedListener(recieverCityTextWatcher); + ed_receiverAddress.addTextChangedListener(recieverAddressTextWatcher); + ed_receiverMobileNo.addTextChangedListener(recieverMobileNoTextWatcher); + ed_receiverEmail.addTextChangedListener(recieverEmailTextWatcher); + ed_receiverIdNumber.addTextChangedListener(recieverIdNumberTextWatcher); } else { - recieverAccountNoFormInputField.removeTextWatchers(recieverAccountNoTextWatcher); + ed_receiverAccountNo.removeTextChangedListener(recieverAccountNoTextWatcher); - recieverFirstNameFormInputField.removeTextWatchers(recieverFirstNameTextWatcher); - recieverMiddleNameFormInputField.removeTextWatchers(recieverMiddleNameTextWatcher); - recieverLastNameFormInputField.removeTextWatchers(recieverLastNameTextWatcher); - recieverFullNameFormInputField.removeTextWatchers(recieverFullNameTextWatcher); + ed_receiverFirstName.removeTextChangedListener(recieverFirstNameTextWatcher); + ed_receiverMiddleName.removeTextChangedListener(recieverMiddleNameTextWatcher); + ed_receiverLastName.removeTextChangedListener(recieverLastNameTextWatcher); + ed_receiverFullName.removeTextChangedListener(recieverFullNameTextWatcher); - recieverLocalFirstNameFormInputField.removeTextWatchers(recieverFirstNameLocalTextWatcher); - recieverLocalMiddleNameFormInputField.removeTextWatchers(recieverMiddleNameLocalTextWatcher); - recieverLocalLastNameFormInputField.removeTextWatchers(recieverLastNameLocalTextWatcher); - recieverLocalFullNameFormInputField.removeTextWatchers(recieverLocalFullNameTextWatcher); + ed_receiverLocalFirstName.removeTextChangedListener(recieverFirstNameLocalTextWatcher); + ed_receiverLocalMiddleName.removeTextChangedListener(recieverMiddleNameLocalTextWatcher); + ed_receiverLocalLastName.removeTextChangedListener(recieverLastNameLocalTextWatcher); + ed_receiverLocalFullName.removeTextChangedListener(recieverLocalFullNameTextWatcher); - recieverCityFormInputField.removeTextWatchers(recieverCityTextWatcher); - recieverAddressFormInputField.removeTextWatchers(recieverAddressTextWatcher); - recieverMobileNoFormInputField.removeTextWatchers(recieverMobileNoTextWatcher); - recieverEmailFormInputField.removeTextWatchers(recieverEmailTextWatcher); - recieverIdNumberFormInputField.removeTextWatchers(recieverIdNumberTextWatcher); + ed_receiverCity.removeTextChangedListener(recieverCityTextWatcher); + ed_receiverAddress.removeTextChangedListener(recieverAddressTextWatcher); + ed_receiverMobileNo.removeTextChangedListener(recieverMobileNoTextWatcher); + ed_receiverEmail.removeTextChangedListener(recieverEmailTextWatcher); + ed_receiverIdNumber.removeTextChangedListener(recieverIdNumberTextWatcher); } } @@ -346,27 +421,27 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien private void registerClickListener(boolean action) { if (action) { - recieverCountrySelectionFormInputField.getEditTextView().setOnClickListener(new CountrySelectionClickListener()); - recieverNativeCountrySelectionFormInputField.getEditTextView().setOnClickListener(new NativeCountrySelectionClickListener()); - recieverPaymentMethodSelectionFormInputField.getEditTextView().setOnClickListener(new PaymentMethodSelectionClickListener()); - recieverBankSelectionFormInputField.getEditTextView().setOnClickListener(new BankSelectionClickListener()); - recieverBranchSelectionFormInputField.getEditTextView().setOnClickListener(new BranchSelectionClickListener()); - recieverStateSelectionFormInputField.getEditTextView().setOnClickListener(new StateSelectionClickListener()); - recieverDistrictSelectionFormInputField.getEditTextView().setOnClickListener(new DistrictSelectionClickListener()); - recieverRelationSelectionFormInputField.getEditTextView().setOnClickListener(new RelationSelectionClickListener()); - recieverTransferReasonSelectionFormInputField.getEditTextView().setOnClickListener(new TransferReasonSelectionClickListener()); - recieverIDTypeSelectionFormInputField.getEditTextView().setOnClickListener(new IDTypeSelectionClickListener()); + ed_receiverCountrySelection.setOnClickListener(new CountrySelectionClickListener()); + ed_receiverNativeCountrySelection.setOnClickListener(new NativeCountrySelectionClickListener()); + ed_receiverPaymentMethodSelection.setOnClickListener(new PaymentMethodSelectionClickListener()); + ed_receiverBankSelection.setOnClickListener(new BankSelectionClickListener()); + ed_receiverBranchSelection.setOnClickListener(new BranchSelectionClickListener()); + ed_receiverStateSelection.setOnClickListener(new StateSelectionClickListener()); + ed_receiverDistrictSelection.setOnClickListener(new DistrictSelectionClickListener()); + ed_receiverRelationSelection.setOnClickListener(new RelationSelectionClickListener()); + ed_receiverTransferReasonSelection.setOnClickListener(new TransferReasonSelectionClickListener()); + ed_receiverIDTypeSelection.setOnClickListener(new IDTypeSelectionClickListener()); } else { - recieverCountrySelectionFormInputField.getEditTextView().setOnClickListener(null); - recieverNativeCountrySelectionFormInputField.getEditTextView().setOnClickListener(null); - recieverPaymentMethodSelectionFormInputField.getEditTextView().setOnClickListener(null); - recieverBankSelectionFormInputField.getEditTextView().setOnClickListener(null); - recieverBranchSelectionFormInputField.getEditTextView().setOnClickListener(null); - recieverStateSelectionFormInputField.getEditTextView().setOnClickListener(null); - recieverDistrictSelectionFormInputField.getEditTextView().setOnClickListener(null); - recieverRelationSelectionFormInputField.getEditTextView().setOnClickListener(null); - recieverTransferReasonSelectionFormInputField.getEditTextView().setOnClickListener(null); - recieverIDTypeSelectionFormInputField.getEditTextView().setOnClickListener(null); + ed_receiverCountrySelection.setOnClickListener(null); + ed_receiverNativeCountrySelection.setOnClickListener(null); + ed_receiverPaymentMethodSelection.setOnClickListener(null); + ed_receiverBankSelection.setOnClickListener(null); + ed_receiverBranchSelection.setOnClickListener(null); + ed_receiverStateSelection.setOnClickListener(null); + ed_receiverDistrictSelection.setOnClickListener(null); + ed_receiverRelationSelection.setOnClickListener(null); + ed_receiverTransferReasonSelection.setOnClickListener(null); + ed_receiverIDTypeSelection.setOnClickListener(null); } } @@ -414,18 +489,18 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien @Override public void showPaymentSelectionView(boolean visiblity) { if (visiblity) - receiverPaymentMethodViewContainer.setVisibility(View.VISIBLE); + receiverPaymentMethodSelectionWrapper.setVisibility(View.VISIBLE); else - receiverPaymentMethodViewContainer.setVisibility(View.GONE); + receiverPaymentMethodSelectionWrapper.setVisibility(View.GONE); } @Override public void updateValidationRuleToWidgetPaymentMethodSelection(boolean visiblity) { if (visiblity) - receiverPaymentMethodViewContainer.setVisibility(View.VISIBLE); + receiverPaymentMethodSelectionWrapper.setVisibility(View.VISIBLE); else - receiverPaymentMethodViewContainer.setVisibility(View.GONE); + receiverPaymentMethodSelectionWrapper.setVisibility(View.GONE); } @Override @@ -437,7 +512,7 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien @Override public void hideAllFormFieldsExceptCountryAndPaymentMethod() { recieverCountryViewContainer.setVisibility(View.VISIBLE); - receiverPaymentMethodViewContainer.setVisibility(View.VISIBLE); + receiverPaymentMethodSelectionWrapper.setVisibility(View.VISIBLE); hideViewFromIndexId(3); } @@ -445,134 +520,134 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien @Override public void updateValueToWidgetSelectedPaymentMethod(String description) { Log.d(this.getClass().getSimpleName(), "Selected method type: " + description); - recieverPaymentMethodSelectionFormInputField.getEditTextView().setText(description); + ed_receiverPaymentMethodSelection.setText(description); } @Override public void updateValueToWidgetSelectedCountry(String countryName) { - recieverCountrySelectionFormInputField.getEditTextView().setText(countryName); + ed_receiverCountrySelection.setText(countryName); } @Override public void updateValueToWidgetBankName(String value) { - recieverBankSelectionFormInputField.getEditTextView().setText(value); + ed_receiverBankSelection.setText(value); } @Override public void updateValueToWidgetBranchName(String value) { - recieverBranchSelectionFormInputField.getEditTextView().setText(value); + ed_receiverBranchSelection.setText(value); } @Override public void updateValueToWidgetAccountNo(String value) { - recieverAccountNoFormInputField.getEditTextView().setText(value); + ed_receiverAccountNo.setText(value); } @Override public void updateValueToWidgetIDType(String value) { - recieverIDTypeSelectionFormInputField.getEditTextView().setText(value); + ed_receiverIDTypeSelection.setText(value); } @Override public void updateValueToWidgetIDNumber(String value) { - recieverIdNumberFormInputField.getEditTextView().setText(value); + ed_receiverIdNumber.setText(value); } @Override public void updateValueToWidgetFirstName(String value) { - recieverFirstNameFormInputField.getEditTextView().setText(value); + ed_receiverFirstName.setText(value); } @Override public void updateValueToWidgetMiddleName(String value) { - recieverMiddleNameFormInputField.getEditTextView().setText(value); + ed_receiverMiddleName.setText(value); } @Override public void updateValueToWidgetLastName(String value) { - recieverLastNameFormInputField.getEditTextView().setText(value); + ed_receiverLastName.setText(value); } @Override public void updateValueToWidgetFullName(String value) { - recieverFullNameFormInputField.getEditTextView().setText(value); + ed_receiverFullName.setText(value); } @Override public void updateValueToWidgetLocalFirstName(String value) { - recieverLocalFirstNameFormInputField.getEditTextView().setText(value); + ed_receiverLocalFirstName.setText(value); } @Override public void updateValueToWidgetLocalMiddleName(String value) { - recieverLocalMiddleNameFormInputField.getEditTextView().setText(value); + ed_receiverLocalMiddleName.setText(value); } @Override public void updateValueToWidgetLocalLastName(String value) { - recieverLocalLastNameFormInputField.getEditTextView().setText(value); + ed_receiverLocalLastName.setText(value); } @Override public void updateValueToWidgetLocalFullName(String name) { - recieverLocalFullNameFormInputField.getEditTextView().setText(name); + ed_receiverLocalFullName.setText(name); } @Override public void updateValueToWidgetMobileNumber(String value) { - recieverMobileNoFormInputField.getEditTextView().setText(value); + ed_receiverMobileNo.setText(value); } @Override public void updateValueToWidgetProvince(String value) { - recieverStateSelectionFormInputField.getEditTextView().setText(value); + ed_receiverStateSelection.setText(value); } @Override public void updateValueToWidgetDistrict(String value) { - recieverDistrictSelectionFormInputField.getEditTextView().setText(value); + ed_receiverDistrictSelection.setText(value); } @Override public void updateValueToWidgetCity(String value) { - recieverCityFormInputField.getEditTextView().setText(value); + ed_receiverCity.setText(value); } @Override public void updateValueToWidgetAddress(String value) { - recieverAddressFormInputField.getEditTextView().setText(value); + ed_receiverAddress.setText(value); } @Override public void updateValueToWidgetRelation(String value) { - recieverRelationSelectionFormInputField.getEditTextView().setText(value); + ed_receiverRelationSelection.setText(value); } @Override public void updateValueToWidgetTransferReason(String value) { - recieverTransferReasonSelectionFormInputField.getEditTextView().setText(value); + ed_receiverTransferReasonSelection.setText(value); } @Override public void updateValueToWidgetNativeCountry(String nativeCountry) { - recieverNativeCountrySelectionFormInputField.getEditTextView().setText(nativeCountry); + ed_receiverNativeCountrySelection.setText(nativeCountry); } @Override public void updateValueToWidgetEmail(String email) { - recieverEmailFormInputField.getEditTextView().setText(email); + ed_receiverEmail.setText(email); } @Override public void updateValidationRuleToWidgetLocalFullName(boolean showWidget, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { - editTextConfiguration.applyConfigurationSetting(recieverLocalFullNameFormInputField.getEditText()); + editTextConfiguration.applyConfigurationSetting(ed_receiverLocalFullName); if (showWidget) { - recieverLocalFullNameFormInputField.setVisibility(View.VISIBLE); + receiverLocalFullNameWrapper.setVisibility(View.VISIBLE); } else - recieverLocalFullNameFormInputField.setVisibility(GONE); + receiverLocalFullNameWrapper.setVisibility(GONE); } @@ -580,9 +655,9 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien public void updateValidationRuleToWidgetBankName(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { // editTextConfiguration.applyConfigurationSetting(recieverBankSelectionFormInputField.getEditTextView()); if (fieldRequired) { - receiverBankViewContainer.setVisibility(View.VISIBLE); + receiverBankSelectionWrapper.setVisibility(View.VISIBLE); } else - receiverBankViewContainer.setVisibility(GONE); + receiverBankSelectionWrapper.setVisibility(GONE); } @Override @@ -590,104 +665,104 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien // if (editTextConfiguration != null) // editTextConfiguration.applyConfigurationSetting(recieverBranchSelectionFormInputField.getEditTextView()); if (fieldRequired) { - receiverBranchViewContainer.setVisibility(View.VISIBLE); + receiverBranchSelectionWrapper.setVisibility(View.VISIBLE); } else - receiverBranchViewContainer.setVisibility(GONE); + receiverBranchSelectionWrapper.setVisibility(GONE); } @Override public void updateValidationRuleToWidgetAccountNo(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { - editTextConfiguration.applyConfigurationSetting(recieverAccountNoFormInputField.getEditTextView()); + editTextConfiguration.applyConfigurationSetting(ed_receiverAccountNo); if (fieldRequired) { - recieverAccountNoFormInputField.setVisibility(View.VISIBLE); + receiverAccountNoWrapper.setVisibility(View.VISIBLE); } else - recieverAccountNoFormInputField.setVisibility(GONE); + receiverAccountNoWrapper.setVisibility(GONE); } @Override public void updateValidationRuleToWidgetIDType(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { // editTextConfiguration.applyConfigurationSetting(recieverIDTypeSelectionFormInputField.getEditTextView()); if (fieldRequired) { - receiverIDTypeViewContainer.setVisibility(View.VISIBLE); + receiverIDTypeSelectionWrapper.setVisibility(View.VISIBLE); } else - receiverIDTypeViewContainer.setVisibility(GONE); + receiverIDTypeSelectionWrapper.setVisibility(GONE); } @Override public void updateValidationRuleToWidgetIDNumber(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { - editTextConfiguration.applyConfigurationSetting(recieverIdNumberFormInputField.getEditTextView()); + editTextConfiguration.applyConfigurationSetting(ed_receiverIdNumber); if (fieldRequired) { - recieverIdNumberFormInputField.setVisibility(View.VISIBLE); + receiverIdNumberWrapper.setVisibility(View.VISIBLE); } else - recieverIdNumberFormInputField.setVisibility(GONE); + receiverIdNumberWrapper.setVisibility(GONE); } @Override public void updateValidationRuleToWidgetFirstName(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { - editTextConfiguration.applyConfigurationSetting(recieverFirstNameFormInputField.getEditTextView()); + editTextConfiguration.applyConfigurationSetting(ed_receiverFirstName); if (fieldRequired) { - recieverFirstNameFormInputField.setVisibility(View.VISIBLE); + receiverFirstNameWrapper.setVisibility(View.VISIBLE); } else - recieverFirstNameFormInputField.setVisibility(GONE); + receiverFirstNameWrapper.setVisibility(GONE); } @Override public void updateValidationRuleToWidgetMiddleName(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { - editTextConfiguration.applyConfigurationSetting(recieverMiddleNameFormInputField.getEditTextView()); + editTextConfiguration.applyConfigurationSetting(ed_receiverMiddleName); if (fieldRequired) { - recieverMiddleNameFormInputField.setVisibility(View.VISIBLE); + receiverMiddleNameWrapper.setVisibility(View.VISIBLE); } else - recieverMiddleNameFormInputField.setVisibility(GONE); + receiverMiddleNameWrapper.setVisibility(GONE); } @Override public void updateValidationRuleToWidgetLastName(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { - editTextConfiguration.applyConfigurationSetting(recieverLastNameFormInputField.getEditTextView()); + editTextConfiguration.applyConfigurationSetting(ed_receiverLastName); if (fieldRequired) { - recieverLastNameFormInputField.setVisibility(View.VISIBLE); + receiverLastNameWrapper.setVisibility(View.VISIBLE); } else - recieverLastNameFormInputField.setVisibility(GONE); + receiverLastNameWrapper.setVisibility(GONE); } @Override public void updateValidationRuleToWidgetFullName(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { - editTextConfiguration.applyConfigurationSetting(recieverFullNameFormInputField.getEditTextView()); + editTextConfiguration.applyConfigurationSetting(ed_receiverFullName); if (fieldRequired) { - recieverFullNameFormInputField.setVisibility(View.VISIBLE); + receiverFullNameWrapper.setVisibility(View.VISIBLE); } else - recieverFullNameFormInputField.setVisibility(GONE); + receiverFullNameWrapper.setVisibility(GONE); } @Override public void updateValidationRuleToWidgetLocalFirstName(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { - editTextConfiguration.applyConfigurationSetting(recieverLocalFirstNameFormInputField.getEditTextView()); + editTextConfiguration.applyConfigurationSetting(ed_receiverLocalFirstName); if (fieldRequired) { - recieverLocalFirstNameFormInputField.setVisibility(View.VISIBLE); + receiverLocalFirstNameWrapper.setVisibility(View.VISIBLE); } else - recieverLocalFirstNameFormInputField.setVisibility(GONE); + receiverLocalFirstNameWrapper.setVisibility(GONE); } @Override public void updateValidationRuleToWidgetLocalMiddleName(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { - editTextConfiguration.applyConfigurationSetting(recieverLocalMiddleNameFormInputField.getEditTextView()); + editTextConfiguration.applyConfigurationSetting(ed_receiverLocalMiddleName); if (fieldRequired) { - recieverLocalMiddleNameFormInputField.setVisibility(View.VISIBLE); + receiverLocalMiddleNameWrapper.setVisibility(View.VISIBLE); } else - recieverLocalMiddleNameFormInputField.setVisibility(GONE); + receiverLocalMiddleNameWrapper.setVisibility(GONE); } @Override public void updateValidationRuleToWidgetLocalLastName(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { - editTextConfiguration.applyConfigurationSetting(recieverLocalLastNameFormInputField.getEditTextView()); + editTextConfiguration.applyConfigurationSetting(ed_receiverLocalLastName); if (fieldRequired) { - recieverLocalLastNameFormInputField.setVisibility(View.VISIBLE); + receiverLocalLastNameWrapper.setVisibility(View.VISIBLE); } else - recieverLocalLastNameFormInputField.setVisibility(GONE); + receiverLocalLastNameWrapper.setVisibility(GONE); } @Override public void updateValidationRuleToWidgetMobileNumber(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { - editTextConfiguration.applyConfigurationSetting(recieverMobileNoFormInputField.getEditTextView()); + editTextConfiguration.applyConfigurationSetting(ed_receiverMobileNo); if (fieldRequired) { mobileViewContainer.setVisibility(View.VISIBLE); } else @@ -732,11 +807,11 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien @Override public void scrollAccountNumberView() { - if (receiverBankViewContainer.getVisibility() == View.VISIBLE) { + if (receiverBankSelectionWrapper.getVisibility() == View.VISIBLE) { scrollView.post(new Runnable() { @Override public void run() { - scrollView.smoothScrollTo(0, receiverBankViewContainer.getTop()); + scrollView.smoothScrollTo(0, receiverBankSelectionWrapper.getTop()); } }); } @@ -744,39 +819,39 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien @Override public void clearViewDependentOnServiceType() { - recieverAccountNoFormInputField.getEditTextView().setText(""); + ed_receiverAccountNo.setText(""); - recieverFirstNameFormInputField.getEditTextView().setText(""); - recieverMiddleNameFormInputField.getEditTextView().setText(""); - recieverLastNameFormInputField.getEditTextView().setText(""); - recieverFullNameFormInputField.getEditTextView().setText(""); + ed_receiverFirstName.setText(""); + ed_receiverMiddleName.setText(""); + ed_receiverLastName.setText(""); + ed_receiverFullName.setText(""); - recieverLocalFirstNameFormInputField.getEditTextView().setText(""); - recieverLocalMiddleNameFormInputField.getEditTextView().setText(""); - recieverLocalLastNameFormInputField.getEditTextView().setText(""); - recieverLocalFullNameFormInputField.getEditTextView().setText(""); + ed_receiverLocalFirstName.setText(""); + ed_receiverLocalMiddleName.setText(""); + ed_receiverLocalLastName.setText(""); + ed_receiverLocalFullName.setText(""); - recieverCityFormInputField.getEditTextView().setText(""); - recieverAddressFormInputField.getEditTextView().setText(""); - recieverMobileNoFormInputField.getEditTextView().setText(""); - recieverEmailFormInputField.getEditTextView().setText(""); - recieverIdNumberFormInputField.getEditTextView().setText(""); + ed_receiverCity.setText(""); + ed_receiverAddress.setText(""); + ed_receiverMobileNo.setText(""); + ed_receiverEmail.setText(""); + ed_receiverIdNumber.setText(""); - recieverBankSelectionFormInputField.getEditTextView().setText(""); - recieverBranchSelectionFormInputField.getEditTextView().setText(""); - recieverStateSelectionFormInputField.getEditTextView().setText(""); - recieverDistrictSelectionFormInputField.getEditTextView().setText(""); - recieverRelationSelectionFormInputField.getEditTextView().setText(""); - recieverTransferReasonSelectionFormInputField.getEditTextView().setText(""); - recieverIDTypeSelectionFormInputField.getEditTextView().setText(""); + ed_receiverBankSelection.setText(""); + ed_receiverBranchSelection.setText(""); + ed_receiverStateSelection.setText(""); + ed_receiverDistrictSelection.setText(""); + ed_receiverRelationSelection.setText(""); + ed_receiverTransferReasonSelection.setText(""); + ed_receiverIDTypeSelection.setText(""); } @Override public void clearViewDependentOnCountryServiceSelected() { - recieverPaymentMethodSelectionFormInputField.getEditTextView().setText(""); + ed_receiverPaymentMethodSelection.setText(""); clearViewDependentOnServiceType(); } @@ -797,63 +872,64 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien public void updateValidationRuleToWidgetProvince(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { // editTextConfiguration.applyConfigurationSetting(recieverStateSelectionFormInputField.getEditTextView()); if (fieldRequired) { - receiverStateViewContainer.setVisibility(View.VISIBLE); + receiverStateSelectionWrapper.setVisibility(View.VISIBLE); } else - receiverStateViewContainer.setVisibility(GONE); + receiverStateSelectionWrapper.setVisibility(GONE); } @Override public void updateValidationRuleToWidgetDistrict(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { // editTextConfiguration.applyConfigurationSetting(recieverDistrictSelectionFormInputField.getEditTextView()); if (fieldRequired) { - receiverDistrictViewContainer.setVisibility(View.VISIBLE); + receiverDistrictSelectionWrapper.setVisibility(View.VISIBLE); } else - receiverDistrictViewContainer.setVisibility(GONE); + receiverDistrictSelectionWrapper.setVisibility(GONE); } @Override public void updateValidationRuleToWidgetCity(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { - editTextConfiguration.applyConfigurationSetting(recieverCityFormInputField.getEditTextView()); + editTextConfiguration.applyConfigurationSetting(ed_receiverCity); if (fieldRequired) { - recieverCityFormInputField.setVisibility(View.VISIBLE); + receiverCityWrapper.setVisibility(View.VISIBLE); } else - recieverCityFormInputField.setVisibility(GONE); + receiverCityWrapper.setVisibility(GONE); } @Override public void updateValidationRuleToWidgetAddress(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { - editTextConfiguration.applyConfigurationSetting(recieverAddressFormInputField.getEditTextView()); + editTextConfiguration.applyConfigurationSetting(ed_receiverAddress); if (fieldRequired) { - recieverAddressFormInputField.setVisibility(View.VISIBLE); + receiverAddressWrapper.setVisibility(View.VISIBLE); } else - recieverAddressFormInputField.setVisibility(GONE); + receiverAddressWrapper.setVisibility(GONE); } @Override public void updateValidationRuleToWidgetRelation(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { // editTextConfiguration.applyConfigurationSetting(recieverRelationSelectionFormInputField.getEditTextView()); if (fieldRequired) { - receiverRelationViewContainer.setVisibility(View.VISIBLE); + receiverRelationSelectionWrapper.setVisibility(View.VISIBLE); } else - receiverRelationViewContainer.setVisibility(GONE); + receiverRelationSelectionWrapper.setVisibility(GONE); } @Override public void updateValidationRuleToWidgetTransferReason(boolean fieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { // editTextConfiguration.applyConfigurationSetting(recieverTransferReasonSelectionFormInputField.getEditTextView()); if (fieldRequired) { - receiverTransferReasonViewContainer.setVisibility(View.VISIBLE); + receiverTransferReasonSelectionWrapper.setVisibility(View.VISIBLE); } else - receiverTransferReasonViewContainer.setVisibility(GONE); + receiverTransferReasonSelectionWrapper.setVisibility(GONE); } @Override public void updateValidationRuleToWidgetEmail(boolean isFieldRequired, EditTextConfigurationFactory.EditTextConfiguration editTextConfiguration) { - editTextConfiguration.applyConfigurationSetting(recieverTransferReasonSelectionFormInputField.getEditTextView()); +// editTextConfiguration.applyConfigurationSetting(ed_receiverTransferReasonSelection); --->??? + editTextConfiguration.applyConfigurationSetting(ed_receiverEmail); if (isFieldRequired) { - recieverEmailFormInputField.setVisibility(View.VISIBLE); + receiverEmailWrapper.setVisibility(View.VISIBLE); } else - recieverEmailFormInputField.setVisibility(GONE); + receiverEmailWrapper.setVisibility(GONE); } @Override @@ -866,192 +942,192 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien @Override public void setErrorOnWidgetBank(String error) { - recieverBankSelectionFormInputField.updateErrorSafely(error); + ed_receiverBankSelection.setError(error); } @Override public void setErrorOnWidgetAccountNo(String error) { - recieverAccountNoFormInputField.updateErrorSafely(error); + receiverAccountNoWrapper.setError(error); } @Override public void setErrorOnWidgetFirstName(String error) { - recieverFirstNameFormInputField.updateErrorSafely(error); + receiverFirstNameWrapper.setError(error); } @Override public void setErrorOnWidgetMiddleName(String error) { - recieverMiddleNameFormInputField.updateErrorSafely(error); + receiverMiddleNameWrapper.setError(error); } @Override public void setErrorOnWidgetLastName(String error) { - recieverLastNameFormInputField.updateErrorSafely(error); + receiverLastNameWrapper.setError(error); } @Override public void setErrorOnWidgetFullName(String error) { - recieverFullNameFormInputField.updateErrorSafely(error); + receiverFullNameWrapper.setError(error); } @Override public void setErrorOnWidgetCity(String error) { - recieverCityFormInputField.updateErrorSafely(error); + receiverCityWrapper.setError(error); } @Override public void setErrorOnWidgetAddress(String error) { - recieverAddressFormInputField.updateErrorSafely(error); + receiverAddressWrapper.setError(error); } @Override public void setErrorOnWidgetMobileNumber(String error) { - recieverMobileNoFormInputField.updateErrorSafely(error); + receiverMobileNoWrapper.setError(error); } @Override public void setErrorOnWidgetEmail(String error) { - recieverEmailFormInputField.updateErrorSafely(error); + receiverEmailWrapper.setError(error); } @Override public void setErrorOnWidgetIDNumber(String error) { - recieverIdNumberFormInputField.updateErrorSafely(error); + receiverIdNumberWrapper.setError(error); } @Override public void setErrorOnWidgetLocalFirstName(String error) { - recieverLocalFirstNameFormInputField.updateErrorSafely(error); + receiverLocalFirstNameWrapper.setError(error); } @Override public void setErrorOnWidgetLocalMiddleName(String error) { - recieverLocalMiddleNameFormInputField.updateErrorSafely(error); + receiverLocalMiddleNameWrapper.setError(error); } @Override public void setErrorOnWidgetLocalLastName(String error) { - recieverLocalLastNameFormInputField.updateErrorSafely(error); + receiverLocalLastNameWrapper.setError(error); } @Override public void setErrorOnWidgetLocalFullName(String error) { - recieverLocalFullNameFormInputField.updateErrorSafely(error); + receiverLocalFullNameWrapper.setError(error); } @Override public void addOptionalAsHintToWidgetBankName(Boolean isOptional) { - ValidationUtils.updateHint(recieverBankSelectionFormInputField, isOptional); + ValidationUtils.updateHint(receiverBankSelectionWrapper, isOptional); } @Override public void addOptionalAsHintToWidgetBranch(Boolean isOptional) { - ValidationUtils.updateHint(recieverBranchSelectionFormInputField, isOptional); + ValidationUtils.updateHint(receiverBranchSelectionWrapper, isOptional); } @Override public void addOptionalAsHintToWidgetAccountNumber(Boolean isOptional) { - ValidationUtils.updateHint(recieverAccountNoFormInputField, isOptional); + ValidationUtils.updateHint(receiverAccountNoWrapper, isOptional); } @Override public void addOptionalAsHintToWidgetIDType(Boolean isOptional) { - ValidationUtils.updateHint(recieverIDTypeSelectionFormInputField, isOptional); + ValidationUtils.updateHint(receiverIDTypeSelectionWrapper, isOptional); } @Override public void addOptionalAsHintToWidgetIDNumber(Boolean isOptional) { - ValidationUtils.updateHint(recieverIdNumberFormInputField, isOptional); + ValidationUtils.updateHint(receiverIdNumberWrapper, isOptional); } @Override public void addOptionalAsHintToWidgetFirstName(Boolean isOptional) { - ValidationUtils.updateHint(recieverFirstNameFormInputField, isOptional); + ValidationUtils.updateHint(receiverFirstNameWrapper, isOptional); } @Override public void addOptionalAsHintToWidgetMiddleName(Boolean isOptional) { - ValidationUtils.updateHint(recieverMiddleNameFormInputField, isOptional); + ValidationUtils.updateHint(receiverMiddleNameWrapper, isOptional); } @Override public void addOptionalAsHintToWidgetLastName(Boolean isOptional) { - ValidationUtils.updateHint(recieverLastNameFormInputField, isOptional); + ValidationUtils.updateHint(receiverLastNameWrapper, isOptional); } @Override public void addOptionalAsHintToWidgetFullName(Boolean isOptional) { - ValidationUtils.updateHint(recieverFullNameFormInputField, isOptional); + ValidationUtils.updateHint(receiverFullNameWrapper, isOptional); } @Override public void addOptionalAsHintToWidgetLocalFirstName(Boolean isOptional) { - ValidationUtils.updateHint(recieverLocalFirstNameFormInputField, isOptional); + ValidationUtils.updateHint(receiverLocalFirstNameWrapper, isOptional); } @Override public void addOptionalAsHintToWidgetLocalMiddleName(Boolean isOptional) { - ValidationUtils.updateHint(recieverLocalMiddleNameFormInputField, isOptional); + ValidationUtils.updateHint(receiverLocalMiddleNameWrapper, isOptional); } @Override public void addOptionalAsHintToWidgetLocalLastName(Boolean isOptional) { - ValidationUtils.updateHint(recieverLocalLastNameFormInputField, isOptional); + ValidationUtils.updateHint(receiverLocalLastNameWrapper, isOptional); } @Override public void addOptionalAsHintToWidgetLocalFullName(Boolean isOptional) { - ValidationUtils.updateHint(recieverLocalFullNameFormInputField, isOptional); + ValidationUtils.updateHint(receiverLocalFullNameWrapper, isOptional); } @Override public void addOptionalAsHintToWidgetMobileNumber(Boolean isOptional) { - ValidationUtils.updateHint(recieverMobileNoFormInputField, isOptional); + ValidationUtils.updateHint(receiverMobileNoWrapper, isOptional); } @Override public void addOptionalAsHintToWidgetProvince(Boolean isOptional) { - ValidationUtils.updateHint(recieverStateSelectionFormInputField, isOptional); + ValidationUtils.updateHint(receiverStateSelectionWrapper, isOptional); } @Override public void addOptionalAsHintToWidgetDistrict(Boolean isOptional) { - ValidationUtils.updateHint(recieverDistrictSelectionFormInputField, isOptional); + ValidationUtils.updateHint(receiverDistrictSelectionWrapper, isOptional); } @Override public void addOptionalAsHintToWidgetCity(Boolean isOptional) { - ValidationUtils.updateHint(recieverCityFormInputField, isOptional); + ValidationUtils.updateHint(receiverCityWrapper, isOptional); } @Override public void addOptionalAsHintToWidgetAddress(Boolean isOptional) { - ValidationUtils.updateHint(recieverAddressFormInputField, isOptional); + ValidationUtils.updateHint(receiverAddressWrapper, isOptional); } @Override public void addOptionalAsHintToWidgetRelation(Boolean isOptional) { - ValidationUtils.updateHint(recieverRelationSelectionFormInputField, isOptional); + ValidationUtils.updateHint(receiverRelationSelectionWrapper, isOptional); } @Override public void addOptionalAsHintToWidgetTransferReason(Boolean isOptional) { - ValidationUtils.updateHint(recieverTransferReasonSelectionFormInputField, isOptional); + ValidationUtils.updateHint(receiverTransferReasonSelectionWrapper, isOptional); } @Override public void addOptionalAsHintToWidgetEmail(Boolean isOptional) { - ValidationUtils.updateHint(recieverEmailFormInputField, isOptional); + ValidationUtils.updateHint(receiverEmailWrapper, isOptional); } @Override public void addOptionalAsHintToWidgetNativeCountry(Boolean isOptional) { - ValidationUtils.updateHint(recieverNativeCountrySelectionFormInputField, isOptional); + ValidationUtils.updateHint(receiverNativeCountrySelectionWrapper, isOptional); } @@ -1134,7 +1210,7 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien presenter.onServiceTypeSelected(selectedPaymentMethod); serviceMethodListingDialog.dismiss(); }); - serviceMethodListingDialog.setHintAndTitle(getString(R.string.search_payment_method_text), getString(R.string.payment_mode_placeholder_text ), getString(R.string.no_payment_method_found_text)); + serviceMethodListingDialog.setHintAndTitle(getString(R.string.search_payment_method_text), getString(R.string.payment_mode_placeholder_text), getString(R.string.no_payment_method_found_text)); serviceMethodListingDialog.disableSearch(false); if (!serviceMethodListingDialog.isAdded()) @@ -1155,7 +1231,7 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien presenter.onBankSelected(selectedBank); bankListingDialog.dismiss(); }); - bankListingDialog.setHintAndTitle(getString(R.string.search_bank_text), getString(R.string.bank_placeholder_text ), getString(R.string.no_bank_found_text)); + bankListingDialog.setHintAndTitle(getString(R.string.search_bank_text), getString(R.string.bank_placeholder_text), getString(R.string.no_bank_found_text)); bankListingDialog.disableSearch(false); if (!bankListingDialog.isAdded()) bankListingDialog.show(getSupportFragmentManager(), this.getClass().getSimpleName()); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/ApiEndpoints.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/ApiEndpoints.java index 0a3c1cb2..7b0868a5 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/ApiEndpoints.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/ApiEndpoints.java @@ -258,7 +258,7 @@ public interface ApiEndpoints { @Headers("Content-Type: application/json") Observable getCountryRelatedSericesV3(@Header("Authorization") String token, @Path("senderId") String senderId); - @GET(API_URL.DYNAMIC_FIELDS) + @POST(API_URL.DYNAMIC_FIELDS) @Headers("Content-Type: application/json") Observable getDynamicFields(@Header("Authorization") String token, @Path("senderId") String senderId,@Query("countryId") String countryId,@Query("serviceType") String serviceType); // Observable getDynamicFields(@Header("Authorization") String token, @Path("senderId") String senderId,@Body() JsonObject json); 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 5466e9a9..5e73bf27 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 @@ -61,193 +61,213 @@ - - - - + > - + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + app:layout_constraintTop_toTopOf="parent" + app:errorEnabled="true"> + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + +