String fixes for From and To title

app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/presenter/autodebitaccountlisting/AutoDebitAccountListingV2Presenter.java

@@ -2,6 +2,7 @@ package com.gmeremit.online.gmeremittance_native.autodebitV2.presenter.autodebit
 
 import android.os.Handler;
 
+import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.autodebitV2.gateway.autodebitaccountlisting.AutoDebitAccountListingV2Gateway;
 import com.gmeremit.online.gmeremittance_native.autodebitV2.model.autodebitaccountlisting.AutoDebitAccount;
 import com.gmeremit.online.gmeremittance_native.autodebitV2.model.autodebitaccountlisting.AutoDebitModel;
@@ -54,7 +55,7 @@ public class AutoDebitAccountListingV2Presenter extends BasePresenter implements
     public void getAllAutoDebitAccountList() {
         compositeDisposable.add(
                 this.gateway.getAllAccountsFromNetwork(gateway.getAuth(),gateway.getUserID())
-                        .doOnSubscribe(disposable -> view.showProgressBar(true, "Fetching data..."))
+                        .doOnSubscribe(disposable -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text)))
                         .doFinally(() -> view.showProgressBar(false, ""))
                         .subscribeOn(Schedulers.io())
                         .observeOn(AndroidSchedulers.mainThread())
@@ -75,7 +76,7 @@ public class AutoDebitAccountListingV2Presenter extends BasePresenter implements
     public void deleteAutoDebitAccount(AutoDebitAccount accountData) {
         compositeDisposable.add(
                 this.gateway.deleteAccountFromNetwork(gateway.getAuth(),gateway.getUserID(),accountData.getKftcAccountId())
-                        .doOnSubscribe(disposable -> view.showProgressBar(true, "Deleting account..."))
+                        .doOnSubscribe(disposable -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text)))
                         .doFinally(() -> view.showProgressBar(false, ""))
                         .subscribeOn(Schedulers.io())
                         .observeOn(AndroidSchedulers.mainThread())

app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/view/AutoDebitWebBrowserV2.java

@@ -4,6 +4,7 @@ import android.content.Context;
 import android.webkit.JavascriptInterface;
 import android.webkit.WebView;
 
+import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.autodebitV2.model.autodebitaccountlisting.AutoDebitAddSeriveAuthenticationServiceModel;
 import com.gmeremit.online.gmeremittance_native.autodebitV2.model.autodebitaccountlisting.WebRequestModel;
 import com.gmeremit.online.gmeremittance_native.customwidgets.CustomAlertDialog;
@@ -39,7 +40,7 @@ public class AutoDebitWebBrowserV2 extends WebBrowserV2Activity {
     private void authenticateService() {
         this.compositeDisposable.add(
                 HttpClientV2.getInstance().postDataForAddingAutoDebitAccount(webRequestModel.getUrl(), webRequestModel.getHeaderAsMapData())
-                        .doOnSubscribe(subs -> showProgressBar(true, "Authenticating..."))
+                        .doOnSubscribe(subs -> showProgressBar(true, getString(R.string.processing_request_text)))
                         .observeOn(Schedulers.io())
                         .doFinally(() ->showProgressBar(false, (String) null))
                         .subscribeOn(Schedulers.io())

app/src/main/java/com/gmeremit/online/gmeremittance_native/changepasswordV2/presenter/ChangePasswordV2Presenter.java

@@ -166,7 +166,7 @@ public class ChangePasswordV2Presenter extends BasePresenter implements ChangePa
     public void changePassword(String currentPass, String newPass) {
 
         this.gateway.performChangePassRequest(this.gateway.getAuth(),this.gateway.getUserID(),this.currentPassword,this.newPassword)
-                    .doOnSubscribe(d->view.showProgressBar(true,"Changing password..."))
+                    .doOnSubscribe(d->view.showProgressBar(true,getStringfromStringId(R.string.processing_request_text)))
                     .doFinally(()->view.showProgressBar(false,""))
                     .subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread())

app/src/main/java/com/gmeremit/online/gmeremittance_native/exchange_rate/presenter/ExchangeRateV2Presenter.java

@@ -37,7 +37,7 @@ public class ExchangeRateV2Presenter extends BasePresenter implements ExchangeRa
     public void getAllData() {
         compositeDisposables.add(
                 Observable.zip(getPaymentServiceInfo(), getDefaultValue(), PaymentServiceData::new)
-                        .doOnSubscribe(disposable -> this.view.showProgressBar(true, "Fetching Exchange Rates..."))
+                        .doOnSubscribe(disposable -> this.view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text)))
                         .doFinally(() -> this.view.showProgressBar(false, ""))
                         .observeOn(AndroidSchedulers.mainThread())
                         .subscribeWith(new PaymentServiceDataObserver())
@@ -64,7 +64,7 @@ public class ExchangeRateV2Presenter extends BasePresenter implements ExchangeRa
                 gateway.getUserPreferredCurrency(),selectedCountryPaymentService.getCurrency(),
                 sendAmount,recipientAmount,selectedPaymentMode.getId(),calculateFlag,selectedCountryPaymentService.getCountry(),
                 selectedCountryPaymentService.getCountryId())
-              .doOnSubscribe(disposable -> this.view.showProgressBar(true, "Calculating..."))
+              .doOnSubscribe(disposable -> this.view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text)))
                 .doOnError((err) -> this.view.showProgressBar(false, ""))
                 .doFinally(()->this.view.showProgressBar(false, ""))
                 .subscribeOn(Schedulers.io())

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/presenter/kyc/KYCV2Presenter.java

@@ -597,7 +597,7 @@ public class KYCV2Presenter extends BasePresenter implements KYCV2PresenterInter
                        passbookFile)
                         .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread())
                         .doOnSubscribe(sub -> {
-                            view.showProgressBar(true, "Uploading your information...");
+                            view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text));
                         })
                         .doFinally(() -> view.showProgressBar(false, ""))
                         .subscribeWith(new KycUploadObserver()));
@@ -609,7 +609,7 @@ public class KYCV2Presenter extends BasePresenter implements KYCV2PresenterInter
         compositeDisposable.add(
                 this.gateway.getKYCRelatedData(this.gateway.getAuth())
                         .delay(200, TimeUnit.MILLISECONDS)
-                        .doOnSubscribe(d -> view.showProgressBar(true, "Fetching related information..."))
+                        .doOnSubscribe(d -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text)))
                         .doFinally(() -> view.showProgressBar(false, ""))
                         .subscribeOn(Schedulers.io())
                         .observeOn(AndroidSchedulers.mainThread())

app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/recipientadd/RecipientAddV2Presenter.java

@@ -38,7 +38,7 @@ public class RecipientAddV2Presenter extends BasePresenter implements RecipientA
     public void getAllData() {
         compositeDisposable.add(
                 this.gateway.getRelatedDataFromServer(gateway.getAuth())
-                        .doOnSubscribe(disposable -> view.showProgressBar(true, "Fetching data..."))
+                        .doOnSubscribe(disposable -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text)))
                         .doFinally(() -> view.showProgressBar(false, ""))
                         .subscribeOn(Schedulers.io())
                         .observeOn(AndroidSchedulers.mainThread())
@@ -67,7 +67,7 @@ public class RecipientAddV2Presenter extends BasePresenter implements RecipientA
                     selectedTransfer.getId(),
                     selectedRecipientId
                     )
-                            .doOnSubscribe(disposable -> view.showProgressBar(true, "Adding Recipient..."))
+                            .doOnSubscribe(disposable -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text)))
                             .doFinally(() -> view.showProgressBar(false, ""))
                             .subscribeOn(Schedulers.io())
                             .observeOn(AndroidSchedulers.mainThread())
@@ -173,7 +173,7 @@ public class RecipientAddV2Presenter extends BasePresenter implements RecipientA
     public void prepareRecipientForEdit(RecipientInfoModel recipientToBeEdited) {
         compositeDisposable.add(Observable.zip(this.gateway.getRelatedDataFromServer(gateway.getAuth()).subscribeOn(Schedulers.io()),
                 Observable.just(recipientToBeEdited), EditableMergedData::new)
-                .doOnSubscribe(disposable -> this.view.showProgressBar(true, "Fetching data..."))
+                .doOnSubscribe(disposable -> this.view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text)))
                 .doOnError((err) -> this.view.showProgressBar(false, ""))
                 .doFinally(() -> this.view.showProgressBar(false, ""))
                 .observeOn(AndroidSchedulers.mainThread())

app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/recipientlisting/RecipientListingV2Presenter.java

@@ -1,5 +1,6 @@
 package com.gmeremit.online.gmeremittance_native.recipientV2.presenter.recipientlisting;
 
