|
@ -160,28 +160,23 @@ public class NewRegisterV3Activity extends BaseActivity implements NewRegisterV3 |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private void registerFcmToken() { |
|
|
private void registerFcmToken() { |
|
|
FirebaseMessaging.getInstance().getToken() |
|
|
|
|
|
.addOnCompleteListener(task -> { |
|
|
|
|
|
if (task.isSuccessful()) { |
|
|
|
|
|
String token = task.getResult(); |
|
|
|
|
|
if (BuildConfig.DEBUG) { |
|
|
|
|
|
Log.d(TAG, "registerFcmToken: " + token); |
|
|
|
|
|
} |
|
|
|
|
|
presenter.setNewToken(token); |
|
|
|
|
|
SharedPreferences.Editor sharedPreferenceEditor = RemitApplication.getStorage().edit(); |
|
|
|
|
|
sharedPreferenceEditor.putString(PrefKeys.USER_FCM_ID, token); |
|
|
|
|
|
} |
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
FirebaseMessaging.getInstance().getToken().addOnCompleteListener(task -> { |
|
|
|
|
|
if (task.isSuccessful()) { |
|
|
|
|
|
String token = task.getResult(); |
|
|
|
|
|
if (BuildConfig.DEBUG) { |
|
|
|
|
|
Log.d(TAG, "registerFcmToken: " + token); |
|
|
|
|
|
} |
|
|
|
|
|
presenter.setNewToken(token); |
|
|
|
|
|
SharedPreferences.Editor sharedPreferenceEditor = RemitApplication.getStorage().edit(); |
|
|
|
|
|
sharedPreferenceEditor.putString(PrefKeys.USER_FCM_ID, token); |
|
|
|
|
|
} |
|
|
|
|
|
}); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private void initialize() { |
|
|
private void initialize() { |
|
|
residenceId_edTxt.setFilters(new InputFilter[]{new InputFilter.AllCaps()}); |
|
|
residenceId_edTxt.setFilters(new InputFilter[]{new InputFilter.AllCaps()}); |
|
|
this.presenter = new ViewModelProvider(this, new NewRegisterV3ViewModelFactory(this)).get(NewRegisterV3Presenter.class); |
|
|
this.presenter = new ViewModelProvider(this, new NewRegisterV3ViewModelFactory(this)).get(NewRegisterV3Presenter.class); |
|
|
registerRelatedViewEvents = this.presenter.getRegisterRelatedViewEvents(new NewRegisterV3ViewLiveData.RegisterViewBinding( |
|
|
|
|
|
RxTextView.textChanges(referralCodeEdTxt).skipInitialValue(), |
|
|
|
|
|
RxTextView.textChanges(userEmail).skipInitialValue(), |
|
|
|
|
|
RxTextView.textChanges(passwordEdTxt).skipInitialValue(), |
|
|
|
|
|
RxTextView.textChanges(confirmPasswordEdTxt).skipInitialValue() |
|
|
|
|
|
|
|
|
registerRelatedViewEvents = this.presenter.getRegisterRelatedViewEvents(new NewRegisterV3ViewLiveData.RegisterViewBinding(RxTextView.textChanges(referralCodeEdTxt).skipInitialValue(), RxTextView.textChanges(userEmail).skipInitialValue(), RxTextView.textChanges(passwordEdTxt).skipInitialValue(), RxTextView.textChanges(confirmPasswordEdTxt).skipInitialValue() |
|
|
|
|
|
|
|
|
)); |
|
|
)); |
|
|
|
|
|
|
|
@ -198,43 +193,37 @@ public class NewRegisterV3Activity extends BaseActivity implements NewRegisterV3 |
|
|
referralCodeEdTxt.setText(""); |
|
|
referralCodeEdTxt.setText(""); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
FirebaseDynamicLinks.getInstance() |
|
|
|
|
|
.getDynamicLink(getIntent()) |
|
|
|
|
|
.addOnSuccessListener(this, new OnSuccessListener<PendingDynamicLinkData>() { |
|
|
|
|
|
@Override |
|
|
|
|
|
public void onSuccess(PendingDynamicLinkData pendingDynamicLinkData) { |
|
|
|
|
|
Uri deepLink = null; |
|
|
|
|
|
if (pendingDynamicLinkData != null) { |
|
|
|
|
|
deepLink = pendingDynamicLinkData.getLink(); |
|
|
|
|
|
String paramValue = deepLink.getQueryParameters("invite").get(0); // it will get "2" as a value |
|
|
|
|
|
Log.d("Value", paramValue); |
|
|
|
|
|
referralCodeEdTxt.setText(paramValue); |
|
|
|
|
|
referralCodeEdTxt.setFocusableInTouchMode(true); |
|
|
|
|
|
referralCodeEdTxt.requestFocus(); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
}) |
|
|
|
|
|
.addOnFailureListener(this, new OnFailureListener() { |
|
|
|
|
|
@Override |
|
|
|
|
|
public void onFailure(@NonNull Exception e) { |
|
|
|
|
|
Log.w("Splash", "getDynamicLink:onFailure", e); |
|
|
|
|
|
} |
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
referralCodeEdTxt.setOnFocusChangeListener( |
|
|
|
|
|
(new View.OnFocusChangeListener() { |
|
|
|
|
|
@Override |
|
|
|
|
|
public void onFocusChange(View view, boolean hasFocus) { |
|
|
|
|
|
if (!hasFocus) { |
|
|
|
|
|
String val = referralCodeEdTxt.getText().toString(); |
|
|
|
|
|
if (!val.isEmpty()) |
|
|
|
|
|
presenter.performReferralCodeValidationFromApi(val); |
|
|
|
|
|
else |
|
|
|
|
|
btn_submit.setEnabled(true); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
})); |
|
|
|
|
|
|
|
|
FirebaseDynamicLinks.getInstance().getDynamicLink(getIntent()).addOnSuccessListener(this, new OnSuccessListener<PendingDynamicLinkData>() { |
|
|
|
|
|
@Override |
|
|
|
|
|
public void onSuccess(PendingDynamicLinkData pendingDynamicLinkData) { |
|
|
|
|
|
Uri deepLink = null; |
|
|
|
|
|
if (pendingDynamicLinkData != null) { |
|
|
|
|
|
deepLink = pendingDynamicLinkData.getLink(); |
|
|
|
|
|
String paramValue = deepLink.getQueryParameters("invite").get(0); // it will get "2" as a value |
|
|
|
|
|
Log.d("Value", paramValue); |
|
|
|
|
|
referralCodeEdTxt.setText(paramValue); |
|
|
|
|
|
referralCodeEdTxt.setFocusableInTouchMode(true); |
|
|
|
|
|
referralCodeEdTxt.requestFocus(); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
}).addOnFailureListener(this, new OnFailureListener() { |
|
|
|
|
|
@Override |
|
|
|
|
|
public void onFailure(@NonNull Exception e) { |
|
|
|
|
|
Log.w("Splash", "getDynamicLink:onFailure", e); |
|
|
|
|
|
} |
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
referralCodeEdTxt.setOnFocusChangeListener((new View.OnFocusChangeListener() { |
|
|
|
|
|
@Override |
|
|
|
|
|
public void onFocusChange(View view, boolean hasFocus) { |
|
|
|
|
|
if (!hasFocus) { |
|
|
|
|
|
String val = referralCodeEdTxt.getText().toString(); |
|
|
|
|
|
if (!val.isEmpty()) presenter.performReferralCodeValidationFromApi(val); |
|
|
|
|
|
else btn_submit.setEnabled(true); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
})); |
|
|
|
|
|
|
|
|
RemitApplication.getStorage().edit().putString(PrefKeys.SELECTED_NATIONALITY, FOREIGNER_TYPE).apply(); |
|
|
RemitApplication.getStorage().edit().putString(PrefKeys.SELECTED_NATIONALITY, FOREIGNER_TYPE).apply(); |
|
|
dobSelectionSubject = PublishSubject.create(); |
|
|
dobSelectionSubject = PublishSubject.create(); |
|
@ -249,8 +238,7 @@ public class NewRegisterV3Activity extends BaseActivity implements NewRegisterV3 |
|
|
residenceId_edTxt.setText(data.getData()); |
|
|
residenceId_edTxt.setText(data.getData()); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
} else |
|
|
|
|
|
residenceId_TxtInputLayout.setError(data.getErrorMessage()); |
|
|
|
|
|
|
|
|
} else residenceId_TxtInputLayout.setError(data.getErrorMessage()); |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
@ -261,8 +249,7 @@ public class NewRegisterV3Activity extends BaseActivity implements NewRegisterV3 |
|
|
confirmPasswordEdTxt.setText(data.getData()); |
|
|
confirmPasswordEdTxt.setText(data.getData()); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
} else |
|
|
|
|
|
confirmPasswordTxtInputLayout.setError(data.getErrorMessage()); |
|
|
|
|
|
|
|
|
} else confirmPasswordTxtInputLayout.setError(data.getErrorMessage()); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -273,8 +260,7 @@ public class NewRegisterV3Activity extends BaseActivity implements NewRegisterV3 |
|
|
passwordEdTxt.setText(data.getData()); |
|
|
passwordEdTxt.setText(data.getData()); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
} else |
|
|
|
|
|
passwordTxtInputLayout.setError(data.getErrorMessage()); |
|
|
|
|
|
|
|
|
} else passwordTxtInputLayout.setError(data.getErrorMessage()); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private void onReferralCodeChanged(FormInputStateDTO<String> data) { |
|
|
private void onReferralCodeChanged(FormInputStateDTO<String> data) { |
|
@ -283,8 +269,7 @@ public class NewRegisterV3Activity extends BaseActivity implements NewRegisterV3 |
|
|
if (data.hasData()) { |
|
|
if (data.hasData()) { |
|
|
referralCodeEdTxt.setText(data.getData()); |
|
|
referralCodeEdTxt.setText(data.getData()); |
|
|
} |
|
|
} |
|
|
} else |
|
|
|
|
|
referralCodeTxtInputLayout.setError(data.getErrorMessage()); |
|
|
|
|
|
|
|
|
} else referralCodeTxtInputLayout.setError(data.getErrorMessage()); |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
@ -295,8 +280,7 @@ public class NewRegisterV3Activity extends BaseActivity implements NewRegisterV3 |
|
|
userEmail.setText(data.getData()); |
|
|
userEmail.setText(data.getData()); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
} else |
|
|
|
|
|
userEmailTxtInputLayout.setError(data.getErrorMessage()); |
|
|
|
|
|
|
|
|
} else userEmailTxtInputLayout.setError(data.getErrorMessage()); |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
@ -322,7 +306,9 @@ public class NewRegisterV3Activity extends BaseActivity implements NewRegisterV3 |
|
|
@OnClick(R.id.btn_submit) |
|
|
@OnClick(R.id.btn_submit) |
|
|
public void onRegisterBtnClicked() { |
|
|
public void onRegisterBtnClicked() { |
|
|
if (presenter.validateAllRegisterForm()) { |
|
|
if (presenter.validateAllRegisterForm()) { |
|
|
presenter.registerUser(); |
|
|
|
|
|
|
|
|
String fullName = String.valueOf(ed_fullName.getText()); |
|
|
|
|
|
String dob = String.valueOf(dob_edTxt.getText()); |
|
|
|
|
|
presenter.registerUser(fullName, dob); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
@ -364,13 +350,10 @@ public class NewRegisterV3Activity extends BaseActivity implements NewRegisterV3 |
|
|
String userId = presenter.getLastRegisteredUserId(); |
|
|
String userId = presenter.getLastRegisteredUserId(); |
|
|
String userPwd = presenter.getLastRegisteredUserPwd(); |
|
|
String userPwd = presenter.getLastRegisteredUserPwd(); |
|
|
KYCV3Activity.startActivityForResult(this, false, userId, userPwd); |
|
|
KYCV3Activity.startActivityForResult(this, false, userId, userPwd); |
|
|
} else if (resultCode == RESULT_CANCELED) |
|
|
|
|
|
redirectToSplash(); |
|
|
|
|
|
|
|
|
} else if (resultCode == RESULT_CANCELED) redirectToSplash(); |
|
|
} else if (requestCode == KYC_FORM_REQUEST_CODE) { |
|
|
} else if (requestCode == KYC_FORM_REQUEST_CODE) { |
|
|
if (resultCode == RESULT_OK) |
|
|
|
|
|
redirectToDashboard(); |
|
|
|
|
|
else |
|
|
|
|
|
redirectToSplash(); |
|
|
|
|
|
|
|
|
if (resultCode == RESULT_OK) redirectToDashboard(); |
|
|
|
|
|
else redirectToSplash(); |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
@ -388,10 +371,8 @@ public class NewRegisterV3Activity extends BaseActivity implements NewRegisterV3 |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public void setUserIdFocus(boolean action) { |
|
|
public void setUserIdFocus(boolean action) { |
|
|
if (action) |
|
|
|
|
|
userEmail.requestFocus(); |
|
|
|
|
|
else |
|
|
|
|
|
userEmail.clearFocus(); |
|
|
|
|
|
|
|
|
if (action) userEmail.requestFocus(); |
|
|
|
|
|
else userEmail.clearFocus(); |
|
|
// usernameId.setCursorVisible(action); |
|
|
// usernameId.setCursorVisible(action); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
@ -444,8 +425,7 @@ public class NewRegisterV3Activity extends BaseActivity implements NewRegisterV3 |
|
|
genericPromptDialog.dismiss(); |
|
|
genericPromptDialog.dismiss(); |
|
|
} else if (verificationViewContainer.getVisibility() == View.GONE) { |
|
|
} else if (verificationViewContainer.getVisibility() == View.GONE) { |
|
|
showResidienceIdVerifyScreen(true, true); |
|
|
showResidienceIdVerifyScreen(true, true); |
|
|
} else |
|
|
|
|
|
super.onBackPressed(); |
|
|
|
|
|
|
|
|
} else super.onBackPressed(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -497,8 +477,7 @@ public class NewRegisterV3Activity extends BaseActivity implements NewRegisterV3 |
|
|
dob_edTxt.setText(state.getData()); |
|
|
dob_edTxt.setText(state.getData()); |
|
|
dobSelectionSubject.onNext(state.getData()); |
|
|
dobSelectionSubject.onNext(state.getData()); |
|
|
} |
|
|
} |
|
|
} else |
|
|
|
|
|
dob_TxtInputLayout.setError(state.getErrorMessage()); |
|
|
|
|
|
|
|
|
} else dob_TxtInputLayout.setError(state.getErrorMessage()); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@OnClick(R.id.dob_edTxt) |
|
|
@OnClick(R.id.dob_edTxt) |
|
@ -506,27 +485,16 @@ public class NewRegisterV3Activity extends BaseActivity implements NewRegisterV3 |
|
|
hideKeyBoard(); |
|
|
hideKeyBoard(); |
|
|
SpinnerDatePickerDialogBuilder builder = new SpinnerDatePickerDialogBuilder(); |
|
|
SpinnerDatePickerDialogBuilder builder = new SpinnerDatePickerDialogBuilder(); |
|
|
|
|
|
|
|
|
builder.context(this) |
|
|
|
|
|
.spinnerTheme(R.style.NumberPickerStyle) |
|
|
|
|
|
.showTitle(true) |
|
|
|
|
|
.showDaySpinner(true) |
|
|
|
|
|
.dialogTheme(R.style.DatePickerTheme) |
|
|
|
|
|
.setTitle(getString(R.string.select_dob_text)) |
|
|
|
|
|
.setPositiveButtonText(getString(R.string.ok_text)) |
|
|
|
|
|
.setNegativeButtonText(getString(R.string.cancel_text)) |
|
|
|
|
|
.setCurrentDateAsMaxDate() |
|
|
|
|
|
.defaultDate(1990, 1, 1) |
|
|
|
|
|
.callback(new com.tsongkha.spinnerdatepicker.DatePickerDialog.OnDateSetListener() { |
|
|
|
|
|
@Override |
|
|
|
|
|
public void onDateSet(com.tsongkha.spinnerdatepicker.DatePicker datePicker, int year, int monthOfYear, int dayOfMonth) { |
|
|
|
|
|
Calendar newDate = Calendar.getInstance(); |
|
|
|
|
|
newDate.set(year, monthOfYear, dayOfMonth); |
|
|
|
|
|
String date = new SimpleDateFormat(Utils.getDefaultDateFormat(), Locale.US).format(newDate.getTime()); |
|
|
|
|
|
dob_edTxt.setText(date); |
|
|
|
|
|
dobSelectionSubject.onNext(date); |
|
|
|
|
|
} |
|
|
|
|
|
}) |
|
|
|
|
|
.build().show(); |
|
|
|
|
|
|
|
|
builder.context(this).spinnerTheme(R.style.NumberPickerStyle).showTitle(true).showDaySpinner(true).dialogTheme(R.style.DatePickerTheme).setTitle(getString(R.string.select_dob_text)).setPositiveButtonText(getString(R.string.ok_text)).setNegativeButtonText(getString(R.string.cancel_text)).setCurrentDateAsMaxDate().defaultDate(1990, 1, 1).callback(new com.tsongkha.spinnerdatepicker.DatePickerDialog.OnDateSetListener() { |
|
|
|
|
|
@Override |
|
|
|
|
|
public void onDateSet(com.tsongkha.spinnerdatepicker.DatePicker datePicker, int year, int monthOfYear, int dayOfMonth) { |
|
|
|
|
|
Calendar newDate = Calendar.getInstance(); |
|
|
|
|
|
newDate.set(year, monthOfYear, dayOfMonth); |
|
|
|
|
|
String date = new SimpleDateFormat(Utils.getDefaultDateFormat(), Locale.US).format(newDate.getTime()); |
|
|
|
|
|
dob_edTxt.setText(date); |
|
|
|
|
|
dobSelectionSubject.onNext(date); |
|
|
|
|
|
} |
|
|
|
|
|
}).build().show(); |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |