Преглед на файлове

Created string resources for onboarding screens and validation for multi lingual

Khubaib преди 6 месеца
родител
ревизия
38b1a91540

+ 1 - 5
app/src/main/java/com/vpn/fastestvpnservice/screens/ForgotPassword.kt

@@ -271,13 +271,12 @@ fun ForgotPassword(navHostController: NavHostController) {
 //            val email = basePreferenceHelper.getUser()?.userinfo?.email ?: "test_123"
             Button(
                 onClick = {
-                    Log.d("test_button", "onClick Send Code $isEmailValid")
                     if (isEmailValid) {
                         isShowLoader = true
                         loginViewModel.forgotPassword(textChanged)
                     } else {
                         coroutineScope.launch {
-                            snackBarStateRed.showSnackbar("The email field is required.")
+                            snackBarStateRed.showSnackbar(context.getString(R.string.email_field_req))
                         }
                     }
                 },
@@ -297,11 +296,8 @@ fun ForgotPassword(navHostController: NavHostController) {
                 Text(text = context.getString(R.string.send_code),
                     style = MaterialTheme.typography.titleMedium
                 )
-                Log.d("test_button", "RowScope")
-
                 val forgotPasswordResponse = loginViewModel.liveDataForgotPassword.observeAsState()
                 forgotPasswordResponse.value?.let { data ->
-                    Log.d("forgotPassword: ","forgotPassword Screen: ${data.status} ${data.message}")
                     isShowLoader = false
                     if (data.status) {
                         coroutineScope.launch {

+ 3 - 3
app/src/main/java/com/vpn/fastestvpnservice/screens/LoginScreen.kt

@@ -567,19 +567,19 @@ fun ColumnScope.SignInButton(
             if (!isErrors) {
 //                            ShowErrorRow(errorText = "Email is Empty")
                 coroutineScope.launch {
-                    snackBarStateRed.showSnackbar("Email is Empty")
+                    snackBarStateRed.showSnackbar(context.getString(R.string.email_field_req))
                 }
             }
             else if (!isError1) {
 //                            ShowErrorRow(errorText = "Password is Empty")
                 coroutineScope.launch {
-                    snackBarStateRed.showSnackbar("Password is Empty")
+                    snackBarStateRed.showSnackbar(context.getString(R.string.password_field_req))
                 }
             }
             else if (!isError2) {
 //                            ShowErrorRow(errorText = "Should be 3 or more!")
                 coroutineScope.launch {
-                    snackBarStateRed.showSnackbar("Password should be 3 or more!")
+                    snackBarStateRed.showSnackbar(context.getString(R.string.password_validation))
                 }
             }
 

+ 4 - 4
app/src/main/java/com/vpn/fastestvpnservice/screens/SignUpScreen.kt

@@ -670,25 +670,25 @@ fun ColumnScope.SignUpButton(
             if (!isErrors) {
 //                            ShowErrorRow(errorText = "Email is Empty")
                 coroutineScope.launch {
-                    snackBarStateRed.showSnackbar("Email is Empty")
+                    snackBarStateRed.showSnackbar(context.getString(R.string.email_field_req))
                 }
             }
             else if (!isErrors4) {
 //                            ShowErrorRow(errorText = "Email format incorrect")
                 coroutineScope.launch {
-                    snackBarStateRed.showSnackbar("Email format incorrect")
+                    snackBarStateRed.showSnackbar(context.getString(R.string.email_format_incorrect))
                 }
             }
             else if (!isErrors2) {
 //                            ShowErrorRow(errorText = "Password is Empty")
                 coroutineScope.launch {
-                    snackBarStateRed.showSnackbar("Password is Empty")
+                    snackBarStateRed.showSnackbar(context.getString(R.string.password_field_req))
                 }
             }
             else if (!isError3) {
 //                            ShowErrorRow(errorText = "Should be 3 or more!")
                 coroutineScope.launch {
-                    snackBarStateRed.showSnackbar("Password should be 3 or more!")
+                    snackBarStateRed.showSnackbar(context.getString(R.string.password_validation))
                 }
             }
 

+ 4 - 0
app/src/main/res/values-de/strings.xml

@@ -16,6 +16,10 @@
     <string name="by_creating_acc">Mit der Erstellung Ihres Kontos erklären Sie sich damit einverstanden</string>
     <string name="termsndcond">Allgemeine Geschäftsbedingungen</string>
     <string name="already_have_acc">Sie haben bereits ein Konto?</string>
+    <string name="email_field_req">Das E-Mail-Feld ist erforderlich.</string>
+    <string name="password_field_req">Das Passwortfeld ist erforderlich.</string>
+    <string name="password_validation">Das Passwort muss mindestens 3 Zeichen lang sein.</string>
+    <string name="email_format_incorrect">E-Mail-Format falsch.</string>
 
     <!-- Forgot Password Screen -->
     <string name="forgot_passwords">Passwort vergessen!</string>

+ 4 - 0
app/src/main/res/values-es/strings.xml

@@ -24,6 +24,10 @@
     <string name="by_creating_acc">Al crear su cuenta, usted acepta</string>
     <string name="termsndcond">Términos y condiciones</string>
     <string name="already_have_acc">¿Ya tienes una cuenta?</string>
+    <string name="email_field_req">El campo de correo electrónico es obligatorio.</string>
+    <string name="password_field_req">El campo de contraseña es obligatorio.</string>
+    <string name="password_validation">La contraseña debe tener al menos 3 caracteres.</string>
+    <string name="email_format_incorrect">Formato de correo electrónico incorrecto.</string>
 
     <!-- Forgot Password Screen -->
     <string name="forgot_passwords">¡Olvidé mi contraseña!</string>

+ 4 - 0
app/src/main/res/values-fr/strings.xml

@@ -23,6 +23,10 @@
     <string name="by_creating_acc">En créant votre compte, vous acceptez</string>
     <string name="termsndcond">Conditions générales</string>
     <string name="already_have_acc">Vous avez déjà un compte?</string>
+    <string name="email_field_req">Le champ email est obligatoire.</string>
+    <string name="password_field_req">Le champ mot de passe est obligatoire.</string>
+    <string name="password_validation">Le mot de passe doit comporter au moins 3 caractères.</string>
+    <string name="email_format_incorrect">Format de l\'e-mail incorrect.</string>
 
     <!-- Forgot Password Screen -->
     <string name="forgot_passwords">Mot de passe oublié!</string>

+ 4 - 0
app/src/main/res/values-it/strings.xml

@@ -23,6 +23,10 @@
     <string name="by_creating_acc">Creando il tuo account, accetti</string>
     <string name="termsndcond">Termini e condizioni Condizioni</string>
     <string name="already_have_acc">Hai già un account? </string>
+    <string name="email_field_req">Il campo email è obbligatorio.</string>
+    <string name="password_field_req">Il campo password è obbligatorio.</string>
+    <string name="password_validation">La password deve contenere almeno 3 caratteri.</string>
+    <string name="email_format_incorrect">Formato email errato.</string>
 
     <!-- Forgot Password Screen -->
     <string name="forgot_passwords">Password dimenticata!</string>

+ 4 - 0
app/src/main/res/values-ja/strings.xml

@@ -24,6 +24,10 @@
     <string name="by_creating_acc">アカウントを作成すると、次のことに同意したことになります</string>
     <string name="termsndcond">利用規約と条件</string>
     <string name="already_have_acc">すでにアカウントをお持ちですか? </string>
+    <string name="email_field_req">電子メールフィールドは必須です。</string>
+    <string name="password_field_req">パスワードフィールドは必須です。</string>
+    <string name="password_validation">パスワードは 3 文字以上である必要があります。</string>
+    <string name="email_format_incorrect">メールの形式が正しくありません。</string>
 
     <!-- Forgot Password Screen -->
     <string name="forgot_passwords">パスワードを忘れた場合!</string>

+ 4 - 0
app/src/main/res/values-nl/strings.xml

@@ -24,6 +24,10 @@
     <string name="by_creating_acc">Door uw account aan te maken, gaat u akkoord met</string>
     <string name="termsndcond">Voorwaarden &amp; Voorwaarden</string>
     <string name="already_have_acc">Heb je al een account? </string>
+    <string name="email_field_req">Het e-mailveld is verplicht.</string>
+    <string name="password_field_req">Het wachtwoordveld is verplicht.</string>
+    <string name="password_validation">Het wachtwoord moet minimaal 3 tekens lang zijn.</string>
+    <string name="email_format_incorrect">E-mailformaat onjuist.</string>
 
     <!-- Forgot Password Screen -->
     <string name="forgot_passwords">Wachtwoord vergeten!</string>

+ 4 - 0
app/src/main/res/values-pl/strings.xml

@@ -24,6 +24,10 @@
     <string name="by_creating_acc">Tworząc konto, wyrażasz zgodę</string>
     <string name="termsndcond">Regulamin</string>
     <string name="already_have_acc">Masz już konto? </string>
+    <string name="email_field_req">Pole e-mail jest wymagane.</string>
+    <string name="password_field_req">Pole hasła jest wymagane.</string>
+    <string name="password_validation">Hasło musi składać się z co najmniej 3 znaków.</string>
+    <string name="email_format_incorrect">Nieprawidłowy format wiadomości e-mail.</string>
 
     <!-- Forgot Password Screen -->
     <string name="forgot_passwords">Zapomniałem hasła!</string>

+ 4 - 0
app/src/main/res/values-pt/strings.xml

@@ -24,6 +24,10 @@
     <string name="by_creating_acc">Ao criar sua conta, você concorda com</string>
     <string name="termsndcond">Termos e Termos Condições</string>
     <string name="already_have_acc">Já tem uma conta? </string>
+    <string name="email_field_req">O campo email é obrigatório.</string>
+    <string name="password_field_req">O campo de senha é obrigatório.</string>
+    <string name="password_validation">A senha deve ter pelo menos 3 caracteres.</string>
+    <string name="email_format_incorrect">Formato de e-mail incorreto.</string>
 
     <!-- Forgot Password Screen -->
     <string name="forgot_passwords">Esqueci a senha!</string>

+ 4 - 0
app/src/main/res/values-ru/strings.xml

@@ -24,6 +24,10 @@
     <string name="by_creating_acc">Создавая учетную запись, вы соглашаетесь</string>
     <string name="termsndcond">Условия использования</string>
     <string name="already_have_acc">У вас уже есть учетная запись? </string>
+    <string name="email_field_req">Поле электронной почты является обязательным.</string>
+    <string name="password_field_req">Поле пароля является обязательным.</string>
+    <string name="password_validation">Пароль должен содержать не менее 3 символов.</string>
+    <string name="email_format_incorrect">Неверный формат электронной почты.</string>
 
     <!-- Forgot Password Screen -->
     <string name="forgot_passwords">Забыли пароль!</string>

+ 4 - 0
app/src/main/res/values-sv/strings.xml

@@ -24,6 +24,10 @@
     <string name="by_creating_acc">Genom att skapa ditt konto godkänner du</string>
     <string name="termsndcond">Allmänna villkor</string>
     <string name="already_have_acc">Har du redan ett konto? </string>
+    <string name="email_field_req">E-postfältet är obligatoriskt.</string>
+    <string name="password_field_req">Lösenordsfältet är obligatoriskt.</string>
+    <string name="password_validation">Lösenordet måste bestå av minst 3 tecken.</string>
+    <string name="email_format_incorrect">E-postformatet är felaktigt.</string>
 
     <!-- Forgot Password Screen -->
     <string name="forgot_passwords">Glömt lösenord!</string>

+ 4 - 0
app/src/main/res/values-tr/strings.xml

@@ -24,6 +24,10 @@
     <string name="by_creating_acc">Hesabınızı oluşturarak şunları kabul etmiş olursunuz</string>
     <string name="termsndcond">Şartlar ve amp; Koşullar</string>
     <string name="already_have_acc">Zaten bir hesabınız var mı? </string>
+    <string name="email_field_req">E-posta alanı zorunludur.</string>
+    <string name="password_field_req">Şifre alanı gereklidir.</string>
+    <string name="password_validation">Şifre en az 3 karakterden oluşmalıdır.</string>
+    <string name="email_format_incorrect">E-posta biçimi hatalı.</string>
 
     <!-- Forgot Password Screen -->
     <string name="forgot_passwords">Şifremi Unuttum!</string>

+ 4 - 0
app/src/main/res/values-zh-rCN/strings.xml

@@ -24,6 +24,10 @@
     <string name="by_creating_acc">创建您的帐户即表示您同意</string>
     <string name="termsndcond">条款和条件条件</string>
     <string name="already_have_acc">已经有帐户? </string>
+    <string name="email_field_req">电子邮件字段为必填项。</string>
+    <string name="password_field_req">密码字段为必填项。</string>
+    <string name="password_validation">密码必须至少包含 3 个字符。</string>
+    <string name="email_format_incorrect">电子邮件格式不正确。</string>
 
     <!-- Forgot Password Screen -->
     <string name="forgot_passwords">忘记密码!</string>

+ 4 - 0
app/src/main/res/values/strings.xml

@@ -520,6 +520,10 @@
     <string name="by_creating_acc">By creating your account, you agree to</string>
     <string name="termsndcond">Terms &amp; Conditions</string>
     <string name="already_have_acc">Already have an account? </string>
+    <string name="email_field_req">The email field is required.</string>
+    <string name="password_field_req">The password field is required.</string>
+    <string name="password_validation">The password must be at least 3 characters.</string>
+    <string name="email_format_incorrect">Email format incorrect.</string>
 
     <!-- Forgot Password Screen -->
     <string name="forgot_passwords">Forgot Password!</string>