IME-LONDON
/
Android_London
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

String extracted to xml till Exchange Rate

master
preyearegmi 6 years ago
parent
5120877bf8
commit
70fe54bb5e
22 changed files with 216 additions and 128 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      .idea/caches/build_file_checksums.ser
  2. 6
      app/src/main/java/com/gmeremit/online/gmeremittance_native/GmeApplication.java
  3. 8
      app/src/main/java/com/gmeremit/online/gmeremittance_native/base/BasePresenter.java
  4. 8
      app/src/main/java/com/gmeremit/online/gmeremittance_native/exchange_rate/presenter/ExchangeRateV2Presenter.java
  5. 2
      app/src/main/java/com/gmeremit/online/gmeremittance_native/exchange_rate/view/ExchangeMethodV2Activity.java
  6. 42
      app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2Presenter.java
  7. 24
      app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeActivityV2.java
  8. 9
      app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeFragmentV2.java
  9. 21
      app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/recipientadd/RecipientAddV2Presenter.java
  10. 8
      app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/recipientadd/RecipientAddV2Activity.java
  11. 4
      app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/recipientlisting/RecipientListingV2Activity.java
  12. 4
      app/src/main/res/layout/acitivity_recipient_listing_v2.xml
  13. 8
      app/src/main/res/layout/activity_exchange_method_v2.xml
  14. 16
      app/src/main/res/layout/activity_login_v2.xml
  15. 24
      app/src/main/res/layout/activity_recipient_v2.xml
  16. 16
      app/src/main/res/layout/activity_register_v2.xml
  17. 10
      app/src/main/res/layout/activity_reset_pass_v2.xml
  18. 9
      app/src/main/res/layout/fragment_home_v2.xml
  19. 8
      app/src/main/res/layout/layout_bottom_tab_bar.xml
  20. 20
      app/src/main/res/layout/nav_drawer_fragment.xml
  21. 4
      app/src/main/res/values-ru-rRU/strings.xml
  22. 85
      app/src/main/res/values/strings.xml

BIN
.idea/caches/build_file_checksums.ser
View File

6
app/src/main/java/com/gmeremit/online/gmeremittance_native/GmeApplication.java
View File

@ -158,10 +158,16 @@ public class GmeApplication extends MultiDexApplication {
public String getStringFromStringId(@StringRes int stringResourceID)
{
try {
if (resources == null)
return "";
return resources.getString(stringResourceID);
}
catch (Exception e)
{
return "No string resource mapped to : "+stringResourceID;
}
}
}
}

8
app/src/main/java/com/gmeremit/online/gmeremittance_native/base/BasePresenter.java
View File

@ -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

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

@ -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);
}

2
app/src/main/java/com/gmeremit/online/gmeremittance_native/exchange_rate/view/ExchangeMethodV2Activity.java
View File

@ -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();
}

42
app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2Presenter.java
View File

@ -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)

24
app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeActivityV2.java
View File

@ -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. <b><font color='#ed1c24'>" + walletNumber + "</font></b>" +bankName));
String gmeWalletNo=getString(R.string.gme_wallet_no_text);
controlNo.setText(Html.fromHtml(gmeWalletNo+" <b><font color='#ed1c24'>" + walletNumber + "</font></b>" +bankName));
}
private void changeLocaleTest()
{
Log.d("SelectedLocale", Locale.getDefault().getLanguage()) ;
Locale locale = new Locale("ru");
Locale.setDefault(locale);

9
app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeFragmentV2.java
View File

@ -138,11 +138,11 @@ public class HomeFragmentV2 extends BaseFragment implements HomeMenuRvAdapterV2.
private List<MenuItem> getMenuData() {
List<MenuItem> 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,7 +246,6 @@ public class HomeFragmentV2 extends BaseFragment implements HomeMenuRvAdapterV2.
if (parentView != null)
parentView.getPresenter().manullyUpdateKYCToSubmittedAndShowPennyTest();
new Handler().postDelayed(this::showPennyTestView, 700);
// showPennyTestView(false);
}
}
}

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

@ -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;
}
}

8
app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/recipientadd/RecipientAddV2Activity.java
View File

@ -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));
}
}

4
app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/recipientlisting/RecipientListingV2Activity.java
View File

@ -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

4
app/src/main/res/layout/acitivity_recipient_listing_v2.xml
View File

