Set resource qualifier for german language, worked on account screens multi lingual

app/src/main/java/com/vpn/fastestvpnservice/screens/accountScreensAll/ChangePasswordScreen.kt

@@ -1,6 +1,7 @@
 package com.vpn.fastestvpnservice.screens.accountScreensAll
 
 import android.app.Activity
+import android.content.Context
 import android.content.res.Configuration
 import android.util.Log
 import android.widget.Toast
@@ -52,6 +53,7 @@ import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.platform.LocalView
@@ -105,6 +107,7 @@ fun ChangePassword(navHostController: NavHostController) {
                 }
             }
     ) {
+        val context = LocalContext.current
         val view = LocalView.current
         val window = (view.context as Activity).window
         window.statusBarColor = Color.Transparent.toArgb()
@@ -149,15 +152,15 @@ fun ChangePassword(navHostController: NavHostController) {
                 .background(Color.Transparent)
 
         ) {
-            TextFieldCurrPass() {
+            TextFieldCurrPass(context) {
                 currentPassword = it
             }
             Spacer(modifier = Modifier.height(25.dp))
-            TextFieldNewPass() {
+            TextFieldNewPass(context) {
                 newPassword = it
             }
             Spacer(modifier = Modifier.height(25.dp))
-            TextFieldReWriteNewPass() {
+            TextFieldReWriteNewPass(context) {
                 confirmPassword = it
             }
             val customValidation = CustomValidation()
@@ -212,7 +215,7 @@ fun ChangePassword(navHostController: NavHostController) {
                 ),
             )
             {
-                Text(text = "Save",
+                Text(text = context.getString(R.string.save),
                     style = TextStyle(
                         color = colorResource(id = R.color.white),
                         textAlign = TextAlign.Center,
@@ -249,7 +252,7 @@ fun ChangePassword(navHostController: NavHostController) {
 }
 
 @Composable
-fun ColumnScope.TextFieldCurrPass(currentPassword: (String) -> Unit) {
+fun ColumnScope.TextFieldCurrPass(context: Context, currentPassword: (String) -> Unit) {
     val keyboardController = LocalSoftwareKeyboardController.current
     val focusManager = LocalFocusManager.current
 
@@ -289,7 +292,7 @@ fun ColumnScope.TextFieldCurrPass(currentPassword: (String) -> Unit) {
 //                },
         label = {
             Text(
-                text = "Current Password",
+                text = context.getString(R.string.current_pass),
                 color = MaterialTheme.colorScheme.tertiaryContainer,
                 style = MaterialTheme.typography.labelMedium
             )
@@ -365,7 +368,7 @@ fun ColumnScope.TextFieldCurrPass(currentPassword: (String) -> Unit) {
 }
 
 @Composable
-fun ColumnScope.TextFieldNewPass(newPassword: (String) -> Unit) {
+fun ColumnScope.TextFieldNewPass(context: Context, newPassword: (String) -> Unit) {
     val keyboardController = LocalSoftwareKeyboardController.current
     val focusManager = LocalFocusManager.current
 
@@ -403,7 +406,7 @@ fun ColumnScope.TextFieldNewPass(newPassword: (String) -> Unit) {
 //                        color = colorResource(id = R.color.white))
 //                },
         label = {
-            androidx.compose.material3.Text(text = "New Password",
+            androidx.compose.material3.Text(text = context.getString(R.string.new_pass),
                 style = TextStyle(
                     MaterialTheme.colorScheme.tertiaryContainer,
                     fontSize = 16.sp,
@@ -482,7 +485,7 @@ fun ColumnScope.TextFieldNewPass(newPassword: (String) -> Unit) {
 }
 
 @Composable
-fun ColumnScope.TextFieldReWriteNewPass(confirmPassword: (String) -> Unit) {
+fun ColumnScope.TextFieldReWriteNewPass(context: Context, confirmPassword: (String) -> Unit) {
     val keyboardController = LocalSoftwareKeyboardController.current
     val focusManager = LocalFocusManager.current
 
@@ -519,7 +522,7 @@ fun ColumnScope.TextFieldReWriteNewPass(confirmPassword: (String) -> Unit) {
 //                        color = colorResource(id = R.color.white))
 //                },
         label = {
-            androidx.compose.material3.Text(text = "Rewrite New Password",
+            androidx.compose.material3.Text(text = context.getString(R.string.rewrite_new_pass),
                 style = TextStyle(
                     MaterialTheme.colorScheme.tertiaryContainer,
                     fontSize = 16.sp,
@@ -599,6 +602,7 @@ fun ColumnScope.TextFieldReWriteNewPass(confirmPassword: (String) -> Unit) {
 
 @Composable
 fun BoxScope.HeaderRowCP(navHostController: NavHostController) {
+    val context = LocalContext.current
     IconButton(
         onClick = {
             navHostController.popBackStack()
@@ -625,7 +629,7 @@ fun BoxScope.HeaderRowCP(navHostController: NavHostController) {
             .padding(5.dp),
         color = colorResource(id = R.color.transparent)
     ) {
-        Text(text = "Change Password",
+        Text(text = context.getString(R.string.change_password),
             color = MaterialTheme.colorScheme.primary,
             style = MaterialTheme.typography.bodyMedium,
             modifier = Modifier.fillMaxHeight()

app/src/main/java/com/vpn/fastestvpnservice/screens/accountScreensAll/FavoriteServersScreen.kt

@@ -145,6 +145,7 @@ fun calPing(server: Server, updatePing: (Int) -> Unit) {
 @Composable
 fun BoxScope.HeaderRowFS(
     navHostController: NavHostController) {
+    val context = LocalContext.current
     IconButton(
         onClick = {
             navHostController.popBackStack()
@@ -173,7 +174,7 @@ fun BoxScope.HeaderRowFS(
             .padding(5.dp),
         color = colorResource(id = R.color.transparent)
     ) {
-        Text(text = "Favorite Servers",
+        Text(text = context.getString(R.string.favorite_servers),
             color = MaterialTheme.colorScheme.primary,
             style = MaterialTheme.typography.bodyMedium,
             modifier = Modifier.fillMaxHeight()

app/src/main/java/com/vpn/fastestvpnservice/screens/accountScreensAll/SubscriptionScreen.kt

@@ -150,7 +150,7 @@ fun SubscriptionScreen(navHostController: NavHostController, activity: Component
                 .fillMaxSize()
                 .background(Color.Transparent)
         ) {
-            Text(text = "Upgrade Your Account",
+            Text(text = context.getString(R.string.upgrade_account),
                 color = MaterialTheme.colorScheme.primary,
                 style = MaterialTheme.typography.titleMedium
             )
@@ -257,7 +257,7 @@ fun SubscriptionScreen(navHostController: NavHostController, activity: Component
             ),
         )
         {
-            Text(text = "Subscribe",
+            Text(text = context.getString(R.string.subscribe),
                 color = colorResource(id = R.color.white),
                 style = MaterialTheme.typography.customTypography2.bodySmall
             )
@@ -330,6 +330,7 @@ fun OnLifecycleEventSS(onEvent: (
 
 @Composable
 fun BoxScope.HeaderRowSS(navHostController: NavHostController) {
+    val context = LocalContext.current
     IconButton(
         onClick = {
             Screen.Subscription.isTrue = false
@@ -357,7 +358,7 @@ fun BoxScope.HeaderRowSS(navHostController: NavHostController) {
             .padding(5.dp),
         color = colorResource(id = R.color.transparent)
     ) {
-        Text(text = "Subscription",
+        Text(text = context.getString(R.string.subscription),
             color = MaterialTheme.colorScheme.primary,
             style = MaterialTheme.typography.bodyMedium,
             modifier = Modifier.fillMaxHeight()

app/src/main/java/com/vpn/fastestvpnservice/screens/bottomNavBarScreens/AccountScreen.kt

@@ -193,10 +193,11 @@ fun Account(navHostController: NavHostController,
                     properties = DialogProperties(),
                     modifier = Modifier
                         .fillMaxWidth()
-                        .height(228.dp)
+                        .height(250.dp)
                 ) {
-                    LogoutDialog("Logout Account",
-                        "Are you sure to logout the account?",
+                    LogoutDialog(
+                        context.getString(R.string.logout_account),
+                        context.getString(R.string.sure_logout_account),
                         onCancel = {
                             isLoggedOut = false
                         },
@@ -219,8 +220,9 @@ fun Account(navHostController: NavHostController,
                         .fillMaxWidth()
                         .height(228.dp)
                 ) {
-                    LogoutDialog("Delete Account",
-                        "Are you sure to delete the account?",
+                    LogoutDialog(
+                        context.getString(R.string.delete_account),
+                        context.getString(R.string.sure_delete_account),
                         onCancel = { isDelete = false },
                         settingsNavHostController,
                         isLoggedOut,
@@ -550,7 +552,9 @@ fun BoxScope.LogoutDialog(
                 color = MaterialTheme.colorScheme.primary,
                 style = MaterialTheme.typography.labelSmall,
                 maxLines = 2,
-                modifier = Modifier.padding(top = 26.dp)
+                modifier = Modifier
+                    .padding(top = 26.dp)
+                    .padding(horizontal = 10.dp)
             )
             Row (
                 modifier = Modifier
@@ -584,7 +588,7 @@ fun BoxScope.LogoutDialog(
                     ),
                 )
                 {
-                    Text(text = "No",
+                    Text(text = context.getString(R.string.no),
                         style = MaterialTheme.typography.labelLarge)
                     Log.d("test_button", "RowScope")
                 }
@@ -638,7 +642,7 @@ fun BoxScope.LogoutDialog(
                     ),
                 )
                 {
-                    Text(text = "Yes",
+                    Text(text = context.getString(R.string.yes),
                         style = MaterialTheme.typography.labelLarge)
                     Log.d("test_button", "RowScope")
 

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

@@ -51,5 +51,17 @@
     <string name="change_password">Passwort ändern</string>
     <string name="delete_account">Konto löschen</string>
     <string name="logout">Abmelden</string>
+    <string name="subscription">Abonnement</string>
+    <string name="upgrade_account">Aktualisieren Sie Ihr Konto</string>
+    <string name="subscribe">Abonnieren</string>
+    <string name="current_pass">Aktuelles Passwort</string>
+    <string name="new_pass">Neues Passwort</string>
+    <string name="rewrite_new_pass">Neues Passwort umschreiben</string>
+    <string name="save">Speichern</string>
+    <string name="sure_delete_account">Möchten Sie das Konto wirklich löschen?</string>
+    <string name="logout_account">Konto abmelden</string>
+    <string name="sure_logout_account">Sind Sie sicher, dass Sie sich vom Konto abmelden?</string>
+    <string name="no">NEIN</string>
+    <string name="yes">Ja</string>
 
 </resources>

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

@@ -149,9 +149,6 @@
     <!--Change Password-->
     <string name="chng_pass_header">Change Password</string>
     <string name="chng_pass_txt">Enter your new password</string>
-    <string name="chng_pass_current_pass">Current Password</string>
-    <string name="chng_pass_new_pass">New Password</string>
-    <string name="chng_pass_confirm_pass">Confirm Password</string>
     <string name="chng_pass_submit">Submit</string>
 
     <!--Saving history-->
@@ -384,7 +381,6 @@
     <string name="how_can_we_help">How can we help you?</string>
     <string name="top_questions">Top Questions</string>
     <string name="new_password">New Password</string>
-    <string name="save">Save</string>
     <string name="m_enable_location">Fastest VPN requires access to your location, Please turn on your location</string>
     <string name="finding_your_location">Finding your location</string>
     <string name="current_location">Current Location</string>
@@ -392,7 +388,6 @@
     <string name="my_account">My Account</string>
     <string name="using_package">Using Package</string>
     <string name="upgrade">Upgrade</string>
-    <string name="upgrade_account">Upgrade Your Account</string>
     <string name="favourite_locations">Favorite Locations</string>
     <string name="chat">Chat</string>
     <string name="help_faq">Help &amp; FAQ</string>
@@ -411,9 +406,6 @@
     <string name="m_back_press">Please click BACK again to exit</string>
     <string name="m_split_tunnel">FastestVPN\'s Split Tunneling feature lets the users\nroute some traffic via the encrypted VPN tunnel\nwhile the rest of the traffic moves normally</string>
     <string name="auto_connect">Auto Connect</string>
-    <string name="no">No</string>
-    <string name="yes">Yes</string>
-    <string name="subscribe">Subscribe</string>
     <string name="forgot_password">Forgot your credentials?</string>
     <string name="disconnect_dialog_title">Disconnect Confirmation</string>
     <string name="cancel_connection_query">Disconnect FastestVPN?</string>
@@ -562,7 +554,19 @@
     <string name="upgrade_subscription">Upgrade Subscription</string>
     <string name="favorite_servers">Favorite Servers</string>
     <string name="change_password">Change Password</string>
-    <string name="delete_account">Delete Account</string>
     <string name="logout">Logout</string>
+    <string name="subscription">Subscription</string>
+    <string name="upgrade_account">Upgrade Your Account</string>
+    <string name="subscribe">Subscribe</string>
+    <string name="current_pass">Current Password</string>
+    <string name="new_pass">New Password</string>
+    <string name="rewrite_new_pass">Rewrite New Password</string>
+    <string name="save">Save</string>
+    <string name="delete_account">Delete Account</string>
+    <string name="sure_delete_account">Are you sure to delete the account?</string>
+    <string name="logout_account">Logout Account</string>
+    <string name="sure_logout_account">Are you sure to logout the account?</string>
+    <string name="no">No</string>
+    <string name="yes">Yes</string>
 
 </resources>