v1.0.47 (#279)
* Add performance and stylus debugging logs * Refactor and decouple UI models from `MainViewModel` * Refactor library state management and projection logic * Implement desktop shell using Compose Multiplatform * Implement desktop shell using Compose Multiplatform * Implement desktop shell using Compose Multiplatform * Introduce ReaderEngine and enhance EPUB reader features in windows app * Move core paginated reader logic to a Kotlin Multiplatform `shared` module and introduce experimental desktop support. * Implement PDF rendering and text extraction for desktop using Pdfium * Add `NonReaderScreens.kt` and UI dependencies * Refactor and centralize library state management and models to improve cross-platform consistency * Implement JSON persistence for desktop library and enhance library management features including shelf CRUD, tagging, and metadata editing * Implement PDF annotation system and enhanced zoom controls for the desktop viewer * Implement WebView-based EPUB rendering for desktop using CEF and embedded resources * Optimize UI state projection, navigation state handling, and main screen pager performance * Implement Bring Your Own Key (BYOK) support for AI features in OSS version * Support Gemini-based Cloud TTS with BYOK support for OSS builds * Refactor table cell image sizing in `PaginatedReader` and improve `MobiParser` native library loading and error handling. * crash fixes * Enhance navigation stability with lifecycle-aware safety checks and update `navigation-compose` to 2.9.6 * Implement dynamic bottom padding for the page info bar to account for device rounded corners * Implement bidirectional jump history navigation and replace the jump-back pill with a dedicated `PdfJumpHistoryBar` * Optimize PDF tiling performance and refine pan-and-fling gesture handling * Implement customizable toolbars with drag-and-drop reordering and placement for PDF and EPUB readers * Updated UI for customize toolbar * Refine drag-and-drop reordering and section assignment for PDF and EPUB reader controls * restructure PDF viewer UI component hierarchy to fix verifier crash * Implement separate text dimming factors for light and dark themes * Synchronize Pdfium access and improve resource lifecycle safety across Kotlin and native layers * Enhance image alignment in paginated and EPUB readers through anchor detection and style-based positioning * Centralize file type resolution logic and implement HTML sanitization during import * Introduce vertical margin customization and configurable progress bar positioning * texture support in epub reader * Enhance TTS session management, progress tracking, and diagnostic logging * Optimize library state projection and folder synchronization performance by refactoring collection lookups and refining metadata extraction logic. * Refine TTS page mapping for PDF and overhaul TTS control UI * Implement natural session completion logic in `TtsPlaybackManager` for cloud tts * Replace Snackbar with `CustomTopBanner` for notifications in `PdfViewerScreen` * Refine TTS playback continuity across PDF pages and improve state management for session transitions * Implement global texture transparency and enhance textured theme support across PDF and EPUB readers. * Update reader themes and improve texture rendering in page animations, EPUB UI, and immersive mode * Add Support Project screen * Optimize library performance via projection caching, batch database updates, and scoped folder synchronization. * Enhance folder synchronization with fallback query mechanisms and refactor annotation sidecar importing logic * Bump version to 1.0.47 (51)
This commit is contained in:
Aryan
GitHub
parent
f42de6b462
commit
d7a9cae9e1
126 changed files with 15287 additions and 3154 deletions
|
|
@ -28,6 +28,7 @@ import me.zhanghai.android.libarchive.ArchiveException
|
|||
import okhttp3.Request
|
||||
import timber.log.Timber
|
||||
import java.util.UUID
|
||||
import java.util.concurrent.atomic.AtomicBoolean
|
||||
import java.util.zip.ZipFile
|
||||
import androidx.core.graphics.createBitmap
|
||||
|
||||
|
|
@ -88,42 +89,97 @@ object DocumentFactory {
|
|||
ArchiveDocumentWrapper(cacheFile)
|
||||
} else {
|
||||
val pfd = context.contentResolver.openFileDescriptor(uri, "r") ?: throw Exception("Failed to open PDF")
|
||||
PdfDocumentWrapper(pdfiumCore.newDocument(pfd, password))
|
||||
PdfDocumentWrapper(PdfiumEngineProvider.withPdfium { pdfiumCore.newDocument(pfd, password) })
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ================= PDF IMPLEMENTATION =================
|
||||
|
||||
private inline fun closePdfiumResource(tag: String, closeBlock: () -> Unit) {
|
||||
try {
|
||||
closeBlock()
|
||||
} catch (e: IllegalStateException) {
|
||||
if (e.message == "Already closed") {
|
||||
Timber.tag(tag).d(e, "Ignoring duplicate Pdfium close")
|
||||
} else {
|
||||
throw e
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class PdfDocumentWrapper(val pdfDocument: PdfDocumentKt) : ReaderDocument {
|
||||
override suspend fun getPageCount() = pdfDocument.getPageCount()
|
||||
private val isClosed = AtomicBoolean(false)
|
||||
|
||||
override suspend fun getPageCount() = PdfiumEngineProvider.withPdfium {
|
||||
pdfDocument.getPageCount()
|
||||
}
|
||||
|
||||
override suspend fun openPage(pageIndex: Int): ReaderPage? {
|
||||
val page = pdfDocument.openPage(pageIndex) ?: return null
|
||||
if (isClosed.get()) return null
|
||||
val page = PdfiumEngineProvider.withPdfium {
|
||||
if (isClosed.get()) null else pdfDocument.openPage(pageIndex)
|
||||
} ?: return null
|
||||
return PdfPageWrapper(page)
|
||||
}
|
||||
override suspend fun getTableOfContents() = pdfDocument.getFixedTableOfContents()
|
||||
override fun close() { pdfDocument.close() }
|
||||
|
||||
override suspend fun getTableOfContents() = PdfiumEngineProvider.withPdfium {
|
||||
pdfDocument.getFixedTableOfContents()
|
||||
}
|
||||
|
||||
override fun close() {
|
||||
if (!isClosed.compareAndSet(false, true)) return
|
||||
PdfiumEngineProvider.withPdfiumBlocking {
|
||||
closePdfiumResource("PdfDocumentWrapper") { pdfDocument.close() }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class PdfPageWrapper(val pdfPage: PdfPageKt) : ReaderPage {
|
||||
override suspend fun getPageWidthPoint() = pdfPage.getPageWidthPoint()
|
||||
override suspend fun getPageHeightPoint() = pdfPage.getPageHeightPoint()
|
||||
override suspend fun getPageRotation() = pdfPage.getPageRotation()
|
||||
private val isClosed = AtomicBoolean(false)
|
||||
|
||||
override suspend fun getPageWidthPoint() = PdfiumEngineProvider.withPdfium {
|
||||
if (isClosed.get()) 0 else pdfPage.getPageWidthPoint()
|
||||
}
|
||||
|
||||
override suspend fun getPageHeightPoint() = PdfiumEngineProvider.withPdfium {
|
||||
if (isClosed.get()) 0 else pdfPage.getPageHeightPoint()
|
||||
}
|
||||
|
||||
override suspend fun getPageRotation() = PdfiumEngineProvider.withPdfium {
|
||||
if (isClosed.get()) 0 else pdfPage.getPageRotation()
|
||||
}
|
||||
|
||||
override suspend fun renderPageBitmap(bitmap: Bitmap, startX: Int, startY: Int, drawSizeX: Int, drawSizeY: Int, renderAnnot: Boolean) {
|
||||
pdfPage.renderPageBitmap(bitmap, startX, startY, drawSizeX, drawSizeY, renderAnnot)
|
||||
PdfiumEngineProvider.withPdfium {
|
||||
if (!isClosed.get()) {
|
||||
pdfPage.renderPageBitmap(bitmap, startX, startY, drawSizeX, drawSizeY, renderAnnot)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun mapRectToDevice(startX: Int, startY: Int, sizeX: Int, sizeY: Int, rotate: Int, coords: RectF) =
|
||||
pdfPage.mapRectToDevice(startX, startY, sizeX, sizeY, rotate, coords)
|
||||
PdfiumEngineProvider.withPdfium {
|
||||
if (isClosed.get()) Rect() else pdfPage.mapRectToDevice(startX, startY, sizeX, sizeY, rotate, coords)
|
||||
}
|
||||
|
||||
override suspend fun mapDeviceCoordsToPage(startX: Int, startY: Int, sizeX: Int, sizeY: Int, rotate: Int, deviceX: Int, deviceY: Int) =
|
||||
pdfPage.mapDeviceCoordsToPage(startX, startY, sizeX, sizeY, rotate, deviceX, deviceY)
|
||||
PdfiumEngineProvider.withPdfium {
|
||||
if (isClosed.get()) PointF() else pdfPage.mapDeviceCoordsToPage(startX, startY, sizeX, sizeY, rotate, deviceX, deviceY)
|
||||
}
|
||||
|
||||
override suspend fun openTextPage(): ReaderTextPage = PdfTextPageWrapper(pdfPage.openTextPage())
|
||||
override suspend fun openTextPage(): ReaderTextPage = PdfiumEngineProvider.withPdfium {
|
||||
if (isClosed.get()) DummyTextPage() else PdfTextPageWrapper(pdfPage.openTextPage())
|
||||
}
|
||||
|
||||
override suspend fun getLinks(): List<ReaderLink> {
|
||||
return pdfPage.getPageLinks().map { ReaderLink(it.uri, it.destPageIdx, it.bounds) }
|
||||
return PdfiumEngineProvider.withPdfium {
|
||||
if (isClosed.get()) {
|
||||
emptyList()
|
||||
} else {
|
||||
pdfPage.getPageLinks().map { ReaderLink(it.uri, it.destPageIdx, it.bounds) }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override fun getNativePointer(): Long {
|
||||
|
|
@ -159,29 +215,80 @@ class PdfPageWrapper(val pdfPage: PdfPageKt) : ReaderPage {
|
|||
return 0L
|
||||
}
|
||||
|
||||
override fun close() { pdfPage.close() }
|
||||
override fun close() {
|
||||
if (!isClosed.compareAndSet(false, true)) return
|
||||
PdfiumEngineProvider.withPdfiumBlocking {
|
||||
closePdfiumResource("PdfPageWrapper") { pdfPage.close() }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class PdfTextPageWrapper(private val textPage: PdfTextPageKt) : ReaderTextPage {
|
||||
override suspend fun textPageCountChars() = textPage.textPageCountChars()
|
||||
override suspend fun textPageGetText(startIndex: Int, count: Int) = textPage.textPageGetText(startIndex, count)
|
||||
override suspend fun textPageGetRectsForRanges(ranges: IntArray) = textPage.textPageGetRectsForRanges(ranges)?.map { ReaderTextRect(it.rect) }
|
||||
override suspend fun textPageGetCharIndexAtPos(x: Double, y: Double, xTolerance: Double, yTolerance: Double) = textPage.textPageGetCharIndexAtPos(x, y, xTolerance, yTolerance)
|
||||
override suspend fun textPageGetCharBox(index: Int) = textPage.textPageGetCharBox(index)
|
||||
override suspend fun textPageGetUnicode(index: Int): Int {
|
||||
return textPage.textPageGetUnicode(index).code
|
||||
private val isClosed = AtomicBoolean(false)
|
||||
|
||||
override suspend fun textPageCountChars() = PdfiumEngineProvider.withPdfium {
|
||||
if (isClosed.get()) 0 else textPage.textPageCountChars()
|
||||
}
|
||||
override suspend fun loadWebLink(): ReaderWebLinks? {
|
||||
val links = textPage.loadWebLink() ?: return null
|
||||
return object : ReaderWebLinks {
|
||||
override suspend fun countWebLinks() = links.countWebLinks()
|
||||
override suspend fun getURL(linkIndex: Int, maxLength: Int) = links.getURL(linkIndex, maxLength)
|
||||
override suspend fun countRects(linkIndex: Int) = links.countRects(linkIndex)
|
||||
override suspend fun getRect(linkIndex: Int, rectIndex: Int) = links.getRect(linkIndex, rectIndex)
|
||||
override fun close() { links.close() }
|
||||
|
||||
override suspend fun textPageGetText(startIndex: Int, count: Int) = PdfiumEngineProvider.withPdfium {
|
||||
if (isClosed.get()) null else textPage.textPageGetText(startIndex, count)
|
||||
}
|
||||
|
||||
override suspend fun textPageGetRectsForRanges(ranges: IntArray) = PdfiumEngineProvider.withPdfium {
|
||||
if (isClosed.get()) null else textPage.textPageGetRectsForRanges(ranges)?.map { ReaderTextRect(it.rect) }
|
||||
}
|
||||
|
||||
override suspend fun textPageGetCharIndexAtPos(x: Double, y: Double, xTolerance: Double, yTolerance: Double) = PdfiumEngineProvider.withPdfium {
|
||||
if (isClosed.get()) -1 else textPage.textPageGetCharIndexAtPos(x, y, xTolerance, yTolerance)
|
||||
}
|
||||
|
||||
override suspend fun textPageGetCharBox(index: Int) = PdfiumEngineProvider.withPdfium {
|
||||
if (isClosed.get()) null else textPage.textPageGetCharBox(index)
|
||||
}
|
||||
|
||||
override suspend fun textPageGetUnicode(index: Int): Int {
|
||||
return PdfiumEngineProvider.withPdfium {
|
||||
if (isClosed.get()) 0 else textPage.textPageGetUnicode(index).code
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun loadWebLink(): ReaderWebLinks? {
|
||||
val links = PdfiumEngineProvider.withPdfium {
|
||||
if (isClosed.get()) null else textPage.loadWebLink()
|
||||
} ?: return null
|
||||
return object : ReaderWebLinks {
|
||||
private val isClosed = AtomicBoolean(false)
|
||||
|
||||
override suspend fun countWebLinks() = PdfiumEngineProvider.withPdfium {
|
||||
if (isClosed.get()) 0 else links.countWebLinks()
|
||||
}
|
||||
|
||||
override suspend fun getURL(linkIndex: Int, maxLength: Int) = PdfiumEngineProvider.withPdfium {
|
||||
if (isClosed.get()) null else links.getURL(linkIndex, maxLength)
|
||||
}
|
||||
|
||||
override suspend fun countRects(linkIndex: Int) = PdfiumEngineProvider.withPdfium {
|
||||
if (isClosed.get()) 0 else links.countRects(linkIndex)
|
||||
}
|
||||
|
||||
override suspend fun getRect(linkIndex: Int, rectIndex: Int) = PdfiumEngineProvider.withPdfium {
|
||||
if (isClosed.get()) RectF() else links.getRect(linkIndex, rectIndex)
|
||||
}
|
||||
|
||||
override fun close() {
|
||||
if (!isClosed.compareAndSet(false, true)) return
|
||||
PdfiumEngineProvider.withPdfiumBlocking {
|
||||
closePdfiumResource("PdfWebLinksWrapper") { links.close() }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
override fun close() {
|
||||
if (!isClosed.compareAndSet(false, true)) return
|
||||
PdfiumEngineProvider.withPdfiumBlocking {
|
||||
closePdfiumResource("PdfTextPageWrapper") { textPage.close() }
|
||||
}
|
||||
}
|
||||
override fun close() { textPage.close() }
|
||||
}
|
||||
|
||||
// ================= CBZ, CBR, CB7 IMPLEMENTATION =================
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue