yusheng/QieKan-3.0
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 2 Wiki Activity

优化

Browse Source
This commit is contained in:
Horis
2024-05-19 17:38:16 +08:00
parent 6521494291
commit 14b7d2af11
4 changed files with 31 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/legado/app/ui/book/read/page/ContentTextView.kt
+21 -24
View File
@@ -278,17 +278,18 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
if (textPos.compare(selectEnd) <= 0) { if (textPos.compare(selectEnd) <= 0) {
selectStart.upData(pos = textPos) selectStart.upData(pos = textPos)
upSelectedStart( upSelectedStart(
if (textPos.isTouch) textColumn.start else textColumn.end, if (textPos.columnIndex < textLine.columns.lastIndex) textColumn.start else textColumn.end,
textLine.lineBottom + relativeOffset, textLine.lineBottom + relativeOffset,
textLine.lineTop + relativeOffset textLine.lineTop + relativeOffset
) )
} else { } else {
reverseStartCursor = true reverseStartCursor = true
reverseEndCursor = false reverseEndCursor = false
selectEnd.columnIndex++
selectStartMoveIndex(selectEnd) selectStartMoveIndex(selectEnd)
selectEnd.upData(textPos) selectEnd.upData(textPos)
upSelectedEnd( upSelectedEnd(
if (selectEnd.isTouch || selectEnd.isLast) textColumn.end else textColumn.start, if (textPos.columnIndex > -1) textColumn.end else textColumn.start,
textLine.lineBottom + relativeOffset textLine.lineBottom + relativeOffset
) )
} }
@@ -307,16 +308,17 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
if (textPos.compare(selectStart) >= 0) { if (textPos.compare(selectStart) >= 0) {
selectEnd.upData(textPos) selectEnd.upData(textPos)
upSelectedEnd( upSelectedEnd(
if (selectEnd.isTouch || selectEnd.isLast) textColumn.end else textColumn.start, if (textPos.columnIndex > -1) textColumn.end else textColumn.start,
textLine.lineBottom + relativeOffset textLine.lineBottom + relativeOffset
) )
} else { } else {
reverseEndCursor = true reverseEndCursor = true
reverseStartCursor = false reverseStartCursor = false
selectStart.columnIndex--
selectEndMoveIndex(selectStart) selectEndMoveIndex(selectStart)
selectStart.upData(textPos) selectStart.upData(textPos)
upSelectedStart( upSelectedStart(
if (textPos.isTouch) textColumn.start else textColumn.end, if (textPos.columnIndex < textLine.columns.lastIndex) textColumn.start else textColumn.end,
textLine.lineBottom + relativeOffset, textLine.lineBottom + relativeOffset,
textLine.lineTop + relativeOffset textLine.lineTop + relativeOffset
) )
@@ -418,11 +420,11 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
} }
} }
val isLast = columns.first().start < x val isLast = columns.first().start < x
val charIndex = if (isLast) columns.lastIndex else 0 val charIndex = if (isLast) columns.lastIndex + 1 else -1
val textColumn = if (isLast) columns.last() else columns.first() val textColumn = if (isLast) columns.last() else columns.first()
touched.invoke( touched.invoke(
relativeOffset, relativeOffset,
TextPos(relativePos, lineIndex, charIndex, false, isLast), TextPos(relativePos, lineIndex, charIndex),
textPage, textLine, textColumn textPage, textLine, textColumn
) )
return return
@@ -489,18 +491,14 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
relativePagePos: Int, relativePagePos: Int,
lineIndex: Int, lineIndex: Int,
charIndex: Int, charIndex: Int,
isTouch: Boolean,
isLast: Boolean = false
) { ) {
selectStart.relativePagePos = relativePagePos selectStart.relativePagePos = relativePagePos
selectStart.lineIndex = lineIndex selectStart.lineIndex = lineIndex
selectStart.columnIndex = charIndex selectStart.columnIndex = charIndex
selectStart.isTouch = isTouch
selectStart.isLast = isLast
val textLine = relativePage(relativePagePos).getLine(lineIndex) val textLine = relativePage(relativePagePos).getLine(lineIndex)
val textColumn = textLine.getColumn(charIndex) val textColumn = textLine.getColumn(charIndex)
upSelectedStart( upSelectedStart(
textColumn.start, if (charIndex < textLine.columns.lastIndex) textColumn.start else textColumn.end,
textLine.lineBottom + relativeOffset(relativePagePos), textLine.lineBottom + relativeOffset(relativePagePos),
textLine.lineTop + relativeOffset(relativePagePos) textLine.lineTop + relativeOffset(relativePagePos)
) )
@@ -508,7 +506,7 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
} }
fun selectStartMoveIndex(textPos: TextPos) = textPos.run { fun selectStartMoveIndex(textPos: TextPos) = textPos.run {
selectStartMoveIndex(relativePagePos, lineIndex, columnIndex, isTouch, isLast) selectStartMoveIndex(relativePagePos, lineIndex, columnIndex)
} }
/** /**
@@ -518,22 +516,21 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
relativePage: Int, relativePage: Int,
lineIndex: Int, lineIndex: Int,
charIndex: Int, charIndex: Int,
isTouch: Boolean,
isLast: Boolean = false
) { ) {
selectEnd.relativePagePos = relativePage selectEnd.relativePagePos = relativePage
selectEnd.lineIndex = lineIndex selectEnd.lineIndex = lineIndex
selectEnd.columnIndex = charIndex selectEnd.columnIndex = charIndex
selectEnd.isTouch = isTouch
selectEnd.isLast = isLast
val textLine = relativePage(relativePage).getLine(lineIndex) val textLine = relativePage(relativePage).getLine(lineIndex)
val textColumn = textLine.getColumn(charIndex) val textColumn = textLine.getColumn(charIndex)
upSelectedEnd(textColumn.end, textLine.lineBottom + relativeOffset(relativePage)) upSelectedEnd(
if (charIndex > -1) textColumn.end else textColumn.start,
textLine.lineBottom + relativeOffset(relativePage)
)
upSelectChars() upSelectChars()
} }
fun selectEndMoveIndex(textPos: TextPos) = textPos.run { fun selectEndMoveIndex(textPos: TextPos) = textPos.run {
selectEndMoveIndex(relativePagePos, lineIndex, columnIndex, isTouch, isLast) selectEndMoveIndex(relativePagePos, lineIndex, columnIndex)
} }
private fun upSelectChars() { private fun upSelectChars() {
@@ -553,8 +550,8 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
val compareStart = textPos.compare(selectStart) val compareStart = textPos.compare(selectStart)
val compareEnd = textPos.compare(selectEnd) val compareEnd = textPos.compare(selectEnd)
column.selected = when { column.selected = when {
compareStart == 0 -> selectStart.isTouch compareStart == 0 -> true
compareEnd == 0 -> selectEnd.isTouch || selectEnd.isLast compareEnd == 0 -> true
compareStart > 0 && compareEnd < 0 -> true compareStart > 0 && compareEnd < 0 -> true
else -> false else -> false
} }
@@ -624,19 +621,19 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
if (column is TextColumn) { if (column is TextColumn) {
when { when {
compareStart == 0 -> { compareStart == 0 -> {
if (selectStart.isTouch) { if (textPos.columnIndex < textLine.columns.lastIndex) {
builder.append(column.charData) builder.append(column.charData)
} }
if ( if (
textLine.isParagraphEnd textLine.isParagraphEnd
&& charIndex == textLine.charSize - 1 && charIndex == textLine.columns.lastIndex
&& compareEnd != 0 && compareEnd != 0
) { ) {
builder.append("\n") builder.append("\n")
} }
} }
compareEnd == 0 -> if (selectEnd.isTouch || selectEnd.isLast) { compareEnd == 0 -> if (textPos.columnIndex > -1) {
builder.append(column.charData) builder.append(column.charData)
} }
@@ -644,7 +641,7 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
builder.append(column.charData) builder.append(column.charData)
if ( if (
textLine.isParagraphEnd textLine.isParagraphEnd
&& charIndex == textLine.charSize - 1 && charIndex == textLine.columns.lastIndex
) { ) {
builder.append("\n") builder.append("\n")
} }
app/src/main/java/io/legado/app/ui/book/read/page/PageView.kt
+4 -20
View File
@@ -404,17 +404,9 @@ class PageView(context: Context) : FrameLayout(context) {
fun selectStartMoveIndex( fun selectStartMoveIndex(
relativePagePos: Int, relativePagePos: Int,
lineIndex: Int, lineIndex: Int,
charIndex: Int, charIndex: Int
isTouch: Boolean = true,
isLast: Boolean = false
) { ) {
binding.contentTextView.selectStartMoveIndex( binding.contentTextView.selectStartMoveIndex(relativePagePos, lineIndex, charIndex)
relativePagePos,
lineIndex,
charIndex,
isTouch,
isLast
)
} }
fun selectStartMoveIndex(textPos: TextPos) { fun selectStartMoveIndex(textPos: TextPos) {
@@ -428,17 +420,9 @@ class PageView(context: Context) : FrameLayout(context) {
fun selectEndMoveIndex( fun selectEndMoveIndex(
relativePagePos: Int, relativePagePos: Int,
lineIndex: Int, lineIndex: Int,
charIndex: Int, charIndex: Int
isTouch: Boolean = true,
isLast: Boolean = false
) { ) {
binding.contentTextView.selectEndMoveIndex( binding.contentTextView.selectEndMoveIndex(relativePagePos, lineIndex, charIndex)
relativePagePos,
lineIndex,
charIndex,
isTouch,
isLast
)
} }
fun selectEndMoveIndex(textPos: TextPos) { fun selectEndMoveIndex(textPos: TextPos) {
app/src/main/java/io/legado/app/ui/book/read/page/ReadView.kt
+6 -2
View File
@@ -443,9 +443,13 @@ class ReadView(context: Context, attrs: AttributeSet) :
curPage.selectText(x, y) { textPos -> curPage.selectText(x, y) { textPos ->
val compare = initialTextPos.compare(textPos) val compare = initialTextPos.compare(textPos)
when { when {
compare >= 0 -> { compare > 0 -> {
curPage.selectStartMoveIndex(textPos) curPage.selectStartMoveIndex(textPos)
curPage.selectEndMoveIndex(initialTextPos) curPage.selectEndMoveIndex(
initialTextPos.relativePagePos,
initialTextPos.lineIndex,
initialTextPos.columnIndex - 1
)
} }
else -> { else -> {
app/src/main/java/io/legado/app/ui/book/read/page/entities/TextPos.kt
-10
View File
@@ -11,30 +11,22 @@ data class TextPos(
var relativePagePos: Int, var relativePagePos: Int,
var lineIndex: Int, var lineIndex: Int,
var columnIndex: Int, var columnIndex: Int,
var isTouch: Boolean = true,
var isLast: Boolean = false
) { ) {
fun upData( fun upData(
relativePos: Int, relativePos: Int,
lineIndex: Int, lineIndex: Int,
charIndex: Int, charIndex: Int,
isTouch: Boolean,
isLast: Boolean
) { ) {
this.relativePagePos = relativePos this.relativePagePos = relativePos
this.lineIndex = lineIndex this.lineIndex = lineIndex
this.columnIndex = charIndex this.columnIndex = charIndex
this.isTouch = isTouch
this.isLast = isLast
} }
fun upData(pos: TextPos) { fun upData(pos: TextPos) {
relativePagePos = pos.relativePagePos relativePagePos = pos.relativePagePos
lineIndex = pos.lineIndex lineIndex = pos.lineIndex
columnIndex = pos.columnIndex columnIndex = pos.columnIndex
isTouch = pos.isTouch
isLast = pos.isLast
} }
fun compare(pos: TextPos): Int { fun compare(pos: TextPos): Int {
@@ -65,8 +57,6 @@ data class TextPos(
relativePagePos = 0 relativePagePos = 0
lineIndex = -1 lineIndex = -1
columnIndex = -1 columnIndex = -1
isTouch = true
isLast = false
} }
fun isSelected(): Boolean { fun isSelected(): Boolean {