Disable loading animation in webview.

osudroid · May 1, 2024 · a347d04 · a347d04
1 parent a61a456
commit a347d04
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 18 deletions.
diff --git a/assets/html/blockAreaSetting.html b/assets/html/blockAreaSetting.html
@@ -329,7 +329,6 @@
             if (left + width > canvasWidth) left = canvasWidth - width;
             if (top + height > canvasHeight) top = canvasHeight - height;
 
-            console.log(JSON.stringify({top, left, width, height}))
             div.style.width = width + 'px';
             div.style.height = height + 'px';
             div.style.top = top + 'px';

diff --git a/src/com/deltaflyer/osu/BlockAreaPreference.kt b/src/com/deltaflyer/osu/BlockAreaPreference.kt
@@ -36,7 +36,6 @@ class BlockAreaPreference : Preference {
         super.onClick()
 
         BlockAreaWebViewFragment().also {
-            it.setCurrentConfig(getPersistedString("null"))
 
             it.setCallback(object : BlockAreaWebViewFragment.Callback {
                 override fun onMessageReceived(message: String?) {
@@ -57,7 +56,7 @@ class BlockAreaPreference : Preference {
                 }
             })
 
-            it.setURL("file:///android_asset/html/blockAreaSetting.html")
+            it.url = "file:///android_asset/html/blockAreaSetting.html"
             it.show()
         }
     }

diff --git a/src/com/deltaflyer/osu/BlockAreaWebViewFragment.kt b/src/com/deltaflyer/osu/BlockAreaWebViewFragment.kt
@@ -1,6 +1,7 @@
 package com.deltaflyer.osu
 
 import android.util.Log
+import android.view.View
 import android.webkit.JavascriptInterface
 import android.webkit.WebView
 import com.edlplan.ui.fragment.WebViewFragment
@@ -9,26 +10,28 @@ import ru.nsu.ccfit.zuev.osuplus.R
 
 class BlockAreaWebViewFragment : WebViewFragment() {
 
-    private lateinit var myWebView: WebView
-    private lateinit var currentConfig: String
+    private lateinit var webview: WebView
     private lateinit var callback: Callback
+    lateinit var url: String
 
     override fun onLoadView() {
-        super.onLoadView()
-        myWebView = findViewById<WebView>(R.id.web)!!
-        myWebView.addJavascriptInterface(object : Any() {
-            @JavascriptInterface
-            fun postMessage(message: String?) {
-                callback.onMessageReceived(message)
-            }
-        }, "Android")
+        webview = findViewById<WebView>(R.id.web)!!.also {
+            val webSettings = it.settings
+            webSettings.javaScriptEnabled = true
+            webSettings.userAgentString = "osudroid"
+            it.loadUrl(url)
+            it.addJavascriptInterface(object : Any() {
+                @JavascriptInterface
+                fun postMessage(message: String?) {
+                    callback.onMessageReceived(message)
+                }
+            }, "Android")
+        }
+
+        findViewById<View>(R.id.close_button)!!.setOnClickListener { v: View? -> dismiss() }
     }
 
 
-    fun setCurrentConfig(persistedString: String): BlockAreaWebViewFragment {
-        this.currentConfig = persistedString
-        return this
-    }
 
     fun setCallback(callback: Callback): BlockAreaWebViewFragment {
         this.callback = callback
@@ -38,7 +41,7 @@ class BlockAreaWebViewFragment : WebViewFragment() {
     fun execute(js: String) {
         Log.d("WebViewFruit", "Exec: $js")
 
-        this.myWebView.evaluateJavascript(js) { value ->
+        this.webview.evaluateJavascript(js) { value ->
             Log.d("WebViewFruit", value)
         }
     }