diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/model/verification/VerificationViewModel.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/model/verification/VerificationViewModel.java index 4356d685..257127f7 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/model/verification/VerificationViewModel.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/model/verification/VerificationViewModel.java @@ -11,8 +11,9 @@ public class VerificationViewModel { String exRate; String serviceCharge; String pAgent; + String bankAcNo; - public VerificationViewModel(String firstName, String address, String country, String mobile, String pCountry, String pMode, String pAmount, String exRate, String serviceCharge, String pAgent) { + public VerificationViewModel(String firstName, String address, String country, String mobile, String pCountry, String pMode, String pAmount, String exRate, String serviceCharge, String pAgent, String bankAcNo) { this.firstName = firstName; this.address = address; this.country = country; @@ -23,6 +24,7 @@ public class VerificationViewModel { this.exRate = exRate; this.serviceCharge = serviceCharge; this.pAgent = pAgent; + this.bankAcNo=bankAcNo; } public String getFirstName() { @@ -104,4 +106,12 @@ public class VerificationViewModel { public void setpAgent(String pAgent) { this.pAgent = pAgent; } + + public String getBankAcNo() { + return bankAcNo; + } + + public void setBankAcNo(String bankAcNo) { + this.bankAcNo = bankAcNo; + } } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2Presenter.java index a0bef787..dc9c6bcd 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2Presenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2Presenter.java @@ -149,7 +149,7 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr pAgent = selectedBankData.getName(); - return new VerificationViewModel(fullName, address, country, mobile, pCountry, pMode, pAmount, exRate, serviceCharge, pAgent); + return new VerificationViewModel(fullName, address, country, mobile, pCountry, pMode, pAmount, exRate, serviceCharge, pAgent,this.selectedAccountNo); } @Override diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/verification/VerificationSendMoneyFragment.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/verification/VerificationSendMoneyFragment.java index 771c4cbd..43e38ca7 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/verification/VerificationSendMoneyFragment.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/verification/VerificationSendMoneyFragment.java @@ -47,6 +47,12 @@ public class VerificationSendMoneyFragment extends BaseFragment implements View TextView txt_pagent ; @BindView(R.id.pAgentContainerView) ViewGroup pAgentContainerView ; + @BindView(R.id.bankAcNoContainer) + View bankAcNoContainer ; + + + @BindView(R.id.txt_bankAcNo) + TextView txt_bankAcNo ; @BindView(R.id.txt_user_aggreement) @@ -131,6 +137,11 @@ public class VerificationSendMoneyFragment extends BaseFragment implements View txt_pcountry.setText(verificationViewModel.getpCountry()); txt_pmode.setText(verificationViewModel.getpMode()); txt_servicechargeAmount.setText(verificationViewModel.getServiceCharge()); + if(verificationViewModel.getBankAcNo()!=null&&verificationViewModel.getBankAcNo().length()>1) + { + bankAcNoContainer.setVisibility(View.VISIBLE); + txt_bankAcNo.setText(verificationViewModel.getBankAcNo()); + } String pAgent=verificationViewModel.getpAgent(); if(pAgent!=null) { diff --git a/app/src/main/res/layout/fragment_verification_send_money_v2.xml b/app/src/main/res/layout/fragment_verification_send_money_v2.xml index a5f0b776..ad06f37a 100644 --- a/app/src/main/res/layout/fragment_verification_send_money_v2.xml +++ b/app/src/main/res/layout/fragment_verification_send_money_v2.xml @@ -294,13 +294,14 @@ android:id="@+id/pAgentContainerView" android:layout_width="match_parent" android:layout_height="wrap_content" + android:paddingTop="10dp" + android:orientation="horizontal"> @@ -316,11 +317,39 @@ android:textSize="13sp" android:textStyle="bold" android:singleLine="false" - android:minLines="3" android:inputType="textMultiLine" app:txtfontName="@string/semibold" /> + + + + + + +