+import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.autodebitV2.model.autodebitaccountlisting.AutoDebitAccount;
 import com.gmeremit.online.gmeremittance_native.base.BasePresenter;
 import com.gmeremit.online.gmeremittance_native.customwidgets.CustomAlertDialog;
@@ -46,7 +47,7 @@ public class RecipientListingV2Presenter extends BasePresenter implements Recipi
     public void getAllRecipientList() {
         compositeDisposable.add(
                 this.gateway.getAllRecipientFromNetwork(gateway.getAuth(),gateway.getUserID())
-                        .doOnSubscribe(disposable -> view.showProgressBar(true, "Fetching data..."))
+                        .doOnSubscribe(disposable -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text)))
                         .doFinally(() -> view.showProgressBar(false, ""))
                         .subscribeOn(Schedulers.io())
                         .observeOn(AndroidSchedulers.mainThread())
@@ -58,7 +59,7 @@ public class RecipientListingV2Presenter extends BasePresenter implements Recipi
     public void deleteRecipient(String recipientId) {
         compositeDisposable.add(
                 this.gateway.deleteRecipientFromNetwork(gateway.getAuth(),gateway.getUserID(),recipientId)
-                        .doOnSubscribe(disposable -> view.showProgressBar(true, "Deleting recipient..."))
+                        .doOnSubscribe(disposable -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text)))
                         .doFinally(() -> view.showProgressBar(false, ""))
                         .subscribeOn(Schedulers.io())
                         .observeOn(AndroidSchedulers.mainThread())

app/src/main/java/com/gmeremit/online/gmeremittance_native/registerV2/presenter/RegisterV2Presenter.java

@@ -1,6 +1,7 @@
 package com.gmeremit.online.gmeremittance_native.registerV2.presenter;
 
 import com.gmeremit.online.gmeremittance_native.GmeApplication;
+import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.base.BasePresenter;
 import com.gmeremit.online.gmeremittance_native.customwidgets.CustomAlertDialog;
 import com.gmeremit.online.gmeremittance_native.registerV2.gateway.RegisterV2Gateway;
@@ -163,7 +164,7 @@ public class RegisterV2Presenter extends BasePresenter implements RegisterV2Pres
                 GmeApplication.getAppRelatedMetaData().getOsName(),
                 GmeApplication.getAppRelatedMetaData().getDeviceId(),
                 GmeApplication.getAppRelatedMetaData().getOsVersion())
-                .doOnSubscribe(d->view.showProgressBar(true,"Registering user..."))
+                .doOnSubscribe(d->view.showProgressBar(true,getStringfromStringId(R.string.processing_request_text)))
                 .doFinally(()->view.showProgressBar(false,""))
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())

app/src/main/java/com/gmeremit/online/gmeremittance_native/resetpassV2/presenter/ResetPassV2Presenter.java

@@ -1,6 +1,7 @@
 package com.gmeremit.online.gmeremittance_native.resetpassV2.presenter;
 
 import com.gmeremit.online.gmeremittance_native.GmeApplication;
+import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.base.BasePresenter;
 import com.gmeremit.online.gmeremittance_native.customwidgets.CustomAlertDialog;
 import com.gmeremit.online.gmeremittance_native.registerV2.presenter.RegisterV2PresenterInterface;
@@ -33,7 +34,7 @@ public class ResetPassV2Presenter extends BasePresenter implements ResetPassV2Pr
         String auth = "Basic " + Utils.toBase64("172017F9EC11222E8107142733:QRK2UM0Q:" + GmeApplication.getAppRelatedMetaData().getDeviceId());
         compositeDisposable.add(
                 gateway.resetPassV2(auth,emailId,dob)
-                        .doOnSubscribe(d->view.showProgressBar(true,"Requesting..."))
+                        .doOnSubscribe(d->view.showProgressBar(true,getStringfromStringId(R.string.processing_request_text)))
                         .doFinally(()->view.showProgressBar(false,""))
                         .subscribeOn(Schedulers.io())
                         .observeOn(AndroidSchedulers.mainThread())

app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2Presenter.java

@@ -128,7 +128,7 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr
     public Observable<AccountValidationApiResponse> validateAccountIfRequired() {
         if (isAccountValidationRequired && selectedAccountNo != null)
             return sendDataForAccountValidation()
-                    .doOnSubscribe(d -> view.showProgressBar(true, "Validating account number..."))
+                    .doOnSubscribe(d -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text)))
                     .doFinally(() -> view.showProgressBar(false, ""))
                     .subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread());
