From 77995d45fce0d294fc49bd7a1e4474157f5c3d77 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Nicolas <6371790+pynicolas@users.noreply.github.com>
Date: Wed, 16 Jul 2025 17:07:01 +0200
Subject: [PATCH] Handle the back button on AboutScreen and LibrariesScreen

---
 app/src/main/java/org/mydomain/myscan/view/AboutScreen.kt     | 2 ++
 app/src/main/java/org/mydomain/myscan/view/DocumentScreen.kt  | 4 +---
 app/src/main/java/org/mydomain/myscan/view/LibrariesScreen.kt | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/mydomain/myscan/view/AboutScreen.kt b/app/src/main/java/org/mydomain/myscan/view/AboutScreen.kt
index bbd052a..df78fa2 100644
--- a/app/src/main/java/org/mydomain/myscan/view/AboutScreen.kt
+++ b/app/src/main/java/org/mydomain/myscan/view/AboutScreen.kt
@@ -14,6 +14,7 @@
  */
 package org.mydomain.myscan.view
 
+import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -60,6 +61,7 @@ import org.mydomain.myscan.ui.theme.MyScanTheme
 fun AboutScreen(onBack: () -> Unit, onViewLibraries: () -> Unit) {
     val showLicenseDialog = rememberSaveable { mutableStateOf(false) }
     val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
+    BackHandler { onBack() }
     Scaffold(
         topBar = {
             TopAppBar(
diff --git a/app/src/main/java/org/mydomain/myscan/view/DocumentScreen.kt b/app/src/main/java/org/mydomain/myscan/view/DocumentScreen.kt
index 1ef2d3a..a7afecf 100644
--- a/app/src/main/java/org/mydomain/myscan/view/DocumentScreen.kt
+++ b/app/src/main/java/org/mydomain/myscan/view/DocumentScreen.kt
@@ -87,9 +87,7 @@ fun DocumentScreen(
         navigation.toCameraScreen()
         return
     }
-    BackHandler {
-        navigation.back()
-    }
+    BackHandler { navigation.back() }
 
     MyScaffold(
         toAboutScreen = navigation.toAboutScreen,
diff --git a/app/src/main/java/org/mydomain/myscan/view/LibrariesScreen.kt b/app/src/main/java/org/mydomain/myscan/view/LibrariesScreen.kt
index 6214f7e..699e6fc 100644
--- a/app/src/main/java/org/mydomain/myscan/view/LibrariesScreen.kt
+++ b/app/src/main/java/org/mydomain/myscan/view/LibrariesScreen.kt
@@ -14,6 +14,7 @@
  */
 package org.mydomain.myscan.view
 
+import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -34,6 +35,7 @@ import org.mydomain.myscan.R
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun LibrariesScreen(onBack: () -> Unit) {
+    BackHandler { onBack() }
     Scaffold(
         topBar = {
             TopAppBar(