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

Locale splash left and and dialogs

master
preyearegmi 6 years ago
parent
5a676acf71
commit
6d9032c5f6
8 changed files with 28 additions and 14 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. 6
      app/src/main/java/com/gmeremit/online/gmeremittance_native/changepasswordV2/view/ChangePasswordV2Activity.java
  2. 8
      app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeActivityV2.java
  3. 2
      app/src/main/java/com/gmeremit/online/gmeremittance_native/loginV2/view/LoginV2Activity.java
  4. 4
      app/src/main/java/com/gmeremit/online/gmeremittance_native/registerV2/view/RegisterV2Activity.java
  5. 2
      app/src/main/res/layout/activity_login_v2.xml
  6. 6
      app/src/main/res/layout/activity_register_v2.xml
  7. 4
      app/src/main/res/values-th-rTH/strings.xml
  8. 10
      app/src/main/res/values/strings.xml

6
app/src/main/java/com/gmeremit/online/gmeremittance_native/changepasswordV2/view/ChangePasswordV2Activity.java
View File

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

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

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

2
app/src/main/java/com/gmeremit/online/gmeremittance_native/loginV2/view/LoginV2Activity.java
View File

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

4
app/src/main/java/com/gmeremit/online/gmeremittance_native/registerV2/view/RegisterV2Activity.java
View File

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

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

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

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

@ -53,7 +53,7 @@
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Register with your email address "
android:text="@string/register_subtitle_text"
android:textSize="14sp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
@ -65,7 +65,7 @@
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:paddingBottom="2dp"
android:text="@string/email_text"
android:text="@string/login_user_id_text"
android:textSize="14sp"
app:txtfontName="@string/regular" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
@ -98,7 +98,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingBottom="2dp"
android:text="@string/password_text"
android:text="@string/create_password_text"
android:textSize="14sp"
app:txtfontName="@string/regular" />
<com.gmeremit.online.gmeremittance_native.utils.security.securitykeypad.SecurityKeyboardView

4
app/src/main/res/values-th-rTH/strings.xml
View File

@ -337,4 +337,6 @@
<string name="no_account_found_text">Not Translated</string>
<string name="select_account_text">Not Translated</string>
<string name="search_account_text">Not Translated</string>
</resources>
<string name="confirm_new_password_placeholder_text">Not Translated</string>
</resources>

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

@ -53,6 +53,7 @@
<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="register_subtitle_text">Register with your email address</string>
<string name="email_text">Email</string>
<string name="confirm_password_text">Confirm Password</string>
<string name="dob_text">Date of Birth</string>
@ -298,6 +299,15 @@
<string name="search_account_text">Search Account</string>
<string name="search_currency_text">Search Currency</string>
<string name="select_currency_text">Select Currency</string>
<string name="user_Id_placeholder_text">Registered Email</string>
<string name="password_placeholder_text">********</string>
<string name="create_password_text">Create Password</string>
<string name="confirm_new_password_placeholder_text">Confirm Your Password</string>
<string name="current_password_placeholder_text">Enter Your Current Password</string>
<string name="new_password_placeholder_text">Enter Your New Password</string>
</resources>
Write Preview
Loading…
Cancel
Save