Desktop app (#308)
* 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
This commit is contained in:
Aryan
GitHub
parent
c0d0e57e79
commit
b20ade9946
247 changed files with 43321 additions and 7087 deletions
|
|
@ -17,9 +17,10 @@ import com.aryan.reader.shared.FileType as SharedFileType
|
|||
import com.aryan.reader.shared.LibraryFilters as SharedLibraryFilters
|
||||
import com.aryan.reader.shared.ReadStatusFilter as SharedReadStatusFilter
|
||||
import com.aryan.reader.shared.RenderMode as SharedRenderMode
|
||||
import com.aryan.reader.shared.SharedLibraryProjectionInput
|
||||
import com.aryan.reader.shared.SharedReaderScreenState
|
||||
import com.aryan.reader.shared.Shelf as SharedShelf
|
||||
import com.aryan.reader.shared.ShelfRecord
|
||||
import com.aryan.reader.shared.ShelfType as SharedShelfType
|
||||
import com.aryan.reader.shared.SortOrder as SharedSortOrder
|
||||
import com.aryan.reader.shared.SyncedFolder as SharedSyncedFolder
|
||||
import com.aryan.reader.shared.Tag as SharedTag
|
||||
|
|
@ -34,18 +35,88 @@ fun RecentFileItem.toSharedBookItem(): SharedBookItem {
|
|||
coverImagePath = coverImagePath,
|
||||
title = title,
|
||||
author = author,
|
||||
description = description,
|
||||
originalTitle = originalTitle,
|
||||
originalAuthor = originalAuthor,
|
||||
originalSeriesName = originalSeriesName,
|
||||
originalSeriesIndex = originalSeriesIndex,
|
||||
originalDescription = originalDescription,
|
||||
progressPercentage = progressPercentage,
|
||||
isRecent = isRecent,
|
||||
fileSize = fileSize,
|
||||
fileContentModifiedTimestamp = fileContentModifiedTimestamp,
|
||||
sourceFolder = sourceFolderUri,
|
||||
folderTextMetadataParsed = folderTextMetadataParsed,
|
||||
seriesName = seriesName,
|
||||
seriesIndex = seriesIndex,
|
||||
lastPageIndex = lastPage,
|
||||
tags = tags.map { it.toSharedTag() },
|
||||
readerHighlights = EpubAnnotationSerializer.parseHighlightsJson(highlightsJson)
|
||||
)
|
||||
}
|
||||
|
||||
fun RecentFileItem.toSharedProjectionBookItem(): SharedBookItem {
|
||||
return toSharedBookItem().copy(displayName = displayName)
|
||||
}
|
||||
|
||||
fun SharedBookItem.toRecentFileItem(
|
||||
androidBooksById: Map<String, RecentFileItem> = emptyMap(),
|
||||
tagEntitiesById: Map<String, TagEntity> = emptyMap()
|
||||
): RecentFileItem {
|
||||
val resolvedTags = tags.map { tag -> tagEntitiesById[tag.id] ?: tag.toTagEntity(createdAt = 0L) }
|
||||
return androidBooksById[id]?.copy(tags = resolvedTags)
|
||||
?.copy(
|
||||
uriString = path,
|
||||
type = type.toAndroidFileType(),
|
||||
displayName = androidBooksById[id]?.displayName ?: displayName,
|
||||
timestamp = timestamp,
|
||||
coverImagePath = coverImagePath,
|
||||
title = title,
|
||||
author = author,
|
||||
description = description,
|
||||
originalTitle = originalTitle,
|
||||
originalAuthor = originalAuthor,
|
||||
originalSeriesName = originalSeriesName,
|
||||
originalSeriesIndex = originalSeriesIndex,
|
||||
originalDescription = originalDescription,
|
||||
lastPage = lastPageIndex,
|
||||
progressPercentage = progressPercentage,
|
||||
isRecent = isRecent,
|
||||
sourceFolderUri = sourceFolder,
|
||||
fileSize = fileSize,
|
||||
fileContentModifiedTimestamp = fileContentModifiedTimestamp,
|
||||
seriesName = seriesName,
|
||||
seriesIndex = seriesIndex,
|
||||
folderTextMetadataParsed = folderTextMetadataParsed
|
||||
)
|
||||
?: RecentFileItem(
|
||||
bookId = id,
|
||||
uriString = path,
|
||||
type = type.toAndroidFileType(),
|
||||
displayName = displayName,
|
||||
timestamp = timestamp,
|
||||
coverImagePath = coverImagePath,
|
||||
title = title,
|
||||
author = author,
|
||||
description = description,
|
||||
originalTitle = originalTitle,
|
||||
originalAuthor = originalAuthor,
|
||||
originalSeriesName = originalSeriesName,
|
||||
originalSeriesIndex = originalSeriesIndex,
|
||||
originalDescription = originalDescription,
|
||||
lastPage = lastPageIndex,
|
||||
progressPercentage = progressPercentage,
|
||||
isRecent = isRecent,
|
||||
sourceFolderUri = sourceFolder,
|
||||
fileSize = fileSize,
|
||||
fileContentModifiedTimestamp = fileContentModifiedTimestamp,
|
||||
seriesName = seriesName,
|
||||
seriesIndex = seriesIndex,
|
||||
folderTextMetadataParsed = folderTextMetadataParsed,
|
||||
tags = resolvedTags
|
||||
)
|
||||
}
|
||||
|
||||
fun TagEntity.toSharedTag(): SharedTag {
|
||||
return SharedTag(
|
||||
id = id,
|
||||
|
|
@ -153,92 +224,147 @@ fun ReaderScreenState.toSharedReaderScreenState(
|
|||
)
|
||||
}
|
||||
|
||||
fun ReaderScreenState.toSharedLibraryProjectionInput(
|
||||
recentFilesFromDb: List<RecentFileItem>,
|
||||
dbShelves: List<ShelfEntity>,
|
||||
shelfRefs: List<BookShelfCrossRef>,
|
||||
fun List<RecentFileItem>.withResolvedTags(
|
||||
dbTags: List<TagEntity>,
|
||||
tagRefs: List<BookTagCrossRef>
|
||||
): SharedLibraryProjectionInput {
|
||||
): List<RecentFileItem> {
|
||||
val tagsById = dbTags.associateBy { it.id }
|
||||
val bookTagsMap = tagRefs.groupBy { it.bookId }.mapValues { entry ->
|
||||
entry.value.mapNotNull { tagsById[it.tagId] }
|
||||
}
|
||||
val taggedBooks = recentFilesFromDb.map { item ->
|
||||
item.copy(tags = bookTagsMap[item.bookId].orEmpty())
|
||||
return map { item -> item.copy(tags = bookTagsMap[item.bookId].orEmpty()) }
|
||||
}
|
||||
|
||||
fun SharedReaderScreenState.toAndroidReaderScreenState(
|
||||
base: ReaderScreenState,
|
||||
androidBooksById: Map<String, RecentFileItem>,
|
||||
tagEntitiesById: Map<String, TagEntity> = emptyMap()
|
||||
): ReaderScreenState {
|
||||
val fallbackBooksById = rawLibraryBooks.associateBy { it.id }
|
||||
fun SharedBookItem.toAndroidBook(): RecentFileItem {
|
||||
return toRecentFileItem(androidBooksById, tagEntitiesById)
|
||||
}
|
||||
return SharedLibraryProjectionInput(
|
||||
state = toSharedReaderScreenState(
|
||||
rawBooks = taggedBooks,
|
||||
dbTags = dbTags
|
||||
),
|
||||
booksFromStore = taggedBooks
|
||||
.filterNot { it.bookId.endsWith("_reflow") }
|
||||
.map { it.toSharedBookItem() },
|
||||
shelfRecords = dbShelves.map { it.toSharedShelfRecord() },
|
||||
shelfRefs = shelfRefs.map { it.toSharedBookShelfRef() },
|
||||
tags = dbTags.map { it.toSharedTag() }
|
||||
fun bookById(bookId: String): RecentFileItem? {
|
||||
return androidBooksById[bookId] ?: fallbackBooksById[bookId]?.toAndroidBook()
|
||||
}
|
||||
return base.copy(
|
||||
recentFiles = recentBooks.map { it.toAndroidBook() },
|
||||
allRecentFiles = libraryBooks.map { it.toAndroidBook() },
|
||||
rawLibraryFiles = rawLibraryBooks.map { it.toAndroidBook() },
|
||||
viewingShelfId = viewingShelfId,
|
||||
isAddingBooksToShelf = isAddingBooksToShelf,
|
||||
contextualActionShelfIds = selectedShelfIds,
|
||||
contextualActionItems = selectedBookIds.mapNotNullTo(mutableSetOf()) { bookById(it) },
|
||||
shelves = shelves.map { it.toAndroidShelf(androidBooksById, tagEntitiesById) },
|
||||
openTabs = openTabs.map { it.toAndroidBook() },
|
||||
openTabIds = openTabIds,
|
||||
activeTabBookId = activeTabBookId,
|
||||
booksAvailableForAdding = booksAvailableForAdding.map { it.toAndroidBook() },
|
||||
allTags = allTags.map { tag -> tagEntitiesById[tag.id] ?: tag.toTagEntity(createdAt = 0L) }
|
||||
)
|
||||
}
|
||||
|
||||
fun SharedShelf.toAndroidShelf(
|
||||
androidBooksById: Map<String, RecentFileItem> = emptyMap(),
|
||||
tagEntitiesById: Map<String, TagEntity> = emptyMap()
|
||||
): Shelf {
|
||||
return Shelf(
|
||||
id = id,
|
||||
name = name,
|
||||
type = type.toAndroidShelfType(),
|
||||
books = books.map { it.toRecentFileItem(androidBooksById, tagEntitiesById) },
|
||||
directBooks = directBooks.map { it.toRecentFileItem(androidBooksById, tagEntitiesById) },
|
||||
parentShelfId = parentShelfId,
|
||||
childShelfIds = childShelfIds,
|
||||
depth = depth,
|
||||
sortKey = sortKey
|
||||
)
|
||||
}
|
||||
|
||||
fun FileType.toSharedFileType(): SharedFileType {
|
||||
return runCatching { SharedFileType.valueOf(name) }.getOrDefault(SharedFileType.UNKNOWN)
|
||||
return this
|
||||
}
|
||||
|
||||
private fun RenderMode.toSharedRenderMode(): SharedRenderMode {
|
||||
return SharedRenderMode.valueOf(name)
|
||||
fun SharedFileType.toAndroidFileType(): FileType {
|
||||
return this
|
||||
}
|
||||
|
||||
private fun AddBooksSource.toSharedAddBooksSource(): SharedAddBooksSource {
|
||||
return SharedAddBooksSource.valueOf(name)
|
||||
fun RenderMode.toSharedRenderMode(): SharedRenderMode {
|
||||
return this
|
||||
}
|
||||
|
||||
private fun SortOrder.toSharedSortOrder(): SharedSortOrder {
|
||||
return SharedSortOrder.valueOf(name)
|
||||
fun SharedRenderMode.toAndroidRenderMode(): RenderMode {
|
||||
return this
|
||||
}
|
||||
|
||||
private fun ReadStatusFilter.toSharedReadStatusFilter(): SharedReadStatusFilter {
|
||||
return SharedReadStatusFilter.valueOf(name)
|
||||
fun AddBooksSource.toSharedAddBooksSource(): SharedAddBooksSource {
|
||||
return this
|
||||
}
|
||||
|
||||
private fun LibraryFilters.toSharedLibraryFilters(): SharedLibraryFilters {
|
||||
return SharedLibraryFilters(
|
||||
fileTypes = fileTypes.mapTo(mutableSetOf()) { it.toSharedFileType() },
|
||||
sourceFolders = sourceFolders,
|
||||
readStatus = readStatus.toSharedReadStatusFilter(),
|
||||
tagIds = tagIds
|
||||
)
|
||||
fun SharedAddBooksSource.toAndroidAddBooksSource(): AddBooksSource {
|
||||
return this
|
||||
}
|
||||
|
||||
private fun SyncedFolder.toSharedSyncedFolder(): SharedSyncedFolder {
|
||||
return SharedSyncedFolder(
|
||||
uriString = uriString,
|
||||
name = name,
|
||||
lastScanTime = lastScanTime,
|
||||
allowedFileTypes = allowedFileTypes.mapTo(mutableSetOf()) { it.toSharedFileType() }
|
||||
)
|
||||
fun SortOrder.toSharedSortOrder(): SharedSortOrder {
|
||||
return this
|
||||
}
|
||||
|
||||
private fun BannerMessage.toSharedBannerMessage(): SharedBannerMessage {
|
||||
return SharedBannerMessage(
|
||||
message = message,
|
||||
isError = isError,
|
||||
isPersistent = isPersistent
|
||||
)
|
||||
fun SharedSortOrder.toAndroidSortOrder(): SortOrder {
|
||||
return this
|
||||
}
|
||||
|
||||
private fun AppThemeMode.toSharedAppThemeMode(): SharedAppThemeMode {
|
||||
return SharedAppThemeMode.valueOf(name)
|
||||
fun ReadStatusFilter.toSharedReadStatusFilter(): SharedReadStatusFilter {
|
||||
return this
|
||||
}
|
||||
|
||||
private fun AppContrastOption.toSharedAppContrastOption(): SharedAppContrastOption {
|
||||
return SharedAppContrastOption.valueOf(name)
|
||||
fun SharedReadStatusFilter.toAndroidReadStatusFilter(): ReadStatusFilter {
|
||||
return this
|
||||
}
|
||||
|
||||
private fun CustomAppTheme.toSharedCustomAppTheme(): SharedCustomAppTheme {
|
||||
return SharedCustomAppTheme(
|
||||
id = id,
|
||||
name = name,
|
||||
seedColor = seedColor
|
||||
)
|
||||
fun LibraryFilters.toSharedLibraryFilters(): SharedLibraryFilters {
|
||||
return this
|
||||
}
|
||||
|
||||
fun SharedLibraryFilters.toAndroidLibraryFilters(): LibraryFilters {
|
||||
return this
|
||||
}
|
||||
|
||||
fun SyncedFolder.toSharedSyncedFolder(): SharedSyncedFolder {
|
||||
return this
|
||||
}
|
||||
|
||||
fun SharedSyncedFolder.toAndroidSyncedFolder(): SyncedFolder {
|
||||
return this
|
||||
}
|
||||
|
||||
private fun SharedShelfType.toAndroidShelfType(): ShelfType {
|
||||
return ShelfType.valueOf(name)
|
||||
}
|
||||
|
||||
fun BannerMessage.toSharedBannerMessage(): SharedBannerMessage {
|
||||
return this
|
||||
}
|
||||
|
||||
fun AppThemeMode.toSharedAppThemeMode(): SharedAppThemeMode {
|
||||
return this
|
||||
}
|
||||
|
||||
fun SharedAppThemeMode.toAndroidAppThemeMode(): AppThemeMode {
|
||||
return this
|
||||
}
|
||||
|
||||
fun AppContrastOption.toSharedAppContrastOption(): SharedAppContrastOption {
|
||||
return this
|
||||
}
|
||||
|
||||
fun SharedAppContrastOption.toAndroidAppContrastOption(): AppContrastOption {
|
||||
return this
|
||||
}
|
||||
|
||||
fun CustomAppTheme.toSharedCustomAppTheme(): SharedCustomAppTheme {
|
||||
return this
|
||||
}
|
||||
|
||||
fun SharedCustomAppTheme.toAndroidCustomAppTheme(): CustomAppTheme {
|
||||
return this
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue