Windows ga (#358)
* Enhance Cloud TTS with navigation controls and shared UI overlay in desktop app * Refactor Cloud TTS voice settings and remove standalone settings overlay on desktop app * Persist reader window state and improve slider interaction in desktop app * Improve PDF page transitions and refine focus management in desktop app * Refactor scrollbar interaction and adjust desktop modal focus handling * Improve PDF sidecar synchronization and cross-platform metadata compatibility * Refactor PDF annotation comment logic to shared module and implement Desktop UI * Refactor reader screen to use tap-to-toggle and full-width styling in desktop app * Refactor reader workspace layout and chrome-panel interactions * Implement global search keyboard shortcuts and focusable chrome layers * Implement flavor-specific legal links and update the About UI * Refactor reader UI controls on desktop app * Enhance desktop folder sync with background metadata extraction and improved error handling * Refactor Library UI and remove redundant Home tab in desktop app * Add custom tooltips to reader icon buttons in desktop app * Integrate app theme controls into reader interfaces on desktop * Add right-to-left pagination support and improve focus restoration on desktop app * Improve EPUB pagination geometry and diagnostic logging for layout cutoffs on desktop app * Update desktop reader defaults and implement settings migration * Implement block-based position tracking in ReaderLocator * Enhance EPUB highlighting reliability in desktop app * Add support for custom reader themes and update highlight palette logic in desktop app * Replace the Tools panel with a "More" dropdown menu and refactor account UI * Implement account profile header in desktop sidebar * Implement cloud sync reliability improvements and sidebar toggle on desktop app * Improve EPUB annotation synchronization and highlight mapping accuracy in desktop app * Integrate WebView2 for EPUB vertical rendering on Windows * Refactor reader layout logic and enhance WebView2 diagnostics * Improve vertical reading layout and WebView2 resizing on Desktop * Refine vertical reading mode layout and margin handling * Enhance reader locator precision and Desktop mode-switching reliability * Implement chapter-level caching and warm-start pagination in desktop app * Replace bundled KCEF with native system webviews via SWT * Refactor EPUB page info bar visibility and layout logic * Improve PDF toolbar persistence and fix tab reactivation logic * Enable multi-selection and bulk operations for custom fonts * Refactor instrumentation tests * Add EPUB UI test fixture and initial instrumentation tests * Expand EpubReader UI tests and improve accessibility * Add instrumentation tests and test tags for library and reader screens * Enhance OPDS parser logic and catalog integration * Add support for toggling local synchronization on a per-folder basis. * Implement tri-state sizing for the TTS overlay * Persist TTS overlay size across sessions * Refactor reader brightness control and add incremental step buttons * Improve CSS support, pagination control, and style-aware semantic caching * Improve link handling, interaction, and diagnostics in the paginated reader * crash fixes * Implement persistent pending removal for external files * Implement book-specific word replacements * Add native vertical reading mode with custom renderer * Implement text selection and navigation improvements for the native vertical reader * Implement locator-based navigation and improved vertical scrolling in native vertical mode in epub * Implement lazy loading and chapter prefetching for native vertical reader * Improve window lifecycle and disposal handling on Desktop * Optimize vertical reading performance in desktop app * Enhance TTS start accuracy and diagnostic logging on desktop * Refactor AI settings visibility on desktop * Improve pagination height measurement and enhance cutoff diagnostics * Implement lifecycle management and improve justified text splitting for pagination * Refine AI usage tracking and force AI feature visibility on Desktop * Add descriptive context comments and usage examples to string and plural resources. * Optimize performance and memory usage in search and state mapping * Replace reader page sliders with minimal slider and navigation controls * Add support for CBT comic archives * Harden file path validation and XML parsing to prevent security vulnerabilities * Implement local account profile caching and optimize desktop performance * Improve desktop persistence reliability and add Linux secure storage support * Improved PDF zoom stability and layout prediction during zoom commits * Improved PDF spread layout prediction, reader focus restoration, and account profile caching * Enhance highlight precision and scoping using block-local offsets and CFIs * Enhance cloud book content synchronization and background downloads * Implement granular timestamp tracking for reading positions and PDF annotations * Restrict diagnostic logging and stack traces to debug builds * Refine PDF page gaps and reader chrome interaction logic * Refactor PDF highlight rendering and overhaul Desktop sidebar UI * Implement a new interaction dock and undo/redo history for PDF annotations in desktop * Enhance PDF color picker and improve navigation scroll restoration * Add highlight palette customization and improve selection menu UI in desktop app epub reader * Enhance desktop shelf management and library organization
This commit is contained in:
Aryan
GitHub
parent
5971eaa571
commit
83dcafa4b6
444 changed files with 47279 additions and 8096 deletions
|
|
@ -0,0 +1,247 @@
|
|||
package com.aryan.reader.paginatedreader
|
||||
|
||||
import androidx.compose.ui.graphics.isSpecified
|
||||
import androidx.compose.ui.text.AnnotatedString
|
||||
import androidx.compose.ui.text.style.TextDecoration
|
||||
import org.jsoup.nodes.Document
|
||||
import org.jsoup.nodes.Element
|
||||
|
||||
internal const val TAG_PAGINATED_LINK_DIAG = "PaginatedLinkDiag"
|
||||
|
||||
private const val LINK_DIAG_MAX_SAMPLES = 4
|
||||
private val linkDiagWhitespaceRegex = Regex("\\s+")
|
||||
|
||||
internal fun Document.readerHtmlLinkDiagSummary(): String {
|
||||
val linkElements = getElementsByTag("a").mapNotNull { element ->
|
||||
element.readerHrefForDiagnostics()?.let { href -> element to href }
|
||||
}
|
||||
val samples = linkElements.take(LINK_DIAG_MAX_SAMPLES).joinToString(
|
||||
prefix = "[",
|
||||
postfix = "]"
|
||||
) { (element, href) ->
|
||||
"href=${href.readerLinkDiagPreview()} text=\"${element.text().readerLinkDiagPreview()}\""
|
||||
}
|
||||
return "htmlAnchors=${linkElements.size} htmlSamples=$samples"
|
||||
}
|
||||
|
||||
internal fun List<SemanticBlock>.readerSemanticLinkDiagSummary(): String {
|
||||
val collector = ReaderLinkDiagCollector()
|
||||
forEach { it.collectSemanticLinks(collector) }
|
||||
return collector.semanticSummary()
|
||||
}
|
||||
|
||||
internal fun List<ContentBlock>.readerContentLinkDiagSummary(): String {
|
||||
val collector = ReaderLinkDiagCollector()
|
||||
forEach { it.collectContentLinks(collector, pageInChapter = null) }
|
||||
return collector.contentSummary()
|
||||
}
|
||||
|
||||
internal fun Page.readerPageLinkDiagSummary(): String {
|
||||
val collector = ReaderLinkDiagCollector()
|
||||
content.forEach { it.collectContentLinks(collector, pageInChapter = null) }
|
||||
return collector.contentSummary()
|
||||
}
|
||||
|
||||
internal fun List<Page>.readerPagesLinkDiagSummary(): String {
|
||||
val collector = ReaderLinkDiagCollector()
|
||||
forEachIndexed { pageInChapter, page ->
|
||||
page.content.forEach { it.collectContentLinks(collector, pageInChapter) }
|
||||
}
|
||||
return "pages=$size ${collector.contentSummary()}"
|
||||
}
|
||||
|
||||
internal fun AnnotatedString.readerAnnotatedLinkDiagSummary(): String {
|
||||
val collector = ReaderLinkDiagCollector()
|
||||
collector.addAnnotatedLinks(
|
||||
blockIndex = null,
|
||||
blockType = "AnnotatedString",
|
||||
cfi = null,
|
||||
text = this,
|
||||
pageInChapter = null
|
||||
)
|
||||
return collector.contentSummary()
|
||||
}
|
||||
|
||||
internal fun String.readerLinkDiagPreview(maxLength: Int = 96): String {
|
||||
val cleaned = replace(linkDiagWhitespaceRegex, " ").trim()
|
||||
return if (cleaned.length <= maxLength) cleaned else cleaned.take(maxLength - 3) + "..."
|
||||
}
|
||||
|
||||
private fun Element.readerHrefForDiagnostics(): String? {
|
||||
return attr("href")
|
||||
.ifBlank { attr("xlink:href") }
|
||||
.ifBlank { attr("l:href") }
|
||||
.ifBlank { attr("epub:href") }
|
||||
.ifBlank { null }
|
||||
}
|
||||
|
||||
private class ReaderLinkDiagCollector {
|
||||
private var semanticTextBlocks = 0
|
||||
private var semanticLinkSpans = 0
|
||||
private val semanticSamples = mutableListOf<String>()
|
||||
|
||||
private var contentTextBlocks = 0
|
||||
private var contentUrlAnnotations = 0
|
||||
private var contentLinksWithColor = 0
|
||||
private var contentLinksWithBackground = 0
|
||||
private var contentLinksWithUnderline = 0
|
||||
private var contentLinksWithCoveringStyle = 0
|
||||
private val contentSamples = mutableListOf<String>()
|
||||
|
||||
fun addSemanticTextBlock(block: SemanticTextBlock) {
|
||||
semanticTextBlocks++
|
||||
block.spans.forEach { span ->
|
||||
val href = span.linkHref?.takeIf { it.isNotBlank() } ?: return@forEach
|
||||
semanticLinkSpans++
|
||||
if (semanticSamples.size < LINK_DIAG_MAX_SAMPLES) {
|
||||
val start = span.start.coerceIn(0, block.text.length)
|
||||
val end = span.end.coerceIn(start, block.text.length)
|
||||
semanticSamples += buildString {
|
||||
append("block=")
|
||||
append(block.blockIndex)
|
||||
append(" type=")
|
||||
append(block::class.simpleName ?: "Text")
|
||||
append(" tag=")
|
||||
append(span.tag)
|
||||
append(" range=")
|
||||
append(start)
|
||||
append("..")
|
||||
append(end)
|
||||
append(" href=")
|
||||
append(href.readerLinkDiagPreview())
|
||||
append(" text=\"")
|
||||
append(block.text.substring(start, end).readerLinkDiagPreview())
|
||||
append("\"")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fun addAnnotatedLinks(
|
||||
blockIndex: Int?,
|
||||
blockType: String,
|
||||
cfi: String?,
|
||||
text: AnnotatedString,
|
||||
pageInChapter: Int?
|
||||
) {
|
||||
contentTextBlocks++
|
||||
val annotations = text.getStringAnnotations("URL", 0, text.length)
|
||||
.filter { it.item.isNotBlank() }
|
||||
annotations.forEach { annotation ->
|
||||
contentUrlAnnotations++
|
||||
val coverage = text.readerLinkStyleCoverage(annotation)
|
||||
if (coverage.hasColor) contentLinksWithColor++
|
||||
if (coverage.hasBackground) contentLinksWithBackground++
|
||||
if (coverage.hasUnderline) contentLinksWithUnderline++
|
||||
if (coverage.hasCoveringStyle) contentLinksWithCoveringStyle++
|
||||
if (contentSamples.size < LINK_DIAG_MAX_SAMPLES) {
|
||||
contentSamples += buildString {
|
||||
if (pageInChapter != null) {
|
||||
append("pageInChapter=")
|
||||
append(pageInChapter)
|
||||
append(" ")
|
||||
}
|
||||
append("block=")
|
||||
append(blockIndex ?: -1)
|
||||
append(" type=")
|
||||
append(blockType)
|
||||
if (!cfi.isNullOrBlank()) {
|
||||
append(" cfi=")
|
||||
append(cfi)
|
||||
}
|
||||
append(" range=")
|
||||
append(annotation.start)
|
||||
append("..")
|
||||
append(annotation.end)
|
||||
append(" href=")
|
||||
append(annotation.item.readerLinkDiagPreview())
|
||||
append(" style={color=")
|
||||
append(coverage.hasColor)
|
||||
append(",bg=")
|
||||
append(coverage.hasBackground)
|
||||
append(",underline=")
|
||||
append(coverage.hasUnderline)
|
||||
append(",covering=")
|
||||
append(coverage.hasCoveringStyle)
|
||||
append("} text=\"")
|
||||
append(
|
||||
text.text.substring(
|
||||
annotation.start.coerceIn(0, text.length),
|
||||
annotation.end.coerceIn(annotation.start.coerceIn(0, text.length), text.length)
|
||||
).readerLinkDiagPreview()
|
||||
)
|
||||
append("\"")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fun semanticSummary(): String {
|
||||
return "semanticTextBlocks=$semanticTextBlocks semanticLinkSpans=$semanticLinkSpans semanticSamples=${semanticSamples.joinToString(prefix = "[", postfix = "]")}"
|
||||
}
|
||||
|
||||
fun contentSummary(): String {
|
||||
return "contentTextBlocks=$contentTextBlocks urlAnnotations=$contentUrlAnnotations styled={color=$contentLinksWithColor,bg=$contentLinksWithBackground,underline=$contentLinksWithUnderline,covering=$contentLinksWithCoveringStyle} contentSamples=${contentSamples.joinToString(prefix = "[", postfix = "]")}"
|
||||
}
|
||||
}
|
||||
|
||||
private data class ReaderLinkStyleCoverage(
|
||||
val hasColor: Boolean,
|
||||
val hasBackground: Boolean,
|
||||
val hasUnderline: Boolean,
|
||||
val hasCoveringStyle: Boolean
|
||||
)
|
||||
|
||||
private fun AnnotatedString.readerLinkStyleCoverage(
|
||||
link: AnnotatedString.Range<String>
|
||||
): ReaderLinkStyleCoverage {
|
||||
val overlappingStyles = spanStyles.filter { styleRange ->
|
||||
styleRange.start < link.end && styleRange.end > link.start
|
||||
}
|
||||
return ReaderLinkStyleCoverage(
|
||||
hasColor = overlappingStyles.any { it.item.color.isSpecified },
|
||||
hasBackground = overlappingStyles.any { it.item.background.isSpecified },
|
||||
hasUnderline = overlappingStyles.any {
|
||||
it.item.textDecoration?.contains(TextDecoration.Underline) == true
|
||||
},
|
||||
hasCoveringStyle = overlappingStyles.any {
|
||||
it.start <= link.start && it.end >= link.end
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
private fun SemanticBlock.collectSemanticLinks(collector: ReaderLinkDiagCollector) {
|
||||
when (this) {
|
||||
is SemanticList -> items.forEach { it.collectSemanticLinks(collector) }
|
||||
is SemanticTable -> rows.flatten().forEach { cell ->
|
||||
cell.content.forEach { it.collectSemanticLinks(collector) }
|
||||
}
|
||||
is SemanticFlexContainer -> children.forEach { it.collectSemanticLinks(collector) }
|
||||
is SemanticWrappingBlock -> paragraphsToWrap.forEach { it.collectSemanticLinks(collector) }
|
||||
is SemanticTextBlock -> collector.addSemanticTextBlock(this)
|
||||
else -> Unit
|
||||
}
|
||||
}
|
||||
|
||||
private fun ContentBlock.collectContentLinks(
|
||||
collector: ReaderLinkDiagCollector,
|
||||
pageInChapter: Int?
|
||||
) {
|
||||
when (this) {
|
||||
is WrappingContentBlock -> paragraphsToWrap.forEach {
|
||||
it.collectContentLinks(collector, pageInChapter)
|
||||
}
|
||||
is TableBlock -> rows.flatten().forEach { cell ->
|
||||
cell.content.forEach { it.collectContentLinks(collector, pageInChapter) }
|
||||
}
|
||||
is FlexContainerBlock -> children.forEach { it.collectContentLinks(collector, pageInChapter) }
|
||||
is TextContentBlock -> collector.addAnnotatedLinks(
|
||||
blockIndex = blockIndex,
|
||||
blockType = this::class.simpleName ?: "Text",
|
||||
cfi = cfi,
|
||||
text = content,
|
||||
pageInChapter = pageInChapter
|
||||
)
|
||||
else -> Unit
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue