add translation and register change

app/build.gradle

@@ -13,8 +13,8 @@ android {
         applicationId "com.remit.jmecustomer"
         minSdkVersion 24
         targetSdkVersion 31
-        versionCode 12
-        versionName "0.9"
+        versionCode 13
+        versionName "1.0"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
         manifestPlaceholders = [fileProvider: "com.remit.jmecustomer.fileprovider"]
@@ -135,18 +135,20 @@ android {
             buildConfigField 'String', 'ClientId', '"172017F9EC11222E8107142733"'
             buildConfigField 'String', 'SecretKey', '"QRK2UM0Q"'
             // TrustDock
-//            buildConfigField 'String', 'TrustDockAuthorizationId', '"SC5ra2f1GDqMaAVZX289bpuH"'
-//            buildConfigField 'String', 'ResidenceCardWithNFCPlanId', '"b1da18ee-fabe-42f0-b7f6-0d375e1f505d"'
-//            buildConfigField 'String', 'SelfieVerificationPlanId', '"ee46f7fd-3988-49cd-a972-1056e498302f"'
-//            buildConfigField 'String', 'ResidenceCardWithoutNFCPlanId', '"9390019a-d41f-42a8-b044-0f41a9825847"'
-//            buildConfigField 'String', 'DrivingLicenseWithNFCPlanId', '"f8d1f271-7c95-43bf-bdf8-f84ebe96671d"'
-//            buildConfigField 'String', 'TrustDockVerificationUrl', '"https://api.test.trustdock.io/v2/verifications?Authorization="'
-            buildConfigField 'String', 'TrustDockAuthorizationId', '"gC8ULGtvqiwkMqTx4NzQexLL"'
-            buildConfigField 'String', 'ResidenceCardWithNFCPlanId', '"17f3f05f-f436-41f0-8b1c-434ee2b5e6ec"'
-            buildConfigField 'String', 'SelfieVerificationPlanId', '"295735e5-022b-44b8-8c35-59604c425daa"'
-            buildConfigField 'String', 'ResidenceCardWithoutNFCPlanId', '"039cfef5-0248-44c4-8464-25baef241f05"'
-            buildConfigField 'String', 'DrivingLicenseWithNFCPlanId', '"6eaba29b-3f40-469d-9a7e-afb33252b10e"'
-            buildConfigField 'String', 'TrustDockVerificationUrl', '"https://api.trustdock.io/v2/verifications?Authorization="'
+            // UAT
+            buildConfigField 'String', 'TrustDockAuthorizationId', '"SC5ra2f1GDqMaAVZX289bpuH"'
+            buildConfigField 'String', 'ResidenceCardWithNFCPlanId', '"b1da18ee-fabe-42f0-b7f6-0d375e1f505d"'
+            buildConfigField 'String', 'SelfieVerificationPlanId', '"ee46f7fd-3988-49cd-a972-1056e498302f"'
+            buildConfigField 'String', 'ResidenceCardWithoutNFCPlanId', '"9390019a-d41f-42a8-b044-0f41a9825847"'
+            buildConfigField 'String', 'DrivingLicenseWithNFCPlanId', '"f8d1f271-7c95-43bf-bdf8-f84ebe96671d"'
+            buildConfigField 'String', 'TrustDockVerificationUrl', '"https://api.test.trustdock.io/v2/verifications?Authorization="'
+            // PROD
+//            buildConfigField 'String', 'TrustDockAuthorizationId', '"gC8ULGtvqiwkMqTx4NzQexLL"'
+//            buildConfigField 'String', 'ResidenceCardWithNFCPlanId', '"17f3f05f-f436-41f0-8b1c-434ee2b5e6ec"'
+//            buildConfigField 'String', 'SelfieVerificationPlanId', '"295735e5-022b-44b8-8c35-59604c425daa"'
+//            buildConfigField 'String', 'ResidenceCardWithoutNFCPlanId', '"039cfef5-0248-44c4-8464-25baef241f05"'
+//            buildConfigField 'String', 'DrivingLicenseWithNFCPlanId', '"6eaba29b-3f40-469d-9a7e-afb33252b10e"'
+//            buildConfigField 'String', 'TrustDockVerificationUrl', '"https://api.trustdock.io/v2/verifications?Authorization="'
             //
             debuggable true
             minifyEnabled false

app/src/main/java/com/remit/jmecustomer/features/registerv3/newcustomer/gateway/NewRegisterV3Gateway.java

@@ -23,7 +23,7 @@ public class NewRegisterV3Gateway extends PrivilegedGateway implements NewRegist
 
 
     @Override
-    public Observable<NewRegisterV3ApiResponse> registerUser(String auth, String referralCode, String email, String residenceCardNo, String password, String confirPassword, String clientId, String fcmId, String appVersion, String phoneBrand, String phoneOs, String deviceId, String osVersion) {
+    public Observable<NewRegisterV3ApiResponse> registerUser(String auth, String referralCode, String email, String residenceCardNo, String password, String confirPassword, String clientId, String fcmId, String appVersion, String phoneBrand, String phoneOs, String deviceId, String osVersion, String fullName, String dob) {
         JsonObject jsonObject = new JsonObject();
         jsonObject.addProperty("referralCode", referralCode);
         jsonObject.addProperty("UserId", email);
@@ -37,6 +37,8 @@ public class NewRegisterV3Gateway extends PrivilegedGateway implements NewRegist
         jsonObject.addProperty("phoneOS", phoneOs);
         jsonObject.addProperty("fcmId", fcmId);
         jsonObject.addProperty("osVersion", osVersion);
+        jsonObject.addProperty("FullName", fullName);
+        jsonObject.addProperty("DOB", dob);
         return HttpClientV2.getInstance().signUpNewCustomerV3(auth, jsonObject);
     }
 

app/src/main/java/com/remit/jmecustomer/features/registerv3/newcustomer/presenter/NewRegisterV3InteractorInterface.java

@@ -18,7 +18,7 @@ public interface NewRegisterV3InteractorInterface extends BaseInteractorInterfac
     interface NewRegisterV3GatewayInterface extends PrivilegedGatewayInterface {
 
 
-        Observable<NewRegisterV3ApiResponse> registerUser(String auth, String referralCode, String userId, String residenceCardNo, String password, String confirPassword, String clientId, String fcmId, String appVersion, String phoneBrand, String phoneOs, String deviceId, String osVersion);
+        Observable<NewRegisterV3ApiResponse> registerUser(String auth, String referralCode, String userId, String residenceCardNo, String password, String confirPassword, String clientId, String fcmId, String appVersion, String phoneBrand, String phoneOs, String deviceId, String osVersion, String fullName, String dob);
 
         void updateUserId(String userId);
 

app/src/main/java/com/remit/jmecustomer/features/registerv3/newcustomer/presenter/NewRegisterV3Presenter.java

@@ -74,7 +74,7 @@ public class NewRegisterV3Presenter extends BaseViewModel implements NewRegister
 
 
     @Override
-    public void registerUser() {
+    public void registerUser(String fullName, String dob) {
 
         RemitApplication.AppRelatedMetaData appRelatedMetaData = RemitApplication.getAppRelatedMetaData(view.getContext());
 
@@ -102,7 +102,9 @@ public class NewRegisterV3Presenter extends BaseViewModel implements NewRegister
                                 appRelatedMetaData.getPhoneBrand(),
                                 appRelatedMetaData.getOsName(),
                                 appRelatedMetaData.getDeviceId(),
-                                appRelatedMetaData.getOsVersion()
+                                appRelatedMetaData.getOsVersion(),
+                                fullName,
+                                dob
                         )
                         .doOnSubscribe(d -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text)))
                         .subscribeOn(Schedulers.io())

app/src/main/java/com/remit/jmecustomer/features/registerv3/newcustomer/presenter/NewRegisterV3PresenterInterface.java

@@ -17,7 +17,7 @@ import io.reactivex.Observable;
 public interface NewRegisterV3PresenterInterface extends BasePresenterInterface {
 
 
-    void registerUser();
+    void registerUser(String fullName, String dob);
 
     void setNewToken(String newToken);
 

app/src/main/java/com/remit/jmecustomer/features/registerv3/newcustomer/view/NewRegisterV3Activity.java

@@ -160,28 +160,23 @@ public class NewRegisterV3Activity extends BaseActivity implements NewRegisterV3
     }
 
     private void registerFcmToken() {
-        FirebaseMessaging.getInstance().getToken()
-                .addOnCompleteListener(task -> {
-                    if (task.isSuccessful()) {
-                        String token = task.getResult();
-                        if (BuildConfig.DEBUG) {
-                            Log.d(TAG, "registerFcmToken: " + token);
-                        }
-                        presenter.setNewToken(token);
-                        SharedPreferences.Editor sharedPreferenceEditor = RemitApplication.getStorage().edit();
-                        sharedPreferenceEditor.putString(PrefKeys.USER_FCM_ID, token);
-                    }
-                });
+        FirebaseMessaging.getInstance().getToken().addOnCompleteListener(task -> {
+            if (task.isSuccessful()) {
+                String token = task.getResult();
+                if (BuildConfig.DEBUG) {
+                    Log.d(TAG, "registerFcmToken: " + token);
+                }
+                presenter.setNewToken(token);
+                SharedPreferences.Editor sharedPreferenceEditor = RemitApplication.getStorage().edit();
+                sharedPreferenceEditor.putString(PrefKeys.USER_FCM_ID, token);
+            }
+        });
     }
 
     private void initialize() {
         residenceId_edTxt.setFilters(new InputFilter[]{new InputFilter.AllCaps()});
         this.presenter = new ViewModelProvider(this, new NewRegisterV3ViewModelFactory(this)).get(NewRegisterV3Presenter.class);
-        registerRelatedViewEvents = this.presenter.getRegisterRelatedViewEvents(new NewRegisterV3ViewLiveData.RegisterViewBinding(
-                RxTextView.textChanges(referralCodeEdTxt).skipInitialValue(),
-                RxTextView.textChanges(userEmail).skipInitialValue(),
-                RxTextView.textChanges(passwordEdTxt).skipInitialValue(),
-                RxTextView.textChanges(confirmPasswordEdTxt).skipInitialValue()
+        registerRelatedViewEvents = this.presenter.getRegisterRelatedViewEvents(new NewRegisterV3ViewLiveData.RegisterViewBinding(RxTextView.textChanges(referralCodeEdTxt).skipInitialValue(), RxTextView.textChanges(userEmail).skipInitialValue(), RxTextView.textChanges(passwordEdTxt).skipInitialValue(), RxTextView.textChanges(confirmPasswordEdTxt).skipInitialValue()
 
         ));
 
@@ -198,43 +193,37 @@ public class NewRegisterV3Activity extends BaseActivity implements NewRegisterV3
         referralCodeEdTxt.setText("");
 
 
-        FirebaseDynamicLinks.getInstance()
-                .getDynamicLink(getIntent())
-                .addOnSuccessListener(this, new OnSuccessListener<PendingDynamicLinkData>() {
-                    @Override
-                    public void onSuccess(PendingDynamicLinkData pendingDynamicLinkData) {
-                        Uri deepLink = null;
-                        if (pendingDynamicLinkData != null) {
-                            deepLink = pendingDynamicLinkData.getLink();
-                            String paramValue = deepLink.getQueryParameters("invite").get(0); // it will get "2" as a value
-                            Log.d("Value", paramValue);
-                            referralCodeEdTxt.setText(paramValue);
-                            referralCodeEdTxt.setFocusableInTouchMode(true);
-                            referralCodeEdTxt.requestFocus();
-                        }
-
-                    }
-                })
-                .addOnFailureListener(this, new OnFailureListener() {
-                    @Override
-                    public void onFailure(@NonNull Exception e) {
-                        Log.w("Splash", "getDynamicLink:onFailure", e);
-                    }
-                });
-
-        referralCodeEdTxt.setOnFocusChangeListener(
-                (new View.OnFocusChangeListener() {
-                    @Override
-                    public void onFocusChange(View view, boolean hasFocus) {
-                        if (!hasFocus) {
-                            String val = referralCodeEdTxt.getText().toString();
-                            if (!val.isEmpty())
-                                presenter.performReferralCodeValidationFromApi(val);
-                            else
-                                btn_submit.setEnabled(true);
-                        }
-                    }
-                }));
+        FirebaseDynamicLinks.getInstance().getDynamicLink(getIntent()).addOnSuccessListener(this, new OnSuccessListener<PendingDynamicLinkData>() {
+            @Override
+            public void onSuccess(PendingDynamicLinkData pendingDynamicLinkData) {
+                Uri deepLink = null;
+                if (pendingDynamicLinkData != null) {
+                    deepLink = pendingDynamicLinkData.getLink();
+                    String paramValue = deepLink.getQueryParameters("invite").get(0); // it will get "2" as a value
+                    Log.d("Value", paramValue);
+                    referralCodeEdTxt.setText(paramValue);
+                    referralCodeEdTxt.setFocusableInTouchMode(true);
+                    referralCodeEdTxt.requestFocus();
+                }
+
+            }
+        }).addOnFailureListener(this, new OnFailureListener() {
+            @Override
+            public void onFailure(@NonNull Exception e) {
+                Log.w("Splash", "getDynamicLink:onFailure", e);
+            }
+        });
+
+        referralCodeEdTxt.setOnFocusChangeListener((new View.OnFocusChangeListener() {
+            @Override
+            public void onFocusChange(View view, boolean hasFocus) {
+                if (!hasFocus) {
+                    String val = referralCodeEdTxt.getText().toString();
+                    if (!val.isEmpty()) presenter.performReferralCodeValidationFromApi(val);
+                    else btn_submit.setEnabled(true);
+                }
+            }
+        }));
 
         RemitApplication.getStorage().edit().putString(PrefKeys.SELECTED_NATIONALITY, FOREIGNER_TYPE).apply();
         dobSelectionSubject = PublishSubject.create();
@@ -249,8 +238,7 @@ public class NewRegisterV3Activity extends BaseActivity implements NewRegisterV3
                 residenceId_edTxt.setText(data.getData());
             }
 
-        } else
-            residenceId_TxtInputLayout.setError(data.getErrorMessage());
+        } else residenceId_TxtInputLayout.setError(data.getErrorMessage());
 
     }
 
@@ -261,8 +249,7 @@ public class NewRegisterV3Activity extends BaseActivity implements NewRegisterV3
                 confirmPasswordEdTxt.setText(data.getData());
             }
 
-        } else
-            confirmPasswordTxtInputLayout.setError(data.getErrorMessage());
+        } else confirmPasswordTxtInputLayout.setError(data.getErrorMessage());
     }
 
 