@ -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" />
</LinearLayout>
@ -52,7 +52,7 @@
android:background="@null"
android:enabled="false"
android:gravity="center"
android:hint="Hold to &quot;Edit&quot; or &quot;Delete&quot; recipient profile"
android:hint="@string/edit_delete_hint_android_text"
android:imeActionLabel="Done"
android:inputType="text"
android:textSize="14sp"

8
app/src/main/res/layout/activity_exchange_method_v2.xml
View File

@ -31,7 +31,7 @@
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="Select Payment Mode"
android:text="@string/select_payment_mode_text"
android:paddingTop="6dp"
android:paddingBottom="6dp"
android:textColor="@color/darkgray"
@ -74,7 +74,7 @@
android:paddingStart="3dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="You Send"
android:text="@string/you_send_text"
android:textColor="@color/darkgray"
android:textSize="16sp"
android:paddingLeft="3dp" />
@ -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" />

16
app/src/main/res/layout/activity_login_v2.xml
View File

@ -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">
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
@ -84,7 +84,7 @@
android:layout_below="@id/useridWrapper"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:hint="Password"
android:hint="@string/password_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"/>
</LinearLayout>
@ -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"/>

24
app/src/main/res/layout/activity_recipient_v2.xml
View File

@ -1,11 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
tools:context="com.gmeremit.online.gmeremittance_native.recipient.view.NewRecipientActivity">
>
<include layout="@layout/layout_sendmoney_toolbar" />
<View
@ -28,7 +27,7 @@
android:gravity="center"
android:paddingTop="9dp"
android:paddingBottom="10dp"
android:text="Who are you sending money to?"
android:text="@string/who_to_send_text"
android:textColor="@color/darkgray"
android:textSize="18sp" />
@ -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">
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
@ -65,7 +64,7 @@
android:id="@+id/middlenameWrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="Middle Name (Optional)"
android:hint="@string/enter_receiver_middlename_text"
android:textColorHint="@color/darkgray">
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
@ -82,7 +81,7 @@
android:id="@+id/lastnameWrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="Last Name"
android:hint="@string/last_name_text"
android:textColorHint="@color/darkgray">
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
@ -108,7 +107,7 @@
android:id="@+id/countryWrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="Select Country"
android:hint="@string/placeholder_select_country_text"
android:textColorHint="@color/darkgray">
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
@ -226,7 +225,7 @@
android:id="@+id/addressWrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="Address"
android:hint="@string/address_text"
android:textColorHint="@color/darkgray">
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
@ -251,7 +250,7 @@
android:id="@+id/relationWrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="Relation"
android:hint="@string/relation_text"
android:textColorHint="@color/darkgray">
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
@ -283,7 +282,7 @@
android:id="@+id/mobileWrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="Mobile No."
android:hint="@string/mobile_number_text"
android:textColorHint="@color/darkgray">
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
@ -327,7 +326,7 @@
android:id="@+id/transferWrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="Transfer Reason"
android:hint="@string/transfer_reason_text"
android:textColorHint="@color/darkgray">
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
@ -365,8 +364,7 @@
android:layout_marginBottom="30dp"
android:layout_marginTop="20dp"
android:background="@drawable/ic_rounded_background_coloured"
android:onClick="onClickSubmit"
android:text="Save and Continue"
android:text="@string/save_text"
android:textAllCaps="false"
android:textColor="@color/white"
android:textSize="16sp" />

16
app/src/main/res/layout/activity_register_v2.xml
View File

@ -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">
<EditText
android:id="@+id/email_mobile"
@ -78,7 +78,7 @@
android:id="@+id/passwordWrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="Password"
android:hint="@string/password_text"
app:hintEnabled="true"
android:paddingTop="1dp"
android:paddingBottom="1dp"
@ -99,7 +99,7 @@
android:id="@+id/confirmpassWrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="Confirm Password"
android:hint="@string/confirm_password_text"
android:textColorHint="@color/darkgray">
<EditText
android:id="@+id/confirm_password"
@ -124,7 +124,7 @@
android:id="@+id/dobWrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="Date of Birth"
android:hint="@string/dob_text"
app:hintEnabled="true"
android:paddingTop="1dp"
android:paddingBottom="1dp"
@ -171,7 +171,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="Already have an account? "
android:text="@string/already_have_account_text"
android:textColor="@color/darkgray"
android:textSize="14sp"/>
@ -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"/>
</LinearLayout>
@ -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"/>

10
app/src/main/res/layout/activity_reset_pass_v2.xml
View File

