Browse Source

Viewmodel implemented in send money process

master
Preyea Regmi 5 years ago
parent
commit
42cddf2561
  1. 33
      app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/SendMoneyViewModelFactory.java
  2. 13
      app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2Presenter.java
  3. 2
      app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/SendMoneyActionListener.java
  4. 32
      app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/SendMoneyV2Activity.java
  5. 24
      app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/amountdetail/AmountDetailSendMoneyFragment.java
  6. 6
      app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/payoutmode/PayoutModeBranchListingDialog.java
  7. 68
      app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/payoutmode/PayoutModeSendMoneyFragment.java
  8. 9
      app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/verification/VerificationSendMoneyFragment.java

33
app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/SendMoneyViewModelFactory.java

@ -0,0 +1,33 @@
package com.gmeremit.online.gmeremittance_native.sendmoneyV2;
import androidx.annotation.NonNull;
import androidx.lifecycle.ViewModel;
import androidx.lifecycle.ViewModelProvider;
import com.gmeremit.online.gmeremittance_native.couponV2.gateway.CouponV2Gateway;
import com.gmeremit.online.gmeremittance_native.kycV3.gateway.FileDownloadGateway;
import com.gmeremit.online.gmeremittance_native.kycV3.gateway.KYCV3Gateway;
import com.gmeremit.online.gmeremittance_native.kycV3.presenter.KYCV3PresenterInterface;
import com.gmeremit.online.gmeremittance_native.kycV3.presenter.KYCV3ViewModel;
import com.gmeremit.online.gmeremittance_native.loginV2.gateway.LoginV2Gateway;
import com.gmeremit.online.gmeremittance_native.sendmoneyV2.gateway.SendMoneyV2Gateway;
import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.SendMoneyRequiredDataV3;
import com.gmeremit.online.gmeremittance_native.sendmoneyV2.presenter.SendMoneyV2Presenter;
import com.gmeremit.online.gmeremittance_native.sendmoneyV2.presenter.SendMoneyV2PresenterInterface;
public class SendMoneyViewModelFactory implements ViewModelProvider.Factory {
private final SendMoneyV2PresenterInterface.SendMoneyV2ContractInterface view;
private final SendMoneyRequiredDataV3 sendMoneyRequiredData;
public SendMoneyViewModelFactory(SendMoneyV2PresenterInterface.SendMoneyV2ContractInterface view, SendMoneyRequiredDataV3 sendMoneyRequiredData) {
this.view = view;
this.sendMoneyRequiredData=sendMoneyRequiredData;
}
@SuppressWarnings("unchecked")
@NonNull
@Override
public <T extends ViewModel> T create(@NonNull Class<T> modelClass) {
return (T) new SendMoneyV2Presenter(view,new SendMoneyV2Gateway(), sendMoneyRequiredData,new CouponV2Gateway());
}
}

13
app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2Presenter.java

