ソースを参照

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

Khubaib 7 ヶ月 前
コミット
192f463088

+ 5 - 2
app/src/main/java/com/vpn/fastestvpnservice/screensTV/helpScreensAll/AboutScreenTV.kt

@@ -33,6 +33,7 @@ import androidx.navigation.NavHostController
 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
@@ -53,8 +54,10 @@ fun AboutTV(navHostController: NavHostController) {
             .verticalScroll(rememberScrollState())
             .background(MaterialTheme.colorScheme.onPrimary)
         ) {
-            val aboutUrl = if (isDarkTheme.value) "${AppConstant.BASE_WEBVIEW_URL}about?devicedark=tv"
-            else "${AppConstant.BASE_WEBVIEW_URL}about?device=tv"
+            val basePreferenceHelper = BasePreferenceHelper(context)
+            val languageIdentifier = basePreferenceHelper.getLanguage()
+            val aboutUrl = if (isDarkTheme.value) "${AppConstant.BASE_WEBVIEW_URL}${languageIdentifier}/about?devicedark=tv"
+            else "${AppConstant.BASE_WEBVIEW_URL}${languageIdentifier}/about?device=tv"
             AndroidView(factory = {
                 WebView(it).apply {
                     layoutParams = ViewGroup.LayoutParams(

+ 5 - 2
app/src/main/java/com/vpn/fastestvpnservice/screensTV/helpScreensAll/FAQScreenTV.kt

@@ -32,6 +32,7 @@ import androidx.navigation.NavHostController
 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
@@ -53,8 +54,10 @@ fun FaqTV(navHostController: NavHostController) {
             .background(MaterialTheme.colorScheme.onPrimary)
 //            .background(colorResource(id = R.color.webview_background))
         ) {
-            val faqUrl = if (isDarkTheme.value) "${AppConstant.BASE_WEBVIEW_URL}faq?devicedark=tv"
-            else "${AppConstant.BASE_WEBVIEW_URL}faq?device=tv"
+            val basePreferenceHelper = BasePreferenceHelper(context)
+            val languageIdentifier = basePreferenceHelper.getLanguage()
+            val faqUrl = if (isDarkTheme.value) "${AppConstant.BASE_WEBVIEW_URL}${languageIdentifier}/faq?devicedark=tv"
+            else "${AppConstant.BASE_WEBVIEW_URL}${languageIdentifier}/faq?device=tv"
             AndroidView(factory = {
                 WebView(it).apply {
                     layoutParams = ViewGroup.LayoutParams(

+ 5 - 2
app/src/main/java/com/vpn/fastestvpnservice/screensTV/helpScreensAll/PrivacyPolicyScreenTV.kt

@@ -38,6 +38,7 @@ import androidx.navigation.NavHostController
 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
@@ -58,8 +59,10 @@ fun PrivacyPolicyTV(navHostController: NavHostController) {
             .verticalScroll(rememberScrollState())
             .background(MaterialTheme.colorScheme.onPrimary)
         ) {
-            val privacyUrl = if (isDarkTheme.value) "${AppConstant.BASE_WEBVIEW_URL}privacy-policy?devicedark=tv"
-            else "${AppConstant.BASE_WEBVIEW_URL}privacy-policy?device=tv"
+            val basePreferenceHelper = BasePreferenceHelper(context)
+            val languageIdentifier = basePreferenceHelper.getLanguage()
+            val privacyUrl = if (isDarkTheme.value) "${AppConstant.BASE_WEBVIEW_URL}${languageIdentifier}/privacy-policy?devicedark=tv"
+            else "${AppConstant.BASE_WEBVIEW_URL}${languageIdentifier}/privacy-policy?device=tv"
             AndroidView(factory = {
                 WebView(it).apply {
                     layoutParams = ViewGroup.LayoutParams(

+ 5 - 2
app/src/main/java/com/vpn/fastestvpnservice/screensTV/helpScreensAll/TermsAndConditionsScreenTV.kt

@@ -33,6 +33,7 @@ import androidx.navigation.NavHostController
 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
@@ -53,8 +54,10 @@ fun TermsAndConditionsTV(navHostController: NavHostController) {
             .verticalScroll(rememberScrollState())
             .background(MaterialTheme.colorScheme.onPrimary)
         ) {
-            val tncUrl = if (isDarkTheme.value) "${AppConstant.BASE_WEBVIEW_URL}terms-of-service?devicedark=tv"
-            else "${AppConstant.BASE_WEBVIEW_URL}terms-of-service?device=tv"
+            val basePreferenceHelper = BasePreferenceHelper(context)
+            val languageIdentifier = basePreferenceHelper.getLanguage()
+            val tncUrl = if (isDarkTheme.value) "${AppConstant.BASE_WEBVIEW_URL}${languageIdentifier}/terms-of-service?devicedark=tv"
+            else "${AppConstant.BASE_WEBVIEW_URL}${languageIdentifier}/terms-of-service?device=tv"
             AndroidView(factory = {
                 WebView(it).apply {
                     layoutParams = ViewGroup.LayoutParams(