cyy/Fairscan_cyy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DocumentScreen: reset zoom after rotation so that all areas are reachable (#152)

Browse Source
This commit is contained in:
Pierre-Yves Nicolas
2026-04-10 16:20:45 +02:00
parent 479680a83d
commit 3e085eca5c
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/fairscan/app/MainViewModel.kt
View File

@@ -85,7 +85,7 @@ class MainViewModel(val imageRepository: ImageRepository, launchMode: LaunchMode
page?.let { page?.let {
val isLoading = (it.id == loadingId) val isLoading = (it.id == loadingId)
val bitmap = imageRepository.jpegBytes(it.key())?.toBitmap() val bitmap = imageRepository.jpegBytes(it.key())?.toBitmap()
CurrentPageUiState(it.id, bitmap, it.colorMode, isLoading) CurrentPageUiState(it.key(), bitmap, it.colorMode, isLoading)
} }
} }
.flowOn(Dispatchers.IO) .flowOn(Dispatchers.IO)

11
app/src/main/java/org/fairscan/app/ui/screens/document/DocumentScreen.kt
View File

@@ -73,6 +73,8 @@ import kotlinx.collections.immutable.toImmutableList
import net.engawapg.lib.zoomable.ZoomState import net.engawapg.lib.zoomable.ZoomState
import net.engawapg.lib.zoomable.zoomable import net.engawapg.lib.zoomable.zoomable
import org.fairscan.app.R import org.fairscan.app.R
import org.fairscan.app.domain.PageViewKey
import org.fairscan.app.domain.Rotation
import org.fairscan.app.ui.Navigation import org.fairscan.app.ui.Navigation
import org.fairscan.app.ui.components.CommonPageListState import org.fairscan.app.ui.components.CommonPageListState
import org.fairscan.app.ui.components.ConfirmationDialog import org.fairscan.app.ui.components.ConfirmationDialog
@@ -160,10 +162,10 @@ private fun DocumentPreview(
modifier = Modifier.fillMaxSize() modifier = Modifier.fillMaxSize()
) { ) {
val bitmap = uiState.currentPage?.bitmap val bitmap = uiState.currentPage?.bitmap
val pageId = uiState.currentPage?.id val pageKey = uiState.currentPage?.key
if (bitmap != null && pageId != null) { if (bitmap != null && pageKey != null) {
val imageBitmap = bitmap.asImageBitmap() val imageBitmap = bitmap.asImageBitmap()
val zoomState = remember(pageId) { val zoomState = remember(pageKey) {
ZoomState( ZoomState(
contentSize = Size(bitmap.width.toFloat(), bitmap.height.toFloat()) contentSize = Size(bitmap.width.toFloat(), bitmap.height.toFloat())
) )
@@ -344,8 +346,9 @@ fun DocumentScreenPreview() {
listOf(1, 2).map { "gallica.bnf.fr-bpt6k5530456s-$it" }.toImmutableList(), listOf(1, 2).map { "gallica.bnf.fr-bpt6k5530456s-$it" }.toImmutableList(),
LocalContext.current LocalContext.current
) )
val key = PageViewKey("123", Rotation.R0, null)
DocumentScreen( DocumentScreen(
uiState = DocumentUiState(1, CurrentPageUiState("123",image, COLOR), document), uiState = DocumentUiState(1, CurrentPageUiState(key,image, COLOR), document),
navigation = dummyNavigation(), navigation = dummyNavigation(),
onExportClick = {}, onExportClick = {},
onDeleteImage = { }, onDeleteImage = { },

3
app/src/main/java/org/fairscan/app/ui/screens/document/DocumentUiState.kt
View File

@@ -15,6 +15,7 @@
package org.fairscan.app.ui.screens.document package org.fairscan.app.ui.screens.document
import android.graphics.Bitmap import android.graphics.Bitmap
import org.fairscan.app.domain.PageViewKey
import org.fairscan.app.ui.state.DocumentUiModel import org.fairscan.app.ui.state.DocumentUiModel
import org.fairscan.imageprocessing.ColorMode import org.fairscan.imageprocessing.ColorMode
@@ -25,7 +26,7 @@ data class DocumentUiState(
) )
data class CurrentPageUiState( data class CurrentPageUiState(
val id: String, val key: PageViewKey,
val bitmap: Bitmap?, val bitmap: Bitmap?,
val colorMode: ColorMode?, val colorMode: ColorMode?,
val isLoading: Boolean = false, val isLoading: Boolean = false,