@ -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 @@
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Reset your password using your email address linked to your GME account."
android:text="@string/forgot_password_subtitle_text"
android:textSize="14sp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
@ -55,7 +55,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">
<EditText
android:id="@+id/email_mobile"
@ -81,7 +81,7 @@
android:id="@+id/dobWrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="Date of Birth"
android:hint="@string/dob_text"
app:hintEnabled="true"
android:paddingTop="1dp"
android:paddingBottom="1dp"
@ -117,7 +117,7 @@
android:layout_marginBottom="4dp"
android:layout_marginTop="10dp"
android:background="@drawable/ic_rounded_background_coloured"
android:text="Reset"
android:text="@string/reset_text"
android:textAllCaps="false"
android:textColor="@color/white"
android:textSize="18sp"/>

9
app/src/main/res/layout/fragment_home_v2.xml
View File

@ -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" />

8
app/src/main/res/layout/layout_bottom_tab_bar.xml
View File

@ -27,7 +27,7 @@
android:padding="2dp"
android:layout_gravity="center"
android:textColor="@color/dark_gray"
android:text="Home"/>
android:text="@string/home"/>
</LinearLayout>
<LinearLayout
android:id="@+id/bottom_invite_layout"
@ -76,7 +76,7 @@
android:padding="2dp"
android:layout_gravity="center"
android:textColor="@color/dark_gray"
android:text="Send Money"/>
android:text="@string/send_money_text"/>
</LinearLayout>
<LinearLayout
android:id="@+id/bottom_agent_layout"
@ -100,7 +100,7 @@
android:padding="2dp"
android:layout_gravity="center"
android:textColor="@color/dark_gray"
android:text="Branch"/>
android:text="@string/branch_text"/>
</LinearLayout>
<LinearLayout
android:id="@+id/bottom_profile_layout"
@ -124,7 +124,7 @@
android:padding="2dp"
android:layout_gravity="center"
android:textColor="@color/dark_gray"
android:text="Profile"/>
android:text="@string/profile_text"/>
</LinearLayout>
</LinearLayout>

20
app/src/main/res/layout/nav_drawer_fragment.xml
View File

@ -99,7 +99,7 @@
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Your Available Balance"
android:text="@string/available_balance_text"
android:textColor="@color/darkgray"
android:textSize="14sp" />
@ -111,21 +111,23 @@
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/txt_balance"
android:layout_gravity="bottom"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="N/A"
android:text="@string/na_text"
android:gravity="center"
android:textColor="@color/cs_red"
android:textSize="24sp" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_gravity="center"
android:layout_gravity="bottom"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_marginLeft="3dp"
android:layout_marginStart="3dp"
android:text="KRW" />
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" />

4
app/src/main/res/values-ru-rRU/strings.xml
View File

@ -17,7 +17,7 @@
<!-- TODO: Remove or change this placeholder text -->
<string name="verify_account_text">Your document is in verification process. This will not take long. Thereafter you can enjoy GME online service.</string>
<string name="emptyTextFieldIndicator">Please add the required information.</string>
<string name="confirm_title_exit">Are you sure want to exit ?</string>
<string name="exit_confirmation_text">Are you sure want to exit ?</string>
<string name="positive_confirm">Yes</string>
<string name="negative_confirm">No</string>
@ -46,5 +46,5 @@
<string name="non_verified_info">Your verification is still in progress.</string>
<string name="remaining_yearly_balance_text" translatable="true">Остающийся годовой баланс</string>
<string name="remaining_limit_text" translatable="true">Остающийся годовой баланс</string>
</resources>

85
app/src/main/res/values/strings.xml
View File

