|
@ -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); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|