字体跟随背景,每个背景对应一个字体

app/src/main/java/io/legado/app/constant/PreferKey.kt

@@ -22,7 +22,6 @@ object PreferKey {
     const val cleanCache = "cleanCache"
     const val saveTabPosition = "saveTabPosition"
     const val pageAnim = "pageAnim"
-    const val readBookFont = "readBookFont"
     const val fontFolder = "fontFolder"
     const val backupPath = "backupUri"
     const val restoreIgnore = "restoreIgnore"

app/src/main/java/io/legado/app/help/ReadBookConfig.kt

@@ -83,8 +83,10 @@ object ReadBookConfig {
 
     fun save() {
         Coroutine.async {
-            val json = GSON.toJson(configList)
-            FileUtils.createFileIfNotExist(configFilePath).writeText(json)
+            synchronized(this) {
+                val json = GSON.toJson(configList)
+                FileUtils.createFileIfNotExist(configFilePath).writeText(json)
+            }
         }
     }
 
@@ -149,6 +151,12 @@ object ReadBookConfig {
 
     private val config get() = if (shareLayout) getConfig(5) else durConfig
 
+    var textFont: String
+        get() = config.textFont
+        set(value) {
+            config.textFont = value
+        }
+
     var textBold: Int
         get() = config.textBold
         set(value) {
@@ -296,6 +304,7 @@ object ReadBookConfig {
         private var darkStatusIconNight: Boolean = false,//晚上是否暗色状态栏
         private var textColor: String = "#3E3D3B",//白天文字颜色
         private var textColorNight: String = "#ADADAD",//夜间文字颜色
+        var textFont: String = "",//字体
         var textBold: Int = 0,//是否粗体字 0:正常, 1:粗体, 2:细体
         var textSize: Int = 20,//文字大小
         var letterSpacing: Float = 0.1f,//字间距
@@ -318,7 +327,7 @@ object ReadBookConfig {
         var footerPaddingRight: Int = 16,
         var footerPaddingTop: Int = 6,
         var showHeaderLine: Boolean = false,
-        var showFooterLine: Boolean = true
+        var showFooterLine: Boolean = true,
     ) {
         fun setBg(bgType: Int, bg: String) {
             if (AppConfig.isNightTheme) {

app/src/main/java/io/legado/app/ui/book/read/config/ReadStyleDialog.kt

@@ -9,7 +9,6 @@ import androidx.core.view.get
 import io.legado.app.R
 import io.legado.app.base.BaseDialogFragment
 import io.legado.app.constant.EventBus
-import io.legado.app.constant.PreferKey
 import io.legado.app.help.ReadBookConfig
 import io.legado.app.lib.dialogs.alert
 import io.legado.app.lib.dialogs.selector
@@ -256,10 +255,12 @@ class ReadStyleDialog : BaseDialogFragment(), FontSelectDialog.CallBack {
     }
 
     override val curFontPath: String
-        get() = requireContext().getPrefString(PreferKey.readBookFont) ?: ""
+        get() = ReadBookConfig.textFont
 
-    override fun selectFile(path: String) {
-        requireContext().putPrefString(PreferKey.readBookFont, path)
-        postEvent(EventBus.UP_CONFIG, true)
+    override fun selectFont(path: String) {
+        if (path != ReadBookConfig.textFont) {
+            ReadBookConfig.textFont = path
+            postEvent(EventBus.UP_CONFIG, true)
+        }
     }
 }

app/src/main/java/io/legado/app/ui/book/read/page/provider/ChapterProvider.kt

@@ -1,14 +1,13 @@
 package io.legado.app.ui.book.read.page.provider
 
 import android.graphics.Typeface
+import android.net.Uri
 import android.os.Build
 import android.text.Layout
 import android.text.StaticLayout
 import android.text.TextPaint
-import android.text.TextUtils
 import io.legado.app.App
 import io.legado.app.constant.AppPattern
-import io.legado.app.constant.PreferKey
 import io.legado.app.data.entities.Book
 import io.legado.app.data.entities.BookChapter
 import io.legado.app.help.AppConfig
@@ -382,18 +381,27 @@ object ChapterProvider {
      */
     fun upStyle() {
         typeface = try {
-            val fontPath = App.INSTANCE.getPrefString(PreferKey.readBookFont)
-            if (!TextUtils.isEmpty(fontPath)) {
-                Typeface.createFromFile(fontPath)
-            } else {
-                when (AppConfig.systemTypefaces) {
+            val fontPath = ReadBookConfig.textFont
+            when {
+                fontPath.isContentPath() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O -> {
+                    val fd = App.INSTANCE.contentResolver
+                        .openFileDescriptor(Uri.parse(fontPath), "r")!!
+                        .fileDescriptor
+                    Typeface.Builder(fd).build()
+                }
+                fontPath.isContentPath() -> {
+                    Typeface.createFromFile(RealPathUtil.getPath(App.INSTANCE, Uri.parse(fontPath)))
+                }
+                fontPath.isNotEmpty() -> Typeface.createFromFile(fontPath)
+                else -> when (AppConfig.systemTypefaces) {
                     1 -> Typeface.SERIF
                     2 -> Typeface.MONOSPACE
                     else -> Typeface.SANS_SERIF
                 }
             }
         } catch (e: Exception) {
-            App.INSTANCE.removePref(PreferKey.readBookFont)
+            ReadBookConfig.textFont = ""
+            ReadBookConfig.save()
             Typeface.SANS_SERIF
         }
         // 字体统一处理

app/src/main/java/io/legado/app/ui/widget/font/FontSelectDialog.kt

@@ -15,7 +15,6 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import io.legado.app.App
 import io.legado.app.R
 import io.legado.app.base.BaseDialogFragment
-import io.legado.app.constant.EventBus
 import io.legado.app.constant.PreferKey
 import io.legado.app.help.AppConfig
 import io.legado.app.help.permission.Permissions
@@ -28,7 +27,6 @@ import io.legado.app.utils.*
 import kotlinx.android.synthetic.main.dialog_font_select.*
 import kotlinx.coroutines.Dispatchers.Main
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import java.io.File
 import java.util.*
 
@@ -170,34 +168,16 @@ class FontSelectDialog : BaseDialogFragment(),
 
     override fun onClick(docItem: DocItem) {
         execute {
-            fontFolder.listFiles()?.forEach {
-                it.delete()
-            }
-            if (docItem.isContentPath) {
-                val file = FileUtils.createFileIfNotExist(fontFolder, docItem.name)
-                @Suppress("BlockingMethodInNonBlockingContext")
-                requireActivity().contentResolver.openInputStream(docItem.uri)?.use { input ->
-                    file.outputStream().use { output ->
-                        input.copyTo(output)
-                    }
-                }
-                callBack?.selectFile(file.path)
-            } else {
-                val file = File(docItem.uri.toString())
-                file.copyTo(FileUtils.createFileIfNotExist(fontFolder, file.name), true)
-                    .absolutePath.let { path ->
-                        if (curFilePath != path) {
-                            withContext(Main) {
-                                callBack?.selectFile(path)
-                            }
-                        }
-                    }
-            }
+            FileUtils.deleteFile(fontFolder.absolutePath)
+            callBack?.selectFont(docItem.uri.toString())
         }.onSuccess {
             dialog?.dismiss()
         }
     }
 
+    /**
+     * 字体文件夹
+     */
     override fun onFilePicked(requestCode: Int, currentPath: String) {
         when (requestCode) {
             fontFolderRequestCode -> {
@@ -231,11 +211,7 @@ class FontSelectDialog : BaseDialogFragment(),
     }
 
     private fun onDefaultFontChange() {
-        if (curFilePath == "") {
-            postEvent(EventBus.UP_CONFIG, true)
-        } else {
-            callBack?.selectFile("")
-        }
+        callBack?.selectFont("")
     }
 
     override val curFilePath: String get() = callBack?.curFontPath ?: ""
@@ -244,7 +220,7 @@ class FontSelectDialog : BaseDialogFragment(),
         get() = (parentFragment as? CallBack) ?: (activity as? CallBack)
 
     interface CallBack {
-        fun selectFile(path: String)
+        fun selectFont(path: String)
         val curFontPath: String
     }
 }