diff --git a/app/src/main/java/io/legado/app/ui/login/WebViewLoginFragment.kt b/app/src/main/java/io/legado/app/ui/login/WebViewLoginFragment.kt
index 19871c6b4..9c19605a4 100644
--- a/app/src/main/java/io/legado/app/ui/login/WebViewLoginFragment.kt
+++ b/app/src/main/java/io/legado/app/ui/login/WebViewLoginFragment.kt
@@ -14,6 +14,8 @@ import io.legado.app.constant.AppConst
import io.legado.app.data.entities.BaseSource
import io.legado.app.databinding.FragmentWebViewLoginBinding
import io.legado.app.help.http.CookieStore
+import io.legado.app.lib.theme.accentColor
+import io.legado.app.utils.gone
import io.legado.app.utils.snackbar
import io.legado.app.utils.viewbindingdelegate.viewBinding
@@ -54,6 +56,7 @@ class WebViewLoginFragment : BaseFragment(R.layout.fragment_web_view_login) {
@SuppressLint("SetJavaScriptEnabled")
private fun initWebView(source: BaseSource) {
+ binding.progressBar.fontColor = accentColor
binding.webView.settings.apply {
mixedContentMode = WebSettings.MIXED_CONTENT_ALWAYS_ALLOW
domStorageEnabled = true
@@ -86,14 +89,13 @@ class WebViewLoginFragment : BaseFragment(R.layout.fragment_web_view_login) {
}
}
binding.webView.webChromeClient = object : WebChromeClient() {
- override fun onJsAlert(
- view: WebView?,
- url: String?,
- message: String?,
- result: JsResult?
- ): Boolean {
- return super.onJsAlert(view, url, message, result)
+
+ override fun onProgressChanged(view: WebView?, newProgress: Int) {
+ super.onProgressChanged(view, newProgress)
+ binding.progressBar.setDurProgress(newProgress)
+ binding.progressBar.gone(newProgress == 100)
}
+
}
source.loginUrl?.let {
binding.webView.loadUrl(it, source.getHeaderMap(true))
diff --git a/app/src/main/res/layout/fragment_web_view_login.xml b/app/src/main/res/layout/fragment_web_view_login.xml
index 28d14f347..6db638382 100644
--- a/app/src/main/res/layout/fragment_web_view_login.xml
+++ b/app/src/main/res/layout/fragment_web_view_login.xml
@@ -1,5 +1,5 @@
-
+ app:title="@string/login"
+ app:layout_constraintTop_toTopOf="parent" />
+ android:layout_height="0dp"
+ app:layout_constraintTop_toBottomOf="@+id/title_bar"
+ app:layout_constraintBottom_toBottomOf="parent" />
-
\ No newline at end of file
+
+
+
\ No newline at end of file