From 6b2872b20415f60d2bcf1111ffb1ecbe75253815 Mon Sep 17 00:00:00 2001 From: Preyea Regmi Date: Mon, 18 Nov 2019 12:30:05 +0545 Subject: [PATCH] Inbound add account process started --- .idea/caches/build_file_checksums.ser | Bin 662 -> 662 bytes app/src/main/AndroidManifest.xml | 10 +- .../AccountListingRvAdapter.java | 4 +- .../InboundAccountListingRvAdapter.java | 2 +- .../AutoDebitAccountListingV2Gateway.java | 5 - .../InboundAccountAddV2Gateway.java | 35 +++ .../InboundAccount.java | 42 ++- .../autodebitaccountmanage/KoreanBankDTO.java | 24 ++ .../InboundAccountAddRequestBody.java | 88 ++++++ ...itAccountListingV2InteractorInterface.java | 1 - .../AutoDebitAccountListingV2Presenter.java | 27 +- ...nboundAccountAddV2InteractorInterface.java | 21 ++ .../InboundAccountAddV2Presenter.java | 262 ++++++++++++++++++ ...InboundAccountAddV2PresenterInterface.java | 50 ++++ .../AutoDebitAccountManageV2Activity.java | 4 +- .../AccountAddRVViewHolder.java | 2 +- .../AccountListingRVViewHolder.java | 4 +- .../AutoDebitAccountListingDialog.java | 2 +- .../AutoDebitAccountListingFragment.java | 5 +- .../CountryListRvViewHolder.java | 2 +- .../CountryListingRvAdapter.java | 2 +- ...ndAccountAddBottomSheetDialogFragment.java | 51 ---- .../InboundAccountListingFragment.java | 14 +- .../InboundAccountAddActionListener.java | 8 + .../InboundAccountAddActivity.java | 143 ++++++++++ .../InboundAddAccountConfirmFragment.java | 189 +++++++++++++ .../InboundAddAccountPennyTestFragment.java | 141 ++++++++++ .../view/CustomerSupportFragment.java | 2 +- .../LineDividerItemDecoration.java | 3 +- .../banklistingdialog/BankIconMapper.java | 4 +- .../common/GenericTextListingDialog.java | 6 +- .../homeV2/view/HomeActivityV2.java | 16 +- .../pennytest/PennyTestOperationFragment.java | 3 +- .../RecipientListingV2Activity.java | 4 +- .../RecipientListingV3Activity.java | 2 +- .../view/TransactionListingV2Activity.java | 2 +- .../ResendMoneyAmountDetailFragment.java | 4 +- .../ResendVerificationDetailFragment.java | 2 +- .../view/RewardPointsShippingActivity.java | 2 +- .../AmountDetailSendMoneyFragment.java | 4 +- .../PayoutModeSendMoneyFragment.java | 2 +- .../VerificationSendMoneyFragment.java | 2 +- .../socials/view/SocialActivity.java | 2 +- .../splash_screen/view/SplashScreen.java | 2 +- .../utils/https/API_URL.java | 2 + .../utils/https/ApiEndpoints.java | 11 + .../main/res/drawable/avd_fail_transition.xml | 8 +- app/src/main/res/drawable/ic_bank.png | Bin 0 -> 16497 bytes app/src/main/res/drawable/ic_bank_link.png | Bin 0 -> 20542 bytes .../main/res/drawable/ic_bank_link_image.png | Bin 0 -> 20499 bytes ...ctivity_inbound_account_add_activitity.xml | 26 ++ ...uto_debit_account_list_cornerless_item.xml | 4 +- .../layout/auto_debit_account_list_item.xml | 4 +- ...fragment_amount_detail_resend_money_v2.xml | 2 +- .../fragment_amount_detail_send_money_v2.xml | 2 +- .../layout/fragment_inbound_account_add.xml | 221 +++++++++++---- .../layout/fragment_inbound_account_list.xml | 12 + .../fragment_inbound_account_penny_test.xml | 161 +++++++++++ .../fragment_payout_mode_send_money_v2.xml | 2 +- .../layout/fragment_penny_test_operation.xml | 10 +- .../res/layout/inbound_account_list_item.xml | 4 +- 61 files changed, 1454 insertions(+), 215 deletions(-) create mode 100644 app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/gateway/inboundaccountmanage/InboundAccountAddV2Gateway.java create mode 100644 app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/model/inboundaccountmanage/InboundAccountAddRequestBody.java create mode 100644 app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/presenter/inboundaccountmanage/InboundAccountAddV2InteractorInterface.java create mode 100644 app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/presenter/inboundaccountmanage/InboundAccountAddV2Presenter.java create mode 100644 app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/presenter/inboundaccountmanage/InboundAccountAddV2PresenterInterface.java rename app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/{accountlisting => autodebitlisting}/AccountAddRVViewHolder.java (93%) rename app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/{accountlisting => autodebitlisting}/AccountListingRVViewHolder.java (90%) rename app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/{accountlisting => autodebitlisting}/AutoDebitAccountListingDialog.java (99%) rename app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/{accountlisting => autodebitlisting}/AutoDebitAccountListingFragment.java (97%) rename app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/{accountlisting => autodebitlisting}/CountryListRvViewHolder.java (95%) rename app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/{accountlisting => autodebitlisting}/CountryListingRvAdapter.java (98%) delete mode 100644 app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/inbound/InboundAccountAddBottomSheetDialogFragment.java rename app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/{inbound => inboundlisting}/InboundAccountListingFragment.java (89%) create mode 100644 app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/inboundaccountmanage/InboundAccountAddActionListener.java create mode 100644 app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/inboundaccountmanage/InboundAccountAddActivity.java create mode 100644 app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/inboundaccountmanage/InboundAddAccountConfirmFragment.java create mode 100644 app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/inboundaccountmanage/InboundAddAccountPennyTestFragment.java create mode 100755 app/src/main/res/drawable/ic_bank.png create mode 100755 app/src/main/res/drawable/ic_bank_link.png create mode 100755 app/src/main/res/drawable/ic_bank_link_image.png create mode 100644 app/src/main/res/layout/activity_inbound_account_add_activitity.xml create mode 100644 app/src/main/res/layout/fragment_inbound_account_list.xml create mode 100644 app/src/main/res/layout/fragment_inbound_account_penny_test.xml diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 914556415b69b7db81fe7a07fde45ecc48dd64b8..cec130d513bcdecbcca4b3a030d7374b6802ece2 100644 GIT binary patch delta 15 XcmbQnI*oP043?UeH8~sS{9*(EF--=z delta 15 XcmbQnI*oP043 - + - getKoreanBankList(String auth, String Uid) { - return HttpClientV2.getInstance().getKoreanBankList(auth); - - } @Override public Observable checkAutoDebitAccountForRenewal(String auth, String Uid) { diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/gateway/inboundaccountmanage/InboundAccountAddV2Gateway.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/gateway/inboundaccountmanage/InboundAccountAddV2Gateway.java new file mode 100644 index 00000000..37e781d7 --- /dev/null +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/gateway/inboundaccountmanage/InboundAccountAddV2Gateway.java @@ -0,0 +1,35 @@ +package com.gmeremit.online.gmeremittance_native.accountmanage.gateway.inboundaccountmanage; + +import com.gmeremit.online.gmeremittance_native.accountmanage.model.inboundaccountmanage.InboundAccountAddRequestBody; +import com.gmeremit.online.gmeremittance_native.accountmanage.presenter.inboundaccountmanage.InboundAccountAddV2InteractorInterface; +import com.gmeremit.online.gmeremittance_native.base.PrivilegedGateway; +import com.gmeremit.online.gmeremittance_native.utils.https.HttpClientV2; +import com.google.gson.JsonObject; + +import io.reactivex.Observable; +import okhttp3.ResponseBody; + +public class InboundAccountAddV2Gateway extends PrivilegedGateway implements InboundAccountAddV2InteractorInterface.InboundAccountAddV2GatewayInterface { + + @Override + public Observable getKoreanBankList(String auth, String Uid) { + return HttpClientV2.getInstance().getKoreanBankList(auth); + + } + + @Override + public Observable startPennyTest(String auth, String userId, InboundAccountAddRequestBody requestBody) { + return HttpClientV2.getInstance().startInboundPennyTestStart(auth,userId,requestBody); + } + + @Override + public Observable submitPennyTest(String auth, String userId, String bankCode, String accountNo, String cerNumber) { + JsonObject jsonObject=new JsonObject() ; + jsonObject.addProperty("CustomerId",userId); + jsonObject.addProperty("BankCode",bankCode); + jsonObject.addProperty("AccountNo",accountNo); + jsonObject.addProperty("CertNumber",cerNumber); + return HttpClientV2.getInstance().performInboundPennyTestSubmit(auth,jsonObject); + } + +} diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/model/autodebitaccountmanage/InboundAccount.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/model/autodebitaccountmanage/InboundAccount.java index df6f4e91..7ce91276 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/model/autodebitaccountmanage/InboundAccount.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/model/autodebitaccountmanage/InboundAccount.java @@ -1,9 +1,12 @@ package com.gmeremit.online.gmeremittance_native.accountmanage.model.autodebitaccountmanage; +import android.os.Parcel; +import android.os.Parcelable; + import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; -public class InboundAccount { +public class InboundAccount implements Parcelable { @SerializedName("BankCode") @Expose @@ -61,4 +64,41 @@ public class InboundAccount { this.accountNo = accountNo; } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + dest.writeString(this.bankCode); + dest.writeValue(this.isPennyTestSuccess); + dest.writeValue(this.isPrimary); + dest.writeString(this.bank); + dest.writeString(this.accountNo); + } + + public InboundAccount() { + } + + protected InboundAccount(Parcel in) { + this.bankCode = in.readString(); + this.isPennyTestSuccess = (Boolean) in.readValue(Boolean.class.getClassLoader()); + this.isPrimary = (Boolean) in.readValue(Boolean.class.getClassLoader()); + this.bank = in.readString(); + this.accountNo = in.readString(); + } + + public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { + @Override + public InboundAccount createFromParcel(Parcel source) { + return new InboundAccount(source); + } + + @Override + public InboundAccount[] newArray(int size) { + return new InboundAccount[size]; + } + }; } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/model/autodebitaccountmanage/KoreanBankDTO.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/model/autodebitaccountmanage/KoreanBankDTO.java index 62a1f4e0..ad22ae7b 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/model/autodebitaccountmanage/KoreanBankDTO.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/model/autodebitaccountmanage/KoreanBankDTO.java @@ -13,4 +13,28 @@ public class KoreanBankDTO { @SerializedName("Name") @Expose private String bankName; + + public KoreanBankDTO() { + } + + public String getBankCode() { + return bankCode; + } + + public void setBankCode(String bankCode) { + this.bankCode = bankCode; + } + + public String getBankName() { + return bankName; + } + + public void setBankName(String bankName) { + this.bankName = bankName; + } + + @Override + public String toString() { + return bankName; + } } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/model/inboundaccountmanage/InboundAccountAddRequestBody.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/model/inboundaccountmanage/InboundAccountAddRequestBody.java new file mode 100644 index 00000000..44e8cac5 --- /dev/null +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/model/inboundaccountmanage/InboundAccountAddRequestBody.java @@ -0,0 +1,88 @@ +package com.gmeremit.online.gmeremittance_native.accountmanage.model.inboundaccountmanage; + +import com.gmeremit.online.gmeremittance_native.accountmanage.model.autodebitaccountmanage.AutoDebitAccount; +import com.gmeremit.online.gmeremittance_native.accountmanage.model.autodebitaccountmanage.InboundAccount; +import com.google.gson.annotations.Expose; +import com.google.gson.annotations.SerializedName; + +public class InboundAccountAddRequestBody { + + @SerializedName("accountType") + @Expose + private String accountType; + + @SerializedName("bankCode") + @Expose + private String bankCode; + + private String bankName; + + @SerializedName("accountNo") + @Expose + private String accountNo; + + @SerializedName("accountID") + @Expose + private String accountId; + + public InboundAccountAddRequestBody(String accountType, String bankCode, String accountNo, String accountId,String bankName) { + this.accountType = accountType; + this.bankCode = bankCode; + this.accountNo = accountNo; + this.accountId = accountId; + this.bankName=bankName; + } + + public InboundAccountAddRequestBody() { + } + + public String getAccountType() { + return accountType; + } + + public void setAccountType(String accountType) { + this.accountType = accountType; + } + + public String getBankCode() { + return bankCode; + } + + public void setBankCode(String bankCode) { + this.bankCode = bankCode; + } + + public String getAccountNo() { + return accountNo; + } + + public void setAccountNo(String accountNo) { + this.accountNo = accountNo; + } + + public String getAccountId() { + return accountId; + } + + public void setAccountId(String accountId) { + this.accountId = accountId; + } + + public String getBankName() { + return bankName; + } + + public void setBankName(String bankName) { + this.bankName = bankName; + } + + public static InboundAccountAddRequestBody createRequestBodyFromAutoDebitAccount(AutoDebitAccount autoDebitAccount) + { + return new InboundAccountAddRequestBody("autodebit",autoDebitAccount.getBankCode(),autoDebitAccount.getAccountNumMasked(),autoDebitAccount.getKftcAccountId(),autoDebitAccount.getBankName()); + } + public static InboundAccountAddRequestBody createRequestBodyFromInboundAccount(InboundAccount inboundAccount) + { + return new InboundAccountAddRequestBody("",inboundAccount.getBankCode(),inboundAccount.getAccountNo(),"",inboundAccount.getBank()); + + } +} diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/presenter/autodebitaccountmanage/AutoDebitAccountListingV2InteractorInterface.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/presenter/autodebitaccountmanage/AutoDebitAccountListingV2InteractorInterface.java index c42d52b1..758fe551 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/presenter/autodebitaccountmanage/AutoDebitAccountListingV2InteractorInterface.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/presenter/autodebitaccountmanage/AutoDebitAccountListingV2InteractorInterface.java @@ -13,7 +13,6 @@ public interface AutoDebitAccountListingV2InteractorInterface extends BaseIntera { Observable getAutDebitAccountsFromNetwork(String auth, String Uid); Observable getInboundAccountsFromNetwork(String auth, String Uid); - Observable getKoreanBankList(String auth, String Uid); Observable checkAutoDebitAccountForRenewal(String auth,String Uid); Observable deleteAccountFromNetwork(String auth, String Uid, String kftcAccountID); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/presenter/autodebitaccountmanage/AutoDebitAccountListingV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/presenter/autodebitaccountmanage/AutoDebitAccountListingV2Presenter.java index 88b158a1..2a5eee8f 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/presenter/autodebitaccountmanage/AutoDebitAccountListingV2Presenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/presenter/autodebitaccountmanage/AutoDebitAccountListingV2Presenter.java @@ -38,7 +38,6 @@ public class AutoDebitAccountListingV2Presenter extends BasePresenter implements private final AutoDebitAccountListingV2GatewayInterface gateway; private CompositeDisposable compositeDisposable; private AutoDebitRegistrationDTO autoDebitRegistrationRelatedData; - private List koreanBankList; private io.reactivex.subjects.BehaviorSubject> autoDebitAccountBehaviorSubject; @@ -66,7 +65,7 @@ public class AutoDebitAccountListingV2Presenter extends BasePresenter implements public void getAccountRelatedData() { compositeDisposable.add( - Observable.zip(getAutoDebitAccountList(), getInboundAccountList(),getKoreanBankList(), AccountDTO::new) + Observable.zip(getAutoDebitAccountList(), getInboundAccountList(), AccountDTO::new) .doOnSubscribe(disposable -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text))) .observeOn(AndroidSchedulers.mainThread()) .doFinally(() -> view.showProgressBar(false, "")) @@ -92,20 +91,7 @@ public class AutoDebitAccountListingV2Presenter extends BasePresenter implements }); } - private Observable> getKoreanBankList() { - Type bankResponseType = new TypeToken>>() { - }.getType(); - return this.gateway.getKoreanBankList(this.gateway.getAuth(), this.gateway.getUserIDNumber()) - .subscribeOn(Schedulers.io()) - .flatMap(response -> { - GenericResponseDataModel> data = HttpClientV2.getDeserializer().fromJson(response.string(), bankResponseType); - if (data.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) { - return Observable.just(data.getData()); - } else - return Observable.just(new ArrayList<>()); - }); - } private Observable getAutoDebitAccountList() { Type accountResponseType = new TypeToken>() { @@ -181,14 +167,12 @@ public class AutoDebitAccountListingV2Presenter extends BasePresenter implements } static class AccountDTO { - private final List koreanBankList; private final AutoDebitModel autoDebitRelatedData; private final List inboundAccountList; - public AccountDTO(AutoDebitModel autoDebitAccountList, List inboundAccountList,List koreanBankList) { + public AccountDTO(AutoDebitModel autoDebitAccountList, List inboundAccountList) { this.autoDebitRelatedData = autoDebitAccountList; this.inboundAccountList = inboundAccountList; - this.koreanBankList=koreanBankList; } public AutoDebitModel getAutoDebitRelatedData() { @@ -199,9 +183,6 @@ public class AutoDebitAccountListingV2Presenter extends BasePresenter implements return inboundAccountList; } - public List getKoreanBankList() { - return koreanBankList; - } } public class AccountListObserver extends DisposableObserver { @@ -217,10 +198,6 @@ public class AutoDebitAccountListingV2Presenter extends BasePresenter implements { inboundAccountBehaviorSubject.onNext(accountData.getInboundAccountList()); } - if(accountData.getKoreanBankList()!=null) - { - koreanBankList=accountData.getKoreanBankList(); - } } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/presenter/inboundaccountmanage/InboundAccountAddV2InteractorInterface.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/presenter/inboundaccountmanage/InboundAccountAddV2InteractorInterface.java new file mode 100644 index 00000000..c17567d0 --- /dev/null +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/presenter/inboundaccountmanage/InboundAccountAddV2InteractorInterface.java @@ -0,0 +1,21 @@ +package com.gmeremit.online.gmeremittance_native.accountmanage.presenter.inboundaccountmanage; + +import com.gmeremit.online.gmeremittance_native.accountmanage.model.inboundaccountmanage.InboundAccountAddRequestBody; +import com.gmeremit.online.gmeremittance_native.base.BaseInteractorInterface; +import com.gmeremit.online.gmeremittance_native.base.PrivilegedGatewayInterface; + +import io.reactivex.Observable; +import okhttp3.ResponseBody; + +public interface InboundAccountAddV2InteractorInterface extends BaseInteractorInterface { + + + interface InboundAccountAddV2GatewayInterface extends PrivilegedGatewayInterface + { + Observable getKoreanBankList(String auth, String Uid); + + Observable startPennyTest(String auth, String userId, InboundAccountAddRequestBody requestBody); + + Observable submitPennyTest(String auth,String userId,String bankCode, String accountNo, String cerNumber); + } +} diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/presenter/inboundaccountmanage/InboundAccountAddV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/presenter/inboundaccountmanage/InboundAccountAddV2Presenter.java new file mode 100644 index 00000000..2646bc1f --- /dev/null +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/presenter/inboundaccountmanage/InboundAccountAddV2Presenter.java @@ -0,0 +1,262 @@ +package com.gmeremit.online.gmeremittance_native.accountmanage.presenter.inboundaccountmanage; + +import com.gmeremit.online.gmeremittance_native.R; +import com.gmeremit.online.gmeremittance_native.accountmanage.model.autodebitaccountmanage.AutoDebitAccount; +import com.gmeremit.online.gmeremittance_native.accountmanage.model.autodebitaccountmanage.InboundAccount; +import com.gmeremit.online.gmeremittance_native.accountmanage.model.autodebitaccountmanage.KoreanBankDTO; +import com.gmeremit.online.gmeremittance_native.accountmanage.model.inboundaccountmanage.InboundAccountAddRequestBody; +import com.gmeremit.online.gmeremittance_native.accountmanage.view.inboundaccountmanage.InboundAddAccountConfirmFragment; +import com.gmeremit.online.gmeremittance_native.accountmanage.view.inboundaccountmanage.InboundAddAccountPennyTestFragment; +import com.gmeremit.online.gmeremittance_native.base.BasePresenter; +import com.gmeremit.online.gmeremittance_native.customwidgets.CustomAlertDialog; +import com.gmeremit.online.gmeremittance_native.utils.Constants; +import com.gmeremit.online.gmeremittance_native.utils.https.GenericApiObserverResponseV2; +import com.gmeremit.online.gmeremittance_native.utils.https.GenericResponseDataModel; +import com.gmeremit.online.gmeremittance_native.utils.https.MessageResponseDataModel; +import com.google.gson.reflect.TypeToken; + +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.List; + +import io.reactivex.Observable; +import io.reactivex.android.schedulers.AndroidSchedulers; +import io.reactivex.disposables.CompositeDisposable; +import io.reactivex.schedulers.Schedulers; +import io.reactivex.subjects.BehaviorSubject; + +public class InboundAccountAddV2Presenter extends BasePresenter implements InboundAccountAddV2PresenterInterface { + + + private final InboundAccountAddV2ContractInterface view; + private final InboundAccountAddV2InteractorInterface.InboundAccountAddV2GatewayInterface gateway; + private final CompositeDisposable compositeDisposable; + private InboundAccountAddRequestBody pennyTestRequestBody; + private List availableKoreanBankList; + private BehaviorSubject addAcountDataSubject; + private BehaviorSubject pennyTestDataSubject; + + public InboundAccountAddV2Presenter(InboundAccountAddV2ContractInterface view, InboundAccountAddV2InteractorInterface.InboundAccountAddV2GatewayInterface gateway) { + this.view = view; + this.gateway = gateway; + this.compositeDisposable = new CompositeDisposable(); + this.pennyTestRequestBody=new InboundAccountAddRequestBody(); + this.availableKoreanBankList=new ArrayList<>(); + addAcountDataSubject=BehaviorSubject.create(); + pennyTestDataSubject=BehaviorSubject.create(); + + } + + @Override + public void updateAutoDebitAccountData(AutoDebitAccount autoDebitAccount) { + this.pennyTestRequestBody = InboundAccountAddRequestBody.createRequestBodyFromAutoDebitAccount(autoDebitAccount); + + InboundAddAccountConfirmFragment.InboundAddAccountViewDTO addAccountViewDTO=new InboundAddAccountConfirmFragment.InboundAddAccountViewDTO(autoDebitAccount.getBankName(),autoDebitAccount.getBankCode(),autoDebitAccount.getAccountNumMasked(),false); + + addAcountDataSubject.onNext(addAccountViewDTO); + } + + @Override + public void updateInboundAccount(InboundAccount inboundAccount) { + this.pennyTestRequestBody = InboundAccountAddRequestBody.createRequestBodyFromInboundAccount(inboundAccount); + InboundAddAccountConfirmFragment.InboundAddAccountViewDTO addAccountViewDTO=new InboundAddAccountConfirmFragment.InboundAddAccountViewDTO(inboundAccount.getBank(),inboundAccount.getBankCode(),inboundAccount.getAccountNo(),false); + + addAcountDataSubject.onNext(addAccountViewDTO); + } + + @Override + public void getRelatedData() { + compositeDisposable.add( + this.gateway.getKoreanBankList(this.gateway.getAuth(), this.gateway.getUserIDNumber()) + .doOnSubscribe(subs -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text))) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .doFinally(() -> view.showProgressBar(false, "")) + .subscribeWith(new KoreanBankListObserver()) + ); + } + + @Override + public void requestForPennyTest() { + compositeDisposable.add( + this.gateway.startPennyTest(this.gateway.getAuth(), this.gateway.getUserIDNumber(), this.pennyTestRequestBody) + .doOnSubscribe(subs -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text))) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .doFinally(() -> view.showProgressBar(false, "")) + .subscribeWith(new PennyTestRequestObserver()) + ); + + } + + + + @Override + public void submitPennyTest(String depositReference) { + compositeDisposable.add( + this.gateway.submitPennyTest(this.gateway.getAuth(), this.gateway.getUserIDNumber(), this.pennyTestRequestBody.getBankCode(), this.pennyTestRequestBody.getAccountNo(), depositReference) + .doOnSubscribe(subs -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text))) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .doFinally(() -> view.showProgressBar(false, "")) + .subscribeWith(new PennyTestResultObserver()) + ); + } + + @Override + public List getKoreanBankList() { + return availableKoreanBankList; + } + + @Override + public void updateBank(KoreanBankDTO selectedBank) { + this.pennyTestRequestBody.setBankName(selectedBank.getBankName()); + this.pennyTestRequestBody.setBankCode(selectedBank.getBankCode()); + } + + @Override + public void onBankAccNoChanged(String bankAccNo) { + if(bankAccNo!=null&&bankAccNo.length()>=9) + { + pennyTestRequestBody.setAccountNo(bankAccNo); + view.showInvalidAccNoError(null); + view.enableForm1Button(true); + } + else + { + pennyTestRequestBody.setAccountNo(""); + view.showInvalidAccNoError("Invalid bank accNo"); + view.enableForm1Button(false); + } + } + + @Override + public Observable subscribeToInboundAddAccountDataEvent() { + return addAcountDataSubject; + } + + @Override + public Observable subscribeToPennyTestDataEvent() { + return pennyTestDataSubject; + } + + @Override + public void onDepositReferenceChanged(String depositReference) { + if(depositReference!=null&&depositReference.length()==4) + { + view.showInvalidDepositError(null); + view.enableForm2Button(true); + } + else + { + view.showInvalidDepositError("4 digit pin is required"); + view.enableForm2Button(false); + } + } + + public class PennyTestRequestObserver extends GenericApiObserverResponseV2 { + + @Override + protected void onSuccess(GenericResponseDataModel t) { + if (t.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) { + InboundAddAccountPennyTestFragment.InboundPennyTestViewDTO pennyTestViewDTO = new InboundAddAccountPennyTestFragment.InboundPennyTestViewDTO(pennyTestRequestBody.getBankName(), pennyTestRequestBody.getBankCode(), pennyTestRequestBody.getAccountNo(), t.getMsg()); + view.showPopUpMessage(t.getMsg(), CustomAlertDialog.AlertType.SUCCESS, alertType -> { + pennyTestDataSubject.onNext(pennyTestViewDTO); + view.showPennyTestScreen(); + }); + } else { + view.showPopUpMessage(t.getMsg(), CustomAlertDialog.AlertType.FAILED, null); + } + } + + @Override + public void onFailed(String message) { + mockErrorAsSuccess(); +// view.showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, null); + } + + @Override + protected void onConnectionNotEstablished(String message) { + view.showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, null); + } + + @Override + protected void unauthorizedAccess(String message) { + view.showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, null); + + } + + private void mockErrorAsSuccess() + { + InboundAddAccountPennyTestFragment.InboundPennyTestViewDTO pennyTestViewDTO = new InboundAddAccountPennyTestFragment.InboundPennyTestViewDTO(pennyTestRequestBody.getBankName(), pennyTestRequestBody.getBankCode(), pennyTestRequestBody.getAccountNo(),"We have successfully deposited 1KRW to your bank account please check."); + view.showPopUpMessage("We have successfully deposited 1KRW to your bank account please check.", CustomAlertDialog.AlertType.SUCCESS, alertType -> { + pennyTestDataSubject.onNext(pennyTestViewDTO); + view.showPennyTestScreen(); + }); + } + } + + public class PennyTestResultObserver extends GenericApiObserverResponseV2 { + + @Override + protected void onSuccess(GenericResponseDataModel t) { + if (t.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) { + view.showPopUpMessage(t.getMsg(), CustomAlertDialog.AlertType.SUCCESS, alertType -> { + view.exitView(); + }); + } else { + view.showPopUpMessage(t.getMsg(), CustomAlertDialog.AlertType.FAILED, null); + } + } + + @Override + public void onFailed(String message) { + view.showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, null); + } + + @Override + protected void onConnectionNotEstablished(String message) { + view.showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, null); + } + + @Override + protected void unauthorizedAccess(String message) { + view.showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, null); + + } + } + + public class KoreanBankListObserver extends GenericApiObserverResponseV2> { + + + @Override + protected Type getDataType() { + return TypeToken.getParameterized(List.class, KoreanBankDTO.class).getType(); + } + + @Override + protected void onSuccess(GenericResponseDataModel> t) { + if (t.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) { + availableKoreanBankList = t.getData(); + } else { + view.showPopUpMessage(t.getMsg(), CustomAlertDialog.AlertType.FAILED, alertType -> view.exitView()); + } + } + + @Override + public void onFailed(String message) { + view.showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, alertType -> view.exitView()); + } + + @Override + protected void onConnectionNotEstablished(String message) { + view.showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, alertType -> view.exitView()); + } + + @Override + protected void unauthorizedAccess(String message) { + view.showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, alertType -> view.exitView()); + + } + } +} diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/presenter/inboundaccountmanage/InboundAccountAddV2PresenterInterface.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/presenter/inboundaccountmanage/InboundAccountAddV2PresenterInterface.java new file mode 100644 index 00000000..e08f0922 --- /dev/null +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/presenter/inboundaccountmanage/InboundAccountAddV2PresenterInterface.java @@ -0,0 +1,50 @@ +package com.gmeremit.online.gmeremittance_native.accountmanage.presenter.inboundaccountmanage; + +import com.gmeremit.online.gmeremittance_native.accountmanage.model.autodebitaccountmanage.AutoDebitAccount; +import com.gmeremit.online.gmeremittance_native.accountmanage.model.autodebitaccountmanage.InboundAccount; +import com.gmeremit.online.gmeremittance_native.accountmanage.model.autodebitaccountmanage.KoreanBankDTO; +import com.gmeremit.online.gmeremittance_native.accountmanage.view.inboundaccountmanage.InboundAddAccountConfirmFragment; +import com.gmeremit.online.gmeremittance_native.accountmanage.view.inboundaccountmanage.InboundAddAccountPennyTestFragment; +import com.gmeremit.online.gmeremittance_native.base.BaseContractInterface; +import com.gmeremit.online.gmeremittance_native.base.BasePresenterInterface; + +import java.util.List; + +import io.reactivex.Observable; + +public interface InboundAccountAddV2PresenterInterface extends BasePresenterInterface { + + void updateAutoDebitAccountData(AutoDebitAccount autoDebitAccount); + void updateInboundAccount(InboundAccount inboundAccount); + + void getRelatedData(); + + void requestForPennyTest(); + + void submitPennyTest(String depositReference); + + List getKoreanBankList(); + + void updateBank(KoreanBankDTO selectedBank); + + void onBankAccNoChanged(String bankAccNo); + + Observable subscribeToInboundAddAccountDataEvent(); + Observable subscribeToPennyTestDataEvent(); + + void onDepositReferenceChanged(String depositReference); + + + interface InboundAccountAddV2ContractInterface extends BaseContractInterface + { + void showInvalidAccNoError(String errorMessage); + + void enableForm1Button(boolean action); + + void showPennyTestScreen(); + + void showInvalidDepositError(String errorMessage); + + void enableForm2Button(boolean action); + } +} diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/AutoDebitAccountManageV2Activity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/AutoDebitAccountManageV2Activity.java index 819d70a0..42ce719e 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/AutoDebitAccountManageV2Activity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/AutoDebitAccountManageV2Activity.java @@ -17,8 +17,8 @@ import com.gmeremit.online.gmeremittance_native.accountmanage.model.bankaccountv import com.gmeremit.online.gmeremittance_native.accountmanage.presenter.autodebitaccountmanage.AutoDebitAccountListingV2Presenter; import com.gmeremit.online.gmeremittance_native.accountmanage.presenter.autodebitaccountmanage.AutoDebitAccountListingV2PresenterInterface; import com.gmeremit.online.gmeremittance_native.accountmanage.view.AutoDebitWebBrowserV2; -import com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.accountlisting.AutoDebitAccountListingFragment; -import com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.inbound.InboundAccountListingFragment; +import com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.autodebitlisting.AutoDebitAccountListingFragment; +import com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.inboundlisting.InboundAccountListingFragment; import com.gmeremit.online.gmeremittance_native.accountmanage.view.bankaccountvalidation.BankAccountValidationV2Activity; import com.gmeremit.online.gmeremittance_native.base.BaseActivity; import com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView; diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/accountlisting/AccountAddRVViewHolder.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/autodebitlisting/AccountAddRVViewHolder.java similarity index 93% rename from app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/accountlisting/AccountAddRVViewHolder.java rename to app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/autodebitlisting/AccountAddRVViewHolder.java index 8bb73511..7d0bb573 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/accountlisting/AccountAddRVViewHolder.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/autodebitlisting/AccountAddRVViewHolder.java @@ -1,4 +1,4 @@ -package com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.accountlisting; +package com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.autodebitlisting; import android.support.annotation.NonNull; import android.support.v7.widget.RecyclerView; diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/accountlisting/AccountListingRVViewHolder.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/autodebitlisting/AccountListingRVViewHolder.java similarity index 90% rename from app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/accountlisting/AccountListingRVViewHolder.java rename to app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/autodebitlisting/AccountListingRVViewHolder.java index 955bba7b..18fae20d 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/accountlisting/AccountListingRVViewHolder.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/autodebitlisting/AccountListingRVViewHolder.java @@ -1,4 +1,4 @@ -package com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.accountlisting; +package com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.autodebitlisting; import android.support.annotation.NonNull; import android.support.v7.widget.RecyclerView; @@ -12,7 +12,7 @@ import butterknife.ButterKnife; public class AccountListingRVViewHolder extends RecyclerView.ViewHolder { - @BindView(R.id.bankName) + @BindView(R.id.bankNameTxtView) TextView bankName; @BindView(R.id.accNo) diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/accountlisting/AutoDebitAccountListingDialog.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/autodebitlisting/AutoDebitAccountListingDialog.java similarity index 99% rename from app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/accountlisting/AutoDebitAccountListingDialog.java rename to app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/autodebitlisting/AutoDebitAccountListingDialog.java index a3125987..6ab2d0e6 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/accountlisting/AutoDebitAccountListingDialog.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/autodebitlisting/AutoDebitAccountListingDialog.java @@ -1,4 +1,4 @@ -package com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.accountlisting; +package com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.autodebitlisting; import android.app.Dialog; import android.content.Context; diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/accountlisting/AutoDebitAccountListingFragment.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/autodebitlisting/AutoDebitAccountListingFragment.java similarity index 97% rename from app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/accountlisting/AutoDebitAccountListingFragment.java rename to app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/autodebitlisting/AutoDebitAccountListingFragment.java index 8029d91f..81fdf066 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/accountlisting/AutoDebitAccountListingFragment.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/autodebitlisting/AutoDebitAccountListingFragment.java @@ -1,4 +1,4 @@ -package com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.accountlisting; +package com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.autodebitlisting; import android.app.AlertDialog; import android.content.DialogInterface; @@ -17,6 +17,7 @@ import com.gmeremit.online.gmeremittance_native.accountmanage.model.autodebitacc import com.gmeremit.online.gmeremittance_native.accountmanage.model.autodebitaccountmanage.KeyValueData; import com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.AutoDebitAccountManageActionListener; import com.gmeremit.online.gmeremittance_native.accountmanage.view.bankaccountvalidation.BankAccountValidationV2Activity; +import com.gmeremit.online.gmeremittance_native.accountmanage.view.inboundaccountmanage.InboundAccountAddActivity; import com.gmeremit.online.gmeremittance_native.base.BaseFragment; import com.gmeremit.online.gmeremittance_native.customwidgets.LineDividerItemDecoration; import com.gmeremit.online.gmeremittance_native.customwidgets.common.GenericPromptDialog; @@ -161,7 +162,7 @@ public class AutoDebitAccountListingFragment extends BaseFragment implements Acc @Override public void onAccountSelected(AutoDebitAccount recipientInfoModel) { - + InboundAccountAddActivity.launchActivity(getActivity(),recipientInfoModel); } @Override diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/accountlisting/CountryListRvViewHolder.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/autodebitlisting/CountryListRvViewHolder.java similarity index 95% rename from app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/accountlisting/CountryListRvViewHolder.java rename to app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/autodebitlisting/CountryListRvViewHolder.java index 35fbe815..8d7dcf64 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/accountlisting/CountryListRvViewHolder.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/autodebitlisting/CountryListRvViewHolder.java @@ -1,4 +1,4 @@ -package com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.accountlisting; +package com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.autodebitlisting; import android.support.v7.widget.RecyclerView; import android.view.View; diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/accountlisting/CountryListingRvAdapter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/autodebitlisting/CountryListingRvAdapter.java similarity index 98% rename from app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/accountlisting/CountryListingRvAdapter.java rename to app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/autodebitlisting/CountryListingRvAdapter.java index 0561770c..15038016 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/accountlisting/CountryListingRvAdapter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/autodebitlisting/CountryListingRvAdapter.java @@ -1,4 +1,4 @@ -package com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.accountlisting; +package com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.autodebitlisting; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/inbound/InboundAccountAddBottomSheetDialogFragment.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/inbound/InboundAccountAddBottomSheetDialogFragment.java deleted file mode 100644 index 1562e866..00000000 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/inbound/InboundAccountAddBottomSheetDialogFragment.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.inbound; - -import android.os.Bundle; -import android.os.Handler; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.BottomSheetDialogFragment; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import com.gmeremit.online.gmeremittance_native.R; -import com.gmeremit.online.gmeremittance_native.customwidgets.CustomProgressDialog; - -public class InboundAccountAddBottomSheetDialogFragment extends BottomSheetDialogFragment { - - private CustomProgressDialog progressBar; - - public static InboundAccountAddBottomSheetDialogFragment newInstance() { - return new InboundAccountAddBottomSheetDialogFragment(); - } - - @Nullable - @Override - public View onCreateView(LayoutInflater inflater, - @Nullable ViewGroup container, - @Nullable Bundle savedInstanceState) { - - return inflater.inflate(R.layout.dialog_fingerprint_auth_prompt, container, - false); - - // get the views and attach the listener - - - } - - @Override - public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { - super.onViewCreated(view, savedInstanceState); - init(); - } - - private void init() - { - progressBar= new CustomProgressDialog(); - progressBar.show(getChildFragmentManager(),"PB"); - new Handler().postDelayed(()->progressBar.dismiss(),4000); - } -} - - diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/inbound/InboundAccountListingFragment.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/inboundlisting/InboundAccountListingFragment.java similarity index 89% rename from app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/inbound/InboundAccountListingFragment.java rename to app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/inboundlisting/InboundAccountListingFragment.java index 873bc1a6..dc7bdf64 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/inbound/InboundAccountListingFragment.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/autodebitaccountmanage/inboundlisting/InboundAccountListingFragment.java @@ -1,25 +1,17 @@ -package com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.inbound; +package com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.inboundlisting; -import android.app.AlertDialog; -import android.content.DialogInterface; -import android.content.Intent; import android.os.Bundle; import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.TextView; import com.gmeremit.online.gmeremittance_native.R; -import com.gmeremit.online.gmeremittance_native.accountmanage.adapter.autodebitaccountmanage.AccountListingRvAdapter; import com.gmeremit.online.gmeremittance_native.accountmanage.adapter.autodebitaccountmanage.InboundAccountListingRvAdapter; -import com.gmeremit.online.gmeremittance_native.accountmanage.model.autodebitaccountmanage.AutoDebitAccount; import com.gmeremit.online.gmeremittance_native.accountmanage.model.autodebitaccountmanage.InboundAccount; import com.gmeremit.online.gmeremittance_native.accountmanage.model.autodebitaccountmanage.KeyValueData; import com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.AutoDebitAccountManageActionListener; -import com.gmeremit.online.gmeremittance_native.accountmanage.view.bankaccountvalidation.BankAccountValidationV2Activity; import com.gmeremit.online.gmeremittance_native.base.BaseFragment; import com.gmeremit.online.gmeremittance_native.customwidgets.LineDividerItemDecoration; import com.gmeremit.online.gmeremittance_native.customwidgets.common.GenericPromptDialog; @@ -32,8 +24,6 @@ import butterknife.ButterKnife; import io.reactivex.disposables.CompositeDisposable; import io.reactivex.observers.DisposableObserver; -import static com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.AutoDebitAccountManageV2Activity.AUTO_DEBIT_BANK_VERIFICATION; - public class InboundAccountListingFragment extends BaseFragment implements View.OnClickListener, InboundAccountListingRvAdapter.InboundAccountActionListener { @BindView(R.id.accountListRv) @@ -49,7 +39,7 @@ public class InboundAccountListingFragment extends BaseFragment implements View @Override public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - return inflater.inflate(R.layout.fragment_inbound_account_add, container, false); + return inflater.inflate(R.layout.fragment_inbound_account_list, container, false); } @Override diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/inboundaccountmanage/InboundAccountAddActionListener.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/inboundaccountmanage/InboundAccountAddActionListener.java new file mode 100644 index 00000000..6c902abf --- /dev/null +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/inboundaccountmanage/InboundAccountAddActionListener.java @@ -0,0 +1,8 @@ +package com.gmeremit.online.gmeremittance_native.accountmanage.view.inboundaccountmanage; + +import com.gmeremit.online.gmeremittance_native.accountmanage.presenter.inboundaccountmanage.InboundAccountAddV2PresenterInterface; + +public interface InboundAccountAddActionListener { + + InboundAccountAddV2PresenterInterface getPresenter(); +} diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/inboundaccountmanage/InboundAccountAddActivity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/inboundaccountmanage/InboundAccountAddActivity.java new file mode 100644 index 00000000..3b46b0bd --- /dev/null +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/inboundaccountmanage/InboundAccountAddActivity.java @@ -0,0 +1,143 @@ +package com.gmeremit.online.gmeremittance_native.accountmanage.view.inboundaccountmanage; + +import android.content.Context; +import android.content.Intent; +import android.content.pm.ActivityInfo; +import android.os.Build; +import android.os.Parcelable; +import android.support.v4.app.Fragment; +import android.support.v4.view.ViewPager; +import android.os.Bundle; +import android.view.ViewGroup; +import android.view.Window; + +import com.gmeremit.online.gmeremittance_native.R; +import com.gmeremit.online.gmeremittance_native.accountmanage.adapter.autodebitaccountmanage.AccountManageViewPagerAdapter; +import com.gmeremit.online.gmeremittance_native.accountmanage.gateway.inboundaccountmanage.InboundAccountAddV2Gateway; +import com.gmeremit.online.gmeremittance_native.accountmanage.model.autodebitaccountmanage.AutoDebitAccount; +import com.gmeremit.online.gmeremittance_native.accountmanage.model.autodebitaccountmanage.InboundAccount; +import com.gmeremit.online.gmeremittance_native.accountmanage.presenter.inboundaccountmanage.InboundAccountAddV2Presenter; +import com.gmeremit.online.gmeremittance_native.accountmanage.presenter.inboundaccountmanage.InboundAccountAddV2PresenterInterface; +import com.gmeremit.online.gmeremittance_native.base.BaseActivity; + +import java.util.ArrayList; + +import butterknife.BindView; +import butterknife.ButterKnife; + +public class InboundAccountAddActivity extends BaseActivity implements InboundAccountAddV2PresenterInterface.InboundAccountAddV2ContractInterface,InboundAccountAddActionListener { + + private static final String ACCOUNT_DATA_BUNDLE_KEY = "ACCOUNT_DATA_BUNDLE_KEY"; + @BindView(R.id.fragmentContainer) + ViewPager fragmentContainer; + + + private AccountManageViewPagerAdapter accountManageViewPagerAdapter; + private ArrayList fragments; + private InboundAccountAddV2PresenterInterface presenter; + + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_inbound_account_add_activitity); + if (Build.VERSION.SDK_INT == 26) { + setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED); + } else { + setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); + } + + Window window = getWindow(); + if (window != null) { + window.getAttributes().windowAnimations = R.style.SlideInAnimation; + window.setBackgroundDrawableResource(R.drawable.ic_rounded_grey_bg_with_inset); + window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT); +// window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING); + } + + + ButterKnife.bind(this); + init(); + performDefaultAction(savedInstanceState); + } + + + public static void launchActivity(Context context, AutoDebitAccount autoDebitAccount) { + Intent intent = new Intent(context, InboundAccountAddActivity.class); + intent.putExtra(ACCOUNT_DATA_BUNDLE_KEY, autoDebitAccount); + context.startActivity(intent); + } + + public static void launchActivity(Context context, InboundAccount inboundAccount) { + Intent intent = new Intent(context, InboundAccountAddActivity.class); + intent.putExtra(ACCOUNT_DATA_BUNDLE_KEY, inboundAccount); + context.startActivity(intent); + } + + private void init() { + presenter = new InboundAccountAddV2Presenter(this,new InboundAccountAddV2Gateway()); + setupViewPager(); + + + } + + private void performDefaultAction(Bundle savedInstance) { + Parcelable data = getIntent().getParcelableExtra(ACCOUNT_DATA_BUNDLE_KEY); + if (data != null) { + if (data instanceof AutoDebitAccount) + presenter.updateAutoDebitAccountData((AutoDebitAccount) data); + else + presenter.updateInboundAccount((InboundAccount) data); + } else + presenter.getRelatedData(); + } + + + private void setupViewPager() { + accountManageViewPagerAdapter = new AccountManageViewPagerAdapter(getSupportFragmentManager()); + + fragments = new ArrayList<>(); + fragments.add(new InboundAddAccountConfirmFragment()); + fragments.add(new InboundAddAccountPennyTestFragment()); + + + accountManageViewPagerAdapter.addFragments(fragments); + + fragmentContainer.setAdapter(accountManageViewPagerAdapter); + } + + + + + @Override + public void showInvalidAccNoError(String errorMessage) { + ((InboundAddAccountConfirmFragment) fragments.get(0)).showInvalidAccNo(errorMessage); + } + + @Override + public void enableForm1Button(boolean action) { + ((InboundAddAccountConfirmFragment) fragments.get(0)).enableButton(action); + + } + + @Override + public void showPennyTestScreen() { + fragmentContainer.setCurrentItem(1,true); + } + + @Override + public void showInvalidDepositError(String errorMessage) { + ((InboundAddAccountPennyTestFragment) fragments.get(1)).showInvalidDepositError(errorMessage); + + } + + @Override + public void enableForm2Button(boolean action) { + ((InboundAddAccountPennyTestFragment) fragments.get(1)).enableButton(action); + } + + @Override + public InboundAccountAddV2PresenterInterface getPresenter() { + return this.presenter; + } +} diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/inboundaccountmanage/InboundAddAccountConfirmFragment.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/inboundaccountmanage/InboundAddAccountConfirmFragment.java new file mode 100644 index 00000000..68bf7b23 --- /dev/null +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/inboundaccountmanage/InboundAddAccountConfirmFragment.java @@ -0,0 +1,189 @@ +package com.gmeremit.online.gmeremittance_native.accountmanage.view.inboundaccountmanage; + +import android.os.Bundle; +import android.support.annotation.Nullable; +import android.text.Editable; +import android.text.InputFilter; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.Button; +import android.widget.ImageView; + +import com.gmeremit.online.gmeremittance_native.R; +import com.gmeremit.online.gmeremittance_native.accountmanage.model.autodebitaccountmanage.KoreanBankDTO; +import com.gmeremit.online.gmeremittance_native.base.BaseFragment; +import com.gmeremit.online.gmeremittance_native.customwidgets.GMEFormInputField; +import com.gmeremit.online.gmeremittance_native.customwidgets.TextWatcherAdapter; +import com.gmeremit.online.gmeremittance_native.customwidgets.banklistingdialog.BankIconMapper; +import com.gmeremit.online.gmeremittance_native.customwidgets.common.GenericTextListingDialog; + +import butterknife.BindView; +import butterknife.ButterKnife; +import butterknife.OnClick; + +import io.reactivex.observers.DisposableObserver; + +public class InboundAddAccountConfirmFragment extends BaseFragment { + + @BindView(R.id.bankAccountNumberFormInputField) + GMEFormInputField bankAccountNumberFormInputField; + + + @BindView(R.id.bankSelectionFormInputField) + GMEFormInputField bankSelectionFormInputField; + + @BindView(R.id.bank_ico_imageview) + ImageView bankIconImageView; + + @BindView(R.id.startPennyTestButton) + Button startPennyTestButton; + private BankSelectClickListener bankSelectionClickListener; + private GenericTextListingDialog bankListingDialog; + private BankAccountNumberTextWatcher bankAccountNoTextWatcher; + + @Override + public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { + return inflater.inflate(R.layout.fragment_inbound_account_add, container, false); + } + + @Override + public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + ButterKnife.bind(this, view); + init(); + performDefaultAction(savedInstanceState); + } + + private void init() { + bankSelectionClickListener = new BankSelectClickListener(); + bankAccountNoTextWatcher=new BankAccountNumberTextWatcher(); + bankSelectionFormInputField.setInputFilters (new InputFilter[]{}); + ((InboundAccountAddActionListener) getActivity()).getPresenter().subscribeToInboundAddAccountDataEvent().subscribe(new InboundAddAccoountDataObserver()); + + } + + @Override + public void onStart() { + super.onStart(); + registerTextWatchers(true); + bankSelectionFormInputField.getEditTextView().setOnClickListener(bankSelectionClickListener); + } + + + @Override + public void onStop() { + super.onStop(); + registerTextWatchers(false); + bankSelectionFormInputField.getEditTextView().setOnClickListener(null); + } + + private void registerTextWatchers(boolean action) { + if (action) { + bankAccountNumberFormInputField.getEditTextView().addTextChangedListener(bankAccountNoTextWatcher); + } else { + bankAccountNumberFormInputField.getEditTextView().removeTextChangedListener(bankAccountNoTextWatcher); + } + } + + @OnClick(R.id.startPennyTestButton) + public void startPennyTest() { + if (startPennyTestButton.isEnabled()) { + ((InboundAccountAddActionListener) getActivity()).getPresenter().requestForPennyTest(); + } + } + + + private void performDefaultAction(Bundle savedInstance) { + + } + + private void updateData(InboundAddAccountViewDTO inboundAddAccountViewDTO) { + + registerTextWatchers(false); + bankAccountNumberFormInputField.getEditTextView().setText(inboundAddAccountViewDTO.accountNo); + bankSelectionFormInputField.getEditTextView().setText(inboundAddAccountViewDTO.bankName); + bankIconImageView.setImageResource(BankIconMapper.getBankIconFromBankCode(inboundAddAccountViewDTO.bankCode)); + bankSelectionFormInputField.setEnabled(inboundAddAccountViewDTO.enableFields); + bankAccountNumberFormInputField.setEnabled(inboundAddAccountViewDTO.enableFields); + + registerTextWatchers(true); + + startPennyTestButton.setEnabled(true); + + + } + + public void showInvalidAccNo(String errorMessage) { + bankAccountNumberFormInputField.setEnabled(errorMessage!=null); + bankAccountNumberFormInputField.setError(errorMessage); + } + + public void enableButton(boolean action) { + startPennyTestButton.setEnabled(action); + } + + public class BankSelectClickListener implements View.OnClickListener { + + @Override + public void onClick(View v) { + + if (bankListingDialog == null) + bankListingDialog = new GenericTextListingDialog<>(); + bankListingDialog.setData(((InboundAccountAddActionListener) getActivity()).getPresenter().getKoreanBankList()); + bankListingDialog.setListener(selectedBank -> + { + ((InboundAccountAddActionListener) getActivity()).getPresenter().updateBank(selectedBank); + bankSelectionFormInputField.getEditTextView().setText(selectedBank.toString()); + bankListingDialog.dismiss(); + }); + bankListingDialog.setHintAndTitle(getString(R.string.search_bank_text), getString(R.string.bank_placeholder_text), getString(R.string.no_bank_found_text)); + bankListingDialog.disableSearch(false); + if (!bankListingDialog.isAdded()) + bankListingDialog.show(getFragmentManager(), "BankSelectionDialog"); + } + } + + public class BankAccountNumberTextWatcher extends TextWatcherAdapter + { + @Override + public void afterTextChanged(Editable s) { + ((InboundAccountAddActionListener) getActivity()).getPresenter().onBankAccNoChanged(s.toString()); + } + } + + public static class InboundAddAccountViewDTO { + String bankName; + String bankCode; + String accountNo; + boolean enableFields; + + public InboundAddAccountViewDTO(String bankName, String bankCode, String accountNo, boolean enableFields) { + this.bankName = bankName; + this.bankCode = bankCode; + this.accountNo = accountNo; + this.enableFields = enableFields; + } + } + + + public class InboundAddAccoountDataObserver extends DisposableObserver + { + + + @Override + public void onNext(InboundAddAccountViewDTO inboundAddAccountViewDTO) { + updateData(inboundAddAccountViewDTO); + } + + @Override + public void onError(Throwable e) { + + } + + @Override + public void onComplete() { + + } + } +} diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/inboundaccountmanage/InboundAddAccountPennyTestFragment.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/inboundaccountmanage/InboundAddAccountPennyTestFragment.java new file mode 100644 index 00000000..92378253 --- /dev/null +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/inboundaccountmanage/InboundAddAccountPennyTestFragment.java @@ -0,0 +1,141 @@ +package com.gmeremit.online.gmeremittance_native.accountmanage.view.inboundaccountmanage; + +import android.os.Bundle; +import android.support.annotation.Nullable; +import android.support.design.widget.TextInputLayout; +import android.text.Editable; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.Button; +import android.widget.EditText; + +import com.gmeremit.online.gmeremittance_native.R; +import com.gmeremit.online.gmeremittance_native.base.BaseFragment; +import com.gmeremit.online.gmeremittance_native.customwidgets.GMEFormInputField; +import com.gmeremit.online.gmeremittance_native.customwidgets.TextWatcherAdapter; + +import butterknife.BindView; +import butterknife.ButterKnife; +import butterknife.OnClick; +import io.reactivex.observers.DisposableObserver; + +public class InboundAddAccountPennyTestFragment extends BaseFragment { + + + @BindView(R.id.depositReferenceInputWrapper) + TextInputLayout depositReferenceInputWrapper; + + @BindView(R.id.ed_creditNumber) + EditText ed_creditNumber; + + @BindView(R.id.pennyTestCompleteButton) + Button pennyTestCompleteButton; + + private DepositReferenceTextWatcher depositReferenceTextWatcher; + + + @Override + public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { + return inflater.inflate(R.layout.fragment_inbound_account_penny_test, container, false); + } + + @Override + public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + ButterKnife.bind(this, view); + init(); + performDefaultAction(savedInstanceState); + } + + private void init() { + depositReferenceTextWatcher = new DepositReferenceTextWatcher(); + ((InboundAccountAddActionListener) getActivity()).getPresenter().subscribeToPennyTestDataEvent().subscribe(new InboundPennyTestDataObserver()); + + } + + + private void performDefaultAction(Bundle savedInstance) { + + } + + public void updateData(InboundPennyTestViewDTO inboundPennyTestViewDTO) { + + } + + @Override + public void onStart() { + super.onStart(); + ed_creditNumber.addTextChangedListener(depositReferenceTextWatcher); + } + + @Override + public void onStop() { + super.onStop(); + ed_creditNumber.removeTextChangedListener(depositReferenceTextWatcher); + } + + + public void showInvalidDepositError(String errorMessage) { + depositReferenceInputWrapper.setEnabled(errorMessage!=null); + depositReferenceInputWrapper.setError(errorMessage); + } + + public void enableButton(boolean action) { + pennyTestCompleteButton.setEnabled(action); + } + + @OnClick(R.id.pennyTestCompleteButton) + public void onPennyTestCompleteButtonPressed() + { + if(pennyTestCompleteButton.isEnabled()) + { + ((InboundAccountAddActionListener) getActivity()).getPresenter().submitPennyTest(ed_creditNumber.getText().toString()); + + } + } + + + public class DepositReferenceTextWatcher extends TextWatcherAdapter + { + @Override + public void afterTextChanged(Editable s) { + ((InboundAccountAddActionListener) getActivity()).getPresenter().onDepositReferenceChanged(s.toString()); + } + } + + public static class InboundPennyTestViewDTO + { + String bankName; + String bankCode; + String accountNo; + String pennyTestMessage; + + public InboundPennyTestViewDTO(String bankName, String bankCode, String accountNo,String pennyTestMessage) { + this.bankName = bankName; + this.bankCode = bankCode; + this.accountNo = accountNo; + this.pennyTestMessage=pennyTestMessage; + } + } + + public class InboundPennyTestDataObserver extends DisposableObserver + { + + + @Override + public void onNext(InboundPennyTestViewDTO inboundAddAccountViewDTO) { + updateData(inboundAddAccountViewDTO); + } + + @Override + public void onError(Throwable e) { + + } + + @Override + public void onComplete() { + + } + } +} diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/customer_support/view/CustomerSupportFragment.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/customer_support/view/CustomerSupportFragment.java index fbc7f7dd..0dcbed44 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/customer_support/view/CustomerSupportFragment.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/customer_support/view/CustomerSupportFragment.java @@ -276,7 +276,7 @@ public class CustomerSupportFragment extends DialogFragment implements CustomerS // mail.setType("message/rfc822"); // mail.putExtra(Intent.EXTRA_EMAIL, new String[]{"support@gmeremit.com"}); // try { -// startActivity(Intent.createChooser(mail, "Send mail....")); +// launchActivity(Intent.createChooser(mail, "Send mail....")); // } catch (ActivityNotFoundException e) { // Toast.makeText(getActivity().getApplicationContext(), "There are no email clients installed", Toast.LENGTH_SHORT).show(); // } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/LineDividerItemDecoration.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/LineDividerItemDecoration.java index 51c95b0c..00e8610d 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/LineDividerItemDecoration.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/LineDividerItemDecoration.java @@ -5,6 +5,7 @@ import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.Rect; import android.graphics.drawable.Drawable; +import android.support.annotation.NonNull; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.view.View; @@ -79,7 +80,7 @@ public class LineDividerItemDecoration extends RecyclerView.ItemDecoration { } @Override - public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) { + public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { if (mOrientation == VERTICAL_LIST) { outRect.set(0, 0, 0, mDivider.getIntrinsicHeight()); } else { diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/banklistingdialog/BankIconMapper.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/banklistingdialog/BankIconMapper.java index d8bcb0e5..91e35d77 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/banklistingdialog/BankIconMapper.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/banklistingdialog/BankIconMapper.java @@ -7,7 +7,7 @@ public class BankIconMapper { public static int getBankIconFromBankCode(String bankCode) { if (bankCode == null || bankCode.length() < 1) - return 0; + return R.drawable.ic_bank; switch (bankCode.toUpperCase()) { case "002": @@ -44,7 +44,7 @@ public class BankIconMapper { return R.drawable.ico_bank_shinhan; default: - return 0; + return R.drawable.ic_bank; } } } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/common/GenericTextListingDialog.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/common/GenericTextListingDialog.java index 32e12b13..ec7bbaa8 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/common/GenericTextListingDialog.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/common/GenericTextListingDialog.java @@ -64,13 +64,13 @@ public class GenericTextListingDialog extends android.support.v4.app.DialogFr cancelButton.setOnClickListener(this); searchEditTextView.addTextChangedListener(this); genericTextListingRvAdapter = new GenericTextListingRvAdapter<>(this.listener); - genericTextListingRvAdapter.setData(this.data); textListRv.setAdapter(genericTextListingRvAdapter); - LineDividerItemDecoration lineDividerItemDecoration = new LineDividerItemDecoration(getActivity(), LineDividerItemDecoration.VERTICAL_LIST); - textListRv.addItemDecoration(lineDividerItemDecoration); +// LineDividerItemDecoration lineDividerItemDecoration = new LineDividerItemDecoration(textListRv.getContext(), LineDividerItemDecoration.VERTICAL_LIST); +// textListRv.addItemDecoration(lineDividerItemDecoration); titleView.setText(titleText != null && titleText.length() > 0 ? titleText : "Select Data"); searchEditTextView.setHint(hintText != null && hintText.length() > 0 ? hintText : "Search Data"); noDataFoundView.setHint(noDataFoundText != null && noDataFoundText.length() > 0 ? noDataFoundText : "No Data Found"); + genericTextListingRvAdapter.setData(this.data); if (shouldDisableSearch) searchViewContainer.setVisibility(View.GONE); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeActivityV2.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeActivityV2.java index cea56fbb..a0ed56ce 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeActivityV2.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeActivityV2.java @@ -25,7 +25,7 @@ import android.widget.ImageView; import android.widget.TextView; import com.gmeremit.online.gmeremittance_native.R; -import com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.inbound.InboundAccountAddBottomSheetDialogFragment; +import com.gmeremit.online.gmeremittance_native.accountmanage.view.inboundaccountmanage.InboundAccountAddActivity; import com.gmeremit.online.gmeremittance_native.agentsV2.view.AgentListV2Activity; import com.gmeremit.online.gmeremittance_native.appupdate.AppUpdateActivity; import com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.AutoDebitAccountManageV2Activity; @@ -50,7 +50,6 @@ import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.view.Outbou import com.gmeremit.online.gmeremittance_native.user_profile.view.ProfileActivity; import com.gmeremit.online.gmeremittance_native.utils.ChatUtils; import com.gmeremit.online.gmeremittance_native.utils.Utils; -import com.gmeremit.online.gmeremittance_native.walletstatementV2.view.WalletStatementV2Activity; import com.gmeremit.online.gmeremittance_native.withdrawV2.view.WithdrawV2Activity; import com.text.drawable.TextDrawable; import com.zoyi.channel.plugin.android.ChannelIO; @@ -313,7 +312,7 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra return; String unverifiedMessage = presenter.checkIfUserVerified(); if (unverifiedMessage == null) -// startActivity(new Intent(getApplicationContext(), RecipientListingV2Activity.class)); +// launchActivity(new Intent(getApplicationContext(), RecipientListingV2Activity.class)); startActivity(new Intent(getApplicationContext(), RecipientListingV3Activity.class)); else showPopUpMessage(unverifiedMessage, CustomAlertDialog.AlertType.ALERT, null); @@ -328,7 +327,7 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra public void showTodaysRateView() { if (isNotificaitonViewActive()) return; -// startActivity(new Intent(this, ExchangeMethodV2Activity.class)); +// launchActivity(new Intent(this, ExchangeMethodV2Activity.class)); startActivity(new Intent(this, ExchangeRateActivity.class)); } @@ -339,11 +338,14 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra // return; // String unverifiedMessage = presenter.checkIfUserVerified(); // if (unverifiedMessage == null) -// startActivity(new Intent(getApplicationContext(), WalletStatementV2Activity.class)); +// launchActivity(new Intent(getApplicationContext(), WalletStatementV2Activity.class)); // else // showPopUpMessage(unverifiedMessage, CustomAlertDialog.AlertType.ALERT, null); - InboundAccountAddBottomSheetDialogFragment.newInstance().show( getSupportFragmentManager(),"Inbound add"); +// InboundAccountAddBottomSheetDialogFragment.newInstance().show( getSupportFragmentManager(),"Inbound add"); + + Intent startPennyTestIntent = new Intent(this, InboundAccountAddActivity.class); + startActivity(startPennyTestIntent); } @Override @@ -353,7 +355,7 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra String unverifiedMessage = presenter.checkIfUserVerified(); if (unverifiedMessage == null) startActivity(new Intent(getApplicationContext(), OutboundTransactionHistoryActivityV2.class)); -// startActivity(new Intent(getApplicationContext(), LocalTopUpActivity.class)); +// launchActivity(new Intent(getApplicationContext(), LocalTopUpActivity.class)); else showPopUpMessage(unverifiedMessage, CustomAlertDialog.AlertType.ALERT, null); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/pennytest/PennyTestOperationFragment.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/pennytest/PennyTestOperationFragment.java index e9db3ea0..edd6ec1f 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/pennytest/PennyTestOperationFragment.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/pennytest/PennyTestOperationFragment.java @@ -11,7 +11,6 @@ import android.widget.TextView; import com.gmeremit.online.gmeremittance_native.R; import com.gmeremit.online.gmeremittance_native.base.BaseFragment; -import com.gmeremit.online.gmeremittance_native.kycV2.presenter.pennytest.PennyTestPresenterInterface; import com.gmeremit.online.gmeremittance_native.utils.other.Utility; import butterknife.BindView; @@ -28,7 +27,7 @@ public class PennyTestOperationFragment extends BaseFragment implements View.OnC @BindView(R.id.resend_request) TextView resendRequest; - @BindView(R.id.accountWrapper) + @BindView(R.id.depositReferenceInputWrapper) TextInputLayout accountWrapper; @BindView(R.id.ed_creditNumber) diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/recipientlisting/RecipientListingV2Activity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/recipientlisting/RecipientListingV2Activity.java index 4677a978..daff5b1a 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/recipientlisting/RecipientListingV2Activity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/recipientlisting/RecipientListingV2Activity.java @@ -11,7 +11,7 @@ import android.widget.TextView; import com.gmeremit.online.gmeremittance_native.R; import com.gmeremit.online.gmeremittance_native.accountmanage.adapter.autodebitaccountmanage.AccountListingRvAdapter; import com.gmeremit.online.gmeremittance_native.accountmanage.model.autodebitaccountmanage.AutoDebitAccount; -import com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.accountlisting.AutoDebitAccountListingDialog; +import com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.autodebitlisting.AutoDebitAccountListingDialog; import com.gmeremit.online.gmeremittance_native.base.BaseActivity; import com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView; import com.gmeremit.online.gmeremittance_native.recipientV2.adapter.RecipientListingRvAdapter; @@ -183,7 +183,7 @@ public class RecipientListingV2Activity extends BaseActivity implements Recipien // SendMoneyRequiredData sendMoneyRequiredData=recipientListingV2PresenterInterface.getSendMoneyRequiredData(selectedAccount); // Intent intent = new Intent(RecipientListingV2Activity.this, SendMoneyV2Activity.class); // intent.putExtra(RecipientAddV2Activity.RECIPIENT_INFO_BUNDLE_KEY, sendMoneyRequiredData); -// startActivity(intent); +// launchActivity(intent); } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/view/recipientlistingV3/RecipientListingV3Activity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/view/recipientlistingV3/RecipientListingV3Activity.java index 68a2725e..3ed08394 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/view/recipientlistingV3/RecipientListingV3Activity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/view/recipientlistingV3/RecipientListingV3Activity.java @@ -15,7 +15,7 @@ import android.widget.FrameLayout; import com.gmeremit.online.gmeremittance_native.R; import com.gmeremit.online.gmeremittance_native.accountmanage.adapter.autodebitaccountmanage.AccountListingRvAdapter; import com.gmeremit.online.gmeremittance_native.accountmanage.model.autodebitaccountmanage.AutoDebitAccount; -import com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.accountlisting.AutoDebitAccountListingDialog; +import com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.autodebitlisting.AutoDebitAccountListingDialog; import com.gmeremit.online.gmeremittance_native.base.BaseActivity; import com.gmeremit.online.gmeremittance_native.customwidgets.common.GenericPromptDialog; import com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView; diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/view/TransactionListingV2Activity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/view/TransactionListingV2Activity.java index b8716518..84477683 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/view/TransactionListingV2Activity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/view/TransactionListingV2Activity.java @@ -13,7 +13,7 @@ import android.widget.TextView; import com.gmeremit.online.gmeremittance_native.R; import com.gmeremit.online.gmeremittance_native.accountmanage.adapter.autodebitaccountmanage.AccountListingRvAdapter; import com.gmeremit.online.gmeremittance_native.accountmanage.model.autodebitaccountmanage.AutoDebitAccount; -import com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.accountlisting.AutoDebitAccountListingDialog; +import com.gmeremit.online.gmeremittance_native.accountmanage.view.autodebitaccountmanage.autodebitlisting.AutoDebitAccountListingDialog; import com.gmeremit.online.gmeremittance_native.base.BaseActivity; import com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView; import com.gmeremit.online.gmeremittance_native.resendV2.adapter.TransactionListingRVAdapter; diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/view/amountdetail/ResendMoneyAmountDetailFragment.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/view/amountdetail/ResendMoneyAmountDetailFragment.java index 876ada9e..c13e615e 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/view/amountdetail/ResendMoneyAmountDetailFragment.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/view/amountdetail/ResendMoneyAmountDetailFragment.java @@ -37,7 +37,7 @@ import io.reactivex.disposables.CompositeDisposable; public class ResendMoneyAmountDetailFragment extends BaseFragment implements View.OnClickListener, TextView.OnEditorActionListener { - @BindView(R.id.amountDetailContinueButton) + @BindView(R.id.pennyTestCompleteButton) Button continueBtn; @BindView(R.id.sendAmountEdTxt) @@ -191,7 +191,7 @@ public class ResendMoneyAmountDetailFragment extends BaseFragment implements Vie @Override public void onClick(View v) { switch (v.getId()) { - case R.id.amountDetailContinueButton: + case R.id.pennyTestCompleteButton: if (shouldCalculateExRate) { diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/view/verification/ResendVerificationDetailFragment.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/view/verification/ResendVerificationDetailFragment.java index 78220910..fa984114 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/view/verification/ResendVerificationDetailFragment.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/view/verification/ResendVerificationDetailFragment.java @@ -180,7 +180,7 @@ public class ResendVerificationDetailFragment extends BaseFragment implements V // String url = "https://online.gmeremit.com/Terms"; // Intent i = new Intent(Intent.ACTION_VIEW); // i.setData(Uri.parse(url)); -// startActivity(i); +// launchActivity(i); WebRequestModel requestModel=((ReSendMoneyActionListener)getActivity()).getPresenter().getWebRequestDataForTermsAndCondition(); Intent intent= new Intent(getActivity(), TermsAndConditionV2BrowserActivity.class); intent.putExtra(WEB_BROWSWER_URL_BUNDLE_KEY,requestModel); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/reward_points/view/RewardPointsShippingActivity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/reward_points/view/RewardPointsShippingActivity.java index 9dfc4cfc..368afe7d 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/reward_points/view/RewardPointsShippingActivity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/reward_points/view/RewardPointsShippingActivity.java @@ -97,7 +97,7 @@ public class RewardPointsShippingActivity extends AppCompatActivity implements R presenter.onSubmitClicked(id); break; case R.id.view_locations: -// startActivity(new Intent(this, GmeBranchesActivity.class)); +// launchActivity(new Intent(this, GmeBranchesActivity.class)); break; } } 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 d16fda32..5ebf4082 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 @@ -42,7 +42,7 @@ import io.reactivex.disposables.CompositeDisposable; public class AmountDetailSendMoneyFragment extends BaseFragment implements View.OnClickListener, AmountDetailExRateCountryListingDialog.ExRateCurrencySelectionListener, TextView.OnEditorActionListener { - @BindView(R.id.amountDetailContinueButton) + @BindView(R.id.pennyTestCompleteButton) Button continueBtn; @BindView(R.id.sendAmountEdTxt) @@ -232,7 +232,7 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements View. @Override public void onClick(View v) { switch (v.getId()) { - case R.id.amountDetailContinueButton: + case R.id.pennyTestCompleteButton: if (shouldCalculateExRate) { diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/payoutmode/PayoutModeSendMoneyFragment.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/payoutmode/PayoutModeSendMoneyFragment.java index 5e86040f..743dd367 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/payoutmode/PayoutModeSendMoneyFragment.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/payoutmode/PayoutModeSendMoneyFragment.java @@ -57,7 +57,7 @@ public class PayoutModeSendMoneyFragment extends BaseFragment implements SendMon @BindView(R.id.bankListContainer) ViewGroup bankListContainer; - @BindView(R.id.accountWrapper) + @BindView(R.id.depositReferenceInputWrapper) View accountViewContainer; @BindView(R.id.bankDetailContainer) diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/verification/VerificationSendMoneyFragment.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/verification/VerificationSendMoneyFragment.java index d3fee19e..aed73f6a 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/verification/VerificationSendMoneyFragment.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/verification/VerificationSendMoneyFragment.java @@ -185,7 +185,7 @@ public class VerificationSendMoneyFragment extends BaseFragment implements View // String url = "https://online.gmeremit.com/Terms"; // Intent i = new Intent(Intent.ACTION_VIEW); // i.setData(Uri.parse(url)); -// startActivity(i); +// launchActivity(i); WebRequestModel requestModel=((SendMoneyActionListener)getActivity()).getPresenter().getWebRequestDataForTermsAndCondition(); Intent intent= new Intent(getActivity(),TermsAndConditionV2BrowserActivity.class); intent.putExtra(WEB_BROWSWER_URL_BUNDLE_KEY,requestModel); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/socials/view/SocialActivity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/socials/view/SocialActivity.java index de63b3a7..07908942 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/socials/view/SocialActivity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/socials/view/SocialActivity.java @@ -52,6 +52,6 @@ public class SocialActivity extends AppCompatActivity { public void onCommentClick(int position) { Intent intent = new Intent(this,CommentsActivity.class); intent.putExtra(Constants.FEED,feedsList.get(position)); - startActivity(intent); + launchActivity(intent); }*/ } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java index 759307ef..9a82ed4b 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java @@ -233,7 +233,7 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener, break; case R.id.btn_lgn: startActivity(new Intent(this, LoginV2Activity.class)); -// startActivity(new Intent(this, PayoutCountrySelectionActivity.class)); +// launchActivity(new Intent(this, PayoutCountrySelectionActivity.class)); break; case R.id.iv_back: diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/API_URL.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/API_URL.java index 698ea407..544a802b 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/API_URL.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/API_URL.java @@ -70,5 +70,7 @@ public class API_URL { public static final String LOCAL_TOPUP_HISTORY = BuildConfig.API_VERSION + "/powerCall/GetChargeHistory"; public static final String FETCH_INBOUND_ACCOUNT_DATA = BuildConfig.API_VERSION + "/inbound/mobile/bankaccounts/{userId}"; public static final String GET_KOREAN_BANK_LIST = BuildConfig.API_VERSION + "/inbound/mobile/koreanBanks"; + public static final String INBOUND_PENNY_TEST_START = BuildConfig.API_VERSION + "/inbound/mobile/pennytest/start/{userId}"; + public static final String INBOUND_PENNY_TEST_SUBMIT = BuildConfig.API_VERSION + "/inbound/mobile/pennytest/getcertified"; } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/ApiEndpoints.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/ApiEndpoints.java index b7c113c5..5f94ea77 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/ApiEndpoints.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/ApiEndpoints.java @@ -1,6 +1,7 @@ package com.gmeremit.online.gmeremittance_native.utils.https; import com.gmeremit.online.gmeremittance_native.accountmanage.model.autodebitaccountmanage.AutoDebitAddSeriveAuthenticationServiceModel; +import com.gmeremit.online.gmeremittance_native.accountmanage.model.inboundaccountmanage.InboundAccountAddRequestBody; import com.gmeremit.online.gmeremittance_native.changepasswordV2.model.ChangePasswordActivityV2APIResponse; import com.gmeremit.online.gmeremittance_native.domesticremit.send.model.DomesticRemitTxnRequestBody; import com.gmeremit.online.gmeremittance_native.exrate.model.datav2.ExchangeCalculationApiResponse; @@ -320,5 +321,15 @@ public interface ApiEndpoints { @Headers("Content-Type: application/json") Observable getKoreanBankList(@Header("Authorization") String token); + @POST(API_URL.INBOUND_PENNY_TEST_START) + @Headers("Content-Type: application/json") + Observable startInboundPennyTestStart(@Header("Authorization") String token, @Path("userId") String userId, @Body()InboundAccountAddRequestBody requestBody); + + + + @POST(API_URL.INBOUND_PENNY_TEST_SUBMIT) + @Headers("Content-Type: application/json") + Observable performInboundPennyTestSubmit(@Header("Authorization") String token, @Body()JsonObject requestBody); + } diff --git a/app/src/main/res/drawable/avd_fail_transition.xml b/app/src/main/res/drawable/avd_fail_transition.xml index 93edc651..560ff2f6 100644 --- a/app/src/main/res/drawable/avd_fail_transition.xml +++ b/app/src/main/res/drawable/avd_fail_transition.xml @@ -93,8 +93,8 @@ android:valueTo="0" android:valueType="floatType"/> !mZRQX6U17sl|B!L7_&{kKi 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 i6<~Spfjp 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 LCfY@sM^64fB}K%q literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/ic_bank_link_image.png b/app/src/main/res/drawable/ic_bank_link_image.png new file mode 100755 index 0000000000000000000000000000000000000000..d4f14409269df0c12ad7c369e4fb18f93855d069 GIT binary patch literal 20499 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/activity_inbound_account_add_activitity.xml b/app/src/main/res/layout/activity_inbound_account_add_activitity.xml new file mode 100644 index 00000000..a0a4ca83 --- /dev/null +++ b/app/src/main/res/layout/activity_inbound_account_add_activitity.xml @@ -0,0 +1,26 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/auto_debit_account_list_cornerless_item.xml b/app/src/main/res/layout/auto_debit_account_list_cornerless_item.xml index 46d4817a..24c325a7 100644 --- a/app/src/main/res/layout/auto_debit_account_list_cornerless_item.xml +++ b/app/src/main/res/layout/auto_debit_account_list_cornerless_item.xml @@ -23,7 +23,7 @@ app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toBottomOf="@+id/bankNameTxtView" /> \ No newline at end of file diff --git a/app/src/main/res/layout/auto_debit_account_list_item.xml b/app/src/main/res/layout/auto_debit_account_list_item.xml index 171ab2ae..95b872aa 100644 --- a/app/src/main/res/layout/auto_debit_account_list_item.xml +++ b/app/src/main/res/layout/auto_debit_account_list_item.xml @@ -25,7 +25,7 @@ app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toBottomOf="@+id/bankNameTxtView" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_amount_detail_resend_money_v2.xml b/app/src/main/res/layout/fragment_amount_detail_resend_money_v2.xml index 158bb2c8..b14b4091 100644 --- a/app/src/main/res/layout/fragment_amount_detail_resend_money_v2.xml +++ b/app/src/main/res/layout/fragment_amount_detail_resend_money_v2.xml @@ -418,7 +418,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:layout_marginTop="8dp" + android:layout_marginEnd="16dp" + android:layout_marginBottom="8dp" + android:gravity="center" + android:paddingStart="15dp" + android:paddingTop="10dp" + android:paddingEnd="15dp" + android:paddingBottom="15dp" + android:text="Link your Korean Bank Account to recieve money from abroad." + android:textSize="17sp" + app:layout_constraintBottom_toTopOf="@+id/bankAccountSelectionContainer" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/imageView" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_inbound_account_list.xml b/app/src/main/res/layout/fragment_inbound_account_list.xml new file mode 100644 index 00000000..cd58814e --- /dev/null +++ b/app/src/main/res/layout/fragment_inbound_account_list.xml @@ -0,0 +1,12 @@ + + + diff --git a/app/src/main/res/layout/fragment_inbound_account_penny_test.xml b/app/src/main/res/layout/fragment_inbound_account_penny_test.xml new file mode 100644 index 00000000..84e2f671 --- /dev/null +++ b/app/src/main/res/layout/fragment_inbound_account_penny_test.xml @@ -0,0 +1,161 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_payout_mode_send_money_v2.xml b/app/src/main/res/layout/fragment_payout_mode_send_money_v2.xml index 7d26d786..58b83187 100644 --- a/app/src/main/res/layout/fragment_payout_mode_send_money_v2.xml +++ b/app/src/main/res/layout/fragment_payout_mode_send_money_v2.xml @@ -136,7 +136,7 @@ android:visibility="gone" android:layout_marginTop="@dimen/_3sdp" android:layout_marginBottom="@dimen/_3sdp" - android:id="@+id/accountWrapper" + android:id="@+id/depositReferenceInputWrapper" android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/account_number_text" diff --git a/app/src/main/res/layout/fragment_penny_test_operation.xml b/app/src/main/res/layout/fragment_penny_test_operation.xml index e33fdcb4..66aee62a 100644 --- a/app/src/main/res/layout/fragment_penny_test_operation.xml +++ b/app/src/main/res/layout/fragment_penny_test_operation.xml @@ -16,7 +16,7 @@ android:layout_marginTop="16dp" android:layout_marginEnd="16dp" android:textSize="17sp" - app:layout_constraintBottom_toTopOf="@+id/accountWrapper" + app:layout_constraintBottom_toTopOf="@+id/depositReferenceInputWrapper" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -24,7 +24,7 @@ app:layout_constraintVertical_chainStyle="packed" /> + app:layout_constraintTop_toTopOf="@+id/depositReferenceInputWrapper" /> + app:layout_constraintTop_toBottomOf="@+id/depositReferenceInputWrapper" /> diff --git a/app/src/main/res/layout/inbound_account_list_item.xml b/app/src/main/res/layout/inbound_account_list_item.xml index 171ab2ae..95b872aa 100644 --- a/app/src/main/res/layout/inbound_account_list_item.xml +++ b/app/src/main/res/layout/inbound_account_list_item.xml @@ -25,7 +25,7 @@ app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toBottomOf="@+id/bankNameTxtView" /> \ No newline at end of file