From 44fa34f582581a9d6f2d43d1ac75e48e889bf48e Mon Sep 17 00:00:00 2001 From: Preyea Regmi Date: Fri, 26 Jun 2020 13:16:21 +0545 Subject: [PATCH] Rebranding started --- .idea/caches/build_file_checksums.ser | Bin 659 -> 659 bytes .../DomesticRemitReceiptPresenterImpl.java | 6 +- .../presenter/DomesticRemitPresenterImpl.java | 4 +- .../homeV2/presenter/HomeV2Presenter.java | 3 +- .../features/homeV2/view/HomeFragmentV2.java | 57 +----------------- .../InboundRemitReceiptPresenterImpl.java | 6 +- .../history/LocalTopUpHistoryAdapter.java | 2 +- .../presenter/topup/LocalTopUpPresenter.java | 10 +-- .../services/regular/DenoListRvAdapter.java | 2 +- ...endMoneyV2TransactionCompleteActivity.java | 3 +- ...nalInboundTransactionHistoryRVAdapter.java | 2 +- .../user_profile/view/ProfileActivity.java | 9 +-- .../remit/android/utils/Constants.java | 9 ++- .../https/GenericApiObserverResponse.java | 16 ++--- .../https/GenericApiObserverResponseV2.java | 14 +++-- app/src/main/res/layout/activity_profile.xml | 18 +----- app/src/main/res/layout/fragment_home_v3.xml | 28 +++++---- app/src/main/res/values/strings.xml | 48 +++++++-------- 18 files changed, 87 insertions(+), 150 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 4dc8b2cdf90b487c2e5360cf4a208072ba310d48..1daa0f2b162967c273f8708d2a2257c9572aeed9 100644 GIT binary patch delta 15 XcmbQtI+=CC43_up?@w-=^PLd@I3Nem delta 15 XcmbQtI+=CC43^hE>8Cf&`OXLcGd%|j diff --git a/app/src/main/java/com/swifttech/remit/android/features/domesticremit/receipt/presenter/DomesticRemitReceiptPresenterImpl.java b/app/src/main/java/com/swifttech/remit/android/features/domesticremit/receipt/presenter/DomesticRemitReceiptPresenterImpl.java index f6b67d16..4ffa3af7 100644 --- a/app/src/main/java/com/swifttech/remit/android/features/domesticremit/receipt/presenter/DomesticRemitReceiptPresenterImpl.java +++ b/app/src/main/java/com/swifttech/remit/android/features/domesticremit/receipt/presenter/DomesticRemitReceiptPresenterImpl.java @@ -55,12 +55,12 @@ public class DomesticRemitReceiptPresenterImpl extends BasePresenter implements { DomesticRemitReceiptActivity.TxnReceiptViewModel txnReceiptViewModel=new DomesticRemitReceiptActivity.TxnReceiptViewModel(); txnReceiptViewModel.setMobileNo(domesticRemitTxnReceiptDTO.getRContactNo()); - txnReceiptViewModel.setpAmount(Utils.formatCurrency(domesticRemitTxnReceiptDTO.getPayOutAmount())+" "+Constants.KRW_STRING); + txnReceiptViewModel.setpAmount(Utils.formatCurrency(domesticRemitTxnReceiptDTO.getPayOutAmount())+" "+Constants.MNT_STRING); txnReceiptViewModel.setRecieverName(domesticRemitTxnReceiptDTO.getRFirstName()); - txnReceiptViewModel.setServiceFee(Utils.formatCurrency(domesticRemitTxnReceiptDTO.getServiceCharge())+" "+Constants.KRW_STRING); + txnReceiptViewModel.setServiceFee(Utils.formatCurrency(domesticRemitTxnReceiptDTO.getServiceCharge())+" "+Constants.MNT_STRING); txnReceiptViewModel.setTxnDate(domesticRemitTxnReceiptDTO.getTrnsDate()); txnReceiptViewModel.setTxnNo("GME Control No. " +domesticRemitTxnReceiptDTO.getTrnId()); - txnReceiptViewModel.setTotalSendAmount(Utils.formatCurrency(domesticRemitTxnReceiptDTO.getCollAmount())+" "+Constants.KRW_STRING); + txnReceiptViewModel.setTotalSendAmount(Utils.formatCurrency(domesticRemitTxnReceiptDTO.getCollAmount())+" "+Constants.MNT_STRING); txnReceiptViewModel.setBank(domesticRemitTxnReceiptDTO.getPAgentBank()); txnReceiptViewModel.setAccNo(domesticRemitTxnReceiptDTO.getAccountNo()); diff --git a/app/src/main/java/com/swifttech/remit/android/features/domesticremit/send/presenter/DomesticRemitPresenterImpl.java b/app/src/main/java/com/swifttech/remit/android/features/domesticremit/send/presenter/DomesticRemitPresenterImpl.java index 6c903797..a51acdc6 100644 --- a/app/src/main/java/com/swifttech/remit/android/features/domesticremit/send/presenter/DomesticRemitPresenterImpl.java +++ b/app/src/main/java/com/swifttech/remit/android/features/domesticremit/send/presenter/DomesticRemitPresenterImpl.java @@ -347,7 +347,7 @@ public class DomesticRemitPresenterImpl extends BasePresenter implements Domesti else serviceChargeOnBasisOnType = serviceChargeWallet; - String messageServiceCharge = getStringfromStringId(R.string.transfer_charge_text) + ": " + Utils.formatCurrencyWithoutTruncatingDecimal(serviceChargeOnBasisOnType) + " " + Constants.KRW_STRING; + String messageServiceCharge = getStringfromStringId(R.string.transfer_charge_text) + ": " + Utils.formatCurrencyWithoutTruncatingDecimal(serviceChargeOnBasisOnType) + " " + Constants.MNT_STRING; view.updateServiceCharge(messageServiceCharge); if (sendAmount != null && sendAmount.length() > 0) @@ -666,7 +666,7 @@ public class DomesticRemitPresenterImpl extends BasePresenter implements Domesti domesticRemitDataValidator.setCurrentBalance(balance); - view.showCurrentBalance(getStringfromStringId(R.string.available_balance_text) + ": " + Utils.formatCurrencyWithoutTruncatingDecimal(balance) + " " + Constants.KRW_STRING); + view.showCurrentBalance(getStringfromStringId(R.string.available_balance_text) + ": " + Utils.formatCurrencyWithoutTruncatingDecimal(balance) + " " + Constants.MNT_STRING); view.showCheckBalanceButton(false); domesticRemitDataValidator.validateCurrentBalanceWithSendingAmount(); diff --git a/app/src/main/java/com/swifttech/remit/android/features/homeV2/presenter/HomeV2Presenter.java b/app/src/main/java/com/swifttech/remit/android/features/homeV2/presenter/HomeV2Presenter.java index 0fb329f1..9dc9ebdc 100644 --- a/app/src/main/java/com/swifttech/remit/android/features/homeV2/presenter/HomeV2Presenter.java +++ b/app/src/main/java/com/swifttech/remit/android/features/homeV2/presenter/HomeV2Presenter.java @@ -231,7 +231,6 @@ public class HomeV2Presenter extends BasePresenter implements HomeV2PresenterInt String autoDebitBody = autoDebitBodyMasked.replaceAll("xx", dateDifference + ""); - boolean shouldShowAutoDebitNotice = !shouldNotPromptAutoDebitAccountRenew && dateDifference <= AUTO_DEBIT_RENEWAL_TIME_LIMIT_IN_DAYS; boolean shouldShowKJBankNotice = checkIfShouldShowKJNotice(); @@ -243,7 +242,7 @@ public class HomeV2Presenter extends BasePresenter implements HomeV2PresenterInt homeRelatedMutableLiveData.setValue(new HomeViewRelatedDTOV2(fullName, userInfoModelV2.getAvailableBalance(), userInfoModelV2.getYearlyLimit(), - userInfoModelV2.getRewardPoint(), shouldShowAutoDebitNotice, autoDebitTitle, autoDebitBody, shouldShowKJBankNotice, + userInfoModelV2.getRewardPoint(), false, autoDebitTitle, autoDebitBody, shouldShowKJBankNotice, userInfoModelV2.getPrimaryBankName(), userInfoModelV2.getWalletNumber(), notificationViewDTO, shouldShowTermsAndCondition)); diff --git a/app/src/main/java/com/swifttech/remit/android/features/homeV2/view/HomeFragmentV2.java b/app/src/main/java/com/swifttech/remit/android/features/homeV2/view/HomeFragmentV2.java index 29f54b2c..746ff464 100644 --- a/app/src/main/java/com/swifttech/remit/android/features/homeV2/view/HomeFragmentV2.java +++ b/app/src/main/java/com/swifttech/remit/android/features/homeV2/view/HomeFragmentV2.java @@ -177,9 +177,9 @@ public class HomeFragmentV2 extends BaseFragment implements HomeMenuRvAdapterV2. waveProgressBarView.stopAnimation(); updateInfo(homeViewRelatedDTOV2.getUserName(), homeViewRelatedDTOV2.getAvailableBalance(), homeViewRelatedDTOV2.getYearlyLimit(), homeViewRelatedDTOV2.getRewardPoint()); setWalletNo(homeViewRelatedDTOV2.getWalletNo(), homeViewRelatedDTOV2.getBankName()); - showAutoDebitNoticeViewIfRequiredInPopup(homeViewRelatedDTOV2.shouldShowAutoDebitNotice(), homeViewRelatedDTOV2.getAutoDebitNoticeTitle(), homeViewRelatedDTOV2.getAutoDebitNoticeBody(), () -> { - showNotificationView(homeViewRelatedDTOV2.getHomeNotificationViewDTO()); - }); + showNotificationView(homeViewRelatedDTOV2.getHomeNotificationViewDTO()); + + if (homeViewRelatedDTOV2.shouldShowTermsAndCondition()) TermsAndConditionAcitivity.startTermsAndCondition(getActivity()); @@ -350,57 +350,6 @@ public class HomeFragmentV2 extends BaseFragment implements HomeMenuRvAdapterV2. }, 500); } - private void showKJBankNoticeIfRequired(boolean shouldShowAutoDebitNotice) { - if (shouldShowAutoDebitNotice) { - KJNoticeDialog kjNoticeDialog = new KJNoticeDialog(); - kjNoticeDialog.setCancellable(false); - kjNoticeDialog.setListener(new KJNoticeDialog.KJNoticeDialogListener() { - @Override - public void onNegativeBtnPressed() { - kjNoticeDialog.dismiss(); - ((HomeParentViewContractV2) getActivity()).getPresenter().skipKJBankNoticeForToday(); - } - - @Override - public void onPositiveBtnPressed() { - kjNoticeDialog.dismiss(); - } - }); - if (!kjNoticeDialog.isAdded()) - kjNoticeDialog.show(getActivity().getSupportFragmentManager(), "KJNotice"); - } - - } - - private void showAutoDebitNoticeViewIfRequiredInPopup(boolean shouldShowAutoDebitNotice, String autoDebitNoticeTitle, String autoDebitNoticeBody, Runnable task) { - if (shouldShowAutoDebitNotice) { - GenericPromptDialog autoDebitRenewalPromptDialog = new GenericPromptDialog(); - autoDebitRenewalPromptDialog.setBodyMessage(autoDebitNoticeBody); - autoDebitRenewalPromptDialog.setCancellable(false); - autoDebitRenewalPromptDialog.setIconsRes(R.drawable.ic_auto_debit_renew); - autoDebitRenewalPromptDialog.setPositiveBtnString(getString(R.string.renewal_text)); - autoDebitRenewalPromptDialog.setNegativeBtnString(getString(R.string.later_text)); - autoDebitRenewalPromptDialog.setTitleMessage(autoDebitNoticeTitle); - autoDebitRenewalPromptDialog.setListener(new GenericPromptDialog.GenericDialogPromptListener() { - @Override - public void onNegativeBtnPressed() { - ((HomeParentViewContractV2) getActivity()).getPresenter().donotPromptAutoDebitRenewalForThisSession(); - if (task != null) - new Handler().postDelayed(task, 200); - } - @Override - public void onPositiveBtnPressed() { - ((HomeParentViewContractV2) getActivity()).getPresenter().donotPromptAutoDebitRenewalForThisSession(); - ((HomeParentViewContractV2) getActivity()).showAutoDebitListingView(); - } - }); - if (!autoDebitRenewalPromptDialog.isAdded()) - autoDebitRenewalPromptDialog.show(getActivity().getSupportFragmentManager(), "AUTODEBITRENEWAL"); - - } else if (task != null) { - task.run(); - } - } } diff --git a/app/src/main/java/com/swifttech/remit/android/features/inboundreceipt/presenter/InboundRemitReceiptPresenterImpl.java b/app/src/main/java/com/swifttech/remit/android/features/inboundreceipt/presenter/InboundRemitReceiptPresenterImpl.java index 6b26ac96..0e0c61b3 100644 --- a/app/src/main/java/com/swifttech/remit/android/features/inboundreceipt/presenter/InboundRemitReceiptPresenterImpl.java +++ b/app/src/main/java/com/swifttech/remit/android/features/inboundreceipt/presenter/InboundRemitReceiptPresenterImpl.java @@ -55,12 +55,12 @@ public class InboundRemitReceiptPresenterImpl extends BasePresenter implements I { InboundRemitReceiptActivity.TxnReceiptViewModel txnReceiptViewModel=new InboundRemitReceiptActivity.TxnReceiptViewModel(); txnReceiptViewModel.setMobileNo(domesticRemitTxnReceiptDTO.getMobileNo()); - txnReceiptViewModel.setpAmount(Utils.formatCurrency(domesticRemitTxnReceiptDTO.getReceivedAmount())+" "+Constants.KRW_STRING); + txnReceiptViewModel.setpAmount(Utils.formatCurrency(domesticRemitTxnReceiptDTO.getReceivedAmount())+" "+Constants.MNT_STRING); txnReceiptViewModel.setSenderName(domesticRemitTxnReceiptDTO.getSenderName()); - txnReceiptViewModel.setServiceFee(Utils.formatCurrency(domesticRemitTxnReceiptDTO.getServiceFee())+" "+Constants.KRW_STRING); + txnReceiptViewModel.setServiceFee(Utils.formatCurrency(domesticRemitTxnReceiptDTO.getServiceFee())+" "+Constants.MNT_STRING); txnReceiptViewModel.setTxnDate(domesticRemitTxnReceiptDTO.getTranDate()); txnReceiptViewModel.setTxnNo(domesticRemitTxnReceiptDTO.getControlNo()); - txnReceiptViewModel.setTotalSendAmount(Utils.formatCurrency(domesticRemitTxnReceiptDTO.getReceivedAmount())+" "+Constants.KRW_STRING); + txnReceiptViewModel.setTotalSendAmount(Utils.formatCurrency(domesticRemitTxnReceiptDTO.getReceivedAmount())+" "+Constants.MNT_STRING); txnReceiptViewModel.setBank(domesticRemitTxnReceiptDTO.getBank()); txnReceiptViewModel.setAccNo(domesticRemitTxnReceiptDTO.getAccountNo()); txnReceiptViewModel.setSendingCountryCode(domesticRemitTxnReceiptDTO.getSendingCountryCode()); diff --git a/app/src/main/java/com/swifttech/remit/android/features/local/adapter/history/LocalTopUpHistoryAdapter.java b/app/src/main/java/com/swifttech/remit/android/features/local/adapter/history/LocalTopUpHistoryAdapter.java index 07bd4a40..6243189d 100644 --- a/app/src/main/java/com/swifttech/remit/android/features/local/adapter/history/LocalTopUpHistoryAdapter.java +++ b/app/src/main/java/com/swifttech/remit/android/features/local/adapter/history/LocalTopUpHistoryAdapter.java @@ -38,7 +38,7 @@ public class LocalTopUpHistoryAdapter extends RecyclerView.Adapter { denoListVH.denoTxtView.setBackgroundResource(R.drawable.deno_unselected_bg); } - denoListVH.denoTxtView.setText(Constants.KOREAN_WON +" "+ Utils.formatCurrencyWithoutTruncatingDecimal(selectedData.getPrice())); + denoListVH.denoTxtView.setText(Constants.MONGOLIA_CURRENCY +" "+ Utils.formatCurrencyWithoutTruncatingDecimal(selectedData.getPrice())); } @Override diff --git a/app/src/main/java/com/swifttech/remit/android/features/sendmoneyV2/view/SendMoneyV2TransactionCompleteActivity.java b/app/src/main/java/com/swifttech/remit/android/features/sendmoneyV2/view/SendMoneyV2TransactionCompleteActivity.java index 8bcebab7..fbf3f228 100644 --- a/app/src/main/java/com/swifttech/remit/android/features/sendmoneyV2/view/SendMoneyV2TransactionCompleteActivity.java +++ b/app/src/main/java/com/swifttech/remit/android/features/sendmoneyV2/view/SendMoneyV2TransactionCompleteActivity.java @@ -211,9 +211,8 @@ public class SendMoneyV2TransactionCompleteActivity extends BaseActivity impleme String name=recieptData.getRFirstName() + " " + middlName + recieptData.getRLastName(); receiverNameTextView.setText(String.format("%s : %s", getString(R.string.to_text), name)); - // receiverNameTextView.setText(recieptData.getRFirstName()); payoutAmountTextView.setText(recieptData.getPAmount()); - gmeControlNumberTextView.setText(String.format("GME Control No. %s", recieptData.getControlNo())); + gmeControlNumberTextView.setText(String.format("Fast Remit Control No. %s", recieptData.getControlNo())); transactionDateTextView.setText(recieptData.getTrnDate()); receiverTextView.setText(name); addressTextView.setText(recieptData.getRAddress()); diff --git a/app/src/main/java/com/swifttech/remit/android/features/transactionhistoryV2/view/international/adapter/InternationalInboundTransactionHistoryRVAdapter.java b/app/src/main/java/com/swifttech/remit/android/features/transactionhistoryV2/view/international/adapter/InternationalInboundTransactionHistoryRVAdapter.java index 5ac29dcd..801952c3 100644 --- a/app/src/main/java/com/swifttech/remit/android/features/transactionhistoryV2/view/international/adapter/InternationalInboundTransactionHistoryRVAdapter.java +++ b/app/src/main/java/com/swifttech/remit/android/features/transactionhistoryV2/view/international/adapter/InternationalInboundTransactionHistoryRVAdapter.java @@ -35,7 +35,7 @@ public class InternationalInboundTransactionHistoryRVAdapter extends RecyclerVie @Override public void onBindViewHolder(@NonNull TransactionItemViewHolder holder, int position) { InternationalInboundTransactionHistoryItemModel transactionItem = transactionHistoryItemModels.get(holder.getAdapterPosition()); - holder.setAmount(Utils.formatCurrency(transactionItem.getReceivedAmount()) + " " + Constants.KRW_STRING); + holder.setAmount(Utils.formatCurrency(transactionItem.getReceivedAmount()) + " " + Constants.MNT_STRING); holder.setDate(transactionItem.getTranDate()); holder.setPaymentMode(transactionItem.getBank().toUpperCase()); diff --git a/app/src/main/java/com/swifttech/remit/android/features/user_profile/view/ProfileActivity.java b/app/src/main/java/com/swifttech/remit/android/features/user_profile/view/ProfileActivity.java index 730151eb..db30157d 100644 --- a/app/src/main/java/com/swifttech/remit/android/features/user_profile/view/ProfileActivity.java +++ b/app/src/main/java/com/swifttech/remit/android/features/user_profile/view/ProfileActivity.java @@ -56,8 +56,7 @@ public class ProfileActivity extends AppCompatActivity implements UserProfileCon CircleImageView profileImage; @BindView(R.id.text_profile_image) ImageView textProfileImage; - @BindView(R.id.iv_edit_profile) - ImageView ivEditProfile; + @BindView(R.id.tv_user_name) GmeTextView tvUserName; @BindView(R.id.tv_phone_number) @@ -100,7 +99,7 @@ public class ProfileActivity extends AppCompatActivity implements UserProfileCon showWithdrawView(myPreferences.getBoolean(PrefKeys.USER_KYC_VERIFIED,false)&&myPreferences.getString(PrefKeys.USER_PENNY_TEST_STATUS,"").equalsIgnoreCase("2")); } - @OnClick({R.id.iv_back, R.id.iv_uploadImage, R.id.iv_edit_profile, R.id.tv_withdraw,R.id.txtEditProfile}) + @OnClick({R.id.iv_back, R.id.iv_uploadImage, R.id.iv_edit_profile, R.id.tv_withdraw}) public void onViewClicked(View view) { switch (view.getId()) { case R.id.iv_back: @@ -130,9 +129,7 @@ public class ProfileActivity extends AppCompatActivity implements UserProfileCon startActivityForResult(new Intent(ProfileActivity.this, WithdrawV2Activity.class),WITHDRAW_REQUEST_CODE); break; - case R.id.txtEditProfile: - startActivity(new Intent(ProfileActivity.this, ProfileInfoListingActivity.class)); - break; + } } diff --git a/app/src/main/java/com/swifttech/remit/android/utils/Constants.java b/app/src/main/java/com/swifttech/remit/android/utils/Constants.java index 1e614e1d..3018c9e8 100644 --- a/app/src/main/java/com/swifttech/remit/android/utils/Constants.java +++ b/app/src/main/java/com/swifttech/remit/android/utils/Constants.java @@ -29,19 +29,18 @@ public class Constants { public static final String GET_ALL_SOURCE_OF_FUND = "GET_ALL_SOURCE_OF_FUND"; public static final String KYC_SOURCE_OF_FUND = "KYC_SOURCE_OF_FUND"; - public static final String REWARD_HOME = "REWARD_HOME"; - public static final String REWARD_SHIPPING = "REWARD_SHIPPING"; - public static final String DEFAULT_EXCHANGE_SEND_AMOUNT = "1000000"; + + public static final String DEFAULT_EXCHANGE_SEND_AMOUNT = "100000"; public static final String CALC_BY_RECIPEINT = "p"; public static final String CALC_BY_SENDER = "c"; public static final String SUCCESS_CODE_V2 = "0"; public static final String TRUE_STRING = "True"; - public static final String KRW_STRING = "KRW"; + public static final String MNT_STRING = "MNT"; - public static String KOREAN_WON="₩"; + public static String MONGOLIA_CURRENCY ="MNT"; } diff --git a/app/src/main/java/com/swifttech/remit/android/utils/https/GenericApiObserverResponse.java b/app/src/main/java/com/swifttech/remit/android/utils/https/GenericApiObserverResponse.java index 79eb1317..b1ce4bba 100644 --- a/app/src/main/java/com/swifttech/remit/android/utils/https/GenericApiObserverResponse.java +++ b/app/src/main/java/com/swifttech/remit/android/utils/https/GenericApiObserverResponse.java @@ -1,7 +1,6 @@ package com.swifttech.remit.android.utils.https; - import java.io.IOException; import java.net.SocketTimeoutException; @@ -10,6 +9,7 @@ import retrofit2.HttpException; /** * Discontinued, Start using GenericApiObserverResponseV2 + * * @param */ public abstract class GenericApiObserverResponse extends DisposableObserver { @@ -32,15 +32,15 @@ public abstract class GenericApiObserverResponse extends DisposableObserver extends DisposableObserver @Override public void onError(Throwable e) { if (e instanceof HttpException) { -// if (((HttpException) e).code() == 401) -// unauthorizedAccess(HTTPConstants.getErrorMessageFromCode(((HttpException) e).code())); -// else + if (((HttpException) e).code() == 401) + unauthorizedAccess(HTTPConstants.getErrorMessageFromCode(((HttpException) e).code())); + else // onFailed(HTTPConstants.getErrorMessageFromCode(((HttpException) e).code())); - HttpException exception= (HttpException) e; - String message=exception.code()+" "+((HttpException) e).response().raw().request().url().url().toString(); - onFailed(message); + { + HttpException exception = (HttpException) e; + String message = exception.code() + " " + ((HttpException) e).response().raw().request().url().url().toString(); + onFailed(message); + } } else if (e instanceof SocketTimeoutException) { // onFailed(HTTPConstants.HTTP_RESPONSE_NO_INTERNET); onFailed(e.getMessage()); diff --git a/app/src/main/res/layout/activity_profile.xml b/app/src/main/res/layout/activity_profile.xml index 16eecaec..6089ad94 100644 --- a/app/src/main/res/layout/activity_profile.xml +++ b/app/src/main/res/layout/activity_profile.xml @@ -94,21 +94,7 @@ - + @@ -187,7 +173,7 @@ android:layout_height="wrap_content" android:layout_marginTop="9dp" android:paddingLeft="4dp" - android:text="@string/krw_text" + android:text="@string/mnt_text" android:textColor="@color/darkgray" android:textSize="18sp" app:layout_constraintStart_toEndOf="@+id/tv_wallet_no" diff --git a/app/src/main/res/layout/fragment_home_v3.xml b/app/src/main/res/layout/fragment_home_v3.xml index 14493c58..24755fdb 100644 --- a/app/src/main/res/layout/fragment_home_v3.xml +++ b/app/src/main/res/layout/fragment_home_v3.xml @@ -57,7 +57,7 @@ android:layout_marginTop="@dimen/_15sdp" android:gravity="center_horizontal" android:padding="2dp" - android:text="Kwangju Bank (034)" + android:text="Bank Account" android:textSize="@dimen/_10ssp" app:fontFamily="@string/bold" app:layout_constraintEnd_toStartOf="@+id/verticalDivider" @@ -102,10 +102,12 @@ android:text="@string/domestic_available_balance_text" android:textSize="@dimen/_10ssp" app:fontFamily="@string/bold" + app:txtfontName="@string/bold" + app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/verticalDivider" app:layout_constraintTop_toTopOf="parent" - app:txtfontName="@string/bold" /> + /> + app:layout_constraintEnd_toStartOf="@+id/tv_yearly_remaining_currency" + app:layout_constraintStart_toEndOf="@+id/verticalDivider" + app:layout_constraintTop_toBottomOf="@+id/tv_yearly_limit_label" + /> + /> O\'zbek پاکستان - KRW - + MNT + MNT N/A USD No image available @@ -69,7 +69,7 @@ Connect to local community Earn reward points and get surprise gifts - Welcome To Global Money Express + Welcome To Fast Remit Login with your email city User ID Registered Email @@ -79,7 +79,7 @@ Register Here User id cannot be empty - Register to Global Money Express + Register to Fast Remit Register with your email id Create Password Confirm Password @@ -118,9 +118,9 @@ Reward Point Your Available Balance - GME Wallet No. + Fast Remit Wallet No. Auto Debit Account - About GME + About Fast Remit Settings Logout Logout @@ -195,7 +195,7 @@ Service Charge Payout Agent/Bank I have read and agreed to - 1. GME Remittance User Agreement + 1. Fast Remit Remittance User Agreement Agree and Send Enter Your Login Password Enter 4 Digit OTP Code @@ -216,8 +216,8 @@ Transfer Successful You have successfully transferred your money to Total Payout Amount - GME Control No - Please keep this GME control no. very secure. + Fast Remit Control No + Please keep this Fast Remit control no. very secure. Share with concerned party only Transaction Date Receiver @@ -429,11 +429,11 @@ Please write a subject Please write a message body - Gme Number not found + Fast Remit Number not found No transaction id found Subject Invalid account number (Only numbers and alphabets allowed) - GME No / Receiver Name / Bank Name + Fast Remit No / Receiver Name / Bank Name Try again in Referral Code (Optional) Fingerprint Authentication @@ -478,7 +478,7 @@ Reward Points Note: The reward points is valid for a year only. Select branch to redeem your reward - You visit nearest GME branch to redeem you reward directly. + You visit nearest Fast Remit branch to redeem you reward directly. Bank account number @@ -517,13 +517,13 @@ Retry Please provide your full Alien Registration Card number Please provide your full National Id card number - KYC information is required to use GME Services. Do you really want to exit? + KYC information is required to use Fast Remit Services. Do you really want to exit? Would you like to renew your token now? (It must be renewed once a year) Your auto debit token expires after xx days. Select Language for Token Renewal Later Renew - Enter your ID for using GME + Enter your ID for using Fast Remit ID must be in between 4 to 50 characters Live Chat User ID / Email / Mobile Number @@ -533,11 +533,11 @@ Would you like to renew your token now? User ID Chat - Welcome to GME Remittance. 😄 How can I help you today? + Welcome to Fast Remit Remittance. 😄 How can I help you today? Enter receiver\'s city Enter receiver\'s city Need help with your password? - Reset your password using your User ID linked to your GME account + Reset your password using your User ID linked to your Fast Remit account There are no recipients @@ -627,7 +627,7 @@ No native country found - Please add your Auto Debit account to start using GME services. + Please add your Auto Debit account to start using Fast Remit services. @@ -669,7 +669,7 @@ Add Inbound Outbound - We have sent 1 KRW to your Bank Account, Please check the statement and enter the 4 digit number display after GME. + We have sent 1 KRW to your Bank Account, Please check the statement and enter the 4 digit number display after Fast Remit. Resend Added your inbound account Delete Account @@ -679,7 +679,7 @@ Inbound Receipt Transfer Processing Transfer Canceled - You have to register account at GME + You have to register account at Fast Remit Transaction will be process soon Link your Mongolia Bank Account to receive money from abroad. Control No. @@ -687,7 +687,7 @@ Received Amount Register Account Local Top up - GME Wallet + Fast Remit Wallet Regular \u2022 Confirm mobile phone number & Recharge amount. \u2022 After completing recharge, refund is not available. @@ -708,8 +708,8 @@ Recharge Request Success You have a recent request for recharging. Wait for the results of this request. Recharge Payment - Expected GME Wallet Balance - Pay Using GME Wallet + Expected Fast Remit Wallet Balance + Pay Using Fast Remit Wallet Select Type Select Plan SUCCESS @@ -721,7 +721,7 @@ Terms And Conditions Please accept the terms and conditions. - In order to use GME\'s overseas remittances and domestic remittances smoothly, you need to agree to withdraw money from your account. Withdrawal transfer will be made through open banking from the account you agreed to withdraw when using services such as overseas remittance and domestic remittance. + In order to use Fast Remit\'s overseas remittances and domestic remittances smoothly, you need to agree to withdraw money from your account. Withdrawal transfer will be made through open banking from the account you agreed to withdraw when using services such as overseas remittance and domestic remittance. Personal Information Treatment Policy Personal Information Collection and Usage Agreement Agreement of Legal Name Confirmation for Prohibiting Manipulation of the Law and Illegal Behavior @@ -757,7 +757,7 @@ Save and Next Reference code must be of 4 digit Do you have a phone number registered with Alien Registration Card under your name? - Thank you for registering for GME. We are verifying your information. Once approved, you will receive SMS. + Thank you for registering for Fast Remit. We are verifying your information. Once approved, you will receive SMS. GPS is not turned on Please grant the required permissions. Could not fetch location at the moment. Try again later.