Parcourir la source

Set background color of webviews for dark/light mode on TV

Khubaib il y a 8 mois
Parent
commit
36bb2c9c7f

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

@@ -39,7 +39,7 @@ fun AboutTV(navHostController: NavHostController) {
     Box(
         modifier = Modifier
             .fillMaxSize()
-            .background(colorResource(id = R.color.white))
+            .background(MaterialTheme.colorScheme.background)
     ) {
         var showLoader by remember { mutableStateOf(true) }
         ShowExpandListTV(navHostController = navHostController, title = "About")
@@ -48,7 +48,7 @@ fun AboutTV(navHostController: NavHostController) {
             .padding(top = 60.dp)
             .fillMaxSize()
             .verticalScroll(rememberScrollState())
-            .background(colorResource(id = R.color.webview_background))
+            .background(MaterialTheme.colorScheme.background)
         ) {
 //            val faqUrl = "${AppConstant.BASE_WEBVIEW_URL}faq?device=ios"
             AndroidView(factory = {
@@ -97,7 +97,7 @@ fun AboutTV(navHostController: NavHostController) {
 
             Box(modifier = Modifier
                 .fillMaxSize()
-                .background(Color.White)) {
+                .background(MaterialTheme.colorScheme.background)) {
                 CircularProgressIndicator(
                     progress = progress,
                     modifier = Modifier

+ 14 - 11
app/src/main/java/com/vpn/fastestvpnservice/screensTV/helpScreensAll/FAQScreenTV.kt

@@ -46,7 +46,7 @@ fun FaqTV(navHostController: NavHostController) {
     Box(
         modifier = Modifier
             .fillMaxSize()
-            .background(colorResource(id = R.color.white))
+            .background(MaterialTheme.colorScheme.background)
     ) {
         var showLoader by remember { mutableStateOf(true) }
         ShowExpandListTV(navHostController = navHostController, title = "FAQ")
@@ -55,7 +55,8 @@ fun FaqTV(navHostController: NavHostController) {
             .padding(top = 60.dp)
             .fillMaxSize()
             .verticalScroll(rememberScrollState())
-            .background(colorResource(id = R.color.webview_background))
+            .background(MaterialTheme.colorScheme.background)
+//            .background(colorResource(id = R.color.webview_background))
         ) {
 //            val faqUrl = "${AppConstant.BASE_WEBVIEW_URL}faq?device=ios"
             AndroidView(factory = {
@@ -104,15 +105,17 @@ fun FaqTV(navHostController: NavHostController) {
 
             Box(modifier = Modifier
                 .fillMaxSize()
-                .background(Color.White)) {
-                CircularProgressIndicator(
-                    progress = progress,
-                    modifier = Modifier
-                        .align(Alignment.Center)
-                        .size(50.dp),
-                    colorResource(id = R.color.appYellow),
-                    strokeWidth = 5.dp,
-                )
+                .background(MaterialTheme.colorScheme.background)
+            )
+            {
+                    CircularProgressIndicator(
+                        progress = progress,
+                        modifier = Modifier
+                            .align(Alignment.Center)
+                            .size(50.dp),
+                        colorResource(id = R.color.appYellow),
+                        strokeWidth = 5.dp,
+                    )
             }
         }
     }

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

@@ -44,7 +44,7 @@ fun PrivacyPolicyTV(navHostController: NavHostController) {
     Box(
         modifier = Modifier
             .fillMaxSize()
-            .background(colorResource(id = R.color.white))
+            .background(MaterialTheme.colorScheme.background)
     ) {
         var showLoader by remember { mutableStateOf(true) }
         ShowExpandListTV(navHostController = navHostController, title = "Privacy Policy")
@@ -53,7 +53,7 @@ fun PrivacyPolicyTV(navHostController: NavHostController) {
             .padding(top = 60.dp)
             .fillMaxSize()
             .verticalScroll(rememberScrollState())
-            .background(colorResource(id = R.color.webview_background))
+            .background(MaterialTheme.colorScheme.background)
         ) {
 //            val privacyUrl = "${AppConstant.BASE_WEBVIEW_URL}faq?device=ios"
             AndroidView(factory = {
@@ -102,7 +102,7 @@ fun PrivacyPolicyTV(navHostController: NavHostController) {
 
             Box(modifier = Modifier
                 .fillMaxSize()
-                .background(Color.White)) {
+                .background(MaterialTheme.colorScheme.background)) {
                 CircularProgressIndicator(
                     progress = progress,
                     modifier = Modifier
@@ -150,7 +150,7 @@ fun BoxScope.ShowExpandListTV(
         color = colorResource(id = R.color.transparent)
     ) {
         Text(text = title,
-            color = colorResource(id = R.color.dark_blue_gray_text),
+            color = MaterialTheme.colorScheme.primary,
             style = MaterialTheme.typography.bodyMedium,
             modifier = Modifier.fillMaxHeight()
 

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

@@ -39,7 +39,7 @@ fun TermsAndConditionsTV(navHostController: NavHostController) {
     Box(
         modifier = Modifier
             .fillMaxSize()
-            .background(colorResource(id = R.color.white))
+            .background(MaterialTheme.colorScheme.background)
     ) {
         var showLoader by remember { mutableStateOf(true) }
         ShowExpandListTV(navHostController = navHostController, title = "Terms & Conditions")
@@ -48,7 +48,7 @@ fun TermsAndConditionsTV(navHostController: NavHostController) {
             .padding(top = 60.dp)
             .fillMaxSize()
             .verticalScroll(rememberScrollState())
-            .background(colorResource(id = R.color.webview_background))
+            .background(MaterialTheme.colorScheme.background)
         ) {
             AndroidView(factory = {
                 WebView(it).apply {
@@ -96,7 +96,7 @@ fun TermsAndConditionsTV(navHostController: NavHostController) {
 
             Box(modifier = Modifier
                 .fillMaxSize()
-                .background(Color.White)) {
+                .background(MaterialTheme.colorScheme.background)) {
                 CircularProgressIndicator(
                     progress = progress,
                     modifier = Modifier