@ -17,9 +17,7 @@
<!-- TODO: Remove or change this placeholder text -->
<string name="verify_account_text">Your document is in verification process. This will not take long. Thereafter you can enjoy GME online service.</string>
<string name="emptyTextFieldIndicator">Please add the required information.</string>
<string name="confirm_title_exit">Are you sure want to exit ?</string>
<string name="positive_confirm">Yes</string>
<string name="negative_confirm">No</string>
<string name="customer_support_description">We are there to help you \n(Available time 10:00AM - 12:00AM)</string>
<string name="cancel">Cancel</string>
@ -46,11 +44,90 @@
<string name="non_verified_info">Your verification is still in progress.</string>
<string name="remaining_yearly_balance_text">Remaining Yearly Balance</string>
<string name="resend_request" translatable="false"><u>Resend Request</u></string>
<!--For V2 start from here-->
<string name="login_title_text">Welcome to Global Money Express</string>
<string name="login_subtitle_text">Login with your email address</string>
<string name="login_user_id_text">User ID</string>
<string name="password_text">Password</string>
<string name="forgot_password_text">Forgot Password?</string>
<string name="new_to_gme_text">New to GME?</string>
<string name="login_register_here_text">Register Here</string>
<string name="login_text">Login</string>
<string name="register_title_text">Register to Global Money Express</string>
<string name="email_text">Email</string>
<string name="confirm_password_text">Confirm Password</string>
<string name="dob_text">Date of Birth</string>
<string name="already_have_account_text">Already have an account?</string>
<string name="register_text">Register</string>
<string name="forgot_password_title_text">Need Help with your Password?</string>
<string name="forgot_password_subtitle_text">Reset your password using your email address linked to your GME account.</string>
<string name="reset_text">Reset</string>
<string name="remaining_limit_text">Remaining Yearly Balance</string>
<string name="na_text">N/A</string>
<string name="usd_text">USD</string>
<string name="reward_point_text">Reward Point</string>
<string name="logout_text">Logout</string>
<string name="logout_confirmation_title_text">Logout?</string>
<string name="logout_confirmation_text">Are you sure you want to logout</string>
<string name="yes_text">Yes</string>
<string name="no_text">No</string>
<string name="exit_confirmation_text">Are you sure want to exit?</string>
<string name="available_balance_text">Your Available Balance</string>
<string name="gme_wallet_no_text">GME Wallet No.</string>
<string name="about_gme_text">About GME</string>
<string name="settings_text">Settings</string>
<string name="home">Home</string>
<string name="branch_text">Branch</string>
<string name="profile_text">Profile</string>
<string name="send_money_text">Send Money</string>
<string name="todays_rate_text">Today’s Rate</string>
<string name="transaction_report_text">Transaction Report</string>
<string name="gme_wallet_statement_text">GME Wallet Statement</string>
<string name="kyc_fill_text">Verify your Account</string>
<string name="complete_your_registration_text">Kindly complete your registration process with us to start using GME services.</string>
<string name="kyc_verify_pending_text">Verification in Process</string>
<string name="verification_in_aproval_process_text">Your registration request is in approval process. You will soon be able to use GME services.</string>
<string name="penny_test_pending_text">Continue the registration process</string>
<string name="complete_penny_test">Please verify your primary bank account to complete the registration.</string>
<string name="krw_text">KRW</string>
<string name="auto_debit_account_text">Auto Debit Account</string>
<string name="recipient_listing_title_text">Select Recipient</string>
<string name="delete_text">Delete</string>
<string name="edit_text">Edit</string>
<string name="new_recipient">New Recipient</string>
<string name="edit_delete_hint_android_text">Hold to \"Edit\" or \"Delete\" recipient profile</string>
<string name="add_recipient_text">Add Recipient</string>
<string name="edit_recipient_text">Edit Recipient</string>
<string name="who_to_send_text">Who are you sending money to?</string>
<string name="first_name_text">First Name</string>
<string name="enter_receiver_middlename_text">Middle Name (Optional)</string>
<string name="last_name_text">Last Name</string>
<string name="placeholder_select_country_text">Select Country</string>
<string name="address_text">Address</string>
<string name="relation_text">Relation</string>
<string name="mobile_number_text">Mobile No.</string>
<string name="transfer_reason_text">Transfer Reason</string>
<string name="save_text">Save and Continue</string>
<string name="first_name_error">First Name cannot be empty</string>
<string name="last_name_error">Last Name cannot be empty</string>
<string name="address_error">Address cannot be empty</string>
<string name="mobile_number_error">Mobile number cannot be empty</string>
<string name="relation_error">Please select a relation</string>
<string name="transfer_reason_error">Please select a transfer reason</string>
<string name="select_country_error">Please select a country</string>
<string name="select_province_error">Please select a state/province</string>
<string name="select_district_error">Please select a district</string>
<string name="todays_rate_title_text">Today\'s Rate</string>
<string name="you_send_text">You Send</string>
<string name="receipient_gets_text">Recepient Gets</string>
<string name="select_payment_mode_text">Select Payment Mode</string>
<string name="calculate_text">Calculate</string>
<string name="no_currency_selected_error">Please select a currency</string>
<string name="transfer_fee_included_text">Transfer Fee Included</string>
<string name="current_exchange_rate_text">Current Exchange Rate</string>
</resources>
Write Preview
Loading…
Cancel
Save