@@ -273,8 +260,7 @@ public class NewRegisterV3Activity extends BaseActivity implements NewRegisterV3
                 passwordEdTxt.setText(data.getData());
             }
 
-        } else
-            passwordTxtInputLayout.setError(data.getErrorMessage());
+        } else passwordTxtInputLayout.setError(data.getErrorMessage());
     }
 
     private void onReferralCodeChanged(FormInputStateDTO<String> data) {
@@ -283,8 +269,7 @@ public class NewRegisterV3Activity extends BaseActivity implements NewRegisterV3
             if (data.hasData()) {
                 referralCodeEdTxt.setText(data.getData());
             }
-        } else
-            referralCodeTxtInputLayout.setError(data.getErrorMessage());
+        } else referralCodeTxtInputLayout.setError(data.getErrorMessage());
 
     }
 
@@ -295,8 +280,7 @@ public class NewRegisterV3Activity extends BaseActivity implements NewRegisterV3
                 userEmail.setText(data.getData());
             }
 
-        } else
-            userEmailTxtInputLayout.setError(data.getErrorMessage());
+        } else userEmailTxtInputLayout.setError(data.getErrorMessage());
 
     }
 
@@ -322,7 +306,9 @@ public class NewRegisterV3Activity extends BaseActivity implements NewRegisterV3
     @OnClick(R.id.btn_submit)
     public void onRegisterBtnClicked() {
         if (presenter.validateAllRegisterForm()) {
-            presenter.registerUser();
+            String fullName = String.valueOf(ed_fullName.getText());
+            String dob = String.valueOf(dob_edTxt.getText());
+            presenter.registerUser(fullName, dob);
         }
     }
 
