added japan as new language, extended special character boundry in Password part

3 years ago · ae3f824c86
10 changed files with 48 additions and 40 deletions
--- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/login/view/LoginV2Activity.java
+++ b/app/src/main/java/com/swifttech/remit/jmecustomer/features/login/view/LoginV2Activity.java
@ -4,6 +4,7 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.text.InputFilter;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
@ -21,6 +22,7 @@ import com.jakewharton.rxbinding3.widget.RxTextView;
 import com.swifttech.remit.jmecustomer.BuildConfig;
 import com.swifttech.remit.jmecustomer.R;
 import com.swifttech.remit.jmecustomer.base.BaseActivity;
+import com.swifttech.remit.jmecustomer.common.customwidgets.GmeEditText;
 import com.swifttech.remit.jmecustomer.common.model.FormInputStateDTO;
 import com.swifttech.remit.jmecustomer.features.home.view.HomeActivityV2;
 import com.swifttech.remit.jmecustomer.features.login.LoginViewModelFactory;
@ -29,6 +31,7 @@ import com.swifttech.remit.jmecustomer.features.login.presenter.LoginV2ViewModel
 import com.swifttech.remit.jmecustomer.features.login.presenter.LoginViewLiveData;
 import com.swifttech.remit.jmecustomer.features.registerv2.newcustomer.view.NewRegisterV2Activity;
 import com.swifttech.remit.jmecustomer.features.resetpassword.view.ResetPassV2Activity;
+import com.swifttech.remit.jmecustomer.utils.Constants;

 import butterknife.BindView;
 import butterknife.ButterKnife;
--- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/gateway/LanguageSelectionGateway.java
+++ b/app/src/main/java/com/swifttech/remit/jmecustomer/features/settings/gateway/LanguageSelectionGateway.java
@ -19,6 +19,7 @@ public class LanguageSelectionGateway implements LanguageSelectionGatewayInterfa
        List<LanguageModel> models = new ArrayList<>();
        models.add(new LanguageModel("EN", "en", RemitApplication.getStringExtractor().getStringFromStringId(R.string.english_language_text), "English"));
        models.add(new LanguageModel("MN", "mn", RemitApplication.getStringExtractor().getStringFromStringId(R.string.mongolia_language_text), "Mongolia"));
+        models.add(new LanguageModel("JP", "ja", RemitApplication.getStringExtractor().getStringFromStringId(R.string.japan_language_text), "Japanese"));
        models.add(new LanguageModel("KH", "km", RemitApplication.getStringExtractor().getStringFromStringId(R.string.cambodia_lanugage_text), "Cambodia"));
        models.add(new LanguageModel("KR", "ko", RemitApplication.getStringExtractor().getStringFromStringId(R.string.korean_language_text), "Korea"));
        models.add(new LanguageModel("TH", "th", RemitApplication.getStringExtractor().getStringFromStringId(R.string.thailand_language_text), "Thailand"));
@ -31,7 +32,6 @@ public class LanguageSelectionGateway implements LanguageSelectionGatewayInterfa
        models.add(new LanguageModel("UZ", "uz", RemitApplication.getStringExtractor().getStringFromStringId(R.string.uzbek_language_text), "Uzbekistan"));
        models.add(new LanguageModel("VN", "vi", RemitApplication.getStringExtractor().getStringFromStringId(R.string.vietnam_language_text), "Vietnam"));
        models.add(new LanguageModel("PH", "phi", RemitApplication.getStringExtractor().getStringFromStringId(R.string.philippines_language_text), "Philippines"));
-//        models.add(new LanguageModel("PK", "ur", RemitApplication.getStringExtractor().getStringFromStringId(R.string.pakistan_language_text), "Pakistan Urdu"));
        return models;
    }

--- a/app/src/main/java/com/swifttech/remit/jmecustomer/utils/Constants.java
+++ b/app/src/main/java/com/swifttech/remit/jmecustomer/utils/Constants.java
@ -59,6 +59,6 @@ public class Constants {
    public static String CANCEL="Cancel";
    public static String PAID="Paid";

-    public static String PASSWORD_PATTERN="^(?=.*[A-Z])(?=.*[a-z])(?=.*[@#$%^_&+-.=])(?=.*[0-9]).{8,24}$";
+    public static String PASSWORD_PATTERN="^(?=.*[A-Z])(?=.*[a-z])(?=.*[~!@+#.=$%^&*()_-\\{\\[\\}\\]\\?])(?=.*[0-9]).{8,24}$";

 }
--- a/app/src/main/res/layout/activity_change_pass_n_pin_layout.xml
+++ b/app/src/main/res/layout/activity_change_pass_n_pin_layout.xml
@ -22,13 +22,13 @@
                android:id="@+id/currentPassword_TxtInputLayout"
                app:errorEnabled="true"
                style="@style/MTextInputLayoutForm"
