|
|
@ -1,9 +1,6 @@ |
|
|
|
package com.gmeremit.online.gmeremittance_native.resendV2.view.amountdetail; |
|
|
|
|
|
|
|
import android.app.Activity; |
|
|
|
import android.content.Context; |
|
|
|
import android.os.Bundle; |
|
|
|
import android.os.Handler; |
|
|
|
import android.support.annotation.Nullable; |
|
|
|
import android.support.v4.view.ViewCompat; |
|
|
|
import android.text.Editable; |
|
|
@ -30,9 +27,6 @@ import com.gmeremit.online.gmeremittance_native.exchange_rate.model.datav2.Excha |
|
|
|
import com.gmeremit.online.gmeremittance_native.exchange_rate.model.datav2.ExchangeCalculationModel; |
|
|
|
import com.gmeremit.online.gmeremittance_native.resendV2.ReSendMoneyActionListener; |
|
|
|
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.view.SendMoneyActionListener; |
|
|
|
import com.gmeremit.online.gmeremittance_native.sendmoneyV2.view.amountdetail.AmountDetailExRateCountryListingDialog; |
|
|
|
import com.gmeremit.online.gmeremittance_native.utils.Constants; |
|
|
|
import com.gmeremit.online.gmeremittance_native.utils.Utils; |
|
|
|
import com.gmeremit.online.gmeremittance_native.utils.https.GenericApiObserverResponse; |
|
|
@ -41,7 +35,7 @@ import butterknife.BindView; |
|
|
|
import butterknife.ButterKnife; |
|
|
|
import io.reactivex.disposables.CompositeDisposable; |
|
|
|
|
|
|
|
public class ResendMoneyAmountDetailFragment extends BaseFragment implements View.OnClickListener, TextView.OnEditorActionListener { |
|
|
|
public class ResendMoneyAmountDetailFragment extends BaseFragment implements View.OnClickListener, TextView.OnEditorActionListener { |
|
|
|
|
|
|
|
@BindView(R.id.amountDetailContinueButton) |
|
|
|
Button continueBtn; |
|
|
@ -76,10 +70,11 @@ public class ResendMoneyAmountDetailFragment extends BaseFragment implements Vie |
|
|
|
|
|
|
|
CompositeDisposable compositeDisposable = null; |
|
|
|
|
|
|
|
ExchangeRateCalcObserver rateCalcObserver; |
|
|
|
|
|
|
|
|
|
|
|
private Interpolator interpolator; |
|
|
|
|
|
|
|
private AmountDetailRelatedDataModel amountDetailRelatedData; |
|
|
|
|
|
|
|
private String selectedTransferFeeAmount; |
|
|
|
private String selectedExRate; |
|
|
@ -114,8 +109,7 @@ public class ResendMoneyAmountDetailFragment extends BaseFragment implements Vie |
|
|
|
compositeDisposable = new CompositeDisposable(); |
|
|
|
interpolator = new AccelerateDecelerateInterpolator(); |
|
|
|
registerTextWatchers(true); |
|
|
|
|
|
|
|
|
|
|
|
rateCalcObserver = new ExchangeRateCalcObserver(); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
@ -139,25 +133,6 @@ public class ResendMoneyAmountDetailFragment extends BaseFragment implements Vie |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
// @Override |
|
|
|
// public void onAttach(Context context) { |
|
|
|
// super.onAttach(context); |
|
|
|
// ((ReSendMoneyActionListener) context).updateCurrentIndexFrom(R.layout.fragment_amount_detail_send_money_v2); |
|
|
|
// } |
|
|
|
// |
|
|
|
// @Override |
|
|
|
// public void onAttach(Activity activity) { |
|
|
|
// super.onAttach(activity); |
|
|
|
// ((ReSendMoneyActionListener) activity).updateCurrentIndexFrom(R.layout.fragment_amount_detail_send_money_v2); |
|
|
|
// |
|
|
|
// } |
|
|
|
// |
|
|
|
// @Override |
|
|
|
// public void onDetach() { |
|
|
|
// super.onDetach(); |
|
|
|
// ((ReSendMoneyActionListener) getActivity()).updateCurrentScreenByLayoutId(R.layout.fragment_amount_detail_send_money_v2); |
|
|
|
// |
|
|
|
// } |
|
|
|
|
|
|
|
@Override |
|
|
|
public void onDestroy() { |
|
|
@ -169,20 +144,17 @@ public class ResendMoneyAmountDetailFragment extends BaseFragment implements Vie |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private void performDefaultAction(Bundle savedInstance) { |
|
|
|
shouldCaulatedByRecipient = false; |
|
|
|
|
|
|
|
|
|
|
|
compositeDisposable.add(((ReSendMoneyActionListener) getActivity()).getPresenter().subscribeToForExChangeEvent().subscribeWith(rateCalcObserver)); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private boolean focusOutAndHideKeyboard() { |
|
|
|
if(sendMoneyEditText.hasFocus()||recieveMoneyEditText.hasFocus()) |
|
|
|
{ |
|
|
|
private boolean focusOutAndHideKeyboard() { |
|
|
|
if (sendMoneyEditText.hasFocus() || recieveMoneyEditText.hasFocus()) { |
|
|
|
|
|
|
|
View currentViewWithFocus=rootView.getFocusedChild(); |
|
|
|
if(currentViewWithFocus!=null) |
|
|
|
View currentViewWithFocus = rootView.getFocusedChild(); |
|
|
|
if (currentViewWithFocus != null) |
|
|
|
currentViewWithFocus.clearFocus(); |
|
|
|
|
|
|
|
hideKeyBoard(); |
|
|
@ -205,7 +177,7 @@ public class ResendMoneyAmountDetailFragment extends BaseFragment implements Vie |
|
|
|
sendMoneyEditText.clearFocus(); |
|
|
|
recieveMoneyEditText.clearFocus(); |
|
|
|
hideKeyBoard(); |
|
|
|
((ReSendMoneyActionListener) getActivity()).getPresenter().setSendingAmount(sendMoneyEditText.getText().toString(), amountDetailRelatedData.getDefaultSelectedCurrency().getCurrencyCode(), selectedExRateWithoutTrunc, selectedRecipientAmount, selectedTransferFeeAmount, shouldCaulatedByRecipient, selectedExRateId,selectedTransferAmount); |
|
|
|
((ReSendMoneyActionListener) getActivity()).getPresenter().setSendingAmount(sendMoneyEditText.getText().toString(), selectedExRateWithoutTrunc, selectedRecipientAmount, selectedTransferFeeAmount, shouldCaulatedByRecipient, selectedExRateId, selectedTransferAmount); |
|
|
|
((ReSendMoneyActionListener) getActivity()).showTransactionReviewPage(); |
|
|
|
} |
|
|
|
|
|
|
@ -224,12 +196,9 @@ public class ResendMoneyAmountDetailFragment extends BaseFragment implements Vie |
|
|
|
showToastMessage(getString(R.string.receiving_amount_error)); |
|
|
|
return; |
|
|
|
} |
|
|
|
// compositeDisposable.add( |
|
|
|
// ((ReSendMoneyActionListener) getActivity()).getPresenter().getForex( |
|
|
|
// recieveMoneyEditText.getText().toString(), sendMoneyEditText.getText().toString(), shouldCaulatedByRecipient, amountDetailRelatedData.getDefaultSelectedCurrency().getCurrencyCode() |
|
|
|
// ).doOnSubscribe(d -> showProgressBar(true, getString(R.string.processing_request_text))) |
|
|
|
// .subscribeWith(new ExchangeRateCalcObserver()) |
|
|
|
// ); |
|
|
|
((ReSendMoneyActionListener) getActivity()).getPresenter().getForex(recieveMoneyEditText.getText().toString(), sendMoneyEditText.getText().toString(), shouldCaulatedByRecipient); |
|
|
|
|
|
|
|
//TODO request for exchange rates |
|
|
|
} |
|
|
|
|
|
|
|
private void showSelectedCurrency(String selectedCountryCode, String selectedCountryCurrency) { |
|
|
@ -321,10 +290,10 @@ public class ResendMoneyAmountDetailFragment extends BaseFragment implements Vie |
|
|
|
selectedSendAmount = data.getCollAmt(); |
|
|
|
selectedsendingCurrency = data.getCollCurr(); |
|
|
|
selectedExRateId = data.getExrateId(); |
|
|
|
selectedTransferAmount=data.getsAmt(); |
|
|
|
selectedTransferAmount = data.getsAmt(); |
|
|
|
|
|
|
|
String transferDisplay = " - " + Utils.formatCurrency(selectedTransferFeeAmount) + " " + selectedsendingCurrency + " ("+getString(R.string.transfer_fee_included_text)+")"; |
|
|
|
String exRateDisplay = " " + selectedExRate + " ("+getString(R.string.current_exchange_rate_text)+")"; |
|
|
|
String transferDisplay = " - " + Utils.formatCurrency(selectedTransferFeeAmount) + " " + selectedsendingCurrency + " (" + getString(R.string.transfer_fee_included_text) + ")"; |
|
|
|
String exRateDisplay = " " + selectedExRate + " (" + getString(R.string.current_exchange_rate_text) + ")"; |
|
|
|
|
|
|
|
showTransferfeeAndExRate(true, transferDisplay, exRateDisplay); |
|
|
|
showSendAndRecieveAmount(selectedSendAmount, selectedRecipientAmount); |
|
|
@ -332,10 +301,8 @@ public class ResendMoneyAmountDetailFragment extends BaseFragment implements Vie |
|
|
|
|
|
|
|
} else |
|
|
|
showPopUpMessage(exchangeCalculationApiResponse.getMsg(), CustomAlertDialog.AlertType.FAILED, null); |
|
|
|
} |
|
|
|
else |
|
|
|
{ |
|
|
|
scheduleTaskLater(()->{ |
|
|
|
} else { |
|
|
|
scheduleTaskLater(() -> { |
|
|
|
showProgressBar(false, ""); |
|
|
|
if (exchangeCalculationApiResponse.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) { |
|
|
|
ExchangeCalculationModel data = exchangeCalculationApiResponse.getData(); |
|
|
@ -346,10 +313,10 @@ public class ResendMoneyAmountDetailFragment extends BaseFragment implements Vie |
|
|
|
selectedSendAmount = data.getCollAmt(); |
|
|
|
selectedsendingCurrency = data.getCollCurr(); |
|
|
|
selectedExRateId = data.getExrateId(); |
|
|
|
selectedTransferAmount=data.getsAmt(); |
|
|
|
selectedTransferAmount = data.getsAmt(); |
|
|
|
|
|
|
|
String transferDisplay = " - " + Utils.formatCurrency(selectedTransferFeeAmount) + " " + selectedsendingCurrency + " ("+getString(R.string.transfer_fee_included_text)+")"; |
|
|
|
String exRateDisplay = " " + selectedExRate + " ("+getString(R.string.current_exchange_rate_text)+")"; |
|
|
|
String transferDisplay = " - " + Utils.formatCurrency(selectedTransferFeeAmount) + " " + selectedsendingCurrency + " (" + getString(R.string.transfer_fee_included_text) + ")"; |
|
|
|
String exRateDisplay = " " + selectedExRate + " (" + getString(R.string.current_exchange_rate_text) + ")"; |
|
|
|
|
|
|
|
showTransferfeeAndExRate(true, transferDisplay, exRateDisplay); |
|
|
|
showSendAndRecieveAmount(selectedSendAmount, selectedRecipientAmount); |
|
|
@ -364,13 +331,11 @@ public class ResendMoneyAmountDetailFragment extends BaseFragment implements Vie |
|
|
|
|
|
|
|
@Override |
|
|
|
public void onFailed(String message) { |
|
|
|
if(isUIReady()) { |
|
|
|
if (isUIReady()) { |
|
|
|
showProgressBar(false, ""); |
|
|
|
showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, null); |
|
|
|
} |
|
|
|
else |
|
|
|
{ |
|
|
|
scheduleTaskLater(()->{ |
|
|
|
} else { |
|
|
|
scheduleTaskLater(() -> { |
|
|
|
showProgressBar(false, ""); |
|
|
|
showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, null); |
|
|
|
}); |
|
|
@ -379,13 +344,11 @@ public class ResendMoneyAmountDetailFragment extends BaseFragment implements Vie |
|
|
|
|
|
|
|
@Override |
|
|
|
protected void onConnectionNotEstablished(String message) { |
|
|
|
if(isUIReady()) { |
|
|
|
if (isUIReady()) { |
|
|
|
showProgressBar(false, ""); |
|
|
|
showPopUpMessage(message, CustomAlertDialog.AlertType.NO_INTERNET, null); |
|
|
|
} |
|
|
|
else |
|
|
|
{ |
|
|
|
scheduleTaskLater(()->{ |
|
|
|
} else { |
|
|
|
scheduleTaskLater(() -> { |
|
|
|
showProgressBar(false, ""); |
|
|
|
showPopUpMessage(message, CustomAlertDialog.AlertType.NO_INTERNET, null); |
|
|
|
}); |
|
|
@ -395,18 +358,17 @@ public class ResendMoneyAmountDetailFragment extends BaseFragment implements Vie |
|
|
|
@Override |
|
|
|
protected void unauthorizedAccess(String message) { |
|
|
|
GmeApplication.getStorage().edit().clear().commit(); |
|
|
|
showPopUpMessage(message, CustomAlertDialog.AlertType.ALERT,alertType -> logout()); |
|
|
|
showPopUpMessage(message, CustomAlertDialog.AlertType.ALERT, alertType -> logout()); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private boolean validateAll() { |
|
|
|
return validateAmountIsNotEmpty(sendMoneyEditText.getText().toString())&&validateAmountIsNotEmpty(recieveMoneyEditText.getText().toString()); |
|
|
|
return validateAmountIsNotEmpty(sendMoneyEditText.getText().toString()) && validateAmountIsNotEmpty(recieveMoneyEditText.getText().toString()); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private void updateButtonToCalculate(boolean action) { |
|
|
|
shouldCalculateExRate = action; |
|
|
|
if (action) |
|
|
|