From 2dc5cef36e6369b36db7c23f7c8a20ffb4e31b23 Mon Sep 17 00:00:00 2001
From: NekoInverter <7741672-NekoInverter@users.noreply.gitlab.com>
Date: Tue, 5 Jan 2021 13:59:52 +0800
Subject: [PATCH] Fix webview resetting dark theme

---
 .../com/hippo/ehviewer/ui/fragment/MyTagsFragment.java     | 2 ++
 .../com/hippo/ehviewer/ui/fragment/UConfigFragment.java    | 7 +++++++
 .../com/hippo/ehviewer/ui/scene/WebViewSignInScene.java    | 2 ++
 3 files changed, 11 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 28efe3655..fea1efab3 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
@@ -18,6 +18,7 @@ import com.hippo.ehviewer.EhApplication;
 import com.hippo.ehviewer.R;
 import com.hippo.ehviewer.client.EhCookieStore;
 import com.hippo.ehviewer.client.EhUrl;
+import com.hippo.ehviewer.ui.SettingsActivity;
 import com.hippo.ehviewer.widget.DialogWebChromeClient;
 import com.hippo.widget.ProgressView;
 
@@ -35,6 +36,7 @@ public class MyTagsFragment extends BaseFragment {
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.activity_webview, container, false);
+        ((SettingsActivity) requireActivity()).getDelegate().applyDayNight();
         webView = view.findViewById(R.id.webview);
         webView.setBackgroundColor(AttrResources.getAttrColor(requireActivity(), android.R.attr.colorBackground));
         webView.getSettings().setBuiltInZoomControls(true);
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 174f4a667..abe54d565 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
@@ -21,6 +21,7 @@ import com.hippo.ehviewer.EhApplication;
 import com.hippo.ehviewer.R;
 import com.hippo.ehviewer.client.EhCookieStore;
 import com.hippo.ehviewer.client.EhUrl;
+import com.hippo.ehviewer.ui.SettingsActivity;
 import com.hippo.ehviewer.ui.scene.BaseScene;
 import com.hippo.ehviewer.widget.DialogWebChromeClient;
 import com.hippo.widget.ProgressView;
@@ -40,6 +41,7 @@ public class UConfigFragment extends BaseFragment {
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.activity_webview, container, false);
+        ((SettingsActivity) requireActivity()).getDelegate().applyDayNight();
         webView = view.findViewById(R.id.webview);
         webView.setBackgroundColor(AttrResources.getAttrColor(requireActivity(), android.R.attr.colorBackground));
         webView.getSettings().setBuiltInZoomControls(true);
@@ -167,6 +169,11 @@ public class UConfigFragment extends BaseFragment {
         }
     }
 
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+    }
+
     @Override
     public int getFragmentTitle() {
         return R.string.u_config;
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/WebViewSignInScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/WebViewSignInScene.java
index fcf6f9dae..243fba995 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/WebViewSignInScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/WebViewSignInScene.java
@@ -34,6 +34,7 @@ import com.hippo.ehviewer.EhApplication;
 import com.hippo.ehviewer.client.EhCookieStore;
 import com.hippo.ehviewer.client.EhUrl;
 import com.hippo.ehviewer.client.EhUtils;
+import com.hippo.ehviewer.ui.MainActivity;
 import com.hippo.ehviewer.widget.DialogWebChromeClient;
 import com.hippo.yorozuya.AssertUtils;
 
@@ -74,6 +75,7 @@ public class WebViewSignInScene extends SolidScene {
         cookieManager.removeSessionCookies(null);
 
         mWebView = new WebView(context);
+        ((MainActivity) context).getDelegate().applyDayNight();
         mWebView.setBackgroundColor(AttrResources.getAttrColor(requireActivity(), android.R.attr.colorBackground));
         mWebView.getSettings().setBuiltInZoomControls(true);
         mWebView.getSettings().setDisplayZoomControls(false);