From a5a12e030a9ccf66df960c4bf5896364159ca554 Mon Sep 17 00:00:00 2001 From: NekoInverter <7741672-NekoInverter@users.noreply.gitlab.com> Date: Fri, 18 Dec 2020 14:16:06 +0800 Subject: [PATCH] Make webview background follow app theme --- .../java/com/hippo/ehviewer/ui/fragment/MyTagsFragment.java | 2 ++ .../java/com/hippo/ehviewer/ui/fragment/UConfigFragment.java | 3 +++ 2 files changed, 5 insertions(+) diff --git a/app/src/main/java/com/hippo/ehviewer/ui/fragment/MyTagsFragment.java b/app/src/main/java/com/hippo/ehviewer/ui/fragment/MyTagsFragment.java index c19e223a1..b111a12a5 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/fragment/MyTagsFragment.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/fragment/MyTagsFragment.java @@ -13,6 +13,7 @@ import android.webkit.WebViewClient; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import com.hippo.android.resource.AttrResources; import com.hippo.ehviewer.EhApplication; import com.hippo.ehviewer.R; import com.hippo.ehviewer.client.EhCookieStore; @@ -36,6 +37,7 @@ public class MyTagsFragment extends BaseFragment { View view = inflater.inflate(R.layout.activity_webview, container, false); setTitle(R.string.my_tags); webView = view.findViewById(R.id.webview); + webView.setBackgroundColor(AttrResources.getAttrColor(requireActivity(), android.R.attr.colorBackground)); webView.getSettings().setJavaScriptEnabled(true); webView.setWebViewClient(new MyTagsWebViewClient()); webView.setWebChromeClient(new DialogWebChromeClient(requireContext())); diff --git a/app/src/main/java/com/hippo/ehviewer/ui/fragment/UConfigFragment.java b/app/src/main/java/com/hippo/ehviewer/ui/fragment/UConfigFragment.java index 0b2e8244b..c9c17ea0e 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/fragment/UConfigFragment.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/fragment/UConfigFragment.java @@ -16,6 +16,7 @@ import android.webkit.WebViewClient; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import com.hippo.android.resource.AttrResources; import com.hippo.ehviewer.EhApplication; import com.hippo.ehviewer.R; import com.hippo.ehviewer.client.EhCookieStore; @@ -41,6 +42,7 @@ public class UConfigFragment extends BaseFragment { View view = inflater.inflate(R.layout.activity_webview, container, false); setTitle(R.string.u_config); webView = view.findViewById(R.id.webview); + webView.setBackgroundColor(AttrResources.getAttrColor(requireActivity(), android.R.attr.colorBackground)); webView.getSettings().setJavaScriptEnabled(true); webView.setWebViewClient(new UConfigWebViewClient()); webView.setWebChromeClient(new DialogWebChromeClient(requireContext())); @@ -144,6 +146,7 @@ public class UConfigFragment extends BaseFragment { } private class UConfigWebViewClient extends WebViewClient { + @Override public boolean shouldOverrideUrlLoading(WebView view, String url) { // Never load other urls