resources: smoother web viewing (fixes #13090) (#13023)

Author: dogi

app/build.gradle

@@ -12,8 +12,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdk = 26
         targetSdk = 36
-        versionCode = 5364
-        versionName = "0.53.64"
+        versionCode = 5365
+        versionName = "0.53.65"
         ndkVersion = '26.3.11579264'
         vectorDrawables.useSupportLibrary = true
     }

app/src/main/java/org/ole/planet/myplanet/ui/viewer/WebViewActivity.kt

@@ -141,30 +141,35 @@ class WebViewActivity : AppCompatActivity() {
         }
     }
 
+
     private fun setWebClient() {
-        val resourceId = intent.getStringExtra("RESOURCE_ID")
-        var assetLoader: androidx.webkit.WebViewAssetLoader? = null
-        if (resourceId != null) {
-            val directory = File(getExternalFilesDir(null), "ole/$resourceId")
-            val externalPathHandler = androidx.webkit.WebViewAssetLoader.PathHandler { path ->
-                try {
-                    val file = File(directory, path)
-                    if (file.exists() && file.canonicalPath.startsWith(directory.canonicalPath)) {
-                        val mimeType = java.net.URLConnection.guessContentTypeFromName(file.name) ?: "application/octet-stream"
-                        return@PathHandler WebResourceResponse(mimeType, "utf-8", java.io.FileInputStream(file))
-                    }
-                } catch (e: Exception) {
-                    e.printStackTrace()
+        val assetLoader = setupAssetLoader()
+        activityWebViewBinding.contentWebView.wv.webViewClient = createWebViewClient(assetLoader)
+    }
+
+    private fun setupAssetLoader(): androidx.webkit.WebViewAssetLoader? {
+        val resourceId = intent.getStringExtra("RESOURCE_ID") ?: return null
+        val directory = File(getExternalFilesDir(null), "ole/$resourceId")
+        val externalPathHandler = androidx.webkit.WebViewAssetLoader.PathHandler { path ->
+            try {
+                val file = File(directory, path)
+                if (file.exists() && file.canonicalPath.startsWith(directory.canonicalPath)) {
+                    val mimeType = java.net.URLConnection.guessContentTypeFromName(file.name) ?: "application/octet-stream"
+                    return@PathHandler WebResourceResponse(mimeType, "utf-8", java.io.FileInputStream(file))
                 }
-                null
+            } catch (e: Exception) {
+                e.printStackTrace()
             }
-
-            assetLoader = androidx.webkit.WebViewAssetLoader.Builder()
-                .addPathHandler("/assets/", externalPathHandler)
-                .build()
+            null
         }
 
-        activityWebViewBinding.contentWebView.wv.webViewClient = object : WebViewClient() {
+        return androidx.webkit.WebViewAssetLoader.Builder()
+            .addPathHandler("/assets/", externalPathHandler)
+            .build()
+    }
+
+    private fun createWebViewClient(assetLoader: androidx.webkit.WebViewAssetLoader?): WebViewClient {
+        return object : WebViewClient() {
             override fun onPageStarted(view: WebView, url: String, favicon: Bitmap?) {
                 super.onPageStarted(view, url, favicon)
 
@@ -195,43 +200,7 @@ class WebViewActivity : AppCompatActivity() {
 
             override fun onPageFinished(view: WebView, url: String) {
                 super.onPageFinished(view, url)
-
-                val nightModeFlags = resources.configuration.uiMode and android.content.res.Configuration.UI_MODE_NIGHT_MASK
-                if (nightModeFlags == android.content.res.Configuration.UI_MODE_NIGHT_YES) {
-                    view.evaluateJavascript(
-                        """
-                            (function() {
-                                document.documentElement.setAttribute('dark', 'true');
-                                document.documentElement.style.backgroundColor = '#000';
-                                document.documentElement.style.color = '#FFF';
-                                const elements = document.querySelectorAll('*');
-                                elements.forEach(el => {
-                                    if (window.getComputedStyle(el).color === 'rgb(0, 0, 0)') {
-                                        el.style.color = '#FFF';
-                                    }
-                                });
-                            })();
-                            """.trimIndent(),
-                        null
-                    )
-                } else {
-                    view.evaluateJavascript(
-                        """
-                            (function() {
-                                document.documentElement.removeAttribute('dark');
-                                document.documentElement.style.backgroundColor = '#FFF';
-                                document.documentElement.style.color = '#000';
-                                const elements = document.querySelectorAll('*');
-                                elements.forEach(el => {
-                                    if (window.getComputedStyle(el).color === 'rgb(255, 255, 255)') {
-                                        el.style.color = '#000';
-                                    }
-                                });
-                            })();
-                            """.trimIndent(),
-                        null
-                    )
-                }
+                applyNightMode(view)
             }
 
             override fun onReceivedError(view: WebView, request: WebResourceRequest, error: WebResourceError) {
@@ -250,6 +219,44 @@ class WebViewActivity : AppCompatActivity() {
         }
     }
 
+    private fun applyNightMode(view: WebView) {
+        val nightModeFlags = resources.configuration.uiMode and android.content.res.Configuration.UI_MODE_NIGHT_MASK
+        if (nightModeFlags == android.content.res.Configuration.UI_MODE_NIGHT_YES) {
+            view.evaluateJavascript(
+                """
+                    (function() {
+                        document.documentElement.setAttribute('dark', 'true');
+                        document.documentElement.style.backgroundColor = '#000';
+                        document.documentElement.style.color = '#FFF';
+                        const elements = document.querySelectorAll('*');
+                        elements.forEach(el => {
+                            if (window.getComputedStyle(el).color === 'rgb(0, 0, 0)') {
+                                el.style.color = '#FFF';
+                            }
+                        });
+                    })();
+                """.trimIndent(),
+                null
+            )
+        } else {
+            view.evaluateJavascript(
+                """
+                    (function() {
+                        document.documentElement.removeAttribute('dark');
+                        document.documentElement.style.backgroundColor = '#FFF';
+                        document.documentElement.style.color = '#000';
+                        const elements = document.querySelectorAll('*');
+                        elements.forEach(el => {
+                            if (window.getComputedStyle(el).color === 'rgb(255, 255, 255)') {
+                                el.style.color = '#000';
+                            }
+                        });
+                    })();
+                """.trimIndent(),
+                null
+            )
+        }
+    }
     private fun clearCookie() {
         val cookieManager = CookieManager.getInstance()
         cookieManager.removeAllCookies(null)