kunfei 4 ani în urmă
părinte
comite
fe7d3f80e9

+ 7 - 1
app/src/main/java/io/legado/app/ui/book/read/page/ContentTextView.kt

@@ -15,7 +15,13 @@ import io.legado.app.help.config.AppConfig
 import io.legado.app.help.config.ReadBookConfig
 import io.legado.app.help.config.ReadBookConfig
 import io.legado.app.lib.theme.accentColor
 import io.legado.app.lib.theme.accentColor
 import io.legado.app.model.ReadBook
 import io.legado.app.model.ReadBook
-import io.legado.app.ui.book.read.page.entities.*
+import io.legado.app.ui.book.read.page.entities.TextLine
+import io.legado.app.ui.book.read.page.entities.TextPage
+import io.legado.app.ui.book.read.page.entities.TextPos
+import io.legado.app.ui.book.read.page.entities.column.BaseColumn
+import io.legado.app.ui.book.read.page.entities.column.ImageColumn
+import io.legado.app.ui.book.read.page.entities.column.ReviewColumn
+import io.legado.app.ui.book.read.page.entities.column.TextColumn
 import io.legado.app.ui.book.read.page.provider.ChapterProvider
 import io.legado.app.ui.book.read.page.provider.ChapterProvider
 import io.legado.app.ui.book.read.page.provider.ImageProvider
 import io.legado.app.ui.book.read.page.provider.ImageProvider
 import io.legado.app.ui.book.read.page.provider.TextPageFactory
 import io.legado.app.ui.book.read.page.provider.TextPageFactory

+ 1 - 0
app/src/main/java/io/legado/app/ui/book/read/page/entities/TextLine.kt

@@ -1,6 +1,7 @@
 package io.legado.app.ui.book.read.page.entities
 package io.legado.app.ui.book.read.page.entities
 
 
 import android.text.TextPaint
 import android.text.TextPaint
+import io.legado.app.ui.book.read.page.entities.column.BaseColumn
 import io.legado.app.ui.book.read.page.provider.ChapterProvider
 import io.legado.app.ui.book.read.page.provider.ChapterProvider
 import io.legado.app.utils.textHeight
 import io.legado.app.utils.textHeight
 
 

+ 1 - 0
app/src/main/java/io/legado/app/ui/book/read/page/entities/TextPage.kt

@@ -5,6 +5,7 @@ import android.text.StaticLayout
 import io.legado.app.R
 import io.legado.app.R
 import io.legado.app.help.config.ReadBookConfig
 import io.legado.app.help.config.ReadBookConfig
 import io.legado.app.model.ReadBook
 import io.legado.app.model.ReadBook
+import io.legado.app.ui.book.read.page.entities.column.TextColumn
 import io.legado.app.ui.book.read.page.provider.ChapterProvider
 import io.legado.app.ui.book.read.page.provider.ChapterProvider
 import io.legado.app.utils.textHeight
 import io.legado.app.utils.textHeight
 import splitties.init.appCtx
 import splitties.init.appCtx

+ 1 - 1
app/src/main/java/io/legado/app/ui/book/read/page/entities/BaseColumn.kt → app/src/main/java/io/legado/app/ui/book/read/page/entities/column/BaseColumn.kt

@@ -1,4 +1,4 @@
-package io.legado.app.ui.book.read.page.entities
+package io.legado.app.ui.book.read.page.entities.column
 
 
 /**
 /**
  * 列基类
  * 列基类

+ 10 - 0
app/src/main/java/io/legado/app/ui/book/read/page/entities/column/ButtonColumn.kt

@@ -0,0 +1,10 @@
+package io.legado.app.ui.book.read.page.entities.column
+
+
+/**
+ * 按钮列
+ */
+data class ButtonColumn(
+    override var start: Float,
+    override var end: Float
+) : BaseColumn

+ 1 - 1
app/src/main/java/io/legado/app/ui/book/read/page/entities/ImageColumn.kt → app/src/main/java/io/legado/app/ui/book/read/page/entities/column/ImageColumn.kt

@@ -1,4 +1,4 @@
-package io.legado.app.ui.book.read.page.entities
+package io.legado.app.ui.book.read.page.entities.column
 
 
 /**
 /**
  * 图片列
  * 图片列

+ 1 - 1
app/src/main/java/io/legado/app/ui/book/read/page/entities/ReviewColumn.kt → app/src/main/java/io/legado/app/ui/book/read/page/entities/column/ReviewColumn.kt

@@ -1,4 +1,4 @@
-package io.legado.app.ui.book.read.page.entities
+package io.legado.app.ui.book.read.page.entities.column
 
 
 import android.graphics.Canvas
 import android.graphics.Canvas
 import android.graphics.Paint
 import android.graphics.Paint

+ 1 - 1
app/src/main/java/io/legado/app/ui/book/read/page/entities/TextColumn.kt → app/src/main/java/io/legado/app/ui/book/read/page/entities/column/TextColumn.kt

@@ -1,4 +1,4 @@
-package io.legado.app.ui.book.read.page.entities
+package io.legado.app.ui.book.read.page.entities.column
 
 
 /**
 /**
  * 文字列
  * 文字列

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

@@ -13,7 +13,12 @@ import io.legado.app.data.entities.BookChapter
 import io.legado.app.help.config.AppConfig
 import io.legado.app.help.config.AppConfig
 import io.legado.app.help.config.ReadBookConfig
 import io.legado.app.help.config.ReadBookConfig
 import io.legado.app.model.ReadBook
 import io.legado.app.model.ReadBook
-import io.legado.app.ui.book.read.page.entities.*
+import io.legado.app.ui.book.read.page.entities.TextChapter
+import io.legado.app.ui.book.read.page.entities.TextLine
+import io.legado.app.ui.book.read.page.entities.TextPage
+import io.legado.app.ui.book.read.page.entities.column.ImageColumn
+import io.legado.app.ui.book.read.page.entities.column.ReviewColumn
+import io.legado.app.ui.book.read.page.entities.column.TextColumn
 import io.legado.app.utils.*
 import io.legado.app.utils.*
 import splitties.init.appCtx
 import splitties.init.appCtx
 import java.util.*
 import java.util.*