* 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
105 lines
3.6 KiB
Kotlin
105 lines
3.6 KiB
Kotlin
package com.aryan.reader.desktop
|
|
|
|
import androidx.compose.foundation.layout.Arrangement
|
|
import androidx.compose.foundation.layout.Box
|
|
import androidx.compose.foundation.layout.Column
|
|
import androidx.compose.material3.CircularProgressIndicator
|
|
import androidx.compose.material3.MaterialTheme
|
|
import androidx.compose.material3.Text
|
|
import androidx.compose.runtime.Composable
|
|
import androidx.compose.ui.Alignment
|
|
import androidx.compose.ui.Modifier
|
|
import androidx.compose.ui.unit.dp
|
|
import com.aryan.reader.shared.reader.ReaderLayoutSignature
|
|
import com.aryan.reader.shared.reader.ReaderPage
|
|
import com.aryan.reader.shared.reader.ReaderReadingMode
|
|
import com.aryan.reader.shared.reader.ReaderViewportSpec
|
|
import com.aryan.reader.shared.reader.SharedEpubBook
|
|
|
|
internal data class DesktopEpubPaginationRequest(
|
|
val bookId: String,
|
|
val chapterSignature: Int,
|
|
val layoutSignature: ReaderLayoutSignature,
|
|
val viewport: ReaderViewportSpec,
|
|
val density: DesktopEpubPaginationDensity,
|
|
val cacheGeneration: Int
|
|
)
|
|
|
|
internal data class DesktopEpubPaginationDensity(
|
|
val density: Float,
|
|
val fontScale: Float
|
|
)
|
|
|
|
internal fun desktopMeasuredPaginationReady(
|
|
request: DesktopEpubPaginationRequest?,
|
|
completedRequest: DesktopEpubPaginationRequest?,
|
|
currentPages: List<ReaderPage>,
|
|
measuredPages: List<ReaderPage>
|
|
): Boolean {
|
|
return request != null &&
|
|
completedRequest == request &&
|
|
measuredPages.isNotEmpty() &&
|
|
currentPages.samePageLayoutAs(measuredPages)
|
|
}
|
|
|
|
internal fun desktopPaginatedLayoutReadyForDisplay(
|
|
readingMode: ReaderReadingMode,
|
|
measuredPagesApplied: Boolean
|
|
): Boolean {
|
|
return readingMode != ReaderReadingMode.PAGINATED || measuredPagesApplied
|
|
}
|
|
|
|
internal fun desktopPagesWithMeasuredChapter(
|
|
currentPages: List<ReaderPage>,
|
|
chapterIndex: Int,
|
|
measuredChapterPages: List<ReaderPage>
|
|
): List<ReaderPage> {
|
|
if (currentPages.isEmpty() || measuredChapterPages.isEmpty()) return currentPages
|
|
val firstChapterPage = currentPages.indexOfFirst { it.chapterIndex == chapterIndex }
|
|
if (firstChapterPage < 0) return currentPages
|
|
val lastChapterPage = currentPages.indexOfLast { it.chapterIndex == chapterIndex }
|
|
val combined = currentPages.take(firstChapterPage) +
|
|
measuredChapterPages +
|
|
currentPages.drop(lastChapterPage + 1)
|
|
return combined.mapIndexed { index, page -> page.copy(pageIndex = index) }
|
|
}
|
|
|
|
internal fun List<ReaderPage>.firstPageIndexForChapter(chapterIndex: Int): Int? {
|
|
return indexOfFirst { it.chapterIndex == chapterIndex }.takeIf { it >= 0 }
|
|
}
|
|
|
|
internal fun SharedEpubBook.desktopPaginationContentSignature(): Int {
|
|
return chapters.fold(31 * id.hashCode() + css.hashCode()) { acc, chapter ->
|
|
31 * acc +
|
|
chapter.id.hashCode() +
|
|
chapter.plainText.length +
|
|
chapter.plainText.hashCode() +
|
|
chapter.semanticBlocks.hashCode() +
|
|
chapter.htmlContent.length +
|
|
chapter.htmlContent.hashCode() +
|
|
chapter.baseHref.orEmpty().hashCode()
|
|
}
|
|
}
|
|
|
|
@Composable
|
|
internal fun DesktopEpubPaginationPreparing(
|
|
active: Boolean,
|
|
modifier: Modifier = Modifier
|
|
) {
|
|
Box(
|
|
modifier = modifier,
|
|
contentAlignment = Alignment.Center
|
|
) {
|
|
Column(
|
|
horizontalAlignment = Alignment.CenterHorizontally,
|
|
verticalArrangement = Arrangement.spacedBy(12.dp)
|
|
) {
|
|
CircularProgressIndicator()
|
|
Text(
|
|
if (active) "Preparing pages" else "Measuring reader layout",
|
|
style = MaterialTheme.typography.bodyMedium,
|
|
color = MaterialTheme.colorScheme.onSurfaceVariant
|
|
)
|
|
}
|
|
}
|
|
}
|