gitea/legado
gitea/legado
1
1
Fork 0
mirror of https://github.com/gedoor/legado.git synced 2024-07-04 23:36:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化

Browse Source 
#3969 #3970
This commit is contained in:
Horis 2024-06-04 15:09:07 +08:00
parent 1ba9ce009e
commit 916adb7f8e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -278,7 +278,7 @@ 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.columnIndex < textLine.columns.lastIndex) textColumn.start else textColumn.end, if (textPos.columnIndex < textLine.columns.size) textColumn.start else textColumn.end,
textLine.lineBottom + relativeOffset, textLine.lineBottom + relativeOffset,
textLine.lineTop + relativeOffset textLine.lineTop + relativeOffset
) )
@ -318,7 +318,7 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
selectEndMoveIndex(selectStart) selectEndMoveIndex(selectStart)
selectStart.upData(textPos) selectStart.upData(textPos)
upSelectedStart( upSelectedStart(
if (textPos.columnIndex < textLine.columns.lastIndex) textColumn.start else textColumn.end, if (textPos.columnIndex < textLine.columns.size) textColumn.start else textColumn.end,
textLine.lineBottom + relativeOffset, textLine.lineBottom + relativeOffset,
textLine.lineTop + relativeOffset textLine.lineTop + relativeOffset
) )
@ -534,7 +534,7 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
} }
private fun upSelectChars() { private fun upSelectChars() {
if (!selectStart.isSelected() || !selectEnd.isSelected()) { if (!selectStart.isSelected() && !selectEnd.isSelected()) {
return return
} }
val last = if (callBack.isScroll) 2 else 0 val last = if (callBack.isScroll) 2 else 0
@ -621,7 +621,7 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
if (column is TextColumn) { if (column is TextColumn) {
when { when {
compareStart == 0 -> { compareStart == 0 -> {
if (textPos.columnIndex < textLine.columns.lastIndex) { if (textPos.columnIndex < textLine.columns.size) {
builder.append(column.charData) builder.append(column.charData)
} }
if ( if (

2
modules/book/src/main/java/me/ag2s/epublib/epub/PackageDocumentReader.java
View File

@ -106,7 +106,7 @@ public class PackageDocumentReader extends PackageDocumentBase {
NodeList originItemElements = manifestElement NodeList originItemElements = manifestElement
.getElementsByTagNameNS(NAMESPACE_OPF, OPFTags.item); .getElementsByTagNameNS(NAMESPACE_OPF, OPFTags.item);
for (int i = 0; i < originItemElements.getLength(); i++) { for (int i = 0; i < originItemElements.getLength(); i++) {
Element itemElement = (Element) originItemElements.item(i); Element itemElement = (Element) originItemElements.item(i).cloneNode(false);
String href = DOMUtil.getAttribute(itemElement, NAMESPACE_OPF, OPFAttributes.href); String href = DOMUtil.getAttribute(itemElement, NAMESPACE_OPF, OPFAttributes.href);
String resolvedHref = packagePath.resolve(href).toString(); String resolvedHref = packagePath.resolve(href).toString();
itemElement.setAttribute("href", resolvedHref); itemElement.setAttribute("href", resolvedHref);