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

Refactoring: store showDetectionError in CameraUiState

Browse Source
This commit is contained in:
Pierre-Yves Nicolas
2025-07-02 06:16:48 +02:00
parent 5a98f9f5e6
commit 1463ef9355
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/org/mydomain/myscan/view/CameraScreen.kt
View File

@@ -84,7 +84,8 @@ import org.mydomain.myscan.ui.theme.MyScanTheme
data class CameraUiState( data class CameraUiState(
val pageCount: Int, val pageCount: Int,
val liveAnalysisState: LiveAnalysisState, val liveAnalysisState: LiveAnalysisState,
val captureState: CaptureState val captureState: CaptureState,
val showDetectionError: Boolean,
) )
const val CAPTURED_IMAGE_DISPLAY_DURATION = 1500L const val CAPTURED_IMAGE_DISPLAY_DURATION = 1500L
@@ -114,12 +115,12 @@ fun CameraScreen(
} }
} }
val showDetectionError = remember { mutableStateOf(false) } var showDetectionError by remember { mutableStateOf(false) }
LaunchedEffect(captureState) { LaunchedEffect(captureState) {
if (captureState is CaptureState.CaptureError) { if (captureState is CaptureState.CaptureError) {
showDetectionError.value = true showDetectionError = true
delay(1000) delay(1000)
showDetectionError.value = false showDetectionError = false
viewModel.afterCaptureError() viewModel.afterCaptureError()
} }
} }
@@ -148,7 +149,7 @@ fun CameraScreen(
{ offset -> thumbnailCoords.value = offset } { offset -> thumbnailCoords.value = offset }
) )
}, },
cameraUiState = CameraUiState(pageIds.size, liveAnalysisState, captureState), cameraUiState = CameraUiState(pageIds.size, liveAnalysisState, captureState, showDetectionError),
onCapture = { onCapture = {
previewView?.bitmap?.let { previewView?.bitmap?.let {
Log.i("MyScan", "Pressed <Capture>") Log.i("MyScan", "Pressed <Capture>")
@@ -160,7 +161,6 @@ fun CameraScreen(
}, },
onFinalizePressed = onFinalizePressed, onFinalizePressed = onFinalizePressed,
thumbnailCoords = thumbnailCoords, thumbnailCoords = thumbnailCoords,
showDetectionError = showDetectionError.value
) )
} }
@@ -172,7 +172,6 @@ private fun CameraScreenScaffold(
onCapture: () -> Unit, onCapture: () -> Unit,
onFinalizePressed: () -> Unit, onFinalizePressed: () -> Unit,
thumbnailCoords: MutableState<Offset>, thumbnailCoords: MutableState<Offset>,
showDetectionError: Boolean,
) { ) {
Box { Box {
Scaffold( Scaffold(
@@ -189,7 +188,7 @@ private fun CameraScreenScaffold(
.padding(bottom = innerPadding.calculateBottomPadding()) .padding(bottom = innerPadding.calculateBottomPadding())
.fillMaxSize() .fillMaxSize()
) { ) {
CameraPreviewWithOverlay(cameraPreview, cameraUiState, showDetectionError) CameraPreviewWithOverlay(cameraPreview, cameraUiState)
MessageBox(cameraUiState.liveAnalysisState.inferenceTime) MessageBox(cameraUiState.liveAnalysisState.inferenceTime)
CaptureButton( CaptureButton(
onClick = onCapture, onClick = onCapture,
@@ -290,7 +289,6 @@ fun CaptureButton(onClick: () -> Unit, modifier: Modifier) {
private fun CameraPreviewWithOverlay( private fun CameraPreviewWithOverlay(
cameraPreview: @Composable () -> Unit, cameraPreview: @Composable () -> Unit,
cameraUiState: CameraUiState, cameraUiState: CameraUiState,
showDetectionError: Boolean
) { ) {
val captureState = cameraUiState.captureState val captureState = cameraUiState.captureState
val width = LocalConfiguration.current.screenWidthDp val width = LocalConfiguration.current.screenWidthDp
@@ -326,7 +324,7 @@ private fun CameraPreviewWithOverlay(
.background(Color.Black.copy(alpha = 0.6f)) .background(Color.Black.copy(alpha = 0.6f))
) )
} }
if (showDetectionError) { if (cameraUiState.showDetectionError) {
Box( Box(
modifier = Modifier modifier = Modifier
.align(Alignment.Center) .align(Alignment.Center)
@@ -434,11 +432,10 @@ private fun ScreenPreview(captureState: CaptureState) {
listState = LazyListState(), listState = LazyListState(),
) )
}, },
cameraUiState = CameraUiState(pageCount = 4, LiveAnalysisState(), captureState), cameraUiState = CameraUiState(pageCount = 4, LiveAnalysisState(), captureState, false),
onCapture = {}, onCapture = {},
onFinalizePressed = {}, onFinalizePressed = {},
thumbnailCoords = thumbnailCoords, thumbnailCoords = thumbnailCoords,
showDetectionError = false,
) )
} }
} }