Set resource qualifier for german language, worked on started, login, signup screen multi lingual

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

@@ -1,6 +1,7 @@
 package com.vpn.fastestvpnservice.screens
 
 import android.app.Activity
+import android.content.Context
 import android.content.Intent
 import android.content.res.Configuration
 import android.location.Location
@@ -194,13 +195,13 @@ fun Login(navHostController: NavHostController) {
                     horizontalAlignment = Alignment.CenterHorizontally
                 ) {
                         TextMsg(
-                            text = "Welcome Back!",
+                            text = context.getString(R.string.welcome_back),
                             color = Color.White,
                             style = MaterialTheme.typography.displayLarge
                         )
                         Spacer(modifier = Modifier.height(8.dp))
                         TextMsg(
-                            text = "Please login to your account.",
+                            text = context.getString(R.string.please_login),
                             color = colorResource(id = R.color.white),
                             style = MaterialTheme.typography.customTypography.labelLarge,
                             alpha = 0.6F
@@ -234,7 +235,7 @@ fun Login(navHostController: NavHostController) {
 //                        color = colorResource(id = R.color.white))
 //                },
                             label = {
-                                Text(text = "Email",
+                                Text(text = context.getString(R.string.email),
                                     style = MaterialTheme.typography.customTypography.bodySmall
                                 )
                             },
@@ -312,7 +313,7 @@ fun Login(navHostController: NavHostController) {
 //                        color = colorResource(id = R.color.white))
 //                },
                             label = {
-                                Text(text = "Password",
+                                Text(text = context.getString(R.string.password),
                                     style = MaterialTheme.typography.customTypography.bodyLarge
                                 )
                             },
@@ -397,7 +398,7 @@ fun Login(navHostController: NavHostController) {
                                 .padding(end = 15.dp)
                                 .align(Alignment.End),
                             style = MaterialTheme.typography.customTypography.titleSmall,
-                            text = AnnotatedString("Forgot Password"),
+                            text = AnnotatedString(context.getString(R.string.forgot_pass)),
                         )
                 }
 
@@ -423,14 +424,15 @@ fun Login(navHostController: NavHostController) {
                         },
                         showErrorPass2,
                         snackBarState,
-                        snackBarStateRed
+                        snackBarStateRed,
+                        context
                     )
                     Row (
                         modifier = Modifier
                             .padding(bottom = 25.dp)
                             .align(Alignment.CenterHorizontally),
                     ){
-                        TextMsgSignUp(navHostController = navHostController, loginViewModel, readOnly!!)
+                        TextMsgSignUp(navHostController = navHostController, loginViewModel, readOnly!!, context)
                     }
                 }
             }
@@ -469,12 +471,13 @@ fun ColumnScope.ShowErrorRow(
 fun RowScope.TextMsgSignUp(
     navHostController: NavHostController,
     loginViewModel: LoginViewModel,
-    isEnabled: Boolean
+    isEnabled: Boolean,
+    context: Context
 ) {
     Text(
             modifier = Modifier
                 .padding(0.dp),
-            text = "Don't have an account? ",
+            text = context.getString(R.string.dont_have_acc),
             style = MaterialTheme.typography.customTypography.labelLarge,
         )
         ClickableText(
@@ -486,7 +489,7 @@ fun RowScope.TextMsgSignUp(
             modifier = Modifier
                 .padding(0.dp),
             style = MaterialTheme.typography.customTypography.titleMedium,
-            text = AnnotatedString(" Sign Up"),
+            text = AnnotatedString(" ${context.getString(R.string.signup)}"),
         )
 
 }
@@ -506,7 +509,8 @@ fun ColumnScope.SignInButton(
     showErrorPass2: (Boolean) -> Unit,
     isErrorPass2: Boolean,
     snackBarState: SnackbarHostState,
-    snackBarStateRed: SnackbarHostState
+    snackBarStateRed: SnackbarHostState,
+    context: Context
 ) {
     val scaffoldState = rememberScaffoldState()
     val coroutineScope = rememberCoroutineScope()
@@ -613,7 +617,7 @@ fun ColumnScope.SignInButton(
     )
     {
 
-        Text(text = "Sign In",
+        Text(text = context.getString(R.string.signin),
             style = MaterialTheme.typography.titleMedium,
             textAlign = TextAlign.Center
         )

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

@@ -1,6 +1,7 @@
 package com.vpn.fastestvpnservice.screens
 
 import android.app.Activity
+import android.content.Context
 import android.content.Intent
 import android.content.res.Configuration
 import android.location.Location
@@ -107,6 +108,7 @@ import kotlinx.coroutines.launch
 fun SignUp(navHostController: NavHostController) {
     val keyboardController = LocalSoftwareKeyboardController.current
     val focusManager = LocalFocusManager.current
+    val context = LocalContext.current
 
     val signUpViewModel: SignUpViewModel = viewModel()
     var isSignUpEnabled = signUpViewModel.liveDataSignUpStatus.observeAsState().value
@@ -241,7 +243,7 @@ fun SignUp(navHostController: NavHostController) {
                                 .align(Alignment.Start)
                             ,
                             style = MaterialTheme.typography.displayLarge,
-                            text = "Hello There!",
+                            text = context.getString(R.string.hello_there),
                             color = Color.White,
                         )
                         Text(
@@ -250,7 +252,7 @@ fun SignUp(navHostController: NavHostController) {
                                 .align(Alignment.Start)
                                 .alpha(0.6F),
                             style = MaterialTheme.typography.customTypography.labelLarge,
-                            text = "Please register your account.",
+                            text = context.getString(R.string.please_register),
                             color = colorResource(id = R.color.white),
                         )
                         Spacer(modifier = Modifier.height(8.dp))
@@ -288,7 +290,7 @@ fun SignUp(navHostController: NavHostController) {
 //                    )
 //                },
                             label = {
-                                Text(text = "Email",
+                                Text(text = context.getString(R.string.email),
                                     style = MaterialTheme.typography.customTypography.bodySmall
                                 )
                             },
@@ -357,7 +359,7 @@ fun SignUp(navHostController: NavHostController) {
 //                        color = colorResource(id = R.color.white))
 //                },
                             label = {
-                                Text(text = "Password",
+                                Text(text = context.getString(R.string.password),
                                     style = MaterialTheme.typography.customTypography.bodyLarge
                                 )
                             },
@@ -455,7 +457,7 @@ fun SignUp(navHostController: NavHostController) {
                                 modifier = Modifier
                                     .padding(start = 15.dp),
                                 style = MaterialTheme.typography.customTypography.bodyLarge,
-                                text = "By creating your account, you agree to",
+                                text = context.getString(R.string.by_creating_acc),
                                 color = colorResource(id = R.color.white),
                             )
                         }
@@ -484,7 +486,7 @@ fun SignUp(navHostController: NavHostController) {
                                 },
                                 modifier = Modifier
                                     .padding(start = 15.dp),
-                                text = AnnotatedString("Terms & Conditions"),
+                                text = AnnotatedString(context.getString(R.string.termsndcond)),
                                 style = MaterialTheme.typography.customTypography.titleLarge
                             )
                         }
@@ -533,7 +535,7 @@ fun SignUp(navHostController: NavHostController) {
                                 modifier = Modifier
                                     .padding(0.dp),
                                 style = MaterialTheme.typography.customTypography.labelLarge,
-                                text = "Already have an account? ",
+                                text = "${context.getString(R.string.already_have_acc)} ",
                                 color = Color.White,
                             )
                             ClickableText(
@@ -563,7 +565,7 @@ fun SignUp(navHostController: NavHostController) {
                                 modifier = Modifier
                                     .padding(0.dp),
                                 style = MaterialTheme.typography.customTypography.titleMedium,
-                                text = AnnotatedString(" Sign In"),
+                                text = AnnotatedString(" ${context.getString(R.string.signin)}"),
                             )
                         }
                     }
@@ -723,7 +725,7 @@ fun ColumnScope.SignUpButton(
         ),
     )
     {
-        Text(text = "Sign Up",
+        Text(text = context.getString(R.string.signup),
             style = MaterialTheme.typography.titleMedium,
             textAlign = TextAlign.Center
         )
@@ -862,11 +864,9 @@ fun ColumnScope.SignUpButton(
 @Preview
 @Composable
 fun SignUpPreview() {
-    SignUp(rememberNavController())
 }
 
 @Preview(uiMode = Configuration.UI_MODE_NIGHT_YES)
 @Composable
 fun SignUpPreviewDark() {
-    SignUp(rememberNavController())
 }

app/src/main/java/com/vpn/fastestvpnservice/screens/StartedScreen.kt

@@ -159,7 +159,7 @@ fun Started(navHostController: NavHostController) {
                     Text(
                         modifier = Modifier
                             .padding(bottom = 15.dp),
-                        text = "Secure. Fast. Stable.",
+                        text = context.getString(R.string.secure_fast),
                         color = colorResource(id = R.color.white),
                         style = MaterialTheme.typography.titleLarge,
                     )
@@ -167,21 +167,21 @@ fun Started(navHostController: NavHostController) {
                         modifier = Modifier
                             .padding(start = 0.dp)
                             .alpha(0.8F),
-                        text = "Top-notch security, blazing speed,",
+                        text = context.getString(R.string.started_text_1),
                         style = MaterialTheme.typography.customTypography.labelSmall,
                     )
                     Text(
                         modifier = Modifier
                             .padding(start = 0.dp)
                             .alpha(0.8F),
-                        text = "Unwavering stability. Your digital world,",
+                        text = context.getString(R.string.started_text_2),
                         style = MaterialTheme.typography.customTypography.labelSmall,
                     )
                     Text(
                         modifier = Modifier
                             .padding(start = 0.dp)
                             .alpha(0.8F),
-                        text = "Protected.",
+                        text = context.getString(R.string.started_text_3),
                         style = MaterialTheme.typography.customTypography.labelSmall,
                     )
                 }
@@ -215,7 +215,7 @@ fun Started(navHostController: NavHostController) {
                         ),
                     )
                     {
-                        Text(text = "Sign In",
+                        Text(text = context.getString(R.string.signin),
                             style = MaterialTheme.typography.customTypography.labelMedium,
                         )
                         Log.d("test_button", "RowScope")
@@ -245,7 +245,7 @@ fun Started(navHostController: NavHostController) {
                             colorResource(id = R.color.white))
                     )
                     {
-                        Text(text = "Sign Up",
+                        Text(text = context.getString(R.string.signup),
                             style = MaterialTheme.typography.customTypography.labelMedium,)
                         Log.d("test_button", "RowScope")
                     }

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

@@ -1,6 +1,28 @@
 <resources>
     <!-- Multi Lingual - (German-de) -->
 
+    <!-- Sign In Screen -->
+    <string name="signin">Anmelden</string>
+    <string name="welcome_back">Willkommen zurück!</string>
+    <string name="please_login">Bitte melden Sie sich bei Ihrem Konto an.</string>
+    <string name="password">Passwort</string>
+    <string name="forgot_pass">Passwort vergessen</string>
+    <string name="dont_have_acc">Sie haben noch kein Konto?</string>
+
+    <!-- Sign Up Screen -->
+    <string name="signup">Melden Sie sich an</string>
+    <string name="hello_there">Hallo!</string>
+    <string name="please_register">Bitte registrieren Sie Ihr Konto.</string>
+    <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>
+
+    <!-- Started Screen -->
+    <string name="secure_fast">Sicher. Schnell. Stabil.</string>
+    <string name="started_text_1">Erstklassige Sicherheit, rasante Geschwindigkeit,</string>
+    <string name="started_text_2">Unerschütterliche Stabilität. Ihre digitale Welt,</string>
+    <string name="started_text_3">Geschützt.</string>
+
     <!-- Home Screen -->
     <string name="change">Ändern</string>
     <string name="see_all_locations">Alle Standorte anzeigen</string>

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

@@ -17,7 +17,6 @@
     <string name="connect_fast_server_msg">Let\'s you connect with Fastest server.</string>
 
     <string name="message_quit">Are you sure you want to exit?</string>
-    <string name="signup">Signup</string>
     <string name="reset_now"><u>Reset Now</u></string>
     <string name="resend_code"><u>Resend Code</u></string>
     <string name="mazaya_id">Mazaya\nID</string>
@@ -53,7 +52,6 @@
     <string name="login_reset_now"><u>Reset Now</u></string>
     <string name="login_with_facebook">LOGIN WITH FACEBOOK</string>
     <string name="login_with_google">LOGIN WITH GOOGLE</string>
-    <string name="login_dont_have_account">Don\'t have an account?</string>
     <string name="login_signup"><u>Signup</u></string>
 
     <!--SignUp Scree-->
@@ -69,7 +67,6 @@
     <string name="signup_btn_txt">SignUp</string>
 
     <!--Forgot Password-->
-    <string name="forgot_header">Forgot Password</string>
     <string name="forgot_txt">Enter your email address to request a password reset.</string>
     <string name="forgot_email">Email Address</string>
     <string name="forgot_next">NEXT</string>
@@ -257,7 +254,6 @@
     <string name="opentun_no_ipaddr">Refusing to open tun device without IP information</string>
     <string name="pkcs12_file_encryption_key">PKCS12 File Encryption Key</string>
     <string name="private_key_password">Private Key Password</string>
-    <string name="password">Password</string>
     <string name="building_configration">configuring settings</string>
     <string name="netstatus">Network Status: %s</string>
     <string name="keychain_nocacert">No CA Certificate returned while reading from Android keystore. Authentication will probably fail.</string>
@@ -364,7 +360,6 @@
 
     <string name="apps_selected">%s Apps Selected</string>
     <string name="m_login">Welcome to FastestVPN! Connect now and take\ncontrol of your privacy</string>
-    <string name="hello_there">Hello There.</string>
     <string name="m_login_or_signup">Login or sign up to continue</string>
     <string name="dont_have_account">Don\'t have an account?</string>
     <string name="login">Login</string>
@@ -505,6 +500,29 @@
 
     <!-- Multi Lingual - (English-en) -->
 
+    <!-- Started Screen -->
+    <string name="secure_fast">Secure. Fast. Stable.</string>
+    <string name="started_text_1">Top-notch security, blazing speed,</string>
+    <string name="started_text_2">Unwavering stability. Your digital world,</string>
+    <string name="started_text_3">Protected.</string>
+
+    <!-- Sign In Screen -->
+    <string name="signin">Sign In</string>
+    <string name="welcome_back">Welcome Back!</string>
+    <string name="please_login">Please login to your account.</string>
+    <string name="password">Password</string>
+    <string name="forgot_pass">Forgot Password</string>
+    <string name="dont_have_acc">Don\'t have an account?</string>
+
+
+    <!-- Sign Up Screen -->
+    <string name="signup">Sign Up</string>
+    <string name="hello_there">Hello There!</string>
+    <string name="please_register">Please register your account.</string>
+    <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>
+
     <!-- Home Screen -->
     <string name="change">Change</string>
     <string name="see_all_locations">See All Locations</string>