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

Remove useless code

Browse Source
This commit is contained in:
Pierre-Yves Nicolas
2025-06-25 18:49:59 +02:00
parent 483165450b
commit d025384f39
2 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
app/src/main/java/org/mydomain/myscan/MainActivity.kt
View File

@@ -51,30 +51,28 @@ class MainActivity : ComponentActivity() {
val pageIds by viewModel.pageIds.collectAsStateWithLifecycle() val pageIds by viewModel.pageIds.collectAsStateWithLifecycle()
val context = LocalContext.current val context = LocalContext.current
MyScanTheme { MyScanTheme {
Column { when (val screen = currentScreen) {
when (val screen = currentScreen) { is Screen.Camera -> {
is Screen.Camera -> { CameraScreen(
CameraScreen( viewModel,
viewModel, liveAnalysisState,
liveAnalysisState, onImageAnalyzed = { image -> viewModel.liveAnalysis(image) },
onImageAnalyzed = { image -> viewModel.liveAnalysis(image) }, onFinalizePressed = { viewModel.navigateTo(Screen.FinalizeDocument()) },
onFinalizePressed = { viewModel.navigateTo(Screen.FinalizeDocument()) }, )
) }
} is Screen.FinalizeDocument -> {
is Screen.FinalizeDocument -> { DocumentScreen (
DocumentScreen ( pageIds,
pageIds, initialPage = screen.initialPage,
initialPage = screen.initialPage, imageLoader = { id -> viewModel.getBitmap(id) },
imageLoader = { id -> viewModel.getBitmap(id) }, toCameraScreen = { viewModel.navigateTo(Screen.Camera) },
toCameraScreen = { viewModel.navigateTo(Screen.Camera) }, onSavePressed = savePdf(viewModel, context),
onSavePressed = savePdf(viewModel, context), onSharePressed = sharePdf(viewModel, context),
onSharePressed = sharePdf(viewModel, context), onStartNew = {
onStartNew = { viewModel.startNewDocument()
viewModel.startNewDocument() viewModel.navigateTo(Screen.Camera) },
viewModel.navigateTo(Screen.Camera) }, onDeleteImage = { id -> viewModel.deletePage(id) }
onDeleteImage = { id -> viewModel.deletePage(id) } )
)
}
} }
} }
} }

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

@@ -170,8 +170,6 @@ class MainViewModel(
} }
} }
fun pageCount(): Int = pageIds.value.size
fun getBitmap(id: String): Bitmap? { fun getBitmap(id: String): Bitmap? {
val bytes = imageRepository.getContent(id) val bytes = imageRepository.getContent(id)
return bytes?.let { BitmapFactory.decodeByteArray(it, 0, it.size) } return bytes?.let { BitmapFactory.decodeByteArray(it, 0, it.size) }