From 33ab365bfad95f02d200ac842d3824d458c792df Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Wed, 4 Mar 2020 21:55:09 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/legado/app/help/storage/Restore.kt     | 14 ++++++++++++--
 .../java/io/legado/app/ui/config/ConfigActivity.kt |  8 ++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/io/legado/app/help/storage/Restore.kt b/app/src/main/java/io/legado/app/help/storage/Restore.kt
index 8cdce0ae5..5393249c3 100644
--- a/app/src/main/java/io/legado/app/help/storage/Restore.kt
+++ b/app/src/main/java/io/legado/app/help/storage/Restore.kt
@@ -2,6 +2,7 @@ package io.legado.app.help.storage
 
 import android.content.Context
 import android.net.Uri
+import androidx.appcompat.app.AppCompatDelegate
 import androidx.documentfile.provider.DocumentFile
 import com.jayway.jsonpath.Configuration
 import com.jayway.jsonpath.JsonPath
@@ -9,8 +10,10 @@ import com.jayway.jsonpath.Option
 import com.jayway.jsonpath.ParseContext
 import io.legado.app.App
 import io.legado.app.BuildConfig
+import io.legado.app.constant.EventBus
 import io.legado.app.constant.PreferKey
 import io.legado.app.data.entities.*
+import io.legado.app.help.AppConfig
 import io.legado.app.help.LauncherIconHelp
 import io.legado.app.help.ReadBookConfig
 import io.legado.app.service.help.ReadBook
@@ -128,9 +131,16 @@ object Restore {
             ReadBook.loadContent()
         }
         withContext(Main) {
-            App.INSTANCE.applyDayNight()
-            if (!BuildConfig.DEBUG)
+            if (AppConfig.isNightTheme && AppCompatDelegate.getDefaultNightMode() != AppCompatDelegate.MODE_NIGHT_YES) {
+                App.INSTANCE.applyDayNight()
+            } else if (!AppConfig.isNightTheme && AppCompatDelegate.getDefaultNightMode() == AppCompatDelegate.MODE_NIGHT_YES) {
+                App.INSTANCE.applyDayNight()
+            } else {
+                postEvent(EventBus.RECREATE, "true")
+            }
+            if (!BuildConfig.DEBUG) {
                 LauncherIconHelp.changeIcon(App.INSTANCE.getPrefString(PreferKey.launcherIcon))
+            }
         }
     }
 
diff --git a/app/src/main/java/io/legado/app/ui/config/ConfigActivity.kt b/app/src/main/java/io/legado/app/ui/config/ConfigActivity.kt
index a685ccd13..6d7bfcfe7 100644
--- a/app/src/main/java/io/legado/app/ui/config/ConfigActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/config/ConfigActivity.kt
@@ -3,7 +3,9 @@ package io.legado.app.ui.config
 import android.os.Bundle
 import io.legado.app.R
 import io.legado.app.base.VMBaseActivity
+import io.legado.app.constant.EventBus
 import io.legado.app.utils.getViewModel
+import io.legado.app.utils.observeEvent
 import kotlinx.android.synthetic.main.activity_config.*
 
 class ConfigActivity : VMBaseActivity<ConfigViewModel>(R.layout.activity_config) {
@@ -47,4 +49,10 @@ class ConfigActivity : VMBaseActivity<ConfigViewModel>(R.layout.activity_config)
 
     }
 
+    override fun observeLiveBus() {
+        super.observeLiveBus()
+        observeEvent<String>(EventBus.RECREATE) {
+            recreate()
+        }
+    }
 }
\ No newline at end of file