Browse Source

Dialog duration fixes in amount detail page send money

master
preyearegmi 6 years ago
parent
commit
c7ba28cfcc
  1. 1
      app/src/main/java/com/gmeremit/online/gmeremittance_native/loginV2/view/LoginV2Activity.java
  2. 17
      app/src/main/java/com/gmeremit/online/gmeremittance_native/registerV2/presenter/RegisterV2Presenter.java
  3. 5
      app/src/main/java/com/gmeremit/online/gmeremittance_native/registerV2/view/RegisterV2Activity.java
  4. 9
      app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/amountdetail/AmountDetailSendMoneyFragment.java
  5. 4
      app/src/main/res/layout/activity_send_money_v2.xml

1
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) {
}

17
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<ResponseBody> {

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

9
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());

4
app/src/main/res/layout/activity_send_money_v2.xml

@ -50,7 +50,7 @@
<View
android:layout_marginTop="15dp"
android:layout_width="70dp"
android:layout_height="3dp"
android:layout_height="2dp"
android:background="@color/gray"
android:layout_gravity="top"/>
<LinearLayout
@ -81,7 +81,7 @@
<View
android:layout_marginTop="15dp"
android:layout_width="70dp"
android:layout_height="3dp"
android:layout_height="2dp"
android:background="@color/gray"
android:layout_gravity="top"/>
<LinearLayout

Loading…
Cancel
Save