@ -11,6 +11,7 @@ import com.gmeremit.online.gmeremittance_native.accountmanage.model.accountlisti
import com.gmeremit.online.gmeremittance_native.accountmanage.model.accountlisting.KeyValueData; import com.gmeremit.online.gmeremittance_native.accountmanage.model.accountlisting.KeyValueData;
import com.gmeremit.online.gmeremittance_native.accountmanage.model.accountlisting.WebRequestModel; import com.gmeremit.online.gmeremittance_native.accountmanage.model.accountlisting.WebRequestModel;
import com.gmeremit.online.gmeremittance_native.base.BasePresenter; import com.gmeremit.online.gmeremittance_native.base.BasePresenter;
import com.gmeremit.online.gmeremittance_native.base.BaseViewModel;
import com.gmeremit.online.gmeremittance_native.couponV2.gateway.CouponV2Gateway; import com.gmeremit.online.gmeremittance_native.couponV2.gateway.CouponV2Gateway;
import com.gmeremit.online.gmeremittance_native.couponV2.model.CouponDTO; import com.gmeremit.online.gmeremittance_native.couponV2.model.CouponDTO;
import com.gmeremit.online.gmeremittance_native.couponV2.presenter.CouponV2InteractorInterface; import com.gmeremit.online.gmeremittance_native.couponV2.presenter.CouponV2InteractorInterface;
@ -51,7 +52,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.CompositeDisposable; import io.reactivex.disposables.CompositeDisposable;
import io.reactivex.schedulers.Schedulers; import io.reactivex.schedulers.Schedulers;
public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2PresenterInterface, SendMoneyV2InteractorInterface {
public class SendMoneyV2Presenter extends BaseViewModel implements SendMoneyV2PresenterInterface, SendMoneyV2InteractorInterface {
private final ReceiverInfoV3Model selectedRecipient; private final ReceiverInfoV3Model selectedRecipient;
private final CompositeDisposable compositeObservable; private final CompositeDisposable compositeObservable;
@ -416,6 +417,16 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr
} }
@Override
public void onViewReady() {
}
@Override
public void onViewNotReady() {
}
@Override @Override
public void onViewDestroyed() { public void onViewDestroyed() {
super.onViewDestroyed(); super.onViewDestroyed();

2
app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/SendMoneyActionListener.java

@ -15,7 +15,7 @@ public interface SendMoneyActionListener {
void showTransactionReviewPage(); void showTransactionReviewPage();
SendMoneyV2PresenterInterface getPresenter();
// SendMoneyV2PresenterInterface getPresenter();
void updateCurrentIndexFrom(int layoutId); void updateCurrentIndexFrom(int layoutId);

32
app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/SendMoneyV2Activity.java

@ -8,6 +8,8 @@ import androidx.annotation.LayoutRes;
import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction; import androidx.fragment.app.FragmentTransaction;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import androidx.lifecycle.ViewModelProviders;
import android.view.View; import android.view.View;
import android.widget.TextView; import android.widget.TextView;
@ -15,6 +17,7 @@ import com.gmeremit.online.gmeremittance_native.R;
import com.gmeremit.online.gmeremittance_native.base.BaseActivity; import com.gmeremit.online.gmeremittance_native.base.BaseActivity;
import com.gmeremit.online.gmeremittance_native.base.BaseFragment; import com.gmeremit.online.gmeremittance_native.base.BaseFragment;
import com.gmeremit.online.gmeremittance_native.couponV2.gateway.CouponV2Gateway; import com.gmeremit.online.gmeremittance_native.couponV2.gateway.CouponV2Gateway;
import com.gmeremit.online.gmeremittance_native.sendmoneyV2.SendMoneyViewModelFactory;
import com.gmeremit.online.gmeremittance_native.sendmoneyV2.gateway.SendMoneyV2Gateway; import com.gmeremit.online.gmeremittance_native.sendmoneyV2.gateway.SendMoneyV2Gateway;
import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.SendMoneyRequiredDataV3; import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.SendMoneyRequiredDataV3;
import com.gmeremit.online.gmeremittance_native.sendmoneyV2.presenter.SendMoneyV2Presenter; import com.gmeremit.online.gmeremittance_native.sendmoneyV2.presenter.SendMoneyV2Presenter;
@ -38,7 +41,6 @@ public class SendMoneyV2Activity extends BaseActivity implements SendMoneyAction
private static final int PASSWORD_PROMPT_REQUEST = 43266; private static final int PASSWORD_PROMPT_REQUEST = 43266;
private FragmentManager fragmentManager; private FragmentManager fragmentManager;
private SendMoneyV2PresenterInterface presenter; private SendMoneyV2PresenterInterface presenter;
private SendMoneyRequiredDataV3 sendMoneyRequiredData = null;
@BindView(R.id.page1TxtView) @BindView(R.id.page1TxtView)
@ -69,6 +71,9 @@ public class SendMoneyV2Activity extends BaseActivity implements SendMoneyAction
private void performDefaultAction(Bundle savedInstanceState) { private void performDefaultAction(Bundle savedInstanceState) {
SendMoneyRequiredDataV3 sendMoneyRequiredData;
if (savedInstanceState == null) { if (savedInstanceState == null) {
try { try {
sendMoneyRequiredData = getIntent().getExtras().getParcelable(RECIPIENT_INFO_BUNDLE_KEY); sendMoneyRequiredData = getIntent().getExtras().getParcelable(RECIPIENT_INFO_BUNDLE_KEY);
@ -80,6 +85,8 @@ public class SendMoneyV2Activity extends BaseActivity implements SendMoneyAction
sendMoneyRequiredData = savedInstanceState.getParcelable(RECIPIENT_DATA); sendMoneyRequiredData = savedInstanceState.getParcelable(RECIPIENT_DATA);
} }
SendMoneyViewModelFactory factory=new SendMoneyViewModelFactory(this,sendMoneyRequiredData);
presenter= ViewModelProviders.of(this, factory).get(SendMoneyV2Presenter.class);
addScreenToSendMoneyOnly(R.layout.fragment_amount_detail_send_money_v2, false); addScreenToSendMoneyOnly(R.layout.fragment_amount_detail_send_money_v2, false);
} }
@ -164,12 +171,12 @@ public class SendMoneyV2Activity extends BaseActivity implements SendMoneyAction
} }
@Override
public SendMoneyV2PresenterInterface getPresenter() {
if (this.presenter == null)
this.presenter = new SendMoneyV2Presenter(this,new SendMoneyV2Gateway(), sendMoneyRequiredData,new CouponV2Gateway());
return this.presenter;
}
// @Override
// public SendMoneyV2PresenterInterface getPresenter() {
// if (this.presenter == null)
// this.presenter = new SendMoneyV2Presenter(this,new SendMoneyV2Gateway(), sendMoneyRequiredData,new CouponV2Gateway());
// return this.presenter;
// }
@Override @Override
public void updateCurrentIndexFrom(int layoutId) { public void updateCurrentIndexFrom(int layoutId) {
@ -242,18 +249,7 @@ public class SendMoneyV2Activity extends BaseActivity implements SendMoneyAction
super.onBackPressed(); super.onBackPressed();
} }
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
outState.putParcelable(RECIPIENT_DATA, sendMoneyRequiredData);
}
@Override
public void onRestoreInstanceState(Bundle savedInstanceState) {
super.onRestoreInstanceState(savedInstanceState);
sendMoneyRequiredData = savedInstanceState.getParcelable(RECIPIENT_DATA);
}
@Override @Override
public void promptPassword(PasswordPromptListener listener, long countDownValue) { public void promptPassword(PasswordPromptListener listener, long countDownValue) {

24
app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/amountdetail/AmountDetailSendMoneyFragment.java

@ -9,6 +9,7 @@ import androidx.annotation.Nullable;
import androidx.constraintlayout.widget.Group; import androidx.constraintlayout.widget.Group;
import androidx.core.view.ViewCompat; import androidx.core.view.ViewCompat;
import androidx.core.widget.NestedScrollView; import androidx.core.widget.NestedScrollView;
import androidx.lifecycle.ViewModelProviders;
import androidx.transition.TransitionManager; import androidx.transition.TransitionManager;
import android.text.Editable; import android.text.Editable;
@ -39,6 +40,7 @@ import com.gmeremit.online.gmeremittance_native.exrate.model.datav2.ExchangeCalc
import com.gmeremit.online.gmeremittance_native.exrate.model.datav2.ExchangeCalculationModel; import com.gmeremit.online.gmeremittance_native.exrate.model.datav2.ExchangeCalculationModel;
import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.amountdetail.AmountDetailRelatedDataModel; import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.amountdetail.AmountDetailRelatedDataModel;
import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.amountdetail.RecipientCurrencyModel; import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.amountdetail.RecipientCurrencyModel;
import com.gmeremit.online.gmeremittance_native.sendmoneyV2.presenter.SendMoneyV2Presenter;
import com.gmeremit.online.gmeremittance_native.sendmoneyV2.view.SendMoneyActionListener; import com.gmeremit.online.gmeremittance_native.sendmoneyV2.view.SendMoneyActionListener;
import com.gmeremit.online.gmeremittance_native.topup.local.view.topup.ConfirmRechargePaymentBottomSheetDialog; import com.gmeremit.online.gmeremittance_native.topup.local.view.topup.ConfirmRechargePaymentBottomSheetDialog;
import com.gmeremit.online.gmeremittance_native.utils.Constants; import com.gmeremit.online.gmeremittance_native.utils.Constants;
@ -195,7 +197,6 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements View.
@Override @Override
public void onDestroy() { public void onDestroy() {
((SendMoneyActionListener) getActivity()).getPresenter().clearExRateData();
registerTextWatchers(false); registerTextWatchers(false);
super.onDestroy(); super.onDestroy();
@ -219,8 +220,9 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements View.
private void performDefaultAction(Bundle savedInstance) { private void performDefaultAction(Bundle savedInstance) {
shouldCaulatedByRecipient = false; shouldCaulatedByRecipient = false;
SendMoneyV2Presenter viewmodel= ViewModelProviders.of(getActivity()).get(SendMoneyV2Presenter.class);
((SendMoneyActionListener) getActivity()).getPresenter().subscribeToAmountRelatedData().observe(getViewLifecycleOwner(), data -> {
viewmodel.subscribeToAmountRelatedData().observe(getViewLifecycleOwner(), data -> {
amountDetailRelatedData = data; amountDetailRelatedData = data;
if (amountDetailRelatedData == null || amountDetailRelatedData.getDefaultSelectedCurrency() == null) { if (amountDetailRelatedData == null || amountDetailRelatedData.getDefaultSelectedCurrency() == null) {
showSelectedCurrency("", getString(R.string.na_text)); showSelectedCurrency("", getString(R.string.na_text));
@ -234,7 +236,7 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements View.
} }
}); });
((SendMoneyActionListener) getActivity()).getPresenter().subscribeToExRateData().observe(getViewLifecycleOwner(), data -> {
viewmodel.subscribeToExRateData().observe(getViewLifecycleOwner(), data -> {
selectedTransferFeeAmount = data.getScCharge(); selectedTransferFeeAmount = data.getScCharge();
selectedExRate = data.getExRateDisplay(); selectedExRate = data.getExRateDisplay();
selectedExRateWithoutTrunc = data.getExRate(); selectedExRateWithoutTrunc = data.getExRate();
@ -256,10 +258,10 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements View.
}); });
((SendMoneyActionListener) getActivity()).getPresenter().subscribeToExRateCouponAvailableEvent().observe(getViewLifecycleOwner(), this::resetCouponView);
((SendMoneyActionListener) getActivity()).getPresenter().subscribeToExRateCouponRequireEvent().observe(getViewLifecycleOwner(), this::showCouponRelatedView);
(ViewModelProviders.of(getActivity()).get(SendMoneyV2Presenter.class)).subscribeToExRateCouponAvailableEvent().observe(getViewLifecycleOwner(), this::resetCouponView);
(ViewModelProviders.of(getActivity()).get(SendMoneyV2Presenter.class)).subscribeToExRateCouponRequireEvent().observe(getViewLifecycleOwner(), this::showCouponRelatedView);
((SendMoneyActionListener) getActivity()).getPresenter().getCouponRelatedData();
viewmodel.getCouponRelatedData();
} }
@ -294,7 +296,7 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements View.
hideKeyBoard(); hideKeyBoard();
sendMoneyEditText.clearFocus(); sendMoneyEditText.clearFocus();
recieveMoneyEditText.clearFocus(); recieveMoneyEditText.clearFocus();
((SendMoneyActionListener) getActivity()).getPresenter().setSendingAmount(sendMoneyEditText.getText().toString(), amountDetailRelatedData.getDefaultSelectedCurrency().getCurrencyCode(), selectedExRateWithoutTrunc, selectedRecipientAmount, selectedTransferFeeAmount, shouldCaulatedByRecipient, selectedExRateId, selectedTransferAmount);
(ViewModelProviders.of(getActivity()).get(SendMoneyV2Presenter.class)).setSendingAmount(sendMoneyEditText.getText().toString(), amountDetailRelatedData.getDefaultSelectedCurrency().getCurrencyCode(), selectedExRateWithoutTrunc, selectedRecipientAmount, selectedTransferFeeAmount, shouldCaulatedByRecipient, selectedExRateId, selectedTransferAmount);
((SendMoneyActionListener) getActivity()).showTransactionReviewPage(); ((SendMoneyActionListener) getActivity()).showTransactionReviewPage();
} }
@ -318,7 +320,7 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements View.
return; return;
} }
((SendMoneyActionListener) getActivity()).getPresenter().getForex(recieveMoneyEditText.getText().toString(), sendMoneyEditText.getText().toString(), shouldCaulatedByRecipient, amountDetailRelatedData.getDefaultSelectedCurrency().getCurrencyCode());
(ViewModelProviders.of(getActivity()).get(SendMoneyV2Presenter.class)).getForex(recieveMoneyEditText.getText().toString(), sendMoneyEditText.getText().toString(), shouldCaulatedByRecipient, amountDetailRelatedData.getDefaultSelectedCurrency().getCurrencyCode());
} }
private void showSelectedCurrency(String selectedCountryCode, String selectedCountryCurrency) { private void showSelectedCurrency(String selectedCountryCode, String selectedCountryCurrency) {
@ -467,13 +469,13 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements View.
@OnClick(R.id.couponViewContainer) @OnClick(R.id.couponViewContainer)
public void showCouponList() { public void showCouponList() {
ArrayList<CouponDTO> objectList = ((SendMoneyActionListener) getActivity()).getPresenter().getCouponList();
int currentSelectedIndex = ((SendMoneyActionListener) getActivity()).getPresenter().getSelectedCouponIndex();
ArrayList<CouponDTO> objectList = (ViewModelProviders.of(getActivity()).get(SendMoneyV2Presenter.class)).getCouponList();
int currentSelectedIndex = (ViewModelProviders.of(getActivity()).get(SendMoneyV2Presenter.class)).getSelectedCouponIndex();
CouponListBottomSheetDialog.showCouponList(objectList,currentSelectedIndex, new CouponListAdapter.CouponOnClickListener() { CouponListBottomSheetDialog.showCouponList(objectList,currentSelectedIndex, new CouponListAdapter.CouponOnClickListener() {
@Override @Override
public void onCouponClicked(CouponDTO coupon) { public void onCouponClicked(CouponDTO coupon) {
CouponDetailViewDTO couponDetail = ((SendMoneyActionListener) getActivity()).getPresenter().onCouponSelected(coupon);
CouponDetailViewDTO couponDetail = (ViewModelProviders.of(getActivity()).get(SendMoneyV2Presenter.class)).onCouponSelected(coupon);
showCoupon(couponDetail); showCoupon(couponDetail);
} }

6
app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/payoutmode/PayoutModeBranchListingDialog.java

@ -8,6 +8,7 @@ import androidx.core.view.ViewCompat;
import androidx.core.view.ViewPropertyAnimatorListenerAdapter; import androidx.core.view.ViewPropertyAnimatorListenerAdapter;
import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.DialogFragment; import androidx.fragment.app.DialogFragment;
import androidx.lifecycle.ViewModelProviders;
import androidx.recyclerview.widget.DefaultItemAnimator; import androidx.recyclerview.widget.DefaultItemAnimator;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import android.text.Editable; import android.text.Editable;
@ -30,6 +31,7 @@ import com.gmeremit.online.gmeremittance_native.sendmoneyV2.adapter.PayoutModeBr
import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.amountdetail.BranchListApiResponse; import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.amountdetail.BranchListApiResponse;
import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.payoutmode.BankList; import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.payoutmode.BankList;
import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.payoutmode.BankBranchDTO; import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.payoutmode.BankBranchDTO;
import com.gmeremit.online.gmeremittance_native.sendmoneyV2.presenter.SendMoneyV2Presenter;
import com.gmeremit.online.gmeremittance_native.sendmoneyV2.view.SendMoneyActionListener; import com.gmeremit.online.gmeremittance_native.sendmoneyV2.view.SendMoneyActionListener;
import com.gmeremit.online.gmeremittance_native.utils.Constants; import com.gmeremit.online.gmeremittance_native.utils.Constants;
import com.gmeremit.online.gmeremittance_native.utils.https.GenericApiObserverResponse; import com.gmeremit.online.gmeremittance_native.utils.https.GenericApiObserverResponse;
@ -81,7 +83,7 @@ public class PayoutModeBranchListingDialog extends DialogFragment implements Vie
} }
compositeDisposable.add( compositeDisposable.add(
((SendMoneyActionListener) getActivity()).getPresenter().getBranchListFromNetwork(selectedBank, "")
(ViewModelProviders.of(getActivity()).get(SendMoneyV2Presenter.class)).getBranchListFromNetwork(selectedBank, "")
.doOnSubscribe(d ->{ showErrorMessage(false, ""); .doOnSubscribe(d ->{ showErrorMessage(false, "");
hideProgressView(false); hideProgressView(false);
showRecyclerView(false); showRecyclerView(false);
@ -229,7 +231,7 @@ public class PayoutModeBranchListingDialog extends DialogFragment implements Vie
compositeDisposable.clear(); compositeDisposable.clear();
compositeDisposable.add( compositeDisposable.add(
((SendMoneyActionListener) getActivity()).getPresenter().getBranchListFromNetwork(selectedBank, keyword)
(ViewModelProviders.of(getActivity()).get(SendMoneyV2Presenter.class)).getBranchListFromNetwork(selectedBank, keyword)
.doOnSubscribe(d ->{ showErrorMessage(false, ""); .doOnSubscribe(d ->{ showErrorMessage(false, "");
hideProgressView(false); hideProgressView(false);
showRecyclerView(false); showRecyclerView(false);

68
app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/payoutmode/PayoutModeSendMoneyFragment.java

@ -154,13 +154,13 @@ public class PayoutModeSendMoneyFragment extends BaseFragment implements SendMon
} }
private void performDefaultAction(Bundle savedInstance) { private void performDefaultAction(Bundle savedInstance) {
showRecipientTitle(((SendMoneyActionListener) getActivity()).getPresenter().getPaymentModeTitle());
compositeDisposable.add(((SendMoneyActionListener) getActivity())
.getPresenter()
.getAllPayoutMode()
.doOnSubscribe(d -> showProgressBar(true, getString(R.string.processing_request_text)))
.subscribeWith(new PayoutModeObserver())
);
// showRecipientTitle(((SendMoneyActionListener) getActivity()).getPresenter().getPaymentModeTitle());
// compositeDisposable.add(((SendMoneyActionListener) getActivity())
// .getPresenter()
// .getAllPayoutMode()
// .doOnSubscribe(d -> showProgressBar(true, getString(R.string.processing_request_text)))
// .subscribeWith(new PayoutModeObserver())
// );
} }
@ -321,33 +321,33 @@ public class PayoutModeSendMoneyFragment extends BaseFragment implements SendMon
@Override @Override
public void onClick(View v) { public void onClick(View v) {
switch (v.getId()) {
case R.id.payoutModeContinueButton:
String errorMessage = ((SendMoneyActionListener) getActivity()).getPresenter()
.returnNullOnValidaitonAndSetPaymentModeData(this.selectedPayoutMode,
this.selectedBank,
this.selectedBranch,
this.ed_account.getText().toString());
if (errorMessage == null) {
hideKeyBoard();
ed_account.clearFocus();
ed_bank.clearFocus();
ed_branch.clearFocus();
compositeDisposable.add(
((SendMoneyActionListener) getActivity()).getPresenter().validateAccountIfRequired().subscribeWith(new AccountValidationObserver())
);
} else
showToastMessage(errorMessage);
break;
case R.id.ed_bank:
showBankListInDialog();
break;
case R.id.ed_branch:
showBranchListInDialog();
break;
}
// switch (v.getId()) {
// case R.id.payoutModeContinueButton:
// String errorMessage = ((SendMoneyActionListener) getActivity()).getPresenter()
// .returnNullOnValidaitonAndSetPaymentModeData(this.selectedPayoutMode,
// this.selectedBank,
// this.selectedBranch,
// this.ed_account.getText().toString());
// if (errorMessage == null) {
// hideKeyBoard();
// ed_account.clearFocus();
// ed_bank.clearFocus();
// ed_branch.clearFocus();
// compositeDisposable.add(
// ((SendMoneyActionListener) getActivity()).getPresenter().validateAccountIfRequired().subscribeWith(new AccountValidationObserver())
// );
// } else
// showToastMessage(errorMessage);
// break;
//
// case R.id.ed_bank:
// showBankListInDialog();
// break;
//
// case R.id.ed_branch:
// showBranchListInDialog();
// break;
// }
} }
private void showBranchListInDialog() { private void showBranchListInDialog() {

9
app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/verification/VerificationSendMoneyFragment.java

@ -5,6 +5,8 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.lifecycle.ViewModelProviders;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -15,6 +17,7 @@ import com.gmeremit.online.gmeremittance_native.R;
import com.gmeremit.online.gmeremittance_native.accountmanage.model.accountlisting.WebRequestModel; import com.gmeremit.online.gmeremittance_native.accountmanage.model.accountlisting.WebRequestModel;
import com.gmeremit.online.gmeremittance_native.base.BaseFragment; import com.gmeremit.online.gmeremittance_native.base.BaseFragment;
import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.verification.VerificationViewModel; import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.verification.VerificationViewModel;
import com.gmeremit.online.gmeremittance_native.sendmoneyV2.presenter.SendMoneyV2Presenter;
import com.gmeremit.online.gmeremittance_native.sendmoneyV2.view.SendMoneyActionListener; import com.gmeremit.online.gmeremittance_native.sendmoneyV2.view.SendMoneyActionListener;
import com.gmeremit.online.gmeremittance_native.sendmoneyV2.view.SendMoneyV2Activity; import com.gmeremit.online.gmeremittance_native.sendmoneyV2.view.SendMoneyV2Activity;
@ -127,7 +130,7 @@ public class VerificationSendMoneyFragment extends BaseFragment implements View
private void performDefaultAction(Bundle savedInstance) { private void performDefaultAction(Bundle savedInstance) {
VerificationViewModel verificationViewModel= ((SendMoneyActionListener)getActivity()).getPresenter().getVerificationRelatedData();
VerificationViewModel verificationViewModel= (ViewModelProviders.of(getActivity()).get(SendMoneyV2Presenter.class)).getVerificationRelatedData();
txt_address.setText(" : "+verificationViewModel.getAddress()); txt_address.setText(" : "+verificationViewModel.getAddress());
txt_country.setText(" : "+verificationViewModel.getCountry()); txt_country.setText(" : "+verificationViewModel.getCountry());
txt_exrate.setText(" : "+verificationViewModel.getExRate()); txt_exrate.setText(" : "+verificationViewModel.getExRate());
@ -173,7 +176,7 @@ public class VerificationSendMoneyFragment extends BaseFragment implements View
switch(v.getId()) switch(v.getId())
{ {
case R.id.exRateCalculateButton: case R.id.exRateCalculateButton:
((SendMoneyActionListener)getActivity()).getPresenter().promptPinAndPerformTransaction();
(ViewModelProviders.of(getActivity()).get(SendMoneyV2Presenter.class)).promptPinAndPerformTransaction();
break; break;
case R.id.txt_user_aggreement: case R.id.txt_user_aggreement:
openUserAgreement(); openUserAgreement();
@ -186,7 +189,7 @@ public class VerificationSendMoneyFragment extends BaseFragment implements View
// Intent i = new Intent(Intent.ACTION_VIEW); // Intent i = new Intent(Intent.ACTION_VIEW);
// i.setData(Uri.parse(url)); // i.setData(Uri.parse(url));
// launchActivity(i); // launchActivity(i);
WebRequestModel requestModel=((SendMoneyActionListener)getActivity()).getPresenter().getWebRequestDataForTermsAndCondition();
WebRequestModel requestModel=(ViewModelProviders.of(getActivity()).get(SendMoneyV2Presenter.class)).getWebRequestDataForTermsAndCondition();
Intent intent= new Intent(getActivity(),TermsAndConditionV2BrowserActivity.class); Intent intent= new Intent(getActivity(),TermsAndConditionV2BrowserActivity.class);
intent.putExtra(WEB_BROWSWER_URL_BUNDLE_KEY,requestModel); intent.putExtra(WEB_BROWSWER_URL_BUNDLE_KEY,requestModel);
startActivity(intent); startActivity(intent);

Loading…
Cancel
Save