Parcourir la source

Set stringresource on settings screen for multi lingual

Khubaib il y a 8 mois
Parent
commit
eaacea0fca

+ 2 - 2
app/src/main/java/com/vpn/fastestvpnservice/beans/Dark_Light_Theme.kt

@@ -9,8 +9,8 @@ val themesList = listOf<String>(
 
 val languages = listOf<Language>(
     Language("English","en"),
-    Language("French","fr"),
-//    Language("German","de"),
+    Language("German","de"),
+//    Language("French","fr"),
 //    Language("Spanish", "es")
 )
 

+ 9 - 8
app/src/main/java/com/vpn/fastestvpnservice/screens/bottomNavBarScreens/SettingsScreen.kt

@@ -203,18 +203,18 @@ fun Settings(navHostController: NavHostController, activity: ComponentActivity)
 
                 AddRowSettingsSmart(
                     icon = R.drawable.smart_connect3x,
-                    text = stringResource(id = R.string.smart_connect),
+                    text = context.getString(R.string.smart_connect),
                     isRowShown = true,
                     isSheetShown = false,
                     navHostController
                 )
                 AddRowSwitch(
                     icon = R.drawable.adblock3x,
-                    text = "AdBlock"
+                    text = context.getString(R.string.adblock)
                 )
                 AddRowSettings(
                     icon = R.drawable.kill_switch3x,
-                    text = "Kill Switch",
+                    text = context.getString(R.string.kill_switch),
                     topPadding = 40.dp,
                     onClick = {
                         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@@ -224,28 +224,29 @@ fun Settings(navHostController: NavHostController, activity: ComponentActivity)
                 )
                 AddRowSettings(
                     icon = R.drawable.split_tunneling3x,
-                    text = "Split Tunneling",
+                    text = context.getString(R.string.split_tunneling),
                     onClick = { navHostController.navigate(Screen.SplitTunneling.route) }
                 )
                 AddRowSettings(
                     icon = R.drawable.notification3x,
-                    text = "Notifications",
+                    text = context.getString(R.string.notifcation),
                     onClick = { navHostController.navigate(Screen.Notifications.route) }
                 )
                 AddRowDarkLightTheme(
                     icon = Icons.Default.DarkMode,
-                    text = "Appearance")
+                    text = context.getString(R.string.appearance)
+                )
 
                 AddRowLaunchSwitch(
                     icon = Icons.Filled.RocketLaunch,
-                    text = "Launch On Startup",
+                    text = context.getString(R.string.launch_on_startup),
                     activity,
                     onClick = {
                         isLaunched = true
                     }
                 )
 
-                SelectLanguage(icon = Icons.Default.Language, text = "Language") {
+                SelectLanguage(icon = Icons.Default.Language, text = context.getString(R.string.language)) {
                     settingsString = it
                 }
 

+ 22 - 3
app/src/main/res/values-de/strings.xml

@@ -1,7 +1,26 @@
 <resources>
     <!-- Multi Lingual - (German-de) -->
+
+    <!-- Settings Screen -->
     <string name="app_name">FastestVPN</string>
-    <string name="settings">Settings</string>
-    <string name="smart_connect">Smart Connect</string>
-    <string name="vpn_protocols">VPN Protocols</string>
+    <string name="settings">Einstellungen</string>
+    <string name="vpn_protocols">VPN-Protokolle</string>
+    <string name="smart_connect">Verbinden Smart</string>
+    <string name="adblock">Werbeblocker</string>
+    <string name="kill_switch">Kill-Schalter</string>
+    <string name="split_tunneling">Split-Tunnelbau</string>
+    <string name="notifcation">Benachrichtigungen</string>
+    <string name="appearance">Aussehen</string>
+    <string name="launch_on_startup">Beim Start starten</string>
+    <string name="language">Sprache</string>
+
+    <!-- Help Screen -->
+    <string name="help">Hilfe</string>
+    <string name="faq">Häufig gestellte Fragen</string>
+    <string name="privacy_policy">Datenschutzrichtlinie</string>
+    <string name="terms_conditions">Allgemeine Geschäftsbedingungen</string>
+    <string name="about_fastest_vpn">Über FastestVPN</string>
+    <string name="customer_support">Kundensupport</string>
+    <string name="email_us">Senden Sie uns eine E-Mail</string>
+
 </resources>

+ 20 - 10
app/src/main/res/values/strings.xml

@@ -19,7 +19,6 @@
     <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="terms_conditions"><u>Terms &amp; Conditions</u></string>
     <string name="resend_code"><u>Resend Code</u></string>
     <string name="mazaya_id">Mazaya\nID</string>
     <string name="implemented_next_build">Will be implemented in next build.</string>
@@ -137,7 +136,6 @@
     <string name="setting_rate_app">Rate Our App</string>
     <string name="setting_give_feedback">Give Us Feedback</string>
     <string name="setting_terms_use">Terms &amp; Condition</string>
-    <string name="setting_faq">FAQ</string>
     <string name="setting_contact">Contact Us</string>
     <string name="setting_sign_out">Sign Out</string>
     <string name="setting_version">Version</string>
@@ -206,7 +204,6 @@
     <string name="connecting">Connecting</string>
     <string name="connecting_new">Connecting...</string>
     <string name="initing">Initing&#8230;</string>
-    <string name="help">About</string>
     <string name="init_fail">init failed: </string>
     <string name="down_fail">load data failed: </string>
     <string name="not_show_more">Not show more</string>
@@ -407,17 +404,13 @@
     <string name="change_password">Change Password</string>
     <string name="chat">Chat</string>
     <string name="help_faq">Help &amp; FAQ</string>
-    <string name="about_fastest_vpn">About Fastest VPN</string>
     <string name="fastest">Fastest</string>
     <string name="vpn">VPN</string>
     <string name="share">Share</string>
-    <string name="policy">Privacy Policy</string>
     <string name="logout">Logout</string>
     <string name="select_protocol">Select Protocol</string>
-    <string name="kill_switch">Kill Switch</string>
     <string name="about">About</string>
 
-    <string name="split_tunneling">Split Tunneling</string>
     <string name="split_info">If "Block connections without VPN"</string>
     <string name="split_info2">is enabled in</string>
     <string name="split_info3">Android settings</string>
@@ -491,7 +484,6 @@
 
     <!-- TODO: Remove or change this placeholder text -->
     <string name="connection_failed">Connection failed</string>
-    <string name="notifcation">Notifications</string>
     <string name="title_activity_welcome_home">WelcomeHomeActivity</string>
     <!-- Strings used for fragments for navigation -->
     <string name="first_fragment_label">First Fragment</string>
@@ -530,9 +522,27 @@
     <string name="app_widget_description">This is an app widget description</string>
 
     <!-- Multi Lingual - (English-en) -->
+
+    <!-- Settings Screen -->
     <string name="app_name">FastestVPN</string>
     <string name="settings">Settings</string>
-    <string name="smart_connect">Smart Connect</string>
     <string name="vpn_protocols">VPN Protocols</string>
+    <string name="smart_connect">Smart Connect</string>
+    <string name="adblock">AdBlock</string>
+    <string name="kill_switch">Kill Switch</string>
+    <string name="split_tunneling">Split Tunneling</string>
+    <string name="notifcation">Notifications</string>
+    <string name="appearance">Appearance</string>
+    <string name="launch_on_startup">Launch on Startup</string>
+    <string name="language">Language</string>
+
+    <!-- Help Screen -->
+    <string name="help">Help</string>
+    <string name="faq">FAQ</string>
+    <string name="privacy_policy">Privacy Policy</string>
+    <string name="terms_conditions">Terms and Conditions</string>
+    <string name="about_fastest_vpn">About Fastest VPN</string>
+    <string name="customer_support">Customer Support</string>
+    <string name="email_us">Email Us</string>
 
-</resources>
+</resources>