From d025384f3983ea3aa9b24ef2ee34512744adf3c0 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Nicolas <6371790+pynicolas@users.noreply.github.com> Date: Wed, 25 Jun 2025 18:49:59 +0200 Subject: [PATCH] Remove useless code --- .../java/org/mydomain/myscan/MainActivity.kt | 46 +++++++++---------- .../java/org/mydomain/myscan/MainViewModel.kt | 2 - 2 files changed, 22 insertions(+), 26 deletions(-) diff --git a/app/src/main/java/org/mydomain/myscan/MainActivity.kt b/app/src/main/java/org/mydomain/myscan/MainActivity.kt index f04f0cb..4f5dbd0 100644 --- a/app/src/main/java/org/mydomain/myscan/MainActivity.kt +++ b/app/src/main/java/org/mydomain/myscan/MainActivity.kt @@ -51,30 +51,28 @@ class MainActivity : ComponentActivity() { val pageIds by viewModel.pageIds.collectAsStateWithLifecycle() val context = LocalContext.current MyScanTheme { - Column { - when (val screen = currentScreen) { - is Screen.Camera -> { - CameraScreen( - viewModel, - liveAnalysisState, - onImageAnalyzed = { image -> viewModel.liveAnalysis(image) }, - onFinalizePressed = { viewModel.navigateTo(Screen.FinalizeDocument()) }, - ) - } - is Screen.FinalizeDocument -> { - DocumentScreen ( - pageIds, - initialPage = screen.initialPage, - imageLoader = { id -> viewModel.getBitmap(id) }, - toCameraScreen = { viewModel.navigateTo(Screen.Camera) }, - onSavePressed = savePdf(viewModel, context), - onSharePressed = sharePdf(viewModel, context), - onStartNew = { - viewModel.startNewDocument() - viewModel.navigateTo(Screen.Camera) }, - onDeleteImage = { id -> viewModel.deletePage(id) } - ) - } + when (val screen = currentScreen) { + is Screen.Camera -> { + CameraScreen( + viewModel, + liveAnalysisState, + onImageAnalyzed = { image -> viewModel.liveAnalysis(image) }, + onFinalizePressed = { viewModel.navigateTo(Screen.FinalizeDocument()) }, + ) + } + is Screen.FinalizeDocument -> { + DocumentScreen ( + pageIds, + initialPage = screen.initialPage, + imageLoader = { id -> viewModel.getBitmap(id) }, + toCameraScreen = { viewModel.navigateTo(Screen.Camera) }, + onSavePressed = savePdf(viewModel, context), + onSharePressed = sharePdf(viewModel, context), + onStartNew = { + viewModel.startNewDocument() + viewModel.navigateTo(Screen.Camera) }, + onDeleteImage = { id -> viewModel.deletePage(id) } + ) } } } diff --git a/app/src/main/java/org/mydomain/myscan/MainViewModel.kt b/app/src/main/java/org/mydomain/myscan/MainViewModel.kt index 8ea3db1..4e1eca1 100644 --- a/app/src/main/java/org/mydomain/myscan/MainViewModel.kt +++ b/app/src/main/java/org/mydomain/myscan/MainViewModel.kt @@ -170,8 +170,6 @@ class MainViewModel( } } - fun pageCount(): Int = pageIds.value.size - fun getBitmap(id: String): Bitmap? { val bytes = imageRepository.getContent(id) return bytes?.let { BitmapFactory.decodeByteArray(it, 0, it.size) }