From c7ba28cfccfcbb1f3632bde120e8b33dbb70e145 Mon Sep 17 00:00:00 2001 From: preyearegmi Date: Tue, 11 Sep 2018 10:45:15 +0900 Subject: [PATCH] Dialog duration fixes in amount detail page send money --- .../loginV2/view/LoginV2Activity.java | 1 + .../presenter/RegisterV2Presenter.java | 17 ++++++++++++++--- .../registerV2/view/RegisterV2Activity.java | 5 +++++ .../AmountDetailSendMoneyFragment.java | 9 +++++++-- .../main/res/layout/activity_send_money_v2.xml | 4 ++-- 5 files changed, 29 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/loginV2/view/LoginV2Activity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/loginV2/view/LoginV2Activity.java index e8b59826..f74fbde4 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/loginV2/view/LoginV2Activity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/loginV2/view/LoginV2Activity.java @@ -58,6 +58,7 @@ public class LoginV2Activity extends BaseActivity implements View.OnClickListene } private void performDefaultAction(Bundle savedInstanceState) { + } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/registerV2/presenter/RegisterV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/registerV2/presenter/RegisterV2Presenter.java index 8c049d85..05a4d928 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/registerV2/presenter/RegisterV2Presenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/registerV2/presenter/RegisterV2Presenter.java @@ -16,10 +16,11 @@ public class RegisterV2Presenter extends BasePresenter implements RegisterV2Pres private final RegisterV2Gateway gateway; private final RegisterV2ContractInterface view; - CompositeDisposable compositeDisposable; + private CompositeDisposable compositeDisposable; public RegisterV2Presenter(RegisterV2PresenterInterface.RegisterV2ContractInterface view) { this.view = view; + compositeDisposable=new CompositeDisposable(); this.gateway = new RegisterV2Gateway(this); } @@ -40,11 +41,12 @@ public class RegisterV2Presenter extends BasePresenter implements RegisterV2Pres String fcmID = FirebaseInstanceId.getInstance().getToken(); if (fcmID == null) fcmID = this.gateway.getLastKnownFcmId(); + compositeDisposable.add( this.gateway.registerUser( auth, userId, password, - "172017F9EC11222E8107142733:QRK2UM0Q:", + "172017F9EC11222E8107142733", fcmID, GmeApplication.getAppRelatedMetaData().getAppVersion(), GmeApplication.getAppRelatedMetaData().getPhoneBrand(), @@ -53,8 +55,17 @@ public class RegisterV2Presenter extends BasePresenter implements RegisterV2Pres GmeApplication.getAppRelatedMetaData().getOsVersion()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new RegistrationObserver()); + .subscribeWith(new RegistrationObserver()) + ); + } + @Override + public void onViewDestroyed() { + super.onViewDestroyed(); + if (compositeDisposable != null & !compositeDisposable.isDisposed()) { + compositeDisposable.dispose(); + compositeDisposable.clear(); + } } public class RegistrationObserver extends GenericApiObserverResponse { diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/registerV2/view/RegisterV2Activity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/registerV2/view/RegisterV2Activity.java index 2e3a48e1..cd31ad6a 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/registerV2/view/RegisterV2Activity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/registerV2/view/RegisterV2Activity.java @@ -25,10 +25,13 @@ public class RegisterV2Activity extends BaseActivity implements RegisterV2Presen @BindView(R.id.email_mobile) EditText emailMobileTextView; + @BindView(R.id.password) EditText passwordTextView; + @BindView(R.id.confirm_password) EditText confirmPasswordTextView; + @BindView(R.id.btn_submit) Button btn_submit; @@ -109,4 +112,6 @@ public class RegisterV2Activity extends BaseActivity implements RegisterV2Presen public void setUserIdError(String error) { useridWrapper.setError(error); } + + } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/amountdetail/AmountDetailSendMoneyFragment.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/amountdetail/AmountDetailSendMoneyFragment.java index dfba914c..f9b780cf 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/amountdetail/AmountDetailSendMoneyFragment.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/amountdetail/AmountDetailSendMoneyFragment.java @@ -3,6 +3,7 @@ package com.gmeremit.online.gmeremittance_native.sendmoneyV2.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; @@ -373,7 +374,9 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements View. amountDetailRelatedData = amountDetailRelatedDataModel; if (amountDetailRelatedData == null||amountDetailRelatedData.getDefaultSelectedCurrency()==null){ showSelectedCurrency("", "---"); - showPopUpMessage("No payout currency defined, please contact support.", CustomAlertDialog.AlertType.ALERT, null); + new Handler().postDelayed(()->{ + showPopUpMessage("No payout currency defined, please contact support.", CustomAlertDialog.AlertType.ALERT, null); + },350); continueBtn.setOnClickListener(null); } else { showSelectedCurrency(amountDetailRelatedData.getDefaultSelectedCurrency().getCountryCode(), amountDetailRelatedData.getDefaultSelectedCurrency().getCurrencyCode()); @@ -384,7 +387,9 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements View. amountDetailRelatedData = amountDetailRelatedDataModel; if (amountDetailRelatedData == null||amountDetailRelatedData.getDefaultSelectedCurrency()==null) { showSelectedCurrency("", "---"); - showPopUpMessage("No payout currency defined, please contact support.", CustomAlertDialog.AlertType.ALERT, null); + new Handler().postDelayed(()->{ + showPopUpMessage("No payout currency defined, please contact support.", CustomAlertDialog.AlertType.ALERT, null); + },350); continueBtn.setOnClickListener(null); } else { showSelectedCurrency(amountDetailRelatedData.getDefaultSelectedCurrency().getCountryCode(), amountDetailRelatedData.getDefaultSelectedCurrency().getCurrencyCode()); diff --git a/app/src/main/res/layout/activity_send_money_v2.xml b/app/src/main/res/layout/activity_send_money_v2.xml index 5909dccb..10a64574 100644 --- a/app/src/main/res/layout/activity_send_money_v2.xml +++ b/app/src/main/res/layout/activity_send_money_v2.xml @@ -50,7 +50,7 @@