mirror of
https://github.com/gedoor/legado.git
synced 2024-07-04 23:36:56 +08:00
Compare commits
3 Commits
697fd03cc1
...
17416e06f6
Author | SHA1 | Date | |
---|---|---|---|
|
17416e06f6 | ||
|
916adb7f8e | ||
|
1ba9ce009e |
|
@ -278,7 +278,7 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
|
|||
if (textPos.compare(selectEnd) <= 0) {
|
||||
selectStart.upData(pos = textPos)
|
||||
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.lineTop + relativeOffset
|
||||
)
|
||||
|
@ -318,7 +318,7 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
|
|||
selectEndMoveIndex(selectStart)
|
||||
selectStart.upData(textPos)
|
||||
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.lineTop + relativeOffset
|
||||
)
|
||||
|
@ -498,7 +498,7 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
|
|||
val textLine = relativePage(relativePagePos).getLine(lineIndex)
|
||||
val textColumn = textLine.getColumn(charIndex)
|
||||
upSelectedStart(
|
||||
if (charIndex < textLine.columns.lastIndex) textColumn.start else textColumn.end,
|
||||
if (charIndex < textLine.columns.size) textColumn.start else textColumn.end,
|
||||
textLine.lineBottom + relativeOffset(relativePagePos),
|
||||
textLine.lineTop + relativeOffset(relativePagePos)
|
||||
)
|
||||
|
@ -534,7 +534,7 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
|
|||
}
|
||||
|
||||
private fun upSelectChars() {
|
||||
if (!selectStart.isSelected() || !selectEnd.isSelected()) {
|
||||
if (!selectStart.isSelected() && !selectEnd.isSelected()) {
|
||||
return
|
||||
}
|
||||
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) {
|
||||
when {
|
||||
compareStart == 0 -> {
|
||||
if (textPos.columnIndex < textLine.columns.lastIndex) {
|
||||
if (textPos.columnIndex < textLine.columns.size) {
|
||||
builder.append(column.charData)
|
||||
}
|
||||
if (
|
||||
|
|
|
@ -106,11 +106,13 @@ public class PackageDocumentReader extends PackageDocumentBase {
|
|||
NodeList originItemElements = manifestElement
|
||||
.getElementsByTagNameNS(NAMESPACE_OPF, OPFTags.item);
|
||||
for (int i = 0; i < originItemElements.getLength(); i++) {
|
||||
Element itemElement = (Element) originItemElements.item(i);
|
||||
fixedElements.add(itemElement);
|
||||
Element itemElement = (Element) originItemElements.item(i).cloneNode(false);
|
||||
String href = DOMUtil.getAttribute(itemElement, NAMESPACE_OPF, OPFAttributes.href);
|
||||
String resolvedHref = packagePath.resolve(href).toString();
|
||||
itemElement.setAttribute("href", resolvedHref);
|
||||
fixedElements.add(itemElement);
|
||||
try {
|
||||
href = URLDecoder.decode(packagePath.resolve(href).toString(), Constants.CHARACTER_ENCODING);
|
||||
href = URLDecoder.decode(resolvedHref, Constants.CHARACTER_ENCODING);
|
||||
} catch (UnsupportedEncodingException e) {
|
||||
Log.e(TAG, e.getMessage());
|
||||
}
|
||||
|
@ -177,7 +179,7 @@ public class PackageDocumentReader extends PackageDocumentBase {
|
|||
.getAttribute(itemElement, NAMESPACE_OPF, OPFAttributes.href);
|
||||
|
||||
try {
|
||||
href = URLDecoder.decode(packagePath.resolve(href).toString(), Constants.CHARACTER_ENCODING);
|
||||
href = URLDecoder.decode(href, Constants.CHARACTER_ENCODING);
|
||||
} catch (UnsupportedEncodingException e) {
|
||||
Log.e(TAG, e.getMessage());
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user