renun/legado
1
0
Fork 0
mirror of https://github.com/gedoor/legado.git synced 2025-08-10 00:52:30 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
Horis
2024-07-14 21:36:13 +08:00
parent a875d508d1
commit c0f4fd3923
1 changed files with 23 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
app/src/main/java/io/legado/app/ui/book/read/page/ContentTextView.kt
View File

@@ -27,6 +27,7 @@ import io.legado.app.utils.getCompatColor
import io.legado.app.utils.showDialogFragment
import io.legado.app.utils.toastOnUi
import java.util.concurrent.Executors
import kotlin.math.max
import kotlin.math.min
/**
@@ -271,29 +272,19 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
* 开始选择符移动
*/
fun selectStartMove(x: Float, y: Float) {
touchRough(x, y) { relativeOffset, textPos, _, textLine, textColumn ->
touchRough(x, y) { _, textPos, _, _, _ ->
if (selectStart.compare(textPos) == 0) {
return@touchRough
}
if (textPos.compare(selectEnd) <= 0) {
selectStart.upData(pos = textPos)
upSelectedStart(
if (textPos.columnIndex < textLine.columns.size) textColumn.start else textColumn.end,
textLine.lineBottom + relativeOffset,
textLine.lineTop + relativeOffset
)
selectStartMoveIndex(textPos)
} else {
reverseStartCursor = true
reverseEndCursor = false
selectEnd.columnIndex++
selectStartMoveIndex(selectEnd)
selectEnd.upData(textPos)
upSelectedEnd(
if (textPos.columnIndex > -1) textColumn.end else textColumn.start,
textLine.lineBottom + relativeOffset
)
selectEndMoveIndex(textPos)
}
upSelectChars()
}
}
@@ -301,29 +292,19 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
* 结束选择符移动
*/
fun selectEndMove(x: Float, y: Float) {
touchRough(x, y) { relativeOffset, textPos, _, textLine, textColumn ->
touchRough(x, y) { _, textPos, _, _, _ ->
if (textPos.compare(selectEnd) == 0) {
return@touchRough
}
if (textPos.compare(selectStart) >= 0) {
selectEnd.upData(textPos)
upSelectedEnd(
if (textPos.columnIndex > -1) textColumn.end else textColumn.start,
textLine.lineBottom + relativeOffset
)
selectEndMoveIndex(textPos)
} else {
reverseEndCursor = true
reverseStartCursor = false
selectStart.columnIndex--
selectEndMoveIndex(selectStart)
selectStart.upData(textPos)
upSelectedStart(
if (textPos.columnIndex < textLine.columns.size) textColumn.start else textColumn.end,
textLine.lineBottom + relativeOffset,
textLine.lineTop + relativeOffset
)
selectStartMoveIndex(textPos)
}
upSelectChars()
}
}
@@ -494,7 +475,7 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
) {
selectStart.relativePagePos = relativePagePos
selectStart.lineIndex = lineIndex
selectStart.columnIndex = charIndex
selectStart.columnIndex = max(0, charIndex)
val textLine = relativePage(relativePagePos).getLine(lineIndex)
val textColumn = textLine.getColumn(charIndex)
upSelectedStart(
@@ -519,8 +500,8 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
) {
selectEnd.relativePagePos = relativePage
selectEnd.lineIndex = lineIndex
selectEnd.columnIndex = charIndex
val textLine = relativePage(relativePage).getLine(lineIndex)
selectEnd.columnIndex = min(charIndex, textLine.columns.lastIndex)
val textColumn = textLine.getColumn(charIndex)
upSelectedEnd(
if (charIndex > -1) textColumn.end else textColumn.start,
@@ -549,12 +530,7 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
if (column is TextColumn) {
val compareStart = textPos.compare(selectStart)
val compareEnd = textPos.compare(selectEnd)
column.selected = when {
compareStart == 0 -> true
compareEnd == 0 -> true
compareStart > 0 && compareEnd < 0 -> true
else -> false
}
column.selected = compareStart >= 0 && compareEnd <= 0
column.isSearchResult =
column.selected && callBack.isSelectingSearchResult
if (column.isSearchResult) {
@@ -620,10 +596,19 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
val compareEnd = textPos.compare(selectEnd)
if (column is TextColumn) {
when {
compareStart == 0 -> {
if (textPos.columnIndex < textLine.columns.size) {
builder.append(column.charData)
}
compareStart == -1 -> if (
selectStart.columnIndex == textLine.columns.size
&& charIndex == textLine.columns.lastIndex
) {
builder.append("\n")
}
compareEnd == 1 -> if (selectEnd.columnIndex == -1 && charIndex == 0) {
builder.append("\n")
}
compareStart >= 0 && compareEnd <= 0 -> {
builder.append(column.charData)
if (
textLine.isParagraphEnd
&& charIndex == textLine.columns.lastIndex
@@ -632,20 +617,6 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
builder.append("\n")
}
}
compareEnd == 0 -> if (textPos.columnIndex > -1) {
builder.append(column.charData)
}
compareStart > 0 && compareEnd < 0 -> {
builder.append(column.charData)
if (
textLine.isParagraphEnd
&& charIndex == textLine.columns.lastIndex
) {
builder.append("\n")
}
}
}
}
}