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

Avoid displaying the back button when back should be handled by the system (#181)

Browse Source 
After removing the home screen, displaying the back button on the camera screen didn't make sense anymore.
See #179.
This commit is contained in:
Pierre-Yves Nicolas
2026-05-18 14:00:08 +02:00
committed by GitHub
parent 6a3ccb854e
commit d9844be4de
4 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -486,6 +486,10 @@ class MainActivity : ComponentActivity() {
setResult(RESULT_CANCELED) setResult(RESULT_CANCELED)
finish() finish()
} }
},
shouldDisplayBackButton = {
viewModel.currentScreen.value !is Screen.Main.Camera
|| launchMode == LaunchMode.EXTERNAL_SCAN_TO_PDF
} }
) )
} }

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

@@ -37,6 +37,7 @@ data class Navigation(
val toLibrariesScreen: () -> Unit, val toLibrariesScreen: () -> Unit,
val toSettingsScreen: (() -> Unit)?, val toSettingsScreen: (() -> Unit)?,
val back: () -> Unit, val back: () -> Unit,
val shouldDisplayBackButton: () -> Boolean,
) )
@ConsistentCopyVisibility @ConsistentCopyVisibility

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

@@ -25,7 +25,7 @@ import org.fairscan.app.ui.state.PageThumbnail
import org.fairscan.imageprocessing.ColorMode import org.fairscan.imageprocessing.ColorMode
fun dummyNavigation(): Navigation { fun dummyNavigation(): Navigation {
return Navigation({}, {}, {}, {}, {}, {}, {}, {}) return Navigation({}, {}, {}, {}, {}, {}, {}, {}, { -> true})
} }
fun fakeDocument(pageIds: ImmutableList<String>, context: Context): DocumentUiModel { fun fakeDocument(pageIds: ImmutableList<String>, context: Context): DocumentUiModel {

14
app/src/main/java/org/fairscan/app/ui/components/Scaffold.kt
View File

@@ -85,12 +85,14 @@ fun MyScaffold(
} }
} }
} }
BackButton( if (navigation.shouldDisplayBackButton()) {
navigation.back, BackButton(
modifier = Modifier navigation.back,
.align(Alignment.TopStart) modifier = Modifier
.windowInsetsPadding(WindowInsets.safeDrawing) .align(Alignment.TopStart)
) .windowInsetsPadding(WindowInsets.safeDrawing)
)
}
AppOverflowMenu( AppOverflowMenu(
navigation, navigation,
modifier = Modifier modifier = Modifier