diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index d82c6ffb..09634253 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/GmeApplication.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/GmeApplication.java
index 3717c052..6dc2f5d5 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/GmeApplication.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/GmeApplication.java
@@ -158,9 +158,15 @@ public class GmeApplication extends MultiDexApplication {
public String getStringFromStringId(@StringRes int stringResourceID)
{
- if(resources==null)
- return "";
- return resources.getString(stringResourceID);
+ try {
+ if (resources == null)
+ return "";
+ return resources.getString(stringResourceID);
+ }
+ catch (Exception e)
+ {
+ return "No string resource mapped to : "+stringResourceID;
+ }
}
}
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/base/BasePresenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/base/BasePresenter.java
index f1771efa..c3de5e00 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/base/BasePresenter.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/base/BasePresenter.java
@@ -5,13 +5,7 @@ import com.gmeremit.online.gmeremittance_native.GmeApplication;
public class BasePresenter implements BasePresenterInterface {
public String getStringfromStringId(int id) {
- String result = "";
- try {
- result = GmeApplication.getStringExtractor().getStringFromStringId(id);
- } catch (Exception e) {
- result="No string resource mapped to : "+id;
- }
- return result;
+ return GmeApplication.getStringExtractor().getStringFromStringId(id);
}
@Override
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/exchange_rate/presenter/ExchangeRateV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/exchange_rate/presenter/ExchangeRateV2Presenter.java
index 865edcab..cb8a738a 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/exchange_rate/presenter/ExchangeRateV2Presenter.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/exchange_rate/presenter/ExchangeRateV2Presenter.java
@@ -1,6 +1,7 @@
package com.gmeremit.online.gmeremittance_native.exchange_rate.presenter;
import com.crashlytics.android.Crashlytics;
+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.exchange_rate.gateway.ExchangeRateV2Gateway;
@@ -51,7 +52,7 @@ public class ExchangeRateV2Presenter extends BasePresenter implements ExchangeRa
return;
if(selectedCountryPaymentService==null)
{
- view.showToastMessage("Please select a currency");
+ view.showToastMessage(getStringfromStringId(R.string.no_currency_selected_error));
return;
}
String sendCountryDefault="118";
@@ -114,7 +115,6 @@ public class ExchangeRateV2Presenter extends BasePresenter implements ExchangeRa
}
catch(Exception e)
{
- Crashlytics.log("Default seed value is null");
defaultSelectedCountryService=null;
}
@@ -195,8 +195,8 @@ public class ExchangeRateV2Presenter extends BasePresenter implements ExchangeRa
String sendAmount = data.getCollAmt();
String sendingCurrency = data.getCollCurr();
- String transferDisplay = " - " + transferAmount +" "+ sendingCurrency + " (Transfer Fee Included)";
- String exRateDisplay = " " + exRate + " (Current Exchange Rate)";
+ String transferDisplay = " - " + transferAmount +" "+ sendingCurrency + " ("+getStringfromStringId(R.string.transfer_fee_included_text)+")";
+ String exRateDisplay = " " + exRate + " ("+getStringfromStringId(R.string.current_exchange_rate_text)+")";
view.updateExchangeRates(recipientAmount, sendAmount, transferDisplay, exRateDisplay);
}
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/exchange_rate/view/ExchangeMethodV2Activity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/exchange_rate/view/ExchangeMethodV2Activity.java
index 307de9b3..d1799319 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/exchange_rate/view/ExchangeMethodV2Activity.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/exchange_rate/view/ExchangeMethodV2Activity.java
@@ -138,7 +138,7 @@ public class ExchangeMethodV2Activity extends BaseActivity implements PaymentMod
}
private void performDefaultAction(Bundle savedInstanceState) {
- toolbarTitle.setText("Today's Rate");
+ toolbarTitle.setText(getString(R.string.todays_rate_title_text));
this.presenter.getAllData();
}
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2Presenter.java
index 13a5ea6a..ce3ba601 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2Presenter.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2Presenter.java
@@ -4,6 +4,7 @@ import android.util.Log;
import com.gmeremit.online.gmeremittance_native.BuildConfig;
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.base.PrivilegedGateway;
import com.gmeremit.online.gmeremittance_native.customwidgets.CustomAlertDialog;
@@ -57,7 +58,7 @@ public class HomeV2Presenter extends BasePresenter implements HomeV2PresenterInt
if (throwable instanceof SessionExpiredException)
return Observable.error(throwable);
else if (throwable instanceof HttpException && ((HttpException) throwable).code() == 401)
- return Observable.error(new SessionExpiredException("Session Expired"));
+ return Observable.error(new SessionExpiredException("Session Expired."));
else
return Observable.empty();
}
@@ -87,8 +88,10 @@ public class HomeV2Presenter extends BasePresenter implements HomeV2PresenterInt
@Override
public void manuallyUpdateKYCForStatusToSubmitted() {
- String kycMessage = "Your registration request is in approval process. You will soon be able to use GME services.";
- String kycTitle = "Verification in Process";
+// String kycMessage = "Your registration request is in approval process. You will soon be able to use GME services.";
+// String kycTitle = "Verification in Process";
+ String kycMessage = getStringfromStringId(R.string.verification_in_aproval_process_text);
+ String kycTitle = getStringfromStringId(R.string.kyc_verify_pending_text);
view.showKYCVerifiedIfRequired(true, kycMessage, kycTitle, true, null);
}
@@ -96,8 +99,11 @@ public class HomeV2Presenter extends BasePresenter implements HomeV2PresenterInt
public void manullyUpdateKYCToSubmittedAndShowPennyTest() {
gateway.updateSubmittedKycInCache(true);
gateway.updateVerifiedUserInCache(false);
- String pennyTestTitle = "Continue the registration process";
- String pennyTestMessage = "Please verify your primary bank account to complete the registration.";
+// String pennyTestTitle = "Continue the registration process";
+// String pennyTestMessage = "Please verify your primary bank account to complete the registration.";
+
+ String pennyTestTitle = getStringfromStringId(R.string.penny_test_pending_text);
+ String pennyTestMessage = getStringfromStringId(R.string.complete_penny_test);
view.showKYCVerifiedIfRequired(false, "", "", true, () -> view.showPennyTestViewIfRequired(true, pennyTestTitle, pennyTestMessage));
}
@@ -105,12 +111,19 @@ public class HomeV2Presenter extends BasePresenter implements HomeV2PresenterInt
public String checkIfUserVerified() {
String resultMessage = null;
String pennyTestStatus = gateway.getPennyTestStatus();
+// if (!gateway.hasUserSubmittedKYC())
+// resultMessage = "Kindly complete your registration process with us to start using GME services";
+// else if (pennyTestStatus != null && pennyTestStatus.length() > 0 && !pennyTestStatus.equalsIgnoreCase("2"))
+// resultMessage = "Please verify your primary bank account to complete the registration";
+// else if (!gateway.isUserKYCVerified())
+// resultMessage = "Your registration request is in approval process. You will soon be able to use GME services";
+
if (!gateway.hasUserSubmittedKYC())
- resultMessage = "Kindly complete your registration process with us to start using GME services";
+ resultMessage = getStringfromStringId(R.string.complete_your_registration_text);
else if (pennyTestStatus != null && pennyTestStatus.length() > 0 && !pennyTestStatus.equalsIgnoreCase("2"))
- resultMessage = "Please verify your primary bank account to complete the registration";
+ resultMessage = getStringfromStringId(R.string.complete_penny_test);
else if (!gateway.isUserKYCVerified())
- resultMessage = "Your registration request is in approval process. You will soon be able to use GME services";
+ resultMessage = getStringfromStringId(R.string.verification_in_aproval_process_text);
return resultMessage;
@@ -209,16 +222,17 @@ public class HomeV2Presenter extends BasePresenter implements HomeV2PresenterInt
if (!userInfoModelV2.getKyc()) {
shouldShowKYCView = true;
- kycTitle = "Verify your Account";
- kycMessage = "Kindly complete your registration process with us to start using GME services.";
+ kycTitle = getStringfromStringId(R.string.kyc_fill_text);
+ kycMessage = getStringfromStringId(R.string.complete_your_registration_text);
} else if (!userInfoModelV2.isVerified()) {
shouldShowKYCView = !isPennyTestPending;
- kycTitle = "Verification in Process";
- kycMessage = "Your registration request is in approval process. You will soon be able to use GME services.";
+ kycTitle = getStringfromStringId(R.string.kyc_verify_pending_text);
+ kycMessage = getStringfromStringId(R.string.verification_in_aproval_process_text);
}
- String pennyTestTitle = "Continue the registration process";
- String pennyTestMessage = "Please verify your primary bank account to complete the registration.";
+
+ String pennyTestTitle = getStringfromStringId(R.string.penny_test_pending_text);
+ String pennyTestMessage = getStringfromStringId(R.string.complete_penny_test);
if (homeFragmentRelatedSubject != null)
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 4eb7b95e..e29e8044 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
@@ -1,6 +1,5 @@
package com.gmeremit.online.gmeremittance_native.homeV2.view;
-import android.app.Activity;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.res.Configuration;
@@ -36,7 +35,6 @@ import com.gmeremit.online.gmeremittance_native.homeV2.presenter.HomeV2Presenter
import com.gmeremit.online.gmeremittance_native.homeV2.presenter.HomeV2PresenterInterface;
import com.gmeremit.online.gmeremittance_native.int_notification.view.IntNotificationView;
import com.gmeremit.online.gmeremittance_native.recipientV2.view.recipientlisting.RecipientListingV2Activity;
-import com.gmeremit.online.gmeremittance_native.sendmoneyV2.view.SendMoneyV2Activity;
import com.gmeremit.online.gmeremittance_native.settings.view.SettingsView;
import com.gmeremit.online.gmeremittance_native.splash_screen.view.SplashScreen;
import com.gmeremit.online.gmeremittance_native.static_pages.view.AboutGME;
@@ -45,7 +43,6 @@ import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.view.Transa
import com.gmeremit.online.gmeremittance_native.user_profile.view.ProfileActivity;
import com.gmeremit.online.gmeremittance_native.utils.Utils;
import com.gmeremit.online.gmeremittance_native.walletstatementV2.view.WalletStatementV2Activity;
-import com.gmeremit.online.gmeremittance_native.webbrowserV2.WebBrowserV2Activity;
import com.gmeremit.online.gmeremittance_native.withdrawV2.view.WithdrawV2Activity;
import com.text.drawable.TextDrawable;
@@ -212,15 +209,16 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra
private void showLogoutConfirmationDialog() {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
- builder.setTitle("Logout?")
- .setMessage("Are you sure you want to logout?")
- .setPositiveButton("Yes", new DialogInterface.OnClickListener() {
+ builder.setTitle(getString(R.string.logout_confirmation_title_text))
+
+ .setMessage(getString(R.string.logout_confirmation_text))
+ .setPositiveButton(getString(R.string.yes_text), new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
performLogout();
}
})
- .setNegativeButton("No ", new DialogInterface.OnClickListener() {
+ .setNegativeButton(getString(R.string.no_text), new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
dialogInterface.dismiss();
@@ -238,15 +236,15 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra
private void showExitConfirmationDialog() {
final AlertDialog.Builder confimationAlertDialog = new AlertDialog.Builder(this);
- confimationAlertDialog.setTitle(R.string.confirm_title_exit);
- confimationAlertDialog.setPositiveButton(R.string.positive_confirm, new DialogInterface.OnClickListener() {
+ confimationAlertDialog.setTitle(R.string.exit_confirmation_text);
+ confimationAlertDialog.setPositiveButton(getString(R.string.yes_text), new DialogInterface.OnClickListener() {
@RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN)
@Override
public void onClick(DialogInterface dialogInterface, int i) {
finishAffinity();
}
});
- confimationAlertDialog.setNegativeButton(R.string.negative_confirm, new DialogInterface.OnClickListener() {
+ confimationAlertDialog.setNegativeButton(getString(R.string.yes_text), new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
confimationAlertDialog.setCancelable(true);
@@ -344,7 +342,7 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra
txtBalance.setText(balance);
}
else
- txtBalance.setText("N/A");
+ txtBalance.setText(getString(R.string.na_text));
}
if(fullname!=null&&fullname.length()>0) {
@@ -420,12 +418,12 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra
if(bankName!=null&&bankName.length()>1)
bankName=" ("+bankName+") ";
- controlNo.setText(Html.fromHtml("GME Wallet No. " + walletNumber + "" +bankName));
+ String gmeWalletNo=getString(R.string.gme_wallet_no_text);
+ controlNo.setText(Html.fromHtml(gmeWalletNo+" " + walletNumber + "" +bankName));
}
private void changeLocaleTest()
{
- Log.d("SelectedLocale", Locale.getDefault().getLanguage()) ;
Locale locale = new Locale("ru");
Locale.setDefault(locale);
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeFragmentV2.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeFragmentV2.java
index de514ab4..9518213b 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeFragmentV2.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeFragmentV2.java
@@ -138,11 +138,11 @@ public class HomeFragmentV2 extends BaseFragment implements HomeMenuRvAdapterV2.
private List