@@ -364,13 +350,10 @@ public class NewRegisterV3Activity extends BaseActivity implements NewRegisterV3
                 String userId = presenter.getLastRegisteredUserId();
                 String userPwd = presenter.getLastRegisteredUserPwd();
                 KYCV3Activity.startActivityForResult(this, false, userId, userPwd);
-            } else if (resultCode == RESULT_CANCELED)
-                redirectToSplash();
+            } else if (resultCode == RESULT_CANCELED) redirectToSplash();
         } else if (requestCode == KYC_FORM_REQUEST_CODE) {
-            if (resultCode == RESULT_OK)
-                redirectToDashboard();
-            else
-                redirectToSplash();
+            if (resultCode == RESULT_OK) redirectToDashboard();
+            else redirectToSplash();
 
         }
     }
@@ -388,10 +371,8 @@ public class NewRegisterV3Activity extends BaseActivity implements NewRegisterV3
 
     @Override
     public void setUserIdFocus(boolean action) {
-        if (action)
-            userEmail.requestFocus();
-        else
-            userEmail.clearFocus();
+        if (action) userEmail.requestFocus();
+        else userEmail.clearFocus();
 //        usernameId.setCursorVisible(action);
     }
 
@@ -444,8 +425,7 @@ public class NewRegisterV3Activity extends BaseActivity implements NewRegisterV3
             genericPromptDialog.dismiss();
         } else if (verificationViewContainer.getVisibility() == View.GONE) {
             showResidienceIdVerifyScreen(true, true);
-        } else
-            super.onBackPressed();
+        } else super.onBackPressed();
     }
 
 
