setup

grcoleman · grcoleman · commit 0d4fdf875d98 · 2020-07-22T13:48:28.000-04:00
diff --git a/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt b/WebView/app/src/main/java/com/android/samples/webviewdemo/MainActivity.kt
@@ -24,7 +24,6 @@ import android.os.Build
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
-import android.util.Log
 import android.webkit.JavascriptInterface
 import android.webkit.WebResourceRequest
 import android.webkit.WebResourceResponse
@@ -35,8 +34,6 @@ import androidx.webkit.JavaScriptReplyProxy
 import androidx.webkit.WebMessageCompat
 import androidx.webkit.WebSettingsCompat
 import androidx.webkit.WebSettingsCompat.DARK_STRATEGY_PREFER_WEB_THEME_OVER_USER_AGENT_DARKENING
-import androidx.webkit.WebSettingsCompat.DARK_STRATEGY_USER_AGENT_DARKENING_ONLY
-import androidx.webkit.WebSettingsCompat.DARK_STRATEGY_WEB_THEME_DARKENING_ONLY
 import androidx.webkit.WebViewAssetLoader
 import androidx.webkit.WebViewClientCompat
 import androidx.webkit.WebViewCompat
@@ -134,7 +131,6 @@ class MainActivity : AppCompatActivity() {
         val jsObjName = "jsObject"
         val allowedOriginRules = setOf<String>("https://gcoleman799.github.io")
 
-
         // FORCE DARK
         // Check if the system is set to light or dark mode
         val nightModeFlag = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK
@@ -146,12 +142,21 @@ class MainActivity : AppCompatActivity() {
                     WebSettingsCompat.FORCE_DARK_ON
                 )
             }
-            // Use custom Dark Theme
-            // DARK_STRATEGY_WEB_THEME_DARKENING_ONLY - it never applies automatic darkening and uses web page only darkening.
+            /* Set how WebView content should be darkened. There are three options for how to darken
+             * a WebView.
+             * PREFER_WEB_THEME_OVER_USER_AGENT_DARKENING- checks for the "color-scheme" <meta> tag.
+             * If present, it uses media queries. If absent, it applies user-agent (automatic) darkening
+             * DARK_STRATEGY_WEB_THEME_DARKENING_ONLY - uses media queries always, even if there's
+             * no "color-scheme" <meta> tag present.
+             * DARK_STRATEGY_USER_AGENT_DARKENING_ONLY - it ignores web page theme and always applies
+             * user-agent (automatic) darkening.
+             * More information about Force Dark Strategy can be found here:
+             * https://developer.android.com/reference/androidx/webkit/WebSettingsCompat#setForceDarkStrategy(android.webkit.WebSettings,%20int)
+             */
             if (WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK_STRATEGY)) {
                 WebSettingsCompat.setForceDarkStrategy(
                     binding.webview.settings,
-                    DARK_STRATEGY_WEB_THEME_DARKENING_ONLY
+                    DARK_STRATEGY_PREFER_WEB_THEME_OVER_USER_AGENT_DARKENING
                 )
             }
         }
