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

Handle the back button on AboutScreen and LibrariesScreen

Browse Source
This commit is contained in:
Pierre-Yves Nicolas
2025-07-16 17:07:01 +02:00
parent ca5bb70961
commit 77995d45fc
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,6 +14,7 @@
*/ */
package org.mydomain.myscan.view package org.mydomain.myscan.view
import androidx.activity.compose.BackHandler
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
@@ -60,6 +61,7 @@ import org.mydomain.myscan.ui.theme.MyScanTheme
fun AboutScreen(onBack: () -> Unit, onViewLibraries: () -> Unit) { fun AboutScreen(onBack: () -> Unit, onViewLibraries: () -> Unit) {
val showLicenseDialog = rememberSaveable { mutableStateOf(false) } val showLicenseDialog = rememberSaveable { mutableStateOf(false) }
val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true) val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
BackHandler { onBack() }
Scaffold( Scaffold(
topBar = { topBar = {
TopAppBar( TopAppBar(

4
app/src/main/java/org/mydomain/myscan/view/DocumentScreen.kt
View File

@@ -87,9 +87,7 @@ fun DocumentScreen(
navigation.toCameraScreen() navigation.toCameraScreen()
return return
} }
BackHandler { BackHandler { navigation.back() }
navigation.back()
}
MyScaffold( MyScaffold(
toAboutScreen = navigation.toAboutScreen, toAboutScreen = navigation.toAboutScreen,

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

@@ -14,6 +14,7 @@
*/ */
package org.mydomain.myscan.view package org.mydomain.myscan.view
import androidx.activity.compose.BackHandler
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExperimentalMaterial3Api
@@ -34,6 +35,7 @@ import org.mydomain.myscan.R
@OptIn(ExperimentalMaterial3Api::class) @OptIn(ExperimentalMaterial3Api::class)
@Composable @Composable
fun LibrariesScreen(onBack: () -> Unit) { fun LibrariesScreen(onBack: () -> Unit) {
BackHandler { onBack() }
Scaffold( Scaffold(
topBar = { topBar = {
TopAppBar( TopAppBar(