@@ -497,8 +477,7 @@ public class NewRegisterV3Activity extends BaseActivity implements NewRegisterV3
                 dob_edTxt.setText(state.getData());
                 dobSelectionSubject.onNext(state.getData());
             }
-        } else
-            dob_TxtInputLayout.setError(state.getErrorMessage());
+        } else dob_TxtInputLayout.setError(state.getErrorMessage());
     }
 
     @OnClick(R.id.dob_edTxt)
@@ -506,27 +485,16 @@ public class NewRegisterV3Activity extends BaseActivity implements NewRegisterV3
         hideKeyBoard();
         SpinnerDatePickerDialogBuilder builder = new SpinnerDatePickerDialogBuilder();
 
-        builder.context(this)
-                .spinnerTheme(R.style.NumberPickerStyle)
-                .showTitle(true)
-                .showDaySpinner(true)
-                .dialogTheme(R.style.DatePickerTheme)
-                .setTitle(getString(R.string.select_dob_text))
-                .setPositiveButtonText(getString(R.string.ok_text))
-                .setNegativeButtonText(getString(R.string.cancel_text))
-                .setCurrentDateAsMaxDate()
-                .defaultDate(1990, 1, 1)
-                .callback(new com.tsongkha.spinnerdatepicker.DatePickerDialog.OnDateSetListener() {
-                    @Override
-                    public void onDateSet(com.tsongkha.spinnerdatepicker.DatePicker datePicker, int year, int monthOfYear, int dayOfMonth) {
-                        Calendar newDate = Calendar.getInstance();
-                        newDate.set(year, monthOfYear, dayOfMonth);
-                        String date = new SimpleDateFormat(Utils.getDefaultDateFormat(), Locale.US).format(newDate.getTime());
-                        dob_edTxt.setText(date);
-                        dobSelectionSubject.onNext(date);
-                    }
-                })
-                .build().show();
+        builder.context(this).spinnerTheme(R.style.NumberPickerStyle).showTitle(true).showDaySpinner(true).dialogTheme(R.style.DatePickerTheme).setTitle(getString(R.string.select_dob_text)).setPositiveButtonText(getString(R.string.ok_text)).setNegativeButtonText(getString(R.string.cancel_text)).setCurrentDateAsMaxDate().defaultDate(1990, 1, 1).callback(new com.tsongkha.spinnerdatepicker.DatePickerDialog.OnDateSetListener() {
+            @Override
+            public void onDateSet(com.tsongkha.spinnerdatepicker.DatePicker datePicker, int year, int monthOfYear, int dayOfMonth) {
+                Calendar newDate = Calendar.getInstance();
+                newDate.set(year, monthOfYear, dayOfMonth);
+                String date = new SimpleDateFormat(Utils.getDefaultDateFormat(), Locale.US).format(newDate.getTime());
+                dob_edTxt.setText(date);
+                dobSelectionSubject.onNext(date);
+            }
+        }).build().show();
 
     }
 }

