diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index ba8b420..028d753 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2024-11-15T10:27:40.935653100Z">
+        <DropdownSelection timestamp="2024-11-20T15:59:56.710305300Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\15726\.android\avd\Pixel_9_Pro_API_35.avd" />
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=2e1ee842" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index 6d0ee1c..c224ad5 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="2.0.0" />
+    <option name="version" value="2.0.21" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 0ad17cb..8978d23 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 393f8f2..9df2234 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -15,7 +15,7 @@ android {
         applicationId = "com.cyh128.hikari_novel"
         minSdk = 24
         targetSdk = 35
-        versionCode = 241117
+        versionCode = 241123
         versionName = "3.3.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -41,7 +41,7 @@ android {
 
     buildTypes {
         release {
-            isMinifyEnabled = true
+            isMinifyEnabled = false
             signingConfig = signingConfigs.getByName("signing")
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
@@ -74,7 +74,6 @@ android {
     ksp {
         arg("room.schemaLocation", "$projectDir/schemas")
     }
-
 }
 
 dependencies {
@@ -141,15 +140,12 @@ dependencies {
     implementation("com.geyifeng.immersionbar:immersionbar:3.2.2")
 
     //hilt依赖注入
-    implementation("com.google.dagger:hilt-android:2.51.1")
+    implementation("com.google.dagger:hilt-android:2.52")
     ksp("com.google.dagger:hilt-android-compiler:2.51")
 
     //json解析
     implementation("com.google.code.gson:gson:2.11.0")
 
-    //快速切换语言
-    implementation("com.github.YarikSOffice:lingver:1.3.0")
-
     //事件总线
     implementation("com.github.liangjingkanji:Channel:1.1.5")
 
diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml
new file mode 100644
index 0000000..961f135
--- /dev/null
+++ b/app/lint-baseline.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="6" by="lint 8.7.2" type="baseline" client="gradle" dependencies="false" name="AGP (8.7.2)" variant="fatal" version="8.7.2">
+
+    <issue
+        id="MissingDefaultResource"
+        message="The color &quot;nord_outlineVariant&quot; in values-night has no declaration in the base `values` folder; this can lead to crashes when the resource is queried in a configuration that does not match this qualifier"
+        errorLine1="    &lt;color name=&quot;nord_outlineVariant&quot;>#90939a&lt;/color>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/res/values-night/colors_nord.xml"
+            line="27"
+            column="12"/>
+    </issue>
+
+</issues>
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
index 96f6d49..e79baf6 100644
Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ
diff --git a/app/release/baselineProfiles/0/app-release.dm b/app/release/baselineProfiles/0/app-release.dm
index a3ba714..aaed636 100644
Binary files a/app/release/baselineProfiles/0/app-release.dm and b/app/release/baselineProfiles/0/app-release.dm differ
diff --git a/app/release/baselineProfiles/1/app-release.dm b/app/release/baselineProfiles/1/app-release.dm
index bf918ea..0f36162 100644
Binary files a/app/release/baselineProfiles/1/app-release.dm and b/app/release/baselineProfiles/1/app-release.dm differ
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index 7f8bc37..725d1c6 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 241018,
-      "versionName": "3.1.1",
+      "versionCode": 241123,
+      "versionName": "3.3.0",
       "outputFile": "app-release.apk"
     }
   ],
diff --git a/app/src/main/java/com/cyh128/hikari_novel/HikariApp.kt b/app/src/main/java/com/cyh128/hikari_novel/HikariApp.kt
index 72c21b6..3ce334e 100644
--- a/app/src/main/java/com/cyh128/hikari_novel/HikariApp.kt
+++ b/app/src/main/java/com/cyh128/hikari_novel/HikariApp.kt
@@ -1,22 +1,19 @@
 package com.cyh128.hikari_novel
 
 import android.app.Application
-import com.cyh128.hikari_novel.data.model.Language
 import com.cyh128.hikari_novel.data.repository.AppRepository
 import com.cyh128.hikari_novel.ui.view.other.CrashActivity
+import com.cyh128.hikari_novel.util.LanguageHelper
 import com.cyh128.hikari_novel.util.ThemeHelper
 import com.developer.crashx.config.CrashConfig
 import com.tencent.mmkv.MMKV
-import com.yariksoffice.lingver.Lingver
 import dagger.hilt.android.HiltAndroidApp
 import okhttp3.OkHttpClient
 import rxhttp.RxHttpPlugins
 import rxhttp.wrapper.cookie.CookieStore
-import java.util.Locale
 import javax.inject.Inject
 import javax.net.ssl.SSLSession
 
-
 @HiltAndroidApp
 class HikariApp : Application() {
 
@@ -32,6 +29,10 @@ class HikariApp : Application() {
 
         super.onCreate()
 
+        ThemeHelper.setCurrentTheme(appRepository.getAppTheme())
+        ThemeHelper.setDarkMode(appRepository.getDarkMode())
+        LanguageHelper.setCurrentLanguage(appRepository.getLanguage())
+
         application = this
         val client: OkHttpClient = OkHttpClient.Builder()
             .cookieJar(CookieStore()) //保存cookie
@@ -41,18 +42,5 @@ class HikariApp : Application() {
         CrashConfig.Builder.create()
             .errorActivity(CrashActivity::class.java)
             .apply()
-
-        Lingver.init(this)
-        when (appRepository.getLanguage()) {
-            Language.FOLLOW_SYSTEM -> Lingver.getInstance().setFollowSystemLocale(this).apply {
-                if (Lingver.getInstance().getLocale() != Locale.SIMPLIFIED_CHINESE && Lingver.getInstance().getLocale() != Locale.TRADITIONAL_CHINESE) {
-                    Lingver.getInstance().setLocale(this@HikariApp, Locale.SIMPLIFIED_CHINESE)
-                }
-            }
-            Language.ZH_CN -> Lingver.getInstance().setLocale(this, Locale.SIMPLIFIED_CHINESE)
-            Language.ZH_TW -> Lingver.getInstance().setLocale(this, Locale.TRADITIONAL_CHINESE)
-        }
-
-        ThemeHelper.setCurrentTheme(appRepository.getAppTheme())
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/cyh128/hikari_novel/base/BaseActivity.kt b/app/src/main/java/com/cyh128/hikari_novel/base/BaseActivity.kt
index 317c9e1..0b21b25 100644
--- a/app/src/main/java/com/cyh128/hikari_novel/base/BaseActivity.kt
+++ b/app/src/main/java/com/cyh128/hikari_novel/base/BaseActivity.kt
@@ -1,18 +1,28 @@
 package com.cyh128.hikari_novel.base
 
+import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import androidx.appcompat.app.AppCompatActivity
 import androidx.viewbinding.ViewBinding
+import com.cyh128.hikari_novel.data.model.Event
+import com.cyh128.hikari_novel.util.LanguageHelper
 import com.cyh128.hikari_novel.util.ThemeHelper
+import com.drake.channel.receiveEvent
 import java.lang.reflect.ParameterizedType
 
-abstract class BaseActivity<VB: ViewBinding>: AppCompatActivity() {
+abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
     lateinit var binding: VB
+
     override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
+        LanguageHelper.initLanguage()
+        ThemeHelper.initActivityThemeAndDarkMode(this)
 
-        ThemeHelper.initActivityTheme(this)
+        receiveEvent<Event>("event_theme_changed", "event_language_changed") {
+            recreateActivity()
+        }
+
+        super.onCreate(savedInstanceState)
 
         val type = javaClass.genericSuperclass as ParameterizedType
         val aClass = type.actualTypeArguments[0] as Class<*>
@@ -21,4 +31,12 @@ abstract class BaseActivity<VB: ViewBinding>: AppCompatActivity() {
         binding = method.invoke(null, layoutInflater) as VB
         setContentView(binding.root)
     }
+
+    private fun recreateActivity() {
+        val intent = Intent(this, this::class.java)
+        startActivity(intent)
+        finish()
+        overridePendingTransition(0, 0) //TODO 去掉切换动画
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/cyh128/hikari_novel/data/model/DarkMode.kt b/app/src/main/java/com/cyh128/hikari_novel/data/model/DarkMode.kt
new file mode 100644
index 0000000..00d3aed
--- /dev/null
+++ b/app/src/main/java/com/cyh128/hikari_novel/data/model/DarkMode.kt
@@ -0,0 +1,7 @@
+package com.cyh128.hikari_novel.data.model
+
+enum class DarkMode {
+    System,
+    Enable,
+    Disable
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cyh128/hikari_novel/data/model/Event.kt b/app/src/main/java/com/cyh128/hikari_novel/data/model/Event.kt
index 8019c33..026b5ac 100644
--- a/app/src/main/java/com/cyh128/hikari_novel/data/model/Event.kt
+++ b/app/src/main/java/com/cyh128/hikari_novel/data/model/Event.kt
@@ -25,4 +25,7 @@ sealed class Event {
     
     data object HaveAvailableUpdateEvent: Event() //有更新
     data object NoAvailableUpdateEvent: Event() //无更新
+
+    data object ThemeChangedEvent: Event() //主题颜色改变事件
+    data object LanguageChantedEvent: Event() //语言改变事件
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/cyh128/hikari_novel/data/repository/AppRepository.kt b/app/src/main/java/com/cyh128/hikari_novel/data/repository/AppRepository.kt
index 63dc322..92abef6 100644
--- a/app/src/main/java/com/cyh128/hikari_novel/data/repository/AppRepository.kt
+++ b/app/src/main/java/com/cyh128/hikari_novel/data/repository/AppRepository.kt
@@ -4,6 +4,7 @@ import android.accounts.NetworkErrorException
 import android.content.pm.PackageManager
 import com.cyh128.hikari_novel.HikariApp
 import com.cyh128.hikari_novel.data.model.AppTheme
+import com.cyh128.hikari_novel.data.model.DarkMode
 import com.cyh128.hikari_novel.data.model.DefaultTab
 import com.cyh128.hikari_novel.data.model.Language
 import com.cyh128.hikari_novel.data.model.ReaderOrientation
@@ -69,6 +70,12 @@ class AppRepository @Inject constructor(
         appConfig.appTheme = appTheme.ordinal
     }
 
+    fun getDarkMode() = enumValues<DarkMode>()[appConfig.darkMode]
+
+    fun setDarkMode(darkMode: DarkMode) {
+        appConfig.darkMode = darkMode.ordinal
+    }
+
     //检查更新
     suspend fun checkUpdate(): Result<Boolean> {
         network.getData("https://api.github.com/repos/15dd/wenku8reader/releases/latest")
diff --git a/app/src/main/java/com/cyh128/hikari_novel/data/repository/Wenku8Repository.kt b/app/src/main/java/com/cyh128/hikari_novel/data/repository/Wenku8Repository.kt
index abc78eb..19b4e67 100644
--- a/app/src/main/java/com/cyh128/hikari_novel/data/repository/Wenku8Repository.kt
+++ b/app/src/main/java/com/cyh128/hikari_novel/data/repository/Wenku8Repository.kt
@@ -20,7 +20,6 @@ import com.cyh128.hikari_novel.data.source.remote.Network
 import com.cyh128.hikari_novel.util.HttpCodeParser
 import com.cyh128.hikari_novel.util.Wenku8Parser
 import com.cyh128.hikari_novel.util.urlEncode
-import com.yariksoffice.lingver.Lingver
 import rxhttp.awaitResult
 import java.nio.charset.Charset
 import java.util.Locale
@@ -69,7 +68,7 @@ class Wenku8Repository @Inject constructor(
     suspend fun getNovelByRanking(ranking: String, index: Int): Result<NovelCoverResponse> {
         val requestUrl: String?
         val charset: String?
-        when(Lingver.getInstance().getLocale()) {
+        when(Locale.getDefault()) {
             Locale.TRADITIONAL_CHINESE -> {
                 requestUrl = "https://${getWenku8Node()}/modules/article/toplist.php?sort=$ranking&page=$index&charset=big5"
                 charset = "BIG5-HKSCS"
@@ -99,7 +98,7 @@ class Wenku8Repository @Inject constructor(
     ): Result<NovelCoverResponse> {
         val requestUrl: String?
         val charset: String?
-        when(Lingver.getInstance().getLocale()) {
+        when(Locale.getDefault()) {
             Locale.TRADITIONAL_CHINESE -> {
                 requestUrl = "https://${getWenku8Node()}/modules/article/tags.php?t=$category&v=$sort&page=$index&charset=big5"
                 charset = "BIG5-HKSCS"
@@ -125,7 +124,7 @@ class Wenku8Repository @Inject constructor(
     suspend fun getNovelInfo(url: String): Result<NovelInfo> {
         val requestUrl: String?
         val charset: String?
-        when(Lingver.getInstance().getLocale()) {
+        when(Locale.getDefault()) {
             Locale.TRADITIONAL_CHINESE -> {
                 requestUrl = "$url&charset=big5"
                 charset = "BIG5-HKSCS" //不能使用普通的big5编码，不然无法显示日文
@@ -151,7 +150,7 @@ class Wenku8Repository @Inject constructor(
     suspend fun getChapter(url: String): Result<List<Volume>> {
         val requestUrl: String?
         val charset: String?
-        when(Lingver.getInstance().getLocale()) {
+        when(Locale.getDefault()) {
             Locale.TRADITIONAL_CHINESE -> {
                 requestUrl = "$url?charset=big5"
                 charset = "BIG5-HKSCS"
@@ -176,7 +175,7 @@ class Wenku8Repository @Inject constructor(
     suspend fun addNovel(aid: String): Result<Boolean> {
         val requestUrl: String?
         val charset: String?
-        when(Lingver.getInstance().getLocale()) {
+        when(Locale.getDefault()) {
             Locale.TRADITIONAL_CHINESE -> {
                 requestUrl = "https://${getWenku8Node()}/modules/article/addbookcase.php?bid=$aid&charset=big5"
                 charset = "BIG5-HKSCS"
@@ -212,7 +211,7 @@ class Wenku8Repository @Inject constructor(
     suspend fun getBookshelf(classId: Int = 0): Result<List<BookshelfNovelInfo>> {
         val requestUrl: String?
         val charset: String?
-        when(Lingver.getInstance().getLocale()) {
+        when(Locale.getDefault()) {
             Locale.TRADITIONAL_CHINESE -> {
                 requestUrl = "https://${getWenku8Node()}/modules/article/bookcase.php?classid=$classId&charset=big5"
                 charset = "BIG5-HKSCS"
@@ -237,7 +236,7 @@ class Wenku8Repository @Inject constructor(
     suspend fun getComment(aid: String, index: Int): Result<CommentResponse> {
         val requestUrl: String?
         val charset: String?
-        when(Lingver.getInstance().getLocale()) {
+        when(Locale.getDefault()) {
             Locale.TRADITIONAL_CHINESE -> {
                 requestUrl = "https://${getWenku8Node()}/modules/article/reviews.php?aid=$aid&page=$index&charset=big5"
                 charset = "BIG5-HKSCS"
@@ -262,7 +261,7 @@ class Wenku8Repository @Inject constructor(
     suspend fun getReply(url: String, index: Int): Result<ReplyResponse> {
         val requestUrl: String?
         val charset: String?
-        when(Lingver.getInstance().getLocale()) {
+        when(Locale.getDefault()) {
             Locale.TRADITIONAL_CHINESE -> {
                 requestUrl = "$url&page=$index&charset=big5"
                 charset = "BIG5-HKSCS"
@@ -286,7 +285,7 @@ class Wenku8Repository @Inject constructor(
     suspend fun getRecommend(): Result<List<HomeBlock>> {
         val requestUrl: String?
         val charset: String?
-        when(Lingver.getInstance().getLocale()) {
+        when(Locale.getDefault()) {
             Locale.TRADITIONAL_CHINESE -> {
                 requestUrl = "https://${getWenku8Node()}/index.php?charset=big5"
                 charset = "BIG5-HKSCS"
@@ -311,7 +310,7 @@ class Wenku8Repository @Inject constructor(
     suspend fun novelVote(aid: String): Result<String> {
         val requestUrl: String?
         val charset: String?
-        when(Lingver.getInstance().getLocale()) {
+        when(Locale.getDefault()) {
             Locale.TRADITIONAL_CHINESE -> {
                 requestUrl = "https://${getWenku8Node()}/modules/article/uservote.php?id=$aid&charset=big5"
                 charset = "BIG5-HKSCS"
@@ -336,7 +335,7 @@ class Wenku8Repository @Inject constructor(
     suspend fun searchNovelByTitle(title: String, index: Int): Result<NovelCoverResponse> {
         val requestUrl: String?
         val charset: String?
-        when(Lingver.getInstance().getLocale()) {
+        when(Locale.getDefault()) {
             Locale.TRADITIONAL_CHINESE -> {
                 requestUrl = "https://${getWenku8Node()}/modules/article/search.php?searchtype=articlename&searchkey=$title&page=$index&charset=big5"
                 charset = "BIG5-HKSCS"
@@ -368,7 +367,7 @@ class Wenku8Repository @Inject constructor(
     suspend fun searchNovelByAuthor(author: String, index: Int): Result<NovelCoverResponse> {
         val requestUrl: String?
         val charset: String?
-        when(Lingver.getInstance().getLocale()) {
+        when(Locale.getDefault()) {
             Locale.TRADITIONAL_CHINESE -> {
                 requestUrl = "https://${getWenku8Node()}/modules/article/search.php?searchtype=author&searchkey=$author&page=$index&charset=big5"
                 charset = "BIG5-HKSCS"
@@ -405,7 +404,7 @@ class Wenku8Repository @Inject constructor(
     suspend fun getUserInfo(): Result<UserInfo> {
         val requestUrl: String?
         val charset: String?
-        when(Lingver.getInstance().getLocale()) {
+        when(Locale.getDefault()) {
             Locale.TRADITIONAL_CHINESE -> {
                 requestUrl = "https://${getWenku8Node()}/userdetail.php?charset=big5"
                 charset = "BIG5-HKSCS"
@@ -430,7 +429,7 @@ class Wenku8Repository @Inject constructor(
     suspend fun getCompletionNovel(index: Int): Result<NovelCoverResponse> {
         val requestUrl: String?
         val charset: String?
-        when(Lingver.getInstance().getLocale()) {
+        when(Locale.getDefault()) {
             Locale.TRADITIONAL_CHINESE -> {
                 requestUrl = "https://${getWenku8Node()}/modules/article/articlelist.php?fullflag=1&page=$index&charset=big5"
                 charset = "BIG5-HKSCS"
@@ -458,7 +457,7 @@ class Wenku8Repository @Inject constructor(
 
     //获取小说内容
     suspend fun getNovelContent(aid: String, cid: String): Result<ChapterContentResponse> {
-        val requestUrl = when(Lingver.getInstance().getLocale()) {
+        val requestUrl = when(Locale.getDefault()) {
             Locale.TRADITIONAL_CHINESE -> "action=book&do=text&aid=$aid&cid=$cid&t=1"
             else -> "action=book&do=text&aid=$aid&cid=$cid&t=0"
         }
diff --git a/app/src/main/java/com/cyh128/hikari_novel/data/source/local/mmkv/AppConfig.kt b/app/src/main/java/com/cyh128/hikari_novel/data/source/local/mmkv/AppConfig.kt
index 9296136..ec49640 100644
--- a/app/src/main/java/com/cyh128/hikari_novel/data/source/local/mmkv/AppConfig.kt
+++ b/app/src/main/java/com/cyh128/hikari_novel/data/source/local/mmkv/AppConfig.kt
@@ -1,6 +1,7 @@
 package com.cyh128.hikari_novel.data.source.local.mmkv
 
 import com.cyh128.hikari_novel.data.model.AppTheme
+import com.cyh128.hikari_novel.data.model.DarkMode
 import com.cyh128.hikari_novel.data.model.DefaultTab
 import com.cyh128.hikari_novel.data.model.Language
 import com.cyh128.hikari_novel.data.model.ReaderOrientation
@@ -60,4 +61,10 @@ class AppConfig @Inject constructor() {
         set(value) {
             cursor.encode("app_theme", value)
         }
+
+    var darkMode: Int
+        get() = cursor.decodeInt("dark_mode", DarkMode.System.ordinal)
+        set(value) {
+            cursor.encode("dark_mode", value)
+        }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/cyh128/hikari_novel/ui/view/main/MainActivity.kt b/app/src/main/java/com/cyh128/hikari_novel/ui/view/main/MainActivity.kt
index 5e5b75c..af394c7 100644
--- a/app/src/main/java/com/cyh128/hikari_novel/ui/view/main/MainActivity.kt
+++ b/app/src/main/java/com/cyh128/hikari_novel/ui/view/main/MainActivity.kt
@@ -15,6 +15,7 @@ import com.cyh128.hikari_novel.ui.view.main.bookshelf.BookshelfFragment
 import com.cyh128.hikari_novel.ui.view.main.home.HomeFragment
 import com.cyh128.hikari_novel.ui.view.main.more.MoreFragment
 import com.cyh128.hikari_novel.ui.view.main.visit_history.VisitHistoryFragment
+import com.cyh128.hikari_novel.util.Constants
 import com.cyh128.hikari_novel.util.openUrl
 import com.drake.channel.receiveEvent
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
@@ -124,9 +125,6 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
             }
         }
 
-        //检查软件更新
-        if (viewModel.isAutoUpdate) viewModel.checkUpdate()
-
         //冷启动tab初始化
         when(viewModel.defaultTab) {
             DefaultTab.Home -> navigator.switchTab(0)
@@ -134,6 +132,12 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
             DefaultTab.History -> navigator.switchTab(2)
             DefaultTab.More -> navigator.switchTab(3)
         }
+
+        //检查软件更新
+        if (viewModel.isAutoUpdate && !Constants.isUpdateChecked) {
+            viewModel.checkUpdate()
+            Constants.isUpdateChecked = true //防止activity重创以后再次检查更新
+        }
     }
 
     //二次确认退出
diff --git a/app/src/main/java/com/cyh128/hikari_novel/ui/view/main/more/more/setting/SettingActivity.kt b/app/src/main/java/com/cyh128/hikari_novel/ui/view/main/more/more/setting/SettingActivity.kt
index aded1e0..201b116 100644
--- a/app/src/main/java/com/cyh128/hikari_novel/ui/view/main/more/more/setting/SettingActivity.kt
+++ b/app/src/main/java/com/cyh128/hikari_novel/ui/view/main/more/more/setting/SettingActivity.kt
@@ -7,10 +7,14 @@ import androidx.lifecycle.ViewModelProvider
 import com.cyh128.hikari_novel.R
 import com.cyh128.hikari_novel.base.BaseActivity
 import com.cyh128.hikari_novel.data.model.AppTheme
+import com.cyh128.hikari_novel.data.model.DarkMode
 import com.cyh128.hikari_novel.data.model.DefaultTab
 import com.cyh128.hikari_novel.data.model.Language
 import com.cyh128.hikari_novel.data.model.ReaderOrientation
 import com.cyh128.hikari_novel.databinding.ActivitySettingBinding
+import com.cyh128.hikari_novel.databinding.ViewThemeListBinding
+import com.cyh128.hikari_novel.util.LanguageHelper
+import com.cyh128.hikari_novel.util.ThemeHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 
@@ -54,62 +58,57 @@ class SettingActivity : BaseActivity<ActivitySettingBinding>() {
             Language.ZH_TW -> getString(R.string.traditional_chinese)
         }
 
-        when(viewModel.getAppTheme()) {
+        when (viewModel.getAppTheme()) {
             AppTheme.Dynamic -> {
                 binding.tvASettingAppTheme.text = getString(R.string.dynamic_color)
-                binding.iVThemeList.cVThemeListDynamicColor.isChecked = true
             }
 
             AppTheme.GreenApple -> {
                 binding.tvASettingAppTheme.text = getString(R.string.green_apple)
-                binding.iVThemeList.cVThemeListGreenApple.isChecked = true
             }
 
             AppTheme.Lavender -> {
                 binding.tvASettingAppTheme.text = getString(R.string.lavender)
-                binding.iVThemeList.cVThemeListLavender.isChecked = true
             }
 
             AppTheme.MidnightDusk -> {
                 binding.tvASettingAppTheme.text = getString(R.string.midnight_dusk)
-                binding.iVThemeList.cVThemeListMidnightdusk.isChecked = true
             }
 
             AppTheme.Nord -> {
                 binding.tvASettingAppTheme.text = getString(R.string.nord)
-                binding.iVThemeList.cVThemeListNord.isChecked = true
             }
 
             AppTheme.StrawberryDaiquiri -> {
                 binding.tvASettingAppTheme.text = getString(R.string.strawberry_daiquiri)
-                binding.iVThemeList.cVThemeListStrawberry.isChecked = true
             }
 
             AppTheme.Tako -> {
                 binding.tvASettingAppTheme.text = getString(R.string.tako)
-                binding.iVThemeList.cVThemeListTako.isChecked = true
             }
 
             AppTheme.TealTurquoise -> {
                 binding.tvASettingAppTheme.text = getString(R.string.teal_turquoise)
-                binding.iVThemeList.cVThemeListTealturquoise.isChecked = true
             }
 
             AppTheme.TidalWave -> {
                 binding.tvASettingAppTheme.text = getString(R.string.tidal_wave)
-                binding.iVThemeList.cVThemeListTidalwave.isChecked = true
             }
 
             AppTheme.YinYang -> {
                 binding.tvASettingAppTheme.text = getString(R.string.yin_yang)
-                binding.iVThemeList.cVThemeListYinyang.isChecked = true
             }
 
             AppTheme.Yotsuba -> {
                 binding.tvASettingAppTheme.text = getString(R.string.yotsuba)
-                binding.iVThemeList.cVThemeListYotsuba.isChecked = true
             }
         }
+
+        binding.tvASettingDarkMode.text = when(viewModel.getDarkMode()) {
+            DarkMode.System -> getString(R.string.follow_system)
+            DarkMode.Enable -> getString(R.string.enable)
+            DarkMode.Disable -> getString(R.string.disable)
+        }
     }
 
     private fun initListener() {
@@ -198,18 +197,20 @@ class SettingActivity : BaseActivity<ActivitySettingBinding>() {
                     when (which) {
                         0 -> {
                             viewModel.setLanguage(Language.FOLLOW_SYSTEM)
+                            LanguageHelper.setCurrentLanguage(Language.FOLLOW_SYSTEM)
                             binding.tvASettingLanguage.text = getString(R.string.follow_system)
                         }
 
                         1 -> {
                             viewModel.setLanguage(Language.ZH_CN)
+                            LanguageHelper.setCurrentLanguage(Language.ZH_CN)
                             binding.tvASettingLanguage.text = getString(R.string.simplified_chinese)
                         }
 
                         2 -> {
                             viewModel.setLanguage(Language.ZH_TW)
-                            binding.tvASettingLanguage.text =
-                                getString(R.string.traditional_chinese)
+                            LanguageHelper.setCurrentLanguage(Language.ZH_TW)
+                            binding.tvASettingLanguage.text = getString(R.string.traditional_chinese)
                         }
                     }
                     dialog.dismiss()
@@ -264,68 +265,51 @@ class SettingActivity : BaseActivity<ActivitySettingBinding>() {
                 .show()
         }
 
-        binding.iVThemeList.cgVThemeList.setOnCheckedStateChangeListener { group, checkedIds ->
-            if (checkedIds.isNotEmpty()) {
-                val selectedChipId = checkedIds[0]
-                val index = group.indexOfChild(group.findViewById(selectedChipId))
-
-                when (index) {
-                    0 -> {
-                        viewModel.setAppTheme(AppTheme.Dynamic)
-                        binding.tvASettingAppTheme.text = getString(R.string.dynamic_color)
-                    }
-
-                    1 -> {
-                        viewModel.setAppTheme(AppTheme.GreenApple)
-                        binding.tvASettingAppTheme.text = getString(R.string.green_apple)
-                    }
-
-                    2 -> {
-                        viewModel.setAppTheme(AppTheme.Lavender)
-                        binding.tvASettingAppTheme.text = getString(R.string.lavender)
-                    }
-
-                    3 -> {
-                        viewModel.setAppTheme(AppTheme.MidnightDusk)
-                        binding.tvASettingAppTheme.text = getString(R.string.midnight_dusk)
-                    }
-
-                    4 -> {
-                        viewModel.setAppTheme(AppTheme.Nord)
-                        binding.tvASettingAppTheme.text = getString(R.string.nord)
-                    }
-
-                    5 -> {
-                        viewModel.setAppTheme(AppTheme.StrawberryDaiquiri)
-                        binding.tvASettingAppTheme.text = getString(R.string.strawberry_daiquiri)
-                    }
-
-                    6 -> {
-                        viewModel.setAppTheme(AppTheme.Tako)
-                        binding.tvASettingAppTheme.text = getString(R.string.tako)
-                    }
-
-                    7 -> {
-                        viewModel.setAppTheme(AppTheme.TealTurquoise)
-                        binding.tvASettingAppTheme.text = getString(R.string.teal_turquoise)
-                    }
+        binding.llASettingAppTheme.setOnClickListener {
+            ThemeListDialogFragment().show(supportFragmentManager, "theme_list_dialog_fragment")
+        }
 
-                    8 -> {
-                        viewModel.setAppTheme(AppTheme.TidalWave)
-                        binding.tvASettingAppTheme.text = getString(R.string.tidal_wave)
+        binding.llASettingDarkMode.setOnClickListener {
+            MaterialAlertDialogBuilder(this)
+                .setTitle(R.string.dark_mode)
+                .setIcon(R.drawable.ic_dark_mode)
+                .setNegativeButton(R.string.cancel, null)
+                .setSingleChoiceItems(
+                    arrayOf(
+                        getString(R.string.follow_system),
+                        getString(R.string.enable),
+                        getString(R.string.disable),
+                    ),
+                    run {
+                        when (viewModel.getDarkMode()) {
+                            DarkMode.System -> return@run 0
+                            DarkMode.Enable -> return@run 1
+                            DarkMode.Disable -> return@run 2
+                        }
                     }
+                ) { dialog: DialogInterface, which: Int ->
+                    when (which) {
+                        0 -> {
+                            viewModel.setDarkMode(DarkMode.System)
+                            ThemeHelper.setDarkMode(DarkMode.System)
+                            binding.tvASettingDarkMode.text = getString(R.string.follow_system)
+                        }
 
-                    9 -> {
-                        viewModel.setAppTheme(AppTheme.YinYang)
-                        binding.tvASettingAppTheme.text = getString(R.string.yin_yang)
-                    }
+                        1 -> {
+                            viewModel.setDarkMode(DarkMode.Enable)
+                            ThemeHelper.setDarkMode(DarkMode.Enable)
+                            binding.tvASettingDarkMode.text = getString(R.string.enable)
+                        }
 
-                    10 -> {
-                        viewModel.setAppTheme(AppTheme.Yotsuba)
-                        binding.tvASettingAppTheme.text = getString(R.string.yotsuba)
+                        2 -> {
+                            viewModel.setDarkMode(DarkMode.Disable)
+                            ThemeHelper.setDarkMode(DarkMode.Disable)
+                            binding.tvASettingDarkMode.text = getString(R.string.disable)
+                        }
                     }
+                    dialog.dismiss()
                 }
-            }
+                .show()
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/cyh128/hikari_novel/ui/view/main/more/more/setting/SettingViewModel.kt b/app/src/main/java/com/cyh128/hikari_novel/ui/view/main/more/more/setting/SettingViewModel.kt
index 3775bbe..4efbc30 100644
--- a/app/src/main/java/com/cyh128/hikari_novel/ui/view/main/more/more/setting/SettingViewModel.kt
+++ b/app/src/main/java/com/cyh128/hikari_novel/ui/view/main/more/more/setting/SettingViewModel.kt
@@ -2,6 +2,7 @@ package com.cyh128.hikari_novel.ui.view.main.more.more.setting
 
 import androidx.lifecycle.ViewModel
 import com.cyh128.hikari_novel.data.model.AppTheme
+import com.cyh128.hikari_novel.data.model.DarkMode
 import com.cyh128.hikari_novel.data.model.DefaultTab
 import com.cyh128.hikari_novel.data.model.Language
 import com.cyh128.hikari_novel.data.model.ReaderOrientation
@@ -38,4 +39,8 @@ class SettingViewModel @Inject constructor(
     fun getAppTheme() = appRepository.getAppTheme()
 
     fun setAppTheme(theme: AppTheme) = appRepository.setAppTheme(theme)
+
+    fun getDarkMode() = appRepository.getDarkMode()
+
+    fun setDarkMode(darkMode: DarkMode) = appRepository.setDarkMode(darkMode)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/cyh128/hikari_novel/ui/view/main/more/more/setting/ThemeListDialogFragment.kt b/app/src/main/java/com/cyh128/hikari_novel/ui/view/main/more/more/setting/ThemeListDialogFragment.kt
new file mode 100644
index 0000000..eb2b768
--- /dev/null
+++ b/app/src/main/java/com/cyh128/hikari_novel/ui/view/main/more/more/setting/ThemeListDialogFragment.kt
@@ -0,0 +1,149 @@
+package com.cyh128.hikari_novel.ui.view.main.more.more.setting
+
+import android.app.Dialog
+import android.os.Bundle
+import android.view.View
+import androidx.fragment.app.DialogFragment
+import androidx.lifecycle.ViewModelProvider
+import com.cyh128.hikari_novel.R
+import com.cyh128.hikari_novel.data.model.AppTheme
+import com.cyh128.hikari_novel.util.ThemeHelper
+import com.google.android.material.chip.Chip
+import com.google.android.material.chip.ChipGroup
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+
+class ThemeListDialogFragment: DialogFragment() {
+    private val viewModel by lazy { ViewModelProvider(requireActivity())[SettingViewModel::class.java] }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val view = layoutInflater.inflate(R.layout.view_theme_list, null)
+
+        when (viewModel.getAppTheme()) {
+            AppTheme.Dynamic -> {
+                view.findViewById<Chip>(R.id.c_v_theme_list_dynamic_color).isChecked = true
+            }
+
+            AppTheme.GreenApple -> {
+                view.findViewById<Chip>(R.id.c_v_theme_list_green_apple).isChecked = true
+            }
+
+            AppTheme.Lavender -> {
+                view.findViewById<Chip>(R.id.c_v_theme_list_lavender).isChecked = true
+            }
+
+            AppTheme.MidnightDusk -> {
+                view.findViewById<Chip>(R.id.c_v_theme_list_midnightdusk).isChecked = true
+            }
+
+            AppTheme.Nord -> {
+                view.findViewById<Chip>(R.id.c_v_theme_list_nord).isChecked = true
+            }
+
+            AppTheme.StrawberryDaiquiri -> {
+                view.findViewById<Chip>(R.id.c_v_theme_list_strawberry).isChecked = true
+            }
+
+            AppTheme.Tako -> {
+                view.findViewById<Chip>(R.id.c_v_theme_list_tako).isChecked = true
+            }
+
+            AppTheme.TealTurquoise -> {
+                view.findViewById<Chip>(R.id.c_v_theme_list_tealturquoise).isChecked = true
+            }
+
+            AppTheme.TidalWave -> {
+                view.findViewById<Chip>(R.id.c_v_theme_list_tidalwave).isChecked = true
+            }
+
+            AppTheme.YinYang -> {
+                view.findViewById<Chip>(R.id.c_v_theme_list_yinyang).isChecked = true
+            }
+
+            AppTheme.Yotsuba -> {
+                view.findViewById<Chip>(R.id.c_v_theme_list_yotsuba).isChecked = true
+            }
+        }
+
+        view.findViewById<ChipGroup>(R.id.cg_v_theme_list).setOnCheckedStateChangeListener { group, checkedIds ->
+            if (checkedIds.isNotEmpty()) {
+                val selectedChipId = checkedIds[0]
+                val index = group.indexOfChild(group.findViewById(selectedChipId))
+
+                when (index) {
+                    0 -> {
+                        viewModel.setAppTheme(AppTheme.Dynamic)
+                        ThemeHelper.setCurrentTheme(AppTheme.Dynamic)
+                        (requireActivity() as SettingActivity).binding.tvASettingAppTheme.text = getString(R.string.dynamic_color)
+                    }
+
+                    1 -> {
+                        viewModel.setAppTheme(AppTheme.GreenApple)
+                        ThemeHelper.setCurrentTheme(AppTheme.GreenApple)
+                        (requireActivity() as SettingActivity).binding.tvASettingAppTheme.text = getString(R.string.green_apple)
+                    }
+
+                    2 -> {
+                        viewModel.setAppTheme(AppTheme.Lavender)
+                        ThemeHelper.setCurrentTheme(AppTheme.Lavender)
+                        (requireActivity() as SettingActivity).binding.tvASettingAppTheme.text = getString(R.string.lavender)
+                    }
+
+                    3 -> {
+                        viewModel.setAppTheme(AppTheme.MidnightDusk)
+                        ThemeHelper.setCurrentTheme(AppTheme.MidnightDusk)
+                        (requireActivity() as SettingActivity).binding.tvASettingAppTheme.text = getString(R.string.midnight_dusk)
+                    }
+
+                    4 -> {
+                        viewModel.setAppTheme(AppTheme.Nord)
+                        ThemeHelper.setCurrentTheme(AppTheme.Nord)
+                        (requireActivity() as SettingActivity).binding.tvASettingAppTheme.text = getString(R.string.nord)
+                    }
+
+                    5 -> {
+                        viewModel.setAppTheme(AppTheme.StrawberryDaiquiri)
+                        ThemeHelper.setCurrentTheme(AppTheme.StrawberryDaiquiri)
+                        (requireActivity() as SettingActivity).binding.tvASettingAppTheme.text = getString(R.string.strawberry_daiquiri)
+                    }
+
+                    6 -> {
+                        viewModel.setAppTheme(AppTheme.Tako)
+                        ThemeHelper.setCurrentTheme(AppTheme.Tako)
+                        (requireActivity() as SettingActivity).binding.tvASettingAppTheme.text = getString(R.string.tako)
+                    }
+
+                    7 -> {
+                        viewModel.setAppTheme(AppTheme.TealTurquoise)
+                        ThemeHelper.setCurrentTheme(AppTheme.TealTurquoise)
+                        (requireActivity() as SettingActivity).binding.tvASettingAppTheme.text = getString(R.string.teal_turquoise)
+                    }
+
+                    8 -> {
+                        viewModel.setAppTheme(AppTheme.TidalWave)
+                        ThemeHelper.setCurrentTheme(AppTheme.TidalWave)
+                        (requireActivity() as SettingActivity).binding.tvASettingAppTheme.text = getString(R.string.tidal_wave)
+                    }
+
+                    9 -> {
+                        viewModel.setAppTheme(AppTheme.YinYang)
+                        ThemeHelper.setCurrentTheme(AppTheme.YinYang)
+                        (requireActivity() as SettingActivity).binding.tvASettingAppTheme.text = getString(R.string.yin_yang)
+                    }
+
+                    10 -> {
+                        viewModel.setAppTheme(AppTheme.Yotsuba)
+                        ThemeHelper.setCurrentTheme(AppTheme.Yotsuba)
+                        (requireActivity() as SettingActivity).binding.tvASettingAppTheme.text = getString(R.string.yotsuba)
+                    }
+                }
+            }
+        }
+
+        return MaterialAlertDialogBuilder(requireContext())
+            .setTitle(R.string.app_theme)
+            .setIcon(R.drawable.ic_palette)
+            .setNegativeButton(R.string.cancel, null)
+            .setView(view)
+            .create()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cyh128/hikari_novel/util/Constants.kt b/app/src/main/java/com/cyh128/hikari_novel/util/Constants.kt
new file mode 100644
index 0000000..b81d1ca
--- /dev/null
+++ b/app/src/main/java/com/cyh128/hikari_novel/util/Constants.kt
@@ -0,0 +1,5 @@
+package com.cyh128.hikari_novel.util
+
+object Constants {
+    var isUpdateChecked = false
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cyh128/hikari_novel/util/Extensions.kt b/app/src/main/java/com/cyh128/hikari_novel/util/Extensions.kt
index b202ef1..64707e0 100644
--- a/app/src/main/java/com/cyh128/hikari_novel/util/Extensions.kt
+++ b/app/src/main/java/com/cyh128/hikari_novel/util/Extensions.kt
@@ -8,7 +8,6 @@ import androidx.fragment.app.Fragment
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
-import com.yariksoffice.lingver.Lingver
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -81,7 +80,7 @@ fun Fragment.getIsInDarkMode() =
 
 fun String.urlEncode(enc: String? = null): String {
     if (enc != null) return URLEncoder.encode(this, enc)
-    return when (Lingver.getInstance().getLocale()) {
+    return when (Locale.getDefault()) {
         Locale.TRADITIONAL_CHINESE -> URLEncoder.encode(this, "BIG5-HKSCS")
         else -> URLEncoder.encode(this, "GBK")
     }
diff --git a/app/src/main/java/com/cyh128/hikari_novel/util/LanguageHelper.kt b/app/src/main/java/com/cyh128/hikari_novel/util/LanguageHelper.kt
new file mode 100644
index 0000000..829af30
--- /dev/null
+++ b/app/src/main/java/com/cyh128/hikari_novel/util/LanguageHelper.kt
@@ -0,0 +1,25 @@
+package com.cyh128.hikari_novel.util
+
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.core.os.LocaleListCompat
+import com.cyh128.hikari_novel.data.model.Event
+import com.cyh128.hikari_novel.data.model.Language
+import com.drake.channel.sendEvent
+
+object LanguageHelper {
+    private lateinit var currentLanguage: Language
+
+    fun setCurrentLanguage(language: Language) {
+        currentLanguage = language
+        sendEvent(Event.LanguageChantedEvent, "event_language_changed")
+    }
+
+    fun initLanguage() {
+        val locale = when (currentLanguage) {
+            Language.FOLLOW_SYSTEM -> LocaleListCompat.getEmptyLocaleList()
+            Language.ZH_CN -> LocaleListCompat.forLanguageTags("zh-cn")
+            Language.ZH_TW -> LocaleListCompat.forLanguageTags("zh-tw")
+        }
+        AppCompatDelegate.setApplicationLocales(locale)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cyh128/hikari_novel/util/ThemeHelper.kt b/app/src/main/java/com/cyh128/hikari_novel/util/ThemeHelper.kt
index 8810c21..c21f715 100644
--- a/app/src/main/java/com/cyh128/hikari_novel/util/ThemeHelper.kt
+++ b/app/src/main/java/com/cyh128/hikari_novel/util/ThemeHelper.kt
@@ -2,15 +2,21 @@ package com.cyh128.hikari_novel.util
 
 import android.app.Activity
 import androidx.annotation.StyleRes
+import androidx.appcompat.app.AppCompatDelegate
 import com.cyh128.hikari_novel.R
 import com.cyh128.hikari_novel.data.model.AppTheme
+import com.cyh128.hikari_novel.data.model.DarkMode
+import com.cyh128.hikari_novel.data.model.Event
+import com.drake.channel.sendEvent
 import com.google.android.material.color.DynamicColors
 
 object ThemeHelper {
-    @StyleRes private var currentTheme: Int? = null
+    @StyleRes
+    private var currentTheme: Int? = null
+    private lateinit var currentDarkMode: DarkMode
 
     fun setCurrentTheme(appTheme: AppTheme) {
-        currentTheme = when(appTheme) {
+        currentTheme = when (appTheme) {
             AppTheme.Dynamic -> null
             AppTheme.GreenApple -> R.style.Theme_HikariNovel_GreenApple
             AppTheme.Lavender -> R.style.Theme_HikariNovel_Lavender
@@ -23,10 +29,22 @@ object ThemeHelper {
             AppTheme.YinYang -> R.style.Theme_HikariNovel_YinYang
             AppTheme.Yotsuba -> R.style.Theme_HikariNovel_Yotsuba
         }
+        sendEvent(Event.ThemeChangedEvent, "event_theme_changed")
     }
 
-    fun initActivityTheme(activity: Activity) {
+    fun setDarkMode(darkMode: DarkMode) {
+        currentDarkMode = darkMode
+        sendEvent(Event.ThemeChangedEvent, "event_theme_changed")
+    }
+
+    fun initActivityThemeAndDarkMode(activity: Activity) {
+        when (currentDarkMode) {
+            DarkMode.System -> AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
+            DarkMode.Enable -> AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
+            DarkMode.Disable -> AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
+        }
+
         if (currentTheme != null) activity.setTheme(currentTheme!!)
-        else DynamicColors.applyToActivityIfAvailable(activity)
+        else DynamicColors.applyToActivitiesIfAvailable(activity.application)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/cyh128/hikari_novel/util/TimeUtil.kt b/app/src/main/java/com/cyh128/hikari_novel/util/TimeUtil.kt
index 7cae683..4c1745e 100644
--- a/app/src/main/java/com/cyh128/hikari_novel/util/TimeUtil.kt
+++ b/app/src/main/java/com/cyh128/hikari_novel/util/TimeUtil.kt
@@ -1,22 +1,22 @@
 package com.cyh128.hikari_novel.util
 
 import android.text.format.DateUtils
-import com.yariksoffice.lingver.Lingver
 import java.text.SimpleDateFormat
 import java.util.Date
+import java.util.Locale
 
 object TimeUtil {
     //20xx-01-01 00:00:00转换成xx天前
     fun dateToText1(dateStr: String): String {
         val pattern = "yyyy-MM-dd HH:mm:ss"
-        val simpleDateFormat = SimpleDateFormat(pattern, Lingver.getInstance().getLocale())
+        val simpleDateFormat = SimpleDateFormat(pattern, Locale.getDefault())
         val date = simpleDateFormat.parse(dateStr)!!
         return DateUtils.getRelativeTimeSpanString(date.time).toString()
     }
 
     //20xx-01-01转换成xx天前
     fun dateToText2(dateStr: String): String {
-        val dateFormat = SimpleDateFormat("yyyy-MM-dd", Lingver.getInstance().getLocale())
+        val dateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault())
         val date: Date = dateFormat.parse(dateStr)!!
         val timeInMillis: Long = date.time
         return DateUtils.getRelativeTimeSpanString(
@@ -28,6 +28,6 @@ object TimeUtil {
 
     fun getTimeToken(): String = SimpleDateFormat(
         "yyyy/MM/dd HH:mm:ss",
-        Lingver.getInstance().getLocale()
+        Locale.getDefault()
     ).format(System.currentTimeMillis())
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_dark_mode.xml b/app/src/main/res/drawable/ic_dark_mode.xml
new file mode 100644
index 0000000..b578c20
--- /dev/null
+++ b/app/src/main/res/drawable/ic_dark_mode.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M480,840Q330,840 225,735Q120,630 120,480Q120,330 225,225Q330,120 480,120Q494,120 507.5,121Q521,122 534,124Q493,153 468.5,199.5Q444,246 444,300Q444,390 507,453Q570,516 660,516Q715,516 761,491.5Q807,467 836,426Q838,439 839,452.5Q840,466 840,480Q840,630 735,735Q630,840 480,840ZM480,760Q568,760 638,711.5Q708,663 740,585Q720,590 700,593Q680,596 660,596Q537,596 450.5,509.5Q364,423 364,300Q364,280 367,260Q370,240 375,220Q297,252 248.5,322Q200,392 200,480Q200,596 282,678Q364,760 480,760ZM470,490Q470,490 470,490Q470,490 470,490Q470,490 470,490Q470,490 470,490Q470,490 470,490Q470,490 470,490Q470,490 470,490Q470,490 470,490Q470,490 470,490Q470,490 470,490Q470,490 470,490Q470,490 470,490Z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml
index 40f4cc3..d7594d3 100644
--- a/app/src/main/res/layout/activity_setting.xml
+++ b/app/src/main/res/layout/activity_setting.xml
@@ -39,17 +39,19 @@
                 android:text="@string/common"/>
 
             <LinearLayout
+                android:id="@+id/ll_a_setting_language"
                 android:layout_width="match_parent"
                 android:layout_height="60dp"
                 android:gravity="center"
                 android:paddingRight="20dp"
                 android:paddingLeft="20dp"
-                android:orientation="horizontal">
+                android:orientation="horizontal"
+                android:background="?selectableItemBackground">
 
                 <androidx.appcompat.widget.AppCompatImageView
                     android:layout_width="24dp"
                     android:layout_height="24dp"
-                    app:srcCompat="@drawable/ic_update"/>
+                    app:srcCompat="@drawable/ic_language"/>
 
                 <LinearLayout
                     android:layout_width="0dp"
@@ -64,38 +66,30 @@
                         android:layout_height="wrap_content"
                         android:textSize="16sp"
                         android:textStyle="bold"
-                        android:text="@string/auto_check_update"/>
+                        android:text="@string/language"/>
 
                 </LinearLayout>
 
-                <com.google.android.material.materialswitch.MaterialSwitch
-                    android:id="@+id/s_a_setting_auto_update"
+                <TextView
+                    android:id="@+id/tv_a_setting_language"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
+                    android:layout_height="wrap_content"
+                    tools:text="跟随系统"/>
 
             </LinearLayout>
 
-            <com.google.android.material.divider.MaterialDivider
-                app:dividerInsetStart="20dp"
-                app:dividerInsetEnd="20dp"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:dividerColor="?attr/colorSurfaceContainer"/>
-
             <LinearLayout
-                android:id="@+id/ll_a_setting_node"
                 android:layout_width="match_parent"
                 android:layout_height="60dp"
                 android:gravity="center"
                 android:paddingRight="20dp"
                 android:paddingLeft="20dp"
-                android:orientation="horizontal"
-                android:background="?selectableItemBackground">
+                android:orientation="horizontal">
 
                 <androidx.appcompat.widget.AppCompatImageView
                     android:layout_width="24dp"
                     android:layout_height="24dp"
-                    app:srcCompat="@drawable/ic_network_node"/>
+                    app:srcCompat="@drawable/ic_update"/>
 
                 <LinearLayout
                     android:layout_width="0dp"
@@ -110,27 +104,19 @@
                         android:layout_height="wrap_content"
                         android:textSize="16sp"
                         android:textStyle="bold"
-                        android:text="@string/switch_node"/>
+                        android:text="@string/auto_check_update"/>
 
                 </LinearLayout>
 
-                <TextView
-                    android:id="@+id/tv_a_setting_node"
+                <com.google.android.material.materialswitch.MaterialSwitch
+                    android:id="@+id/s_a_setting_auto_update"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    tools:text="www.wenku8.cc"/>
+                    android:layout_height="wrap_content"/>
 
             </LinearLayout>
 
-            <com.google.android.material.divider.MaterialDivider
-                app:dividerInsetStart="20dp"
-                app:dividerInsetEnd="20dp"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:dividerColor="?attr/colorSurfaceContainer"/>
-
             <LinearLayout
-                android:id="@+id/ll_a_setting_app_theme"
+                android:id="@+id/ll_a_setting_node"
                 android:layout_width="match_parent"
                 android:layout_height="60dp"
                 android:gravity="center"
@@ -142,7 +128,7 @@
                 <androidx.appcompat.widget.AppCompatImageView
                     android:layout_width="24dp"
                     android:layout_height="24dp"
-                    app:srcCompat="@drawable/ic_palette"/>
+                    app:srcCompat="@drawable/ic_network_node"/>
 
                 <LinearLayout
                     android:layout_width="0dp"
@@ -157,27 +143,24 @@
                         android:layout_height="wrap_content"
                         android:textSize="16sp"
                         android:textStyle="bold"
-                        android:text="@string/app_theme"/>
+                        android:text="@string/switch_node"/>
 
                 </LinearLayout>
 
                 <TextView
-                    android:id="@+id/tv_a_setting_app_theme"
+                    android:id="@+id/tv_a_setting_node"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    tools:text="动态主题"/>
+                    tools:text="www.wenku8.cc"/>
 
             </LinearLayout>
 
-            <include
-                android:id="@+id/i_v_theme_list"
-                layout="@layout/view_theme_list" />
-
             <com.google.android.material.card.MaterialCardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="20dp"
                 android:layout_marginRight="20dp"
+                android:layout_marginBottom="10dp"
                 app:cardCornerRadius="8dp">
 
                 <LinearLayout
@@ -197,22 +180,14 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:gravity="center_vertical"
-                        android:text="@string/language_tip"/>
+                        android:text="@string/need_restart"/>
 
                 </LinearLayout>
 
             </com.google.android.material.card.MaterialCardView>
 
-            <com.google.android.material.divider.MaterialDivider
-                app:dividerInsetStart="20dp"
-                app:dividerInsetEnd="20dp"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                app:dividerColor="?attr/colorSurfaceContainer"/>
-
             <LinearLayout
-                android:id="@+id/ll_a_setting_language"
+                android:id="@+id/ll_a_setting_dark_mode"
                 android:layout_width="match_parent"
                 android:layout_height="60dp"
                 android:gravity="center"
@@ -224,7 +199,7 @@
                 <androidx.appcompat.widget.AppCompatImageView
                     android:layout_width="24dp"
                     android:layout_height="24dp"
-                    app:srcCompat="@drawable/ic_language"/>
+                    app:srcCompat="@drawable/ic_dark_mode"/>
 
                 <LinearLayout
                     android:layout_width="0dp"
@@ -239,55 +214,57 @@
                         android:layout_height="wrap_content"
                         android:textSize="16sp"
                         android:textStyle="bold"
-                        android:text="@string/language"/>
+                        android:text="@string/dark_mode"/>
 
                 </LinearLayout>
 
                 <TextView
-                    android:id="@+id/tv_a_setting_language"
+                    android:id="@+id/tv_a_setting_dark_mode"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     tools:text="跟随系统"/>
 
             </LinearLayout>
 
-            <com.google.android.material.card.MaterialCardView
+            <LinearLayout
+                android:id="@+id/ll_a_setting_app_theme"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
-                app:cardCornerRadius="8dp">
+                android:layout_height="60dp"
+                android:gravity="center"
+                android:paddingRight="20dp"
+                android:paddingLeft="20dp"
+                android:orientation="horizontal"
+                android:background="?selectableItemBackground">
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    app:srcCompat="@drawable/ic_palette"/>
 
                 <LinearLayout
-                    android:padding="10dp"
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="match_parent"
-                    android:orientation="horizontal">
-
-                    <ImageView
-                        android:layout_width="20dp"
-                        android:layout_height="20dp"
-                        android:layout_gravity="center_vertical"
-                        android:src="@drawable/ic_warning"/>
+                    android:layout_weight="1"
+                    android:layout_marginLeft="20dp"
+                    android:orientation="vertical"
+                    android:gravity="center_vertical">
 
                     <TextView
-                        android:layout_marginLeft="10dp"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:gravity="center_vertical"
-                        android:text="@string/language_tip"/>
+                        android:textSize="16sp"
+                        android:textStyle="bold"
+                        android:text="@string/app_theme"/>
 
                 </LinearLayout>
 
-            </com.google.android.material.card.MaterialCardView>
+                <TextView
+                    android:id="@+id/tv_a_setting_app_theme"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    tools:text="动态取色"/>
 
-            <com.google.android.material.divider.MaterialDivider
-                app:dividerInsetStart="20dp"
-                app:dividerInsetEnd="20dp"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                app:dividerColor="?attr/colorSurfaceContainer"/>
+            </LinearLayout>
 
             <LinearLayout
                 android:id="@+id/ll_a_setting_default_tab"
@@ -329,13 +306,6 @@
 
             </LinearLayout>
 
-            <com.google.android.material.divider.MaterialDivider
-                app:dividerInsetStart="20dp"
-                app:dividerInsetEnd="20dp"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:dividerColor="?attr/colorSurfaceContainer"/>
-
 
 
 
@@ -420,14 +390,6 @@
 
             </com.google.android.material.card.MaterialCardView>
 
-            <com.google.android.material.divider.MaterialDivider
-                app:dividerInsetStart="20dp"
-                app:dividerInsetEnd="20dp"
-                android:layout_marginTop="10dp"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:dividerColor="?attr/colorSurfaceContainer"/>
-
         </LinearLayout>
 
     </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/view_theme_list.xml b/app/src/main/res/layout/view_theme_list.xml
index d0ac99d..32c4ea8 100644
--- a/app/src/main/res/layout/view_theme_list.xml
+++ b/app/src/main/res/layout/view_theme_list.xml
@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:fadingEdgeLength="60dp"
-    android:layout_marginBottom="10dp"
-    android:paddingLeft="20dp"
-    android:paddingRight="20dp"
-    android:requiresFadingEdge="horizontal"
-    android:scrollbars="none">
+    android:padding="20dp">
 
     <com.google.android.material.chip.ChipGroup
         android:id="@+id/cg_v_theme_list"
@@ -126,4 +121,4 @@
 
     </com.google.android.material.chip.ChipGroup>
 
-</HorizontalScrollView>
\ No newline at end of file
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/colors_nord.xml b/app/src/main/res/values-night/colors_nord.xml
index 0aeb36c..fc5faa5 100644
--- a/app/src/main/res/values-night/colors_nord.xml
+++ b/app/src/main/res/values-night/colors_nord.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--https://www.nordtheme.com/docs/colors-and-palettes-->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <color name="nord_primary">#88C0D0</color>
     <color name="nord_onPrimary">#2E3440</color>
     <color name="nord_primaryContainer">#88C0D0</color>
@@ -24,7 +24,7 @@
     <color name="nord_inverseSurface">#D8DEE9</color>
     <color name="nord_inverseOnSurface">#2E3440</color>
     <color name="nord_outline">#6d717b</color>
-    <color name="nord_outlineVariant">#90939a</color>
+    <color name="nord_outlineVariant" tools:ignore="MissingDefaultResource">#90939a</color>
     <color name="nord_onError">#2E3440</color>
     <color name="nord_errorContainer">#BF616A</color>
     <color name="nord_onErrorContainer">#000000</color>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 2008993..ca12c96 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,7 +1,8 @@
 <resources>
     <!-- Base application theme. -->
-    <style name="Base.Theme.HikariNovel" parent="Theme.Material3.DayNight.NoActionBar">
+    <style name="Base.Theme.HikariNovel" parent="Theme.Material3.DynamicColors.DayNight.NoActionBar">
         <!-- Customize your dark theme here. -->
         <!-- <item name="colorPrimary">@color/my_dark_primary</item> -->
     </style>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v23/themes.xml b/app/src/main/res/values-v23/themes.xml
index b194167..ea0ceca 100644
--- a/app/src/main/res/values-v23/themes.xml
+++ b/app/src/main/res/values-v23/themes.xml
@@ -4,4 +4,5 @@
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:windowLightStatusBar">?attr/isLightTheme</item>
     </style>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index c25e414..3983066 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -243,7 +243,7 @@
     <string name="simplified_chinese">簡體中文</string>
     <string name="traditional_chinese">繁體中文</string>
     <string name="follow_system">跟隨系統</string>
-    <string name="language_tip">設定完成後需要重啟</string>
+    <string name="need_restart">此項設定完成後需要手動重啓</string>
     <string name="off_shelf">已下架</string>
     <string name="update">更新</string>
     <string name="no_heat_msg">作品熱度：無 ，目前熱度上升指數為：無</string>
@@ -269,5 +269,8 @@
     <string name="tidal_wave">浪潮</string>
     <string name="yin_yang">陰陽</string>
     <string name="yotsuba">四葉草</string>
+    <string name="dark_mode">暗色模式</string>
+    <string name="enable">啟用</string>
+    <string name="disable">禁用</string>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 98f2567..77b0471 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,19 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="white">#ffffff</color>
-
-    <color name="color_fff_99">#99ffffff</color>
-
-    <color name="black">#000000</color>
-    <color name="color_2c">#2c2c2c</color>
-    <color name="color_2f332d">#2f332d</color>
-    <color name="color_cec29c">#CEC29C</color>
-    <color name="color_cec29c_dd">#DDCEC29C</color>
-    <color name="color_ccebcc">#ccebcc</color>
-    <color name="color_92918c">#92918c</color>
-    <color name="color_aaa">#aaaaaa</color>
-    <color name="color_383429">#383429</color>
-    <color name="color_d1cec5">#d1cec5</color>
-    <color name="color_627176">#627176</color>
-    <color name="color_001c27">#001c27</color>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7b2b78d..dd395e9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -250,7 +250,7 @@
     <string name="simplified_chinese">简体中文</string>
     <string name="traditional_chinese">繁体中文</string>
     <string name="follow_system">跟随系统</string>
-    <string name="language_tip">设置完成后需要重启</string>
+    <string name="need_restart">此项设置完成后需要手动重启</string>
     <string name="off_shelf">已下架</string>
     <string name="update">更新</string>
     <string name="no_heat_msg">作品热度：无 ，当前热度上升指数为：无</string>
@@ -278,5 +278,8 @@
     <string name="yin_yang">阴阳</string>
     <string name="yotsuba">四叶草</string>
     <string name="nord" translatable="false">nord</string>
+    <string name="dark_mode">暗色模式</string>
+    <string name="enable">启用</string>
+    <string name="disable">禁用</string>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 34852f2..a4fbfb5 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,8 +1,8 @@
 <resources>
     <!-- Base application theme. -->
-    <style name="Base.Theme.HikariNovel" parent="Theme.Material3.DayNight.NoActionBar">
+    <style name="Base.Theme.HikariNovel" parent="Theme.Material3.DynamicColors.DayNight.NoActionBar">
         <!-- Customize your light theme here. -->
-         <item name="color">#ffffff</item>
+
     </style>
 
     <!--== Green Apple Theme ==-->
diff --git a/build.gradle.kts b/build.gradle.kts
index 2b8c2d5..0ce5b51 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,10 +1,10 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
     id("com.android.application") version "8.7.2" apply false
-    id("org.jetbrains.kotlin.android") version "2.0.0" apply false
-    id("com.google.devtools.ksp") version "2.0.0-1.0.21" apply false
+    id("org.jetbrains.kotlin.android") version "2.0.21" apply false
+    id("com.google.devtools.ksp") version "2.0.21-1.0.26" apply false
 //    id("org.jetbrains.kotlin.kapt") version "2.0.0" apply false
     id("com.android.library") version "8.7.2" apply false
-    id("com.google.dagger.hilt.android") version "2.50" apply false
+    id("com.google.dagger.hilt.android") version "2.52" apply false
 }