From e59b4b42cfbf6442ed0c85c5738c0eae4fd96953 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= <zhangyujiu@ghzhushou.com>
Date: Tue, 10 May 2022 14:34:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E8=AF=84=E8=AE=BA=E9=A1=B5?=
 =?UTF-8?q?=E6=97=A5=E5=A4=9C=E9=97=B4=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/gh/gamecenter/gamedetail/GameDetailFragment.kt   | 1 +
 .../gamedetail/rating/edit/RatingEditActivity.kt         | 9 +++++++++
 .../main/java/com/halo/assistant/fragment/WebFragment.kt | 6 ++++++
 app/src/main/res/layout/activity_rating_edit.xml         | 2 +-
 app/src/main/res/layout/gamedetail_body.xml              | 1 -
 5 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt
index 9463cedd81..edb94fb742 100644
--- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt
@@ -628,6 +628,7 @@ class GameDetailFragment : NormalFragment() {
             }
 
             BaseFragment_TabLayout.initTabStyle(mBodyBinding.tabLayout, gamedetailVp.currentItem)
+            updateToolbarStyle(gamedetailThumbSmall.visibility == View.VISIBLE)
         }
     }
 
diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/edit/RatingEditActivity.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/edit/RatingEditActivity.kt
index c7ccdcf6f6..4010cad3de 100644
--- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/edit/RatingEditActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/edit/RatingEditActivity.kt
@@ -150,6 +150,7 @@ class RatingEditActivity : ToolBarActivity(), KeyboardHeightObserver {
     private fun initWebView() {
         val settings = mBinding.mWebView.settings
         settings.javaScriptEnabled = true
+        mBinding.mWebView.enableForceDark(NightModeUtils.isNightMode(this))
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             settings.mixedContentMode = WebSettings.MIXED_CONTENT_ALWAYS_ALLOW
         }
@@ -474,6 +475,14 @@ class RatingEditActivity : ToolBarActivity(), KeyboardHeightObserver {
         )
     }
 
+    override fun isAutoResetViewBackgroundEnabled(): Boolean = true
+
+    override fun onNightModeChange() {
+        super.onNightModeChange()
+        updateStatusBarColor( R.color.black, R.color.white)
+        mBinding.mWebView.enableForceDark(NightModeUtils.isNightMode(this))
+    }
+
     companion object {
         const val LABEL_REPLACE_REGEX = "<tag[^>]*?>[\\s\\S]*?<\\/tag>"
         const val LABEL_PREFIX = "<tag>"
diff --git a/app/src/main/java/com/halo/assistant/fragment/WebFragment.kt b/app/src/main/java/com/halo/assistant/fragment/WebFragment.kt
index 4a89351477..8f3cc81354 100644
--- a/app/src/main/java/com/halo/assistant/fragment/WebFragment.kt
+++ b/app/src/main/java/com/halo/assistant/fragment/WebFragment.kt
@@ -299,6 +299,7 @@ class WebFragment : LazyFragment(), IScrollable {
         mBinding?.run {
             val settings = newsWebview.settings
             settings.javaScriptEnabled = true
+            newsWebview.enableForceDark(NightModeUtils.isNightMode(requireContext()))
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
                 settings.mixedContentMode = WebSettings.MIXED_CONTENT_ALWAYS_ALLOW
             }
@@ -745,6 +746,11 @@ class WebFragment : LazyFragment(), IScrollable {
         }
     }
 
+    override fun onNightModeChange() {
+        super.onNightModeChange()
+        mBinding?.newsWebview?.enableForceDark(NightModeUtils.isNightMode(requireContext()))
+    }
+
     companion object {
         const val KEY_ISTOOLS = "isTools"
         const val KEY_IS_BIND_WECHAT = "is_bind_wechat"
diff --git a/app/src/main/res/layout/activity_rating_edit.xml b/app/src/main/res/layout/activity_rating_edit.xml
index 6bb80d7a86..1891c6a92e 100644
--- a/app/src/main/res/layout/activity_rating_edit.xml
+++ b/app/src/main/res/layout/activity_rating_edit.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white">
+    android:background="@color/background_white">
 
     <include
         android:id="@+id/toolbar"
diff --git a/app/src/main/res/layout/gamedetail_body.xml b/app/src/main/res/layout/gamedetail_body.xml
index 81bb8cd513..43934d9beb 100644
--- a/app/src/main/res/layout/gamedetail_body.xml
+++ b/app/src/main/res/layout/gamedetail_body.xml
@@ -261,7 +261,6 @@
                         android:layout_marginLeft="8dp"
                         android:ellipsize="end"
                         android:maxLines="1"
-                        android:textColor="@color/white"
                         android:textSize="16sp"
                         android:textStyle="bold" />
                 </LinearLayout>