app/src/main/res/values-si/strings.xml

@@ -229,11 +229,11 @@
     <string name="invalidAdditionalIdBackImage_text">අතිරේක හැඳුනුම්පතේ පිටුපස රූපය වලංගු නොමැත</string>
 
     <!--New EKYC-->
-    <string name="ekyc_registration_title_text">ලියාපදිංචි කිරීමේ ක්‍රියාවලිය EKYC</string>
+    <string name="ekyc_registration_title_text">EKYC සඳහා ලියාපදිංචිවීම</string>
     <string name="scan_text">ස්කෑන් කරන්න</string>
-    <string name="scan_doc_text">ලේඛන පරිලෝකනය කරන්න</string>
-    <string name="scan_residence_card_text">පදිංචි කාඩ්පත</string>
-    <string name="scan_driver_license_text">රියදුරු බලපත්ර අංකය</string>
+    <string name="scan_doc_text">ස්කෑන් කල ලියකියවිලි</string>
+    <string name="scan_residence_card_text">නේවාසික හැඳුනුම්පත</string>
+    <string name="scan_driver_license_text">රියදුරුබලපත් අංකය</string>
 
     <!--Login-->
     <string name="use_fingerprint_text">ඇඟිලිසලකුණ භාවිතාකරන්න</string>