-                app:endIconMode="password_toggle"
+                app:passwordToggleEnabled="true"
                android:hint="@string/current_password_text"
                app:startIconDrawable="@drawable/icv_vd_lock"
                app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle"
                >
-                <com.swifttech.remit.jmecustomer.common.view.MTextInputEditTextSpaceMasked
-                    android:inputType="textPassword"
+                <com.swifttech.remit.jmecustomer.common.view.MTextInputEditText
+                    android:inputType="text"
                    android:id="@+id/currentPassword_edTxt"
                    style="@style/MTextInputEditText"/>

@ -39,13 +39,13 @@
                android:id="@+id/newPassword_TxtInputLayout"
                app:errorEnabled="true"
                style="@style/MTextInputLayoutForm"
-                app:endIconMode="password_toggle"
+                app:passwordToggleEnabled="true"
                android:hint="@string/new_password_text"
                app:startIconDrawable="@drawable/icv_vd_lock"
                app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle"
                >
-                <com.swifttech.remit.jmecustomer.common.view.MTextInputEditTextSpaceMasked
-                    android:inputType="textPassword"
+                <com.swifttech.remit.jmecustomer.common.view.MTextInputEditText
+                    android:inputType="text"
                    android:id="@+id/newPassword_edTxt"
                    style="@style/MTextInputEditText"/>

@ -58,13 +58,13 @@
                android:id="@+id/confirmPassword_TxtInputLayout"
                app:errorEnabled="true"
                style="@style/MTextInputLayoutForm"
-                app:endIconMode="password_toggle"
+                app:passwordToggleEnabled="true"
                android:hint="@string/confirm_password_text"
                app:startIconDrawable="@drawable/icv_vd_lock"
                app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle"
                >
-                <com.swifttech.remit.jmecustomer.common.view.MTextInputEditTextSpaceMasked
-                    android:inputType="textPassword"
+                <com.swifttech.remit.jmecustomer.common.view.MTextInputEditText
+                    android:inputType="text"
                    android:id="@+id/confirmPassword_edTxt"
                    style="@style/MTextInputEditText"/>

--- a/app/src/main/res/layout/activity_change_password_v2.xml
+++ b/app/src/main/res/layout/activity_change_password_v2.xml
@ -23,13 +23,13 @@
                android:id="@+id/currentPassword_TxtInputLayout"
                app:errorEnabled="true"
                style="@style/MTextInputLayoutForm"
-                app:endIconMode="password_toggle"
+                app:passwordToggleEnabled="true"
                android:hint="@string/current_password_text"
                app:startIconDrawable="@drawable/icv_vd_lock"
                app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle"
                >
-                <com.swifttech.remit.jmecustomer.common.view.MTextInputEditTextSpaceMasked
-                    android:inputType="textPassword"
+                <com.swifttech.remit.jmecustomer.common.view.MTextInputEditText
+                    android:inputType="text"
                    android:id="@+id/currentPassword_edTxt"
                    style="@style/MTextInputEditText"/>

@ -40,13 +40,13 @@
                android:id="@+id/newPassword_TxtInputLayout"
                app:errorEnabled="true"
                style="@style/MTextInputLayoutForm"
-                app:endIconMode="password_toggle"
+                app:passwordToggleEnabled="true"
                android:hint="@string/new_password_text"
                app:startIconDrawable="@drawable/icv_vd_lock"
                app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle"
                >
-                <com.swifttech.remit.jmecustomer.common.view.MTextInputEditTextSpaceMasked
-                    android:inputType="textPassword"
+                <com.swifttech.remit.jmecustomer.common.view.MTextInputEditText
+                    android:inputType="text"
                    android:id="@+id/newPassword_edTxt"
                    style="@style/MTextInputEditText"/>

@ -59,13 +59,13 @@
                android:id="@+id/confirmPassword_TxtInputLayout"
                app:errorEnabled="true"
                style="@style/MTextInputLayoutForm"
-                app:endIconMode="password_toggle"
+                app:passwordToggleEnabled="true"
                android:hint="@string/confirm_password_text"
                app:startIconDrawable="@drawable/icv_vd_lock"
                app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle"
                >
-                <com.swifttech.remit.jmecustomer.common.view.MTextInputEditTextSpaceMasked
-                    android:inputType="textPassword"
+                <com.swifttech.remit.jmecustomer.common.view.MTextInputEditText
+                    android:inputType="text"
                    android:id="@+id/confirmPassword_edTxt"
                    android:imeOptions="actionDone"
                    style="@style/MTextInputEditText"/>
--- a/app/src/main/res/layout/activity_login_v2.xml
+++ b/app/src/main/res/layout/activity_login_v2.xml
@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-
 <LinearLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
@ -56,16 +54,20 @@
                    android:id="@+id/password_TxtInputLayout"
                    app:errorEnabled="true"
                    style="@style/MTextInputLayoutForm"
-                    app:endIconMode="password_toggle"
+                    app:passwordToggleEnabled="true"
                    android:hint="@string/password_placeholder_text"
                    app:startIconDrawable="@drawable/icv_vd_lock"
                    app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle"
                    >
-                    <com.swifttech.remit.jmecustomer.common.view.MTextInputEditTextSpaceMasked
-                        android:inputType="textPassword"
+
+
+                    <com.swifttech.remit.jmecustomer.common.view.MTextInputEditText
                        android:id="@+id/password_edTxt"
+                        style="@style/MTextInputEditText"
                        android:imeOptions="actionDone"
-                        style="@style/MTextInputEditText"/>
+                        android:inputType="text"
+
+                        />

                </com.swifttech.remit.jmecustomer.common.view.MTextInputLayout>

--- a/app/src/main/res/layout/activity_register_v2.xml
+++ b/app/src/main/res/layout/activity_register_v2.xml
@ -114,14 +114,14 @@
                    android:id="@+id/password_TxtInputLayout"
                    app:errorEnabled="true"
                    style="@style/MTextInputLayoutForm"
-                    app:endIconMode="password_toggle"
-                    android:hint="@string/password_placeholder_text"
+                    app:passwordToggleEnabled="true"
+                    android:hint="@string/new_password_text"
                    app:startIconDrawable="@drawable/icv_vd_lock"
                    app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle"
                    >
-                    <com.swifttech.remit.jmecustomer.common.view.MTextInputEditTextSpaceMasked
+                    <com.swifttech.remit.jmecustomer.common.view.MTextInputEditText
                        android:id="@+id/password_edTxt"
-                        android:inputType="textPassword"
+                        android:inputType="text"
                        style="@style/MTextInputEditText"
                        android:imeOptions="actionNext"
                        />
@ -132,14 +132,14 @@
                    android:id="@+id/confirmPassword_TxtInputLayout"
                    app:errorEnabled="true"
                    style="@style/MTextInputLayoutForm"
-                    app:endIconMode="password_toggle"
-                    android:hint="@string/password_placeholder_text"
+                    app:passwordToggleEnabled="true"
+                    android:hint="@string/confirm_password_text"
                    app:startIconDrawable="@drawable/icv_vd_lock"
                    app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle"
                    >
-                    <com.swifttech.remit.jmecustomer.common.view.MTextInputEditTextSpaceMasked
+                    <com.swifttech.remit.jmecustomer.common.view.MTextInputEditText
                        android:id="@+id/confirmPassword_edTxt"
-                        android:inputType="textPassword"
+                        android:inputType="text"
                        style="@style/MTextInputEditText"
                        android:imeOptions="actionDone"
                        />
--- a/app/src/main/res/layout/fragment_existing_customer_registration_submit.xml
+++ b/app/src/main/res/layout/fragment_existing_customer_registration_submit.xml
@ -71,13 +71,13 @@
            android:id="@+id/newPassword_TxtInputLayout"
            app:errorEnabled="true"
            style="@style/MTextInputLayoutForm"
-            app:endIconMode="password_toggle"
+            app:passwordToggleEnabled="true"
            android:hint="@string/new_password_text"
            app:startIconDrawable="@drawable/icv_vd_lock"
            app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle"
            >
-            <com.swifttech.remit.jmecustomer.common.view.MTextInputEditTextSpaceMasked
-                android:inputType="textPassword"
+            <com.swifttech.remit.jmecustomer.common.view.MTextInputEditText
+                android:inputType="text"
                android:id="@+id/newPassword_edTxt"
                style="@style/MTextInputEditText"/>

@ -90,13 +90,13 @@
            android:id="@+id/confirmPassword_TxtInputLayout"
            app:errorEnabled="true"
            style="@style/MTextInputLayoutForm"
-            app:endIconMode="password_toggle"
+            app:passwordToggleEnabled="true"
            android:hint="@string/confirm_password_text"
            app:startIconDrawable="@drawable/icv_vd_lock"
            app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle"
            >
-            <com.swifttech.remit.jmecustomer.common.view.MTextInputEditTextSpaceMasked
-                android:inputType="textPassword"
+            <com.swifttech.remit.jmecustomer.common.view.MTextInputEditText
+                android:inputType="text"
                android:id="@+id/confirmPassword_edTxt"
                style="@style/MTextInputEditText"/>

--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -45,6 +45,7 @@

    <string name="english_language_text" translatable="false">English</string>
    <string name="korean_language_text" translatable="false">한국어</string>
+    <string name="japan_language_text" translatable="false">日本語</string>
    <string name="cambodia_lanugage_text" translatable="false">ភាសាខ្មែរ</string>
    <string name="srilanka_lanugage_text" translatable="false">සිංහල</string>
    <string name="myanmar_language_text" translatable="false">မြန်မာ</string>