|
@@ -498,34 +498,32 @@ object ChapterProvider {
|
|
|
isLineEnd: Boolean,
|
|
isLineEnd: Boolean,
|
|
|
srcList: LinkedList<String>?
|
|
srcList: LinkedList<String>?
|
|
|
) {
|
|
) {
|
|
|
- if (srcList != null && char == srcReplaceChar) {
|
|
|
|
|
- val src = srcList.removeFirst()
|
|
|
|
|
- ImageProvider.cacheImage(book, src, ReadBook.bookSource)
|
|
|
|
|
- textLine.addColumn(
|
|
|
|
|
|
|
+ val column = when {
|
|
|
|
|
+ srcList != null && char == srcReplaceChar -> {
|
|
|
|
|
+ val src = srcList.removeFirst()
|
|
|
|
|
+ ImageProvider.cacheImage(book, src, ReadBook.bookSource)
|
|
|
TextColumn(
|
|
TextColumn(
|
|
|
start = absStartX + xStart,
|
|
start = absStartX + xStart,
|
|
|
end = absStartX + xEnd,
|
|
end = absStartX + xEnd,
|
|
|
charData = src
|
|
charData = src
|
|
|
)
|
|
)
|
|
|
- )
|
|
|
|
|
- } else {
|
|
|
|
|
- val column = if (isLineEnd && char == reviewChar) {
|
|
|
|
|
|
|
+ }
|
|
|
|
|
+ isLineEnd && char == reviewChar -> {
|
|
|
ReviewColumn(
|
|
ReviewColumn(
|
|
|
start = absStartX + xStart,
|
|
start = absStartX + xStart,
|
|
|
end = absStartX + xEnd,
|
|
end = absStartX + xEnd,
|
|
|
- count = 1
|
|
|
|
|
|
|
+ count = 2
|
|
|
)
|
|
)
|
|
|
- } else {
|
|
|
|
|
|
|
+ }
|
|
|
|
|
+ else -> {
|
|
|
TextColumn(
|
|
TextColumn(
|
|
|
start = absStartX + xStart,
|
|
start = absStartX + xStart,
|
|
|
end = absStartX + xEnd,
|
|
end = absStartX + xEnd,
|
|
|
charData = char
|
|
charData = char
|
|
|
)
|
|
)
|
|
|
}
|
|
}
|
|
|
- textLine.addColumn(
|
|
|
|
|
- column
|
|
|
|
|
- )
|
|
|
|
|
}
|
|
}
|
|
|
|
|
+ textLine.addColumn(column)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|