From 7504bdb108b273030c2f6e5b6feba7f50387d476 Mon Sep 17 00:00:00 2001 From: Horis <821938089@qq.com> Date: Sun, 16 Jul 2023 21:38:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/ui/book/read/page/provider/ChapterProvider.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/provider/ChapterProvider.kt b/app/src/main/java/io/legado/app/ui/book/read/page/provider/ChapterProvider.kt index 4ad3074e0..4cc5db183 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/page/provider/ChapterProvider.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/provider/ChapterProvider.kt @@ -91,7 +91,7 @@ object ChapterProvider { private var titleBottomSpacing = 0 @JvmStatic - var typeface: Typeface = Typeface.DEFAULT + var typeface: Typeface? = Typeface.DEFAULT private set @JvmStatic @@ -637,7 +637,7 @@ object ChapterProvider { upLayout() } - private fun getTypeface(fontPath: String): Typeface { + private fun getTypeface(fontPath: String): Typeface? { return kotlin.runCatching { when { fontPath.isContentScheme() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O -> { @@ -666,7 +666,7 @@ object ChapterProvider { } ?: Typeface.DEFAULT } - private fun getPaints(typeface: Typeface): Pair { + private fun getPaints(typeface: Typeface?): Pair { // 字体统一处理 val bold = Typeface.create(typeface, Typeface.BOLD) val normal = Typeface.create(typeface, Typeface.NORMAL)