فهرست منبع

ChapterProvider.kt减少代码

Xwite 4 سال پیش
والد
کامیت
5dd421cb38
1فایلهای تغییر یافته به همراه4 افزوده شده و 12 حذف شده
  1. 4 12
      app/src/main/java/io/legado/app/ui/book/read/page/provider/ChapterProvider.kt

+ 4 - 12
app/src/main/java/io/legado/app/ui/book/read/page/provider/ChapterProvider.kt

@@ -114,6 +114,10 @@ object ChapterProvider {
         var durY = 0f
         var durY = 0f
         textPages.add(TextPage())
         textPages.add(TextPage())
         contents.forEachIndexed { index, content ->
         contents.forEachIndexed { index, content ->
+            val isTitle = index == 0
+            val isTitleWithNoContent = isTitle && contents.size == 1
+            val isVolumeTitle = isTitle && bookChapter.isVolume
+            val textPaint = if (isTitle) titlePaint else contentPaint
             if (book.getImageStyle() == Book.imgStyleText) {
             if (book.getImageStyle() == Book.imgStyleText) {
                 var text = content.replace(srcReplaceChar, "▣")
                 var text = content.replace(srcReplaceChar, "▣")
                 val srcList = LinkedList<String>()
                 val srcList = LinkedList<String>()
@@ -128,10 +132,6 @@ object ChapterProvider {
                 }
                 }
                 matcher.appendTail(sb)
                 matcher.appendTail(sb)
                 text = sb.toString()
                 text = sb.toString()
-                val isTitle = index == 0
-                val isTitleWithNoContent = isTitle && contents.size == 1
-                val isVolumeTitle = isTitle && bookChapter.isVolume
-                val textPaint = if (isTitle) titlePaint else contentPaint
                 if (!(isTitle && ReadBookConfig.titleMode == 2)) {
                 if (!(isTitle && ReadBookConfig.titleMode == 2)) {
                     setTypeText(
                     setTypeText(
                         absStartX, durY, text, textPages, stringBuilder,
                         absStartX, durY, text, textPages, stringBuilder,
@@ -147,10 +147,6 @@ object ChapterProvider {
                 while (matcher.find()) {
                 while (matcher.find()) {
                     val text = content.substring(start, matcher.start())
                     val text = content.substring(start, matcher.start())
                     if (text.isNotBlank()) {
                     if (text.isNotBlank()) {
-                        val isTitle = index == 0
-                        val isTitleWithNoContent = isTitle && contents.size == 1
-                        val isVolumeTitle = isTitle && bookChapter.isVolume
-                        val textPaint = if (isTitle) titlePaint else contentPaint
                         if (!(isTitle && ReadBookConfig.titleMode == 2)) {
                         if (!(isTitle && ReadBookConfig.titleMode == 2)) {
                             setTypeText(
                             setTypeText(
                                 absStartX, durY, text, textPages, stringBuilder,
                                 absStartX, durY, text, textPages, stringBuilder,
@@ -170,10 +166,6 @@ object ChapterProvider {
                 if (start < content.length) {
                 if (start < content.length) {
                     val text = content.substring(start, content.length)
                     val text = content.substring(start, content.length)
                     if (text.isNotBlank()) {
                     if (text.isNotBlank()) {
-                        val isTitle = index == 0
-                        val isTitleWithNoContent = isTitle && contents.size == 1
-                        val isVolumeTitle = isTitle && bookChapter.isVolume
-                        val textPaint = if (isTitle) titlePaint else contentPaint
                         if (!(isTitle && ReadBookConfig.titleMode == 2)) {
                         if (!(isTitle && ReadBookConfig.titleMode == 2)) {
                             setTypeText(
                             setTypeText(
                                 absStartX, durY, text, textPages, stringBuilder,
                                 absStartX, durY, text, textPages, stringBuilder,