* Implement build profiles and feature policy for offline desktop builds * Introduce unified cross-platform Settings Hub * Refactor main settings into a hierarchical page-based navigation model * Refactor library projection to use shared multiplatform logic * Refactor UI state consumption by removing intermediate screen models * Introduce AndroidSharedStateBridge to centralize state mapping and reduction logic * Refactor state management for tabs, selection, and pinning to use shared bridge logic * Refactor file type management and validation into a centralized shared module * Centralize file type resolution and improve handling of unknown types * Centralize book import logic with SharedImportPlanner * Refactor magnifier geometry logic and coordinate mapping * Properly handle orientation changes in scroll-locked PDF reader * Add screen orientation controls to EPUB and PDF readers * Implement right-to-left (RTL) pagination support and refactor reader menus * Separate right-to-left pagination settings for PDF and EPUB * Ensure PDF page data is scoped by document key for multi tab support * Implement theme-aware link styling for the epub reader * Implement jump history for back and forward navigation in the epub reader * Improve locator handling and navigation logic in paginated reader mode * Implement stable pagination navigation and location tracking * Centralize banner message management and auto-dismiss logic in MainViewModel * Implement zoom and pan state preservation for PDF pan lock mode * Enhance reader navigation UI and workspace layout management in desktop app * Refactor reader navigation sidebar and relocate search controls in desktop app * Enhance reader UI with redesigned selection menus and bottom sheet overlays * Implement custom highlight palettes and reader theme customization in desktop app * Implement cross-platform modal layer and refine reader UI styling * Improve highlight accuracy and implement metadata enrichment on book open in desktop app * Implement two-page spread layout for paginated reader on desktop * Implement persistent caching for book loading and pagination in desktop app * Implement persistent caching for book loading and pagination in desktop app * Optimize reader settings updates by separating layout and appearance changes in desktop app * Improve desktop window branding and native Windows styling * Enhance reader selection interactions and UI across EPUB and PDF viewers in desktop app * Refine selection handle positioning and interaction logic * Implement EPUB selection debug logging and improve handle targeting * Optimize desktop book loading performance and UI responsiveness * Implement anchored zoom gestures and rendering optimizations for the Desktop PDF viewer. * Implement smooth zoom preview for the PDF reader in desktop app * Optimize PDF rendering performance and responsiveness in the desktop reader * Implement conditional diagnostic logging and update desktop build configuration * Implemented hierarchical TOC, custom scrollbars, and improved desktop modal handling * Added management options for annotations and highlights in the sidebar in desktop app * Implemented `SharedStableOutlinedTextField` and updated text input fields to use `TextFieldValue` for improved cursor and selection stability. * Refined library filters and enhanced OPDS functionality in desktop app * Improved EPUB pagination measurement and implemented layout diagnostic logging for desktop app * Added PPTX support including document parsing, rendering, and indexing * Improved PPTX rendering and layout accuracy * Implemented text autofit support for PPTX rendering * Enhanced PPTX rendering with support for custom geometry, automatic numbering, table styles, and image opacity * Improved EPUB pagination accuracy and added layout telemetry in desktop app * Improved folder synchronization with metadata-only mode and hashed sidecar management in desktop app * Implemented rich text font scaling and migrated desktop ink tools to custom pointer input handling * Implemented billing account obfuscation * Implemented hierarchical folder navigation and improved library selection functionality in desktop app * Implemented platform-aware directory resolution and multi-platform native library support for desktop * Added full-screen mode for the reader workspace * Added PDF zoom indicator and interactive vertical scrollbar with page tooltips * Refactored speech bubble prefetching to use a limited radius and improved ML detector initialization and lifecycle management * Updated PDF indexing to replace existing page text and removed search result item keys * Implemented "preparing" foreground notification for TTS service * Optimized PDF rendering performance by pre-calculating page-specific annotations * Refactored desktop packaging tasks and improved distribution configuration * Optimized EPUB parser memory usage and added path traversal protection * Refactored WorkManager monitoring logic and added work pruning * Implemented comprehensive resource cleanup and memory management for WebView-based components to prevent memory leaks * Implemented bitmap size limits and scaling to prevent canvas rendering errors * Split long text paragraphs into multiple semantic blocks during HTML parsing * Implemented local ActionMode for text selection to prevent platform crashes * Refactored PPTX text layout, optimized HtmlParser block detection, and improved banner dismissal logic * Added desktop startup splash screen and deferred WebView initialization * Reorganized settings hub and added separate PDF reader defaults * Implemented embedded cover extraction and metadata support for MOBI and FB2 formats * Implemented batching for MetadataExtractionWorker and optimized EPUB metadata extraction performance. * Implemented procedurally generated book covers and replaced static placeholders * Redesigned search UI with a top bar and results overlay in desktop app * Added PDF page gap and overlay visibility options and implemented DesktopBookImporter * Refactored PDF reader UI with tabbed inspector and improved theme background handling in desktop * Implemented PDF viewport persistence for zoom and scroll positions in desktop app * Improved desktop fullscreen implementation and state restoration * Implemented desktop window state persistence * Implemented flavor-based branding and ProGuard configuration for desktop builds * Implemented precise reader positioning and improved highlight rendering logic in desktop app * Added support for user-editable book metadata * Enhanced book metadata support and integrated info/edit dialogs * Implemented embedded EPUB metadata editing * Improved highlight mapping and added custom scrollbar styling for the reader. * Reduced desktop WebView bundle size by excluding unused locales and runtime files * Added neutral pan mode as the default PDF interaction state. * Refactored library empty states and updated primary navigation tabs in desktop app * Implemented native paginated reader and unified content rendering architecture in desktop epub reader * Implemented native EPUB image rendering for desktop and improved block layout spacing with margin collapsing. * Improved pagination overflow detection in desktop * Implemented multi-block text selection with interactive handles and CFI support in desktop epub pagination
157 lines
6.4 KiB
Kotlin
157 lines
6.4 KiB
Kotlin
package com.aryan.reader
|
|
|
|
import com.aryan.reader.data.BookShelfCrossRef
|
|
import com.aryan.reader.data.BookTagCrossRef
|
|
import com.aryan.reader.data.RecentFileItem
|
|
import com.aryan.reader.data.ShelfEntity
|
|
import com.aryan.reader.data.TagEntity
|
|
import com.aryan.reader.shared.SharedReaderScreenState
|
|
import com.aryan.reader.shared.applyLibraryFilters as sharedApplyLibraryFilters
|
|
import com.aryan.reader.shared.filterBySearch as sharedFilterBySearch
|
|
import com.aryan.reader.shared.sortBooks as sharedSortBooks
|
|
|
|
fun interface FolderPathResolver {
|
|
fun relativeFolderSegments(item: RecentFileItem): List<String>
|
|
}
|
|
|
|
object EmptyFolderPathResolver : FolderPathResolver {
|
|
override fun relativeFolderSegments(item: RecentFileItem): List<String> = emptyList()
|
|
}
|
|
|
|
data class LibraryProjectionInput(
|
|
val state: ReaderScreenState,
|
|
val recentFilesFromDb: List<RecentFileItem>,
|
|
val dbShelves: List<ShelfEntity>,
|
|
val shelfRefs: List<BookShelfCrossRef>,
|
|
val dbTags: List<TagEntity>,
|
|
val tagRefs: List<BookTagCrossRef>
|
|
)
|
|
|
|
class LibraryStateProjector(
|
|
private val folderPathResolver: FolderPathResolver = EmptyFolderPathResolver
|
|
) {
|
|
private var cachedProjection: CachedProjection? = null
|
|
|
|
fun project(input: LibraryProjectionInput): ReaderScreenState {
|
|
val start = ReaderPerfLog.nowNanos()
|
|
val internalState = input.state
|
|
val bridgeContext = AndroidSharedStateBridge.prepareLibraryProjection(input, folderPathResolver)
|
|
val cacheKey = ProjectionCacheKey(
|
|
recentFilesFromDb = input.recentFilesFromDb,
|
|
dbShelves = input.dbShelves,
|
|
shelfRefs = input.shelfRefs,
|
|
dbTags = input.dbTags,
|
|
tagRefs = input.tagRefs,
|
|
folderKeys = bridgeContext.folderKeys,
|
|
sortOrder = internalState.sortOrder,
|
|
searchQuery = internalState.searchQuery,
|
|
libraryFilters = internalState.libraryFilters,
|
|
recentFilesLimit = internalState.recentFilesLimit,
|
|
openTabIds = internalState.openTabIds,
|
|
activeTabBookId = internalState.activeTabBookId,
|
|
selectedBookIds = internalState.contextualActionItems.mapTo(mutableSetOf()) { it.bookId },
|
|
selectedShelfIds = internalState.contextualActionShelfIds,
|
|
viewingShelfId = internalState.viewingShelfId,
|
|
isAddingBooksToShelf = internalState.isAddingBooksToShelf,
|
|
addBooksSource = internalState.addBooksSource,
|
|
booksSelectedForAdding = internalState.booksSelectedForAdding,
|
|
pinnedHomeBookIds = internalState.pinnedHomeBookIds,
|
|
pinnedLibraryBookIds = internalState.pinnedLibraryBookIds
|
|
)
|
|
|
|
cachedProjection?.takeIf { it.key == cacheKey }?.let { cache ->
|
|
val result = buildStateFromCache(internalState, cache)
|
|
val elapsed = ReaderPerfLog.elapsedMs(start)
|
|
if (elapsed >= 8L) {
|
|
ReaderPerfLog.d(
|
|
"LibraryProject cache-hit took ${elapsed}ms books=${cache.androidBooksById.size} shelves=${cache.projected.shelves.size}"
|
|
)
|
|
}
|
|
return result
|
|
}
|
|
|
|
val projected = AndroidSharedStateBridge.projectLibrary(bridgeContext)
|
|
val cache = CachedProjection(
|
|
key = cacheKey,
|
|
projected = projected,
|
|
androidBooksById = bridgeContext.androidBooksById,
|
|
tagEntitiesById = bridgeContext.tagEntitiesById
|
|
)
|
|
cachedProjection = cache
|
|
|
|
val elapsed = ReaderPerfLog.elapsedMs(start)
|
|
if (elapsed >= 16L || bridgeContext.androidBooksById.size >= 500) {
|
|
ReaderPerfLog.d(
|
|
"LibraryProject shared recompute took ${elapsed}ms books=${bridgeContext.androidBooksById.size} " +
|
|
"visible=${projected.libraryBooks.size} shelves=${projected.shelves.size} " +
|
|
"tags=${input.dbTags.size} shelfRefs=${input.shelfRefs.size} tagRefs=${input.tagRefs.size}"
|
|
)
|
|
}
|
|
|
|
return buildStateFromCache(internalState, cache)
|
|
}
|
|
|
|
private fun buildStateFromCache(
|
|
internalState: ReaderScreenState,
|
|
cache: CachedProjection
|
|
): ReaderScreenState {
|
|
return AndroidSharedStateBridge.toAndroidState(
|
|
base = internalState,
|
|
sharedState = cache.projected,
|
|
androidBooksById = cache.androidBooksById,
|
|
tagEntitiesById = cache.tagEntitiesById
|
|
)
|
|
}
|
|
|
|
private data class ProjectionCacheKey(
|
|
val recentFilesFromDb: List<RecentFileItem>,
|
|
val dbShelves: List<ShelfEntity>,
|
|
val shelfRefs: List<BookShelfCrossRef>,
|
|
val dbTags: List<TagEntity>,
|
|
val tagRefs: List<BookTagCrossRef>,
|
|
val folderKeys: List<AndroidSharedFolderProjectionKey>,
|
|
val sortOrder: SortOrder,
|
|
val searchQuery: String,
|
|
val libraryFilters: LibraryFilters,
|
|
val recentFilesLimit: Int,
|
|
val openTabIds: List<String>,
|
|
val activeTabBookId: String?,
|
|
val selectedBookIds: Set<String>,
|
|
val selectedShelfIds: Set<String>,
|
|
val viewingShelfId: String?,
|
|
val isAddingBooksToShelf: Boolean,
|
|
val addBooksSource: AddBooksSource,
|
|
val booksSelectedForAdding: Set<String>,
|
|
val pinnedHomeBookIds: Set<String>,
|
|
val pinnedLibraryBookIds: Set<String>
|
|
)
|
|
|
|
private data class CachedProjection(
|
|
val key: ProjectionCacheKey,
|
|
val projected: SharedReaderScreenState,
|
|
val androidBooksById: Map<String, RecentFileItem>,
|
|
val tagEntitiesById: Map<String, TagEntity>
|
|
)
|
|
}
|
|
|
|
fun filterBySearch(files: List<RecentFileItem>, searchQuery: String): List<RecentFileItem> {
|
|
return files.mapSharedResults(sharedFilterBySearch(files.map { it.toSharedProjectionBookItem() }, searchQuery))
|
|
}
|
|
|
|
fun applyLibraryFilters(files: List<RecentFileItem>, filters: LibraryFilters): List<RecentFileItem> {
|
|
return files.mapSharedResults(
|
|
sharedApplyLibraryFilters(
|
|
books = files.map { it.toSharedProjectionBookItem() },
|
|
filters = filters.toSharedLibraryFilters()
|
|
)
|
|
)
|
|
}
|
|
|
|
fun sortFiles(files: List<RecentFileItem>, sortOrder: SortOrder): List<RecentFileItem> {
|
|
return files.mapSharedResults(sharedSortBooks(files.map { it.toSharedProjectionBookItem() }, sortOrder.toSharedSortOrder()))
|
|
}
|
|
|
|
private fun List<RecentFileItem>.mapSharedResults(sharedBooks: List<com.aryan.reader.shared.BookItem>): List<RecentFileItem> {
|
|
val byId = associateBy { it.bookId }
|
|
return sharedBooks.mapNotNull { byId[it.id] }
|
|
}
|