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

Move Document screen out of default scan process

Browse Source
This commit is contained in:
Pierre-Yves Nicolas
2026-01-31 07:23:36 +01:00
parent 6fa3fe68fb
commit 37d4ded7f8
4 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/src/main/java/org/fairscan/app/MainActivity.kt
View File

@@ -131,6 +131,20 @@ class MainActivity : ComponentActivity() {
FairScanTheme {
val navigation = navigation(viewModel, launchMode)
val onExportClick = if (launchMode == LaunchMode.EXTERNAL_SCAN_TO_PDF) {
{
lifecycleScope.launch {
val result = exportViewModel.generatePdfForExternalCall()
sendActivityResult(result)
viewModel.startNewDocument()
finish()
}
Unit
}
} else {
navigation.toExportScreen
}
when (val screen = currentScreen) {
is Screen.Main.Home -> {
val recentDocs by homeViewModel.recentDocuments.collectAsStateWithLifecycle()
@@ -150,7 +164,7 @@ class MainActivity : ComponentActivity() {
navigation,
liveAnalysisState,
onImageAnalyzed = { image -> cameraViewModel.liveAnalysis(image) },
onFinalizePressed = navigation.toDocumentScreen,
onFinalizePressed = onExportClick,
cameraPermission = cameraPermission
)
}
@@ -159,19 +173,7 @@ class MainActivity : ComponentActivity() {
document = document,
initialPage = screen.initialPage,
navigation = navigation,
onExportClick = if (launchMode == LaunchMode.EXTERNAL_SCAN_TO_PDF) {
{
lifecycleScope.launch {
val result = exportViewModel.generatePdfForExternalCall()
sendActivityResult(result)
viewModel.startNewDocument()
finish()
}
Unit
}
} else {
navigation.toExportScreen
},
onExportClick = onExportClick,
onDeleteImage = { id -> viewModel.deletePage(id) },
onRotateImage = { id, clockwise -> viewModel.rotateImage(id, clockwise) },
onPageReorder = { id, newIndex -> viewModel.movePage(id, newIndex) },

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

@@ -73,7 +73,7 @@ data class NavigationState private constructor(val stack: List<Screen>, val root
is Screen.Main.Home -> this // Back handled by system
is Screen.Main.Camera -> copy(stack = listOf(Screen.Main.Home))
is Screen.Main.Document -> copy(stack = listOf(Screen.Main.Camera))
is Screen.Main.Export -> copy(stack = listOf(Screen.Main.Document()))
is Screen.Main.Export -> copy(stack = listOf(Screen.Main.Camera))
is Screen.Overlay -> copy(stack = stack.dropLast(1))
}
}

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

@@ -32,7 +32,7 @@ import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.RotateLeft
import androidx.compose.material.icons.automirrored.filled.RotateRight
import androidx.compose.material.icons.filled.Add
import androidx.compose.material.icons.filled.Description
import androidx.compose.material.icons.filled.Done
import androidx.compose.material.icons.outlined.Delete
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.MaterialTheme
@@ -227,7 +227,7 @@ private fun BottomBar(
) {
MainActionButton(
onClick = onExportClick,
icon = Icons.Default.Description,
icon = Icons.Default.Done,
text = stringResource(R.string.export),
)
}