birdulon
/
pdf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor hidden page tracking

This commit is contained in:
Luke Hubmayer-Werner 2024-09-01 02:37:51 +09:30
parent b67da818c2
commit 033629bb11
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/com/lhw/pdf/MainActivity.kt
View File

@ -58,17 +58,9 @@ class MainActivity : AppCompatActivity() {
} }
private val displayListener = object: DisplayListener { private val displayListener = object: DisplayListener {
override fun onDisplayAdded(p0: Int) { override fun onDisplayAdded(p0: Int) { reevaluateDisplay(p0) }
reevaluateDisplay(p0) override fun onDisplayChanged(p0: Int) { reevaluateDisplay(p0) }
} override fun onDisplayRemoved(p0: Int) { reevaluateDisplay(p0) }
override fun onDisplayChanged(p0: Int) {
reevaluateDisplay(p0)
}
override fun onDisplayRemoved(p0: Int) {
reevaluateDisplay(p0)
}
} }
private fun reevaluateDisplay(p0: Int) { private fun reevaluateDisplay(p0: Int) {
@ -102,13 +94,13 @@ class MainActivity : AppCompatActivity() {
updateBitmaps(maxWidth, maxHeight) updateBitmaps(maxWidth, maxHeight)
val key = Pair(maxWidth, maxHeight) val key = Pair(maxWidth, maxHeight)
val bitmapPages = pdfDocument.bitmapPages[key] val bitmapPages = pdfDocument.bitmapPages[key]
val bitmaps = pageGroups.withIndex() val bitmaps = viewModel.enabledPageIds.value?.mapNotNull { bitmapPages?.get(it) }?.toList() ?: listOf()
.mapNotNull { (i, group) -> if (group in hiddenPageGroups) null else bitmapPages?.get(i) }
.toList()
p.updateImages(bitmaps) p.updateImages(bitmaps)
} }
private fun updatePresentations(reRender: Boolean = true) { private fun updatePresentations(reRender: Boolean = true) {
viewModel.enabledPageIds.value = pageGroups.mapIndexedNotNull { i, group -> if (group !in hiddenPageGroups) i else null }.toList()
if (reRender) pdfDocument.invalidateCache() if (reRender) pdfDocument.invalidateCache()
presentations.values.forEach(::updatePresentationImages) presentations.values.forEach(::updatePresentationImages)
} }

1
app/src/main/java/com/lhw/pdf/ui/gallery/GalleryViewModel.kt
View File

@ -8,6 +8,7 @@ class GalleryViewModel : ViewModel() {
val pageThumbnails = MutableLiveData<List<Bitmap>>().apply { value = listOf() } val pageThumbnails = MutableLiveData<List<Bitmap>>().apply { value = listOf() }
val hiddenPageGroups = MutableLiveData<Set<Int>>().apply { value = setOf() } val hiddenPageGroups = MutableLiveData<Set<Int>>().apply { value = setOf() }
val pageGroups = MutableLiveData<List<Int>>().apply { value = listOf() } val pageGroups = MutableLiveData<List<Int>>().apply { value = listOf() }
val enabledPageIds = MutableLiveData<List<Int>>().apply { value = listOf() }
val thumbnailScrollProgress = MutableLiveData<Float>().apply { value = 0F } val thumbnailScrollProgress = MutableLiveData<Float>().apply { value = 0F }
val textDisplays = MutableLiveData<String>().apply { value = "" } val textDisplays = MutableLiveData<String>().apply { value = "" }
val pagesPerLandscape = MutableLiveData<Float>().apply { value = 3F } val pagesPerLandscape = MutableLiveData<Float>().apply { value = 3F }