@@ -340,7 +340,7 @@
     <string name="invalidDistrict_text">දිස්ත්‍රික්කය වලංගු නොමැත</string>
     <string name="receiver_wallet_no_text">වොලට් අංකය</string>
     <string name="receiver_wallet_no_text_enter">වොලට් අංකය ඇතුලත් කරන්න</string>
-    <string name="account_validation_failed_text">ගිණුම් වලංගු කිරීම අසාර්ථක විය</string>
+    <string name="account_validation_failed_text">ගිණුම තහවුරුකිරීම අසාර්ථකයි</string>
 
     <!--Register-->
     <string name="register_title_text1">JME \n ලියාපදිංචි වන්න</string>
@@ -622,8 +622,8 @@
     <string name="loyalty_points_btn_link_text">මුදල් එවන්න</string>
 
     <!-- Trust Dock -->
-    <string name="id_number_hint_text">හැඳුනුම්පත අංකය</string>
-    <string name="driver_license_hint_text" >රියැදුරු බලපත්ර</string>
+    <string name="id_number_hint_text">හැඳුනුම්පත් අංකය</string>
+    <string name="driver_license_hint_text" >රියදුරු බලපත්‍රය</string>
     <string name="invalid_driver_license_text" >වලංගු නොවන රියදුරු බලපත්‍රය</string>
-    <string name="driver_license_passport_hint_text" >රියදුරු බලපත්‍රය/ ගමන් බලපත්‍රය</string>
+    <string name="driver_license_passport_hint_text" >රියදුරු බලපත්‍රය /විදේශ ගමන් බලපත්‍රය</string>
 </resources>

gradle.properties

@@ -11,7 +11,7 @@
 # The setting is particularly useful for tweaking memory settings.
 android.enableJetifier=true
 android.useAndroidX=true
-org.gradle.jvmargs=-Xmx1536m
+org.gradle.jvmargs=-Xmx4096m
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit