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 getMenuData() { List menuList = new ArrayList<>(); - menuList.add(new MenuItem("Send Money", R.drawable.ic_menu_sendmoney, 1)); + menuList.add(new MenuItem(getString(R.string.send_money_text), R.drawable.ic_menu_sendmoney, 1)); // menuList.add(new MenuItem("Mobile Recharge", R.drawable.ic_menu_recharge, 2)); - menuList.add(new MenuItem("Today’s Rate", R.drawable.ic_menu_exchange_rate, 3)); - menuList.add(new MenuItem("Transaction Report", R.drawable.ic_menu_statement, 5)); - menuList.add(new MenuItem("GME Wallet Statement", R.drawable.ic_menu_trackloc, 4)); + menuList.add(new MenuItem(getString(R.string.todays_rate_text), R.drawable.ic_menu_exchange_rate, 3)); + menuList.add(new MenuItem(getString(R.string.transaction_report_text), R.drawable.ic_menu_statement, 5)); + menuList.add(new MenuItem(getString(R.string.gme_wallet_statement_text) , R.drawable.ic_menu_trackloc, 4)); // menuList.add(new MenuItem("Wallet to Wallet Transfer", R.drawable.ic_menu_wallet, 6)); return menuList; } @@ -246,8 +246,7 @@ public class HomeFragmentV2 extends BaseFragment implements HomeMenuRvAdapterV2. if (parentView != null) parentView.getPresenter().manullyUpdateKYCToSubmittedAndShowPennyTest(); new Handler().postDelayed(this::showPennyTestView, 700); -// showPennyTestView(false); - } + } } } else if (requestCode == PENNY_REQUEST_FROM_HOME) { diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/recipientadd/RecipientAddV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/recipientadd/RecipientAddV2Presenter.java index e60cdfc6..ff496190 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/recipientadd/RecipientAddV2Presenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/recipientadd/RecipientAddV2Presenter.java @@ -1,5 +1,6 @@ package com.gmeremit.online.gmeremittance_native.recipientV2.presenter.recipientadd; +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.recipientV2.gateway.RecipientAddV2Gateway; @@ -13,7 +14,6 @@ import com.gmeremit.online.gmeremittance_native.recipientV2.model.recipientadd.R import com.gmeremit.online.gmeremittance_native.recipientV2.model.recipientadd.TransferDetailModel; import com.gmeremit.online.gmeremittance_native.recipientV2.model.recipientlisting.RecipientInfoModel; import com.gmeremit.online.gmeremittance_native.utils.Constants; -import com.gmeremit.online.gmeremittance_native.utils.Utils; import com.gmeremit.online.gmeremittance_native.utils.https.GenericApiObserverResponse; import io.reactivex.Observable; @@ -106,10 +106,11 @@ public class RecipientAddV2Presenter extends BasePresenter implements RecipientA { if(!checkStringNotEmpty(firstName)) { - view.setErrorOnFirstName("First Name cannot be empty"); + view.setErrorOnFirstName(getStringfromStringId(R.string.first_name_error)); return false; } view.setErrorOnFirstName(null); + return true; } @@ -117,7 +118,7 @@ public class RecipientAddV2Presenter extends BasePresenter implements RecipientA { if(!checkStringNotEmpty(lastName)) { - view.setErrorOnLastName("Last Name cannot be empty"); + view.setErrorOnLastName(getStringfromStringId(R.string.last_name_error)); return false; } view.setErrorOnLastName(null); @@ -128,7 +129,7 @@ public class RecipientAddV2Presenter extends BasePresenter implements RecipientA { if(!checkStringNotEmpty(address)) { - view.setErrorOnAddress("Address cannot be empty"); + view.setErrorOnAddress(getStringfromStringId(R.string.address_error)); return false; } view.setErrorOnAddress(null); @@ -138,7 +139,7 @@ public class RecipientAddV2Presenter extends BasePresenter implements RecipientA { if(!checkStringNotEmpty(mobile)) { - view.setErrorOnMobileNumber("Mobile number cannot be empty"); + view.setErrorOnMobileNumber(getStringfromStringId(R.string.mobile_number_error)); return false; } view.setErrorOnMobileNumber(null); @@ -149,7 +150,7 @@ public class RecipientAddV2Presenter extends BasePresenter implements RecipientA { if(selectedRelation==null) { - view.setErrorOnRelation("Please select a relation"); + view.setErrorOnRelation(getStringfromStringId(R.string.relation_error)); return false; } view.setErrorOnRelation(null); @@ -159,7 +160,7 @@ public class RecipientAddV2Presenter extends BasePresenter implements RecipientA { if(selectedTransferReason==null) { - view.setErrorOnTransferReason("Please select a transfer reason"); + view.setErrorOnTransferReason(getStringfromStringId(R.string.transfer_reason_error)); return false; } view.setErrorOnTransferReason(null); @@ -193,7 +194,7 @@ public class RecipientAddV2Presenter extends BasePresenter implements RecipientA hasState=true; } else { - view.setErrorOnProvince("Please select a state/province"); + view.setErrorOnProvince(getStringfromStringId(R.string.select_province_error)); hasState= false; } if(district!=null) { @@ -202,7 +203,7 @@ public class RecipientAddV2Presenter extends BasePresenter implements RecipientA } else { - view.setErrorOnDistrict("Please select a district"); + view.setErrorOnDistrict(getStringfromStringId(R.string.select_district_error)); hasDistrict= false; } return hasState&&hasDistrict; @@ -212,7 +213,7 @@ public class RecipientAddV2Presenter extends BasePresenter implements RecipientA return true; } } else { - view.setErrorOnCountry("Please select a country"); + view.setErrorOnCountry(getStringfromStringId(R.string.select_country_error)); return false; } } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/recipientadd/RecipientAddV2Activity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/recipientadd/RecipientAddV2Activity.java index 86959f15..5231cb1c 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/recipientadd/RecipientAddV2Activity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/recipientadd/RecipientAddV2Activity.java @@ -181,13 +181,13 @@ public class RecipientAddV2Activity extends BaseActivity implements View.OnClick } private void performDefaultAction(Bundle savedInstanceState) { - toolbarTitle.setText("Add Recipient"); + toolbarTitle.setText(getString(R.string.add_recipient_text)); //TODO modify this for reciepient CRUD try { recipientToBeEdited = getIntent().getExtras().getParcelable(RECIPIENT_INFO_BUNDLE_KEY); selectedRecipientId = recipientToBeEdited.getRecipientId(); if (recipientToBeEdited != null) - toolbarTitle.setText("Edit Recipient"); + toolbarTitle.setText(getString(R.string.edit_recipient_text)); } catch (Exception e) { @@ -296,7 +296,7 @@ public class RecipientAddV2Activity extends BaseActivity implements View.OnClick if (!districtListingDialog.isAdded()) districtListingDialog.show(getSupportFragmentManager(), "RecipientProvinceListingDialog"); } else { - showToastMessage("Select a State/Province first."); + showToastMessage(getString(R.string.select_province_error)); } } @@ -310,7 +310,7 @@ public class RecipientAddV2Activity extends BaseActivity implements View.OnClick if (!provinceListingDialog.isAdded()) provinceListingDialog.show(getSupportFragmentManager(), "RecipientProvinceListingDialog"); } else { - showToastMessage("Select a Country first."); + showToastMessage(getString(R.string.select_country_error)); } } 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 88303532..20bee35d 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 @@ -67,7 +67,7 @@ public class RecipientListingV2Activity extends BaseActivity implements Recipien private void init() { iv_cancel.setVisibility(View.INVISIBLE); - toolbarTitle.setText("Select Recipient"); + toolbarTitle.setText(getString(R.string.recipient_listing_title_text)); this.recipientListingV2PresenterInterface = new RecipientListingV2Presenter(this); setupRecyclerView(); @@ -173,7 +173,7 @@ public class RecipientListingV2Activity extends BaseActivity implements Recipien @Override public void onRecipientLongPressed(RecipientInfoModel recipientInfoModel) { - CharSequence[] charSequences = new CharSequence[]{"Delete", "Edit"}; + CharSequence[] charSequences = new CharSequence[]{getString(R.string.delete_text), getString(R.string.edit_text)}; AlertDialog.Builder alert = new AlertDialog.Builder(RecipientListingV2Activity.this); alert.setItems(charSequences, new DialogInterface.OnClickListener() { @Override diff --git a/app/src/main/res/layout/acitivity_recipient_listing_v2.xml b/app/src/main/res/layout/acitivity_recipient_listing_v2.xml index 33720ab1..54bc0238 100644 --- a/app/src/main/res/layout/acitivity_recipient_listing_v2.xml +++ b/app/src/main/res/layout/acitivity_recipient_listing_v2.xml @@ -37,7 +37,7 @@ android:layout_marginLeft="10dp" android:layout_toRightOf="@id/iv_front_image" android:padding="2dp" - android:text="New Recipient" + android:text="@string/new_recipient" android:textColor="@color/darkgray" android:textSize="17sp" /> @@ -52,7 +52,7 @@ android:background="@null" android:enabled="false" android:gravity="center" - android:hint="Hold to "Edit" or "Delete" recipient profile" + android:hint="@string/edit_delete_hint_android_text" android:imeActionLabel="Done" android:inputType="text" android:textSize="14sp" diff --git a/app/src/main/res/layout/activity_exchange_method_v2.xml b/app/src/main/res/layout/activity_exchange_method_v2.xml index b43ab5d9..ee483888 100644 --- a/app/src/main/res/layout/activity_exchange_method_v2.xml +++ b/app/src/main/res/layout/activity_exchange_method_v2.xml @@ -31,7 +31,7 @@ @@ -243,7 +243,7 @@ android:layout_height="wrap_content" android:paddingTop="3dp" android:paddingStart="3dp" - android:text="Recepient Gets" + android:text="@string/receipient_gets_text" android:textColor="@color/darkgray" android:textSize="16sp" android:paddingLeft="3dp" /> @@ -312,7 +312,7 @@ android:layout_height="50dp" android:layout_gravity="center" android:background="@drawable/ic_rounded_background_coloured" - android:text="Calculate" + android:text="@string/calculate_text" android:textAllCaps="false" android:textColor="@color/white" android:textSize="18sp" /> diff --git a/app/src/main/res/layout/activity_login_v2.xml b/app/src/main/res/layout/activity_login_v2.xml index e2b6b576..21bba2ff 100644 --- a/app/src/main/res/layout/activity_login_v2.xml +++ b/app/src/main/res/layout/activity_login_v2.xml @@ -36,7 +36,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="10dp" android:paddingTop="6dp" - android:text="Welcome to\nGlobal Money Express" + android:text="@string/login_title_text" android:textColor="@color/colorAccent" android:textSize="24sp" app:txtfontName="@string/bold"/> @@ -47,7 +47,7 @@ android:layout_marginLeft="10dp" android:paddingTop="8dp" android:paddingBottom="8dp" - android:text="Login with your email address" + android:text="@string/login_subtitle_text" android:textSize="14sp" app:txtfontName="@string/regular" /> @@ -61,7 +61,7 @@ android:layout_marginLeft="10dp" android:layout_marginBottom="3dp" android:layout_marginRight="10dp" - android:hint="User ID" + android:hint="@string/login_user_id_text" android:textColorHint="@color/darkgray"> @@ -111,7 +111,7 @@ android:layout_marginTop="8dp" android:layout_marginBottom="8dp" android:padding="5dp" - android:text="Forgot Password?" + android:text="@string/forgot_password_text" android:textColor="@color/colorAccent" android:textSize="14sp"/> @@ -130,7 +130,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:text="New to GME? " + android:text="@string/new_to_gme_text" android:textColor="@color/darkgray" android:textSize="14sp"/> @@ -140,7 +140,7 @@ android:id="@+id/register" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Register Here" + android:text="@string/login_register_here_text" android:textColor="#2e3192" android:textSize="14sp"/> @@ -158,7 +158,7 @@ android:layout_marginBottom="4dp" android:layout_marginTop="4dp" android:background="@drawable/red_morph_button_bg" - android:text="Login" + android:text="@string/login_text" android:textAllCaps="false" android:textColor="@color/white" android:textSize="18sp"/> diff --git a/app/src/main/res/layout/activity_recipient_v2.xml b/app/src/main/res/layout/activity_recipient_v2.xml index 5388f86a..638b337c 100644 --- a/app/src/main/res/layout/activity_recipient_v2.xml +++ b/app/src/main/res/layout/activity_recipient_v2.xml @@ -1,11 +1,10 @@ + > @@ -48,7 +47,7 @@ android:id="@+id/firstnameWrapper" android:layout_width="match_parent" android:layout_height="wrap_content" - android:hint="First Name" + android:hint="@string/first_name_text" android:textColorHint="@color/darkgray"> diff --git a/app/src/main/res/layout/activity_register_v2.xml b/app/src/main/res/layout/activity_register_v2.xml index b3277f43..c2053fe1 100644 --- a/app/src/main/res/layout/activity_register_v2.xml +++ b/app/src/main/res/layout/activity_register_v2.xml @@ -39,7 +39,7 @@ android:layout_height="wrap_content" android:paddingTop="10dp" android:paddingBottom="5dp" - android:text="Register to\nGlobal Money Express" + android:text="@string/register_title_text" android:textColor="@color/colorAccent" android:textSize="24sp" app:txtfontName="@string/bold"/> @@ -61,7 +61,7 @@ android:id="@+id/useridWrapper" android:layout_width="match_parent" android:layout_height="wrap_content" - android:hint="Email" + android:hint="@string/email_text" android:textColorHint="@color/darkgray"> @@ -181,7 +181,7 @@ android:id="@+id/tv_login" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Login" + android:text="@string/login_text" android:textColor="#2e3192" android:textSize="14sp"/> @@ -195,7 +195,7 @@ android:layout_marginBottom="4dp" android:layout_marginTop="4dp" android:background="@drawable/ic_rounded_background_coloured" - android:text="Register" + android:text="@string/register_text" android:textAllCaps="false" android:textColor="@color/white" android:textSize="18sp"/> diff --git a/app/src/main/res/layout/activity_reset_pass_v2.xml b/app/src/main/res/layout/activity_reset_pass_v2.xml index 72eb0693..b6539908 100644 --- a/app/src/main/res/layout/activity_reset_pass_v2.xml +++ b/app/src/main/res/layout/activity_reset_pass_v2.xml @@ -34,7 +34,7 @@ android:layout_height="wrap_content" android:paddingTop="10dp" android:paddingBottom="5dp" - android:text="Need Help with your\nPassword?" + android:text="@string/forgot_password_title_text" android:textColor="@color/colorAccent" android:textSize="24sp" app:txtfontName="@string/bold"/> @@ -42,7 +42,7 @@ diff --git a/app/src/main/res/layout/fragment_home_v2.xml b/app/src/main/res/layout/fragment_home_v2.xml index 6b64c4ce..9a528d64 100644 --- a/app/src/main/res/layout/fragment_home_v2.xml +++ b/app/src/main/res/layout/fragment_home_v2.xml @@ -194,7 +194,7 @@ android:layout_centerHorizontal="true" android:gravity="center_horizontal" android:padding="2dp" - android:text="@string/remaining_yearly_balance_text" + android:text="@string/remaining_limit_text" android:textSize="13sp" app:fontFamily="@string/bold" app:txtfontName="@string/bold" /> @@ -213,7 +213,7 @@ android:id="@+id/tv_balance" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="N/A" + android:text="@string/na_text" android:textColor="@color/colorAccent" android:textSize="24sp" /> @@ -224,7 +224,7 @@ android:layout_below="@id/tv_balance_label" android:layout_centerHorizontal="true" android:paddingLeft="4dp" - android:text="USD " + android:text="@string/usd_text" android:textColor="@color/darkgray" android:textSize="18sp" android:visibility="gone" /> @@ -287,7 +287,7 @@ android:layout_toLeftOf="@id/tv_rewardpoint" android:paddingRight="4dp" android:paddingTop="6dp" - android:text="Reward Point " + android:text="@string/reward_point_text" android:textSize="12sp" android:visibility="invisible" /> @@ -302,7 +302,6 @@ android:gravity="center" android:paddingLeft="10dp" android:paddingRight="10dp" - android:text="99" android:textColor="@color/white" android:textSize="12sp" android:visibility="invisible" /> diff --git a/app/src/main/res/layout/layout_bottom_tab_bar.xml b/app/src/main/res/layout/layout_bottom_tab_bar.xml index 95b95bc0..f8bc01dc 100644 --- a/app/src/main/res/layout/layout_bottom_tab_bar.xml +++ b/app/src/main/res/layout/layout_bottom_tab_bar.xml @@ -27,7 +27,7 @@ android:padding="2dp" android:layout_gravity="center" android:textColor="@color/dark_gray" - android:text="Home"/> + android:text="@string/home"/> + android:text="@string/send_money_text"/> + android:text="@string/branch_text"/> + android:text="@string/profile_text"/> \ No newline at end of file diff --git a/app/src/main/res/layout/nav_drawer_fragment.xml b/app/src/main/res/layout/nav_drawer_fragment.xml index 411f571d..7b7e5315 100644 --- a/app/src/main/res/layout/nav_drawer_fragment.xml +++ b/app/src/main/res/layout/nav_drawer_fragment.xml @@ -99,7 +99,7 @@ @@ -111,21 +111,23 @@ + android:text="@string/krw_text" /> @@ -151,7 +153,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="15dp" - android:text="@string/drawer_user_number" + android:text="@string/gme_wallet_no_text" android:textColor="@color/darkgray" android:textSize="15sp" /> @@ -188,7 +190,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="12dp" android:layout_marginStart="12dp" - android:text="Auto Debit Account" + android:text="@string/auto_debit_account_text" android:textColor="@color/darkgray" android:textSize="14sp" /> @@ -217,7 +219,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="14dp" android:layout_marginStart="14dp" - android:text="About GME" + android:text="@string/about_gme_text" android:textColor="@color/darkgray" android:textSize="14sp" /> @@ -277,7 +279,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="14dp" android:layout_marginStart="14dp" - android:text="Settings" + android:text="@string/settings_text" android:textColor="@color/darkgray" android:textSize="14sp" /> @@ -306,7 +308,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="14dp" android:layout_marginStart="14dp" - android:text="Logout" + android:text="@string/logout_text" android:textColor="@color/darkgray" android:textSize="14sp" /> diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml index 8333e4cf..9492cf7d 100644 --- a/app/src/main/res/values-ru-rRU/strings.xml +++ b/app/src/main/res/values-ru-rRU/strings.xml @@ -17,7 +17,7 @@ Your document is in verification process. This will not take long. Thereafter you can enjoy GME online service. Please add the required information. - Are you sure want to exit ? + Are you sure want to exit ? Yes No @@ -46,5 +46,5 @@ Your verification is still in progress. - Остающийся годовой баланс + Остающийся годовой баланс diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 64dc5f73..e89ea752 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -17,9 +17,7 @@ Your document is in verification process. This will not take long. Thereafter you can enjoy GME online service. Please add the required information. - Are you sure want to exit ? - Yes - No + We are there to help you \n(Available time 10:00AM - 12:00AM) Cancel @@ -46,11 +44,90 @@ Your verification is still in progress. - Remaining Yearly Balance Resend Request + Welcome to Global Money Express + Login with your email address + User ID + Password + Forgot Password? + New to GME? + Register Here + Login + Register to Global Money Express + Email + Confirm Password + Date of Birth + Already have an account? + Register + Need Help with your Password? + Reset your password using your email address linked to your GME account. + Reset + Remaining Yearly Balance + N/A + USD + Reward Point + Logout + Logout? + Are you sure you want to logout + Yes + No + Are you sure want to exit? + Your Available Balance + GME Wallet No. + About GME + Settings + Home + Branch + Profile + Send Money + Today’s Rate + Transaction Report + GME Wallet Statement + Verify your Account + Kindly complete your registration process with us to start using GME services. + Verification in Process + Your registration request is in approval process. You will soon be able to use GME services. + Continue the registration process + Please verify your primary bank account to complete the registration. + KRW + Auto Debit Account + Select Recipient + Delete + Edit + New Recipient + Hold to \"Edit\" or \"Delete\" recipient profile + Add Recipient + Edit Recipient + Who are you sending money to? + First Name + Middle Name (Optional) + Last Name + Select Country + Address + Relation + Mobile No. + Transfer Reason + Save and Continue + First Name cannot be empty + Last Name cannot be empty + Address cannot be empty + Mobile number cannot be empty + Please select a relation + Please select a transfer reason + Please select a country + Please select a state/province + Please select a district + Today\'s Rate + You Send + Recepient Gets + Select Payment Mode + Calculate + Please select a currency + Transfer Fee Included + Current Exchange Rate