@@ -253,7 +253,7 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr
         compositeObservable.add(
                 gateway.performSendMoneyTransaction(gateway.getAuth(), sendMoneyAPIRequestBody)
                         .subscribeOn(Schedulers.io())
-                        .doOnSubscribe(d -> view.showProgressBar(true, "Performing transaction..."))
+                        .doOnSubscribe(d -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text)))
                         .doFinally(() -> view.showProgressBar(false, ""))
                         .observeOn(AndroidSchedulers.mainThread())
                         .subscribeWith(new SendMoneyTransactionObserver())

app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/amountdetail/AmountDetailSendMoneyFragment.java

@@ -246,7 +246,7 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements View.
         compositeDisposable.add(
                 ((SendMoneyActionListener) getActivity()).getPresenter().getForex(
                         recieveMoneyEditText.getText().toString(), sendMoneyEditText.getText().toString(), shouldCaulatedByRecipient, amountDetailRelatedData.getDefaultSelectedCurrency().getCurrencyCode()
-                ).doOnSubscribe(d -> showProgressBar(true, "Calculating..."))
+                ).doOnSubscribe(d -> showProgressBar(true, getString(R.string.processing_request_text)))
                         .subscribeWith(new ExchangeRateCalcObserver())
         );
     }

app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/payoutmode/PayoutModeSendMoneyFragment.java

@@ -163,7 +163,7 @@ public class PayoutModeSendMoneyFragment extends BaseFragment implements SendMon
         compositeDisposable.add(((SendMoneyActionListener) getActivity())
                 .getPresenter()
                 .getAllPayoutMode()
-                .doOnSubscribe(d -> showProgressBar(true, "Fetching data..."))
+                .doOnSubscribe(d -> showProgressBar(true, getString(R.string.processing_request_text)))
                 .subscribeWith(new PayoutModeObserver())
         );
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/supportV2/presenter/SupportActivityV2Presenter.java

@@ -1,5 +1,6 @@
 package com.gmeremit.online.gmeremittance_native.supportV2.presenter;
 
+import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.base.BasePresenter;
 import com.gmeremit.online.gmeremittance_native.customwidgets.CustomAlertDialog;
 import com.gmeremit.online.gmeremittance_native.supportV2.gateway.SupportActivityV2Gateway;
@@ -123,7 +124,7 @@ public class SupportActivityV2Presenter extends BasePresenter implements Support
     private void performNormalRequest(String subject, String body) {
         compositeDisposable.add(
                 this.gateway.performNormalRequest(this.gateway.getAuth(),this.gateway.getUserID(),body,subject)
-                        .doOnSubscribe(disposable -> view.showProgressBar(true,"Sending request...."))
+                        .doOnSubscribe(disposable -> view.showProgressBar(true,getStringfromStringId(R.string.processing_request_text)))
                         .doFinally(()->view.showProgressBar(false,""))
                         .subscribeOn(Schedulers.io())
                         .observeOn(AndroidSchedulers.mainThread())
@@ -134,7 +135,7 @@ public class SupportActivityV2Presenter extends BasePresenter implements Support
     private void performAmmendmentRequest(String controlNo, String transactionId, String body, String subject) {
         compositeDisposable.add(
                 this.gateway.performAmmendmentRequest(this.gateway.getAuth(),this.gateway.getUserID(),controlNo,transactionId,body,subject)
-                .doOnSubscribe(disposable -> view.showProgressBar(true,"Sending change request...."))
+                .doOnSubscribe(disposable -> view.showProgressBar(true,getStringfromStringId(R.string.processing_request_text)))
                 .doFinally(()->view.showProgressBar(false,""))
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
@@ -145,7 +146,7 @@ public class SupportActivityV2Presenter extends BasePresenter implements Support
     private void performCancellationRequest(String controlNo, String transactionId, String body, String subject) {
         compositeDisposable.add(
                 this.gateway.performCancellationRequest(this.gateway.getAuth(),this.gateway.getUserID(), controlNo,transactionId,body,subject)
-                        .doOnSubscribe(disposable -> view.showProgressBar(true,"Sending cancellation request...."))
+                        .doOnSubscribe(disposable -> view.showProgressBar(true,getStringfromStringId(R.string.processing_request_text)))
                         .doFinally(()->view.showProgressBar(false,""))
                         .subscribeOn(Schedulers.io())
                         .observeOn(AndroidSchedulers.mainThread())

app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/presenter/TransactionHistoryV2Presenter.java

@@ -2,6 +2,7 @@ package com.gmeremit.online.gmeremittance_native.transactionhistoryV2.presenter;
 
 import android.util.Log;
 
+import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.base.BasePresenter;
 import com.gmeremit.online.gmeremittance_native.customwidgets.CustomAlertDialog;
 import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.gateway.TransactionHistoryV2Gateway;
@@ -42,7 +43,7 @@ public class TransactionHistoryV2Presenter extends BasePresenter implements Tran
         if(endDate==null)
             endDate="";
         this.gateway.getTransactionHistory(this.gateway.getAuth(), this.gateway.getUserID(),startDate,endDate)
-                        .doOnSubscribe(subs->view.showProgressBar(true,"Fetching transaction history..."))
+                        .doOnSubscribe(subs->view.showProgressBar(true,getStringfromStringId(R.string.processing_request_text)))
                         .doFinally(()->view.showProgressBar(false,""))
                         .subscribeOn(Schedulers.io())
                         .flatMap(response->{

app/src/main/java/com/gmeremit/online/gmeremittance_native/walletstatementV2/presenter/WalletStatementV2Presenter.java

@@ -1,5 +1,6 @@
 package com.gmeremit.online.gmeremittance_native.walletstatementV2.presenter;
 
+import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.base.BasePresenter;
 import com.gmeremit.online.gmeremittance_native.customwidgets.CustomAlertDialog;
 import com.gmeremit.online.gmeremittance_native.utils.Constants;
@@ -32,7 +33,7 @@ public class WalletStatementV2Presenter extends BasePresenter implements WalletS
             endDate="";
         compositeDisposables.add(
         this.gateway.getWalletStatements(this.gateway.getAuth(), this.gateway.getUserID(),startDate,endDate)
-                .doOnSubscribe(subs->view.showProgressBar(true,"Fetching wallet statements..."))
+                .doOnSubscribe(subs->view.showProgressBar(true,getStringfromStringId(R.string.processing_request_text)))
                 .doFinally(()->view.showProgressBar(false,""))
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())

app/src/main/java/com/gmeremit/online/gmeremittance_native/withdrawV2/presenter/WithdrawV2Presenter.java

@@ -1,5 +1,6 @@
 package com.gmeremit.online.gmeremittance_native.withdrawV2.presenter;
 
+import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.base.BasePresenter;
 import com.gmeremit.online.gmeremittance_native.customwidgets.CustomAlertDialog;
 import com.gmeremit.online.gmeremittance_native.homeV2.model.UserInfoModelV2;
@@ -41,7 +42,7 @@ public class WithdrawV2Presenter extends BasePresenter implements WithdrawV2Pres
                             Utils.removeSpecialCharacterAndDecimalFromCurrency(amount),
                             Utils.removeSpecialCharacterAndDecimalFromCurrency(refundRelatedData.getRefundCharge()), this.gateway.getUserIDNumber(),
                             this.gateway.getAuth())
-                            .doOnSubscribe(action -> view.showProgressBar(true, "Performing transaction..."))
+                            .doOnSubscribe(action -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text)))
                             .doFinally(() -> view.showProgressBar(false, ""))
                             .subscribeOn(Schedulers.io())
                             .observeOn(AndroidSchedulers.mainThread())
@@ -88,7 +89,7 @@ public class WithdrawV2Presenter extends BasePresenter implements WithdrawV2Pres
 
         compositeDisposables.add(
                 this.gateway.getWithdrawRelatedData(this.gateway.getUserID(), this.gateway.getAuth())
-                        .doOnSubscribe(action ->  view.showProgressBar(true, "Fetching user related data..."))
+                        .doOnSubscribe(action ->  view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text)))
                         .doFinally(() -> view.showProgressBar(false, ""))
                         .subscribeOn(Schedulers.io())
                         .observeOn(AndroidSchedulers.mainThread())

app/src/main/res/values/strings.xml

@@ -310,6 +310,7 @@
     <string name="all_text">All</string>
     <string name="unpaid_text">Unpaid</string>
     <string name="paid_text">Paid</string>
+    <string name="processing_request_text">Processing request…</string>