Преглед изворни кода

Added language identifier on url of webviews, FAQ, PP, T&C, About FastestVPN

Khubaib пре 8 месеци
родитељ
комит
5d25295c49

+ 6 - 3
app/src/main/java/com/vpn/fastestvpnservice/screens/helpScreensAll/AboutScreen.kt

@@ -44,6 +44,7 @@ import androidx.navigation.compose.rememberNavController
 import com.vpn.fastestvpnservice.R
 import com.vpn.fastestvpnservice.beans.isDarkTheme
 import com.vpn.fastestvpnservice.constants.AppConstant
+import com.vpn.fastestvpnservice.helpers.BasePreferenceHelper
 import kotlinx.coroutines.delay
 
 @Composable
@@ -71,9 +72,11 @@ fun About(navHostController: NavHostController) {
             .fillMaxSize()
             .background(MaterialTheme.colorScheme.onPrimary)
         ) {
-
-            val aboutUrl = if (isDarkTheme.value) "${AppConstant.BASE_WEBVIEW_URL}about?skin=dark"
-            else "${AppConstant.BASE_WEBVIEW_URL}about?device=ios"
+            val context = LocalContext.current
+            val basePreferenceHelper = BasePreferenceHelper(context)
+            val languageIdentifier = basePreferenceHelper.getLanguage()
+            val aboutUrl = if (isDarkTheme.value) "${AppConstant.BASE_WEBVIEW_URL}${languageIdentifier}/about?skin=dark"
+            else "${AppConstant.BASE_WEBVIEW_URL}${languageIdentifier}/about?device=ios"
 
             AndroidView(factory = {
                 WebView(it).apply {

+ 6 - 2
app/src/main/java/com/vpn/fastestvpnservice/screens/helpScreensAll/FAQScreen.kt

@@ -83,6 +83,7 @@ import com.vpn.fastestvpnservice.beans.isDarkTheme
 import com.vpn.fastestvpnservice.constants.AppConstant
 import com.vpn.fastestvpnservice.constants.HelpDesc
 import com.vpn.fastestvpnservice.constants.HelpTitles
+import com.vpn.fastestvpnservice.helpers.BasePreferenceHelper
 import com.vpn.fastestvpnservice.sealedClass.BottomBarScreen
 import kotlinx.coroutines.delay
 
@@ -112,8 +113,11 @@ fun FAQ(navHostController: NavHostController) {
             .fillMaxSize()
             .background(MaterialTheme.colorScheme.onPrimaryContainer)
         ) {
-            val faqUrl = if (isDarkTheme.value) "${AppConstant.BASE_WEBVIEW_URL}faq?skin=dark"
-            else "${AppConstant.BASE_WEBVIEW_URL}faq?device=ios"
+            val context = LocalContext.current
+            val basePreferenceHelper = BasePreferenceHelper(context)
+            val languageIdentifier = basePreferenceHelper.getLanguage()
+            val faqUrl = if (isDarkTheme.value) "${AppConstant.BASE_WEBVIEW_URL}${languageIdentifier}/faq?skin=dark"
+            else "${AppConstant.BASE_WEBVIEW_URL}${languageIdentifier}/faq?device=ios"
             AndroidView(factory = {
                 WebView(it).apply {
                     layoutParams = ViewGroup.LayoutParams(

+ 6 - 4
app/src/main/java/com/vpn/fastestvpnservice/screens/helpScreensAll/PrivacyPolicyScreen.kt

@@ -58,6 +58,7 @@ import com.vpn.fastestvpnservice.R
 import com.vpn.fastestvpnservice.beans.isDarkTheme
 import com.vpn.fastestvpnservice.constants.AppConstant
 import com.vpn.fastestvpnservice.constants.PrivacyPolicyDesc
+import com.vpn.fastestvpnservice.helpers.BasePreferenceHelper
 import com.vpn.fastestvpnservice.sealedClass.BottomBarScreen
 import kotlinx.coroutines.delay
 
@@ -86,10 +87,11 @@ fun PrivacyPolicy(navHostController: NavHostController){
             .fillMaxSize()
             .background(MaterialTheme.colorScheme.onPrimary)
         ) {
-
-
-            val privacyUrl = if (isDarkTheme.value) "${AppConstant.BASE_WEBVIEW_URL}privacy-policy?skin=dark"
-            else "${AppConstant.BASE_WEBVIEW_URL}privacy-policy?device=ios"
+            val context = LocalContext.current
+            val basePreferenceHelper = BasePreferenceHelper(context)
+            val languageIdentifier = basePreferenceHelper.getLanguage()
+            val privacyUrl = if (isDarkTheme.value) "${AppConstant.BASE_WEBVIEW_URL}${languageIdentifier}/privacy-policy?skin=dark"
+            else "${AppConstant.BASE_WEBVIEW_URL}${languageIdentifier}/privacy-policy?device=ios"
             AndroidView(factory = {
                 WebView(it).apply {
                     layoutParams = ViewGroup.LayoutParams(

+ 6 - 2
app/src/main/java/com/vpn/fastestvpnservice/screens/helpScreensAll/TermsAndConditionsScreen.kt

@@ -60,6 +60,7 @@ import com.vpn.fastestvpnservice.beans.isDarkTheme
 import com.vpn.fastestvpnservice.constants.AppConstant
 import com.vpn.fastestvpnservice.constants.PrivacyPolicyDesc
 import com.vpn.fastestvpnservice.constants.TermsAndConditionsDesc
+import com.vpn.fastestvpnservice.helpers.BasePreferenceHelper
 import com.vpn.fastestvpnservice.sealedClass.BottomBarScreen
 import com.vpn.fastestvpnservice.sealedClass.Screen
 import kotlinx.coroutines.delay
@@ -93,8 +94,11 @@ fun TermsAndConditions(
             .fillMaxSize()
             .background(MaterialTheme.colorScheme.onPrimary)
         ) {
-            val tncUrl = if (isDarkTheme.value) "${AppConstant.BASE_WEBVIEW_URL}terms-of-service?skin=dark"
-            else "${AppConstant.BASE_WEBVIEW_URL}terms-of-service?device=ios"
+            val context = LocalContext.current
+            val basePreferenceHelper = BasePreferenceHelper(context)
+            val languageIdentifier = basePreferenceHelper.getLanguage()
+            val tncUrl = if (isDarkTheme.value) "${AppConstant.BASE_WEBVIEW_URL}${languageIdentifier}/terms-of-service?skin=dark"
+            else "${AppConstant.BASE_WEBVIEW_URL}${languageIdentifier}/terms-of-service?device=ios"
 
             AndroidView(factory = {
                 WebView(it).apply {