From 6d9032c5f64451358f1b3da1003c80d664e52999 Mon Sep 17 00:00:00 2001 From: preyearegmi Date: Fri, 1 Feb 2019 17:44:58 +0900 Subject: [PATCH] Locale splash left and and dialogs --- .../view/ChangePasswordV2Activity.java | 6 +++--- .../homeV2/view/HomeActivityV2.java | 8 +++++--- .../loginV2/view/LoginV2Activity.java | 2 +- .../registerV2/view/RegisterV2Activity.java | 4 ++-- app/src/main/res/layout/activity_login_v2.xml | 2 +- app/src/main/res/layout/activity_register_v2.xml | 6 +++--- app/src/main/res/values-th-rTH/strings.xml | 4 +++- app/src/main/res/values/strings.xml | 10 ++++++++++ 8 files changed, 28 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/changepasswordV2/view/ChangePasswordV2Activity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/changepasswordV2/view/ChangePasswordV2Activity.java index 978193cb..68d18203 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/changepasswordV2/view/ChangePasswordV2Activity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/changepasswordV2/view/ChangePasswordV2Activity.java @@ -115,7 +115,7 @@ public class ChangePasswordV2Activity extends BaseActivity implements ChangePass securityKeyboardCurrentPasswordManager = new SecurityKeyboardManager(this); SecurityKeypadRequestParamBuilder request = new SecurityKeypadRequestParamBuilder(this); request.disableKeyPadEffect(false); - request.setHintString("Password"); + request.setHintString(getString(R.string.current_password_placeholder_text)); securityKeyboardCurrentPasswordManager.bindWithSecurityWidgetView(securityKeyboardCurrentPasswordView) .setBallonView(ballonView) @@ -135,7 +135,7 @@ public class ChangePasswordV2Activity extends BaseActivity implements ChangePass try { securityKeyboardNewPasswordManager = new SecurityKeyboardManager(this); SecurityKeypadRequestParamBuilder request = new SecurityKeypadRequestParamBuilder(this); - request.setHintString("Password"); + request.setHintString(getString(R.string.new_password_placeholder_text)); securityKeyboardNewPasswordManager.bindWithSecurityWidgetView(securityKeyboardNewPassword) .setBallonView(ballonView) @@ -155,7 +155,7 @@ public class ChangePasswordV2Activity extends BaseActivity implements ChangePass try { securityKeyboardConfirmPasswordManager = new SecurityKeyboardManager(this); SecurityKeypadRequestParamBuilder request = new SecurityKeypadRequestParamBuilder(this); - request.setHintString("Password"); + request.setHintString(getString(R.string.confirm_new_password_placeholder_text)); securityKeyboardConfirmPasswordManager.bindWithSecurityWidgetView(securityKeyboardConfirmPassword) .setBallonView(ballonView) 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 0ab487eb..bc2ac61d 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 @@ -195,8 +195,7 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra break; case R.id.view_logout: showDrawer(false); -// showLogoutConfirmationDialog(); - changeLocaleTest(); + showLogoutConfirmationDialog(); break; case R.id.iv_close: showDrawer(false); @@ -222,7 +221,8 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra .setPositiveButton(getString(R.string.yes_text), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialogInterface, int i) { - performLogout(); + changeLocaleTest(); +// performLogout(); } }) .setNegativeButton(getString(R.string.no_text), new DialogInterface.OnClickListener() { @@ -455,6 +455,8 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra { showToastMessage("Please restart app manually."); } +// performLogout(); + } public static void restart(Context context, int delay) { diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/loginV2/view/LoginV2Activity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/loginV2/view/LoginV2Activity.java index 509fbbb9..fd62c9eb 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/loginV2/view/LoginV2Activity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/loginV2/view/LoginV2Activity.java @@ -125,7 +125,7 @@ public class LoginV2Activity extends BaseActivity implements View.OnClickListene try { securityKeyboardManager = new SecurityKeyboardManager(this); SecurityKeypadRequestParamBuilder request = new SecurityKeypadRequestParamBuilder(this); - request.setHintString("Password"); + request.setHintString(getString(R.string.password_placeholder_text)); request.disableKeyPadEffect(false); securityKeyboardManager.bindWithSecurityWidgetView(securityKeyboardView) diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/registerV2/view/RegisterV2Activity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/registerV2/view/RegisterV2Activity.java index b5a0c30f..bbb9a076 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/registerV2/view/RegisterV2Activity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/registerV2/view/RegisterV2Activity.java @@ -125,7 +125,7 @@ public class RegisterV2Activity extends BaseActivity implements RegisterV2Presen try { securityKeyboardPasswordManager = new SecurityKeyboardManager(this); SecurityKeypadRequestParamBuilder request = new SecurityKeypadRequestParamBuilder(this); - request.setHintString("Password"); + request.setHintString(getString(R.string.create_password_text)); securityKeyboardPasswordManager.bindWithSecurityWidgetView(securityKeyboardPasswordView) .setBallonView(ballonView) @@ -145,7 +145,7 @@ public class RegisterV2Activity extends BaseActivity implements RegisterV2Presen try { securityKeyboardConfirmPasswordManager = new SecurityKeyboardManager(this); SecurityKeypadRequestParamBuilder request = new SecurityKeypadRequestParamBuilder(this); - request.setHintString("Password"); + request.setHintString(getString(R.string.confirm_password_text)); request.disableKeyPadEffect(false); securityKeyboardConfirmPasswordManager.bindWithSecurityWidgetView(securityKeyboardConfirmPasswordView) diff --git a/app/src/main/res/layout/activity_login_v2.xml b/app/src/main/res/layout/activity_login_v2.xml index ad3d715b..407b924a 100644 --- a/app/src/main/res/layout/activity_login_v2.xml +++ b/app/src/main/res/layout/activity_login_v2.xml @@ -81,7 +81,7 @@ android:paddingEnd="8dp" android:textSize="16sp" android:minHeight="40dp" - android:hint="@string/login_user_id_text" + android:hint="@string/user_Id_placeholder_text" android:layout_marginStart="10dp" android:layout_marginEnd="10dp" android:imeOptions="actionDone" diff --git a/app/src/main/res/layout/activity_register_v2.xml b/app/src/main/res/layout/activity_register_v2.xml index e1f02c23..96489b83 100644 --- a/app/src/main/res/layout/activity_register_v2.xml +++ b/app/src/main/res/layout/activity_register_v2.xml @@ -53,7 +53,7 @@ Not Translated Not Translated Not Translated - \ No newline at end of file + Not Translated + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a63fd757..40cf565a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -53,6 +53,7 @@ Register Here Login Register to Global Money Express + Register with your email address Email Confirm Password Date of Birth @@ -298,6 +299,15 @@ Search Account Search Currency Select Currency + Registered Email + ******** + Create Password + Confirm Your Password + Enter Your Current Password + Enter Your New Password + + +