From 1bc78da999b087b39870fde8806a95b7ce8b8cf9 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Nicolas <6371790+pynicolas@users.noreply.github.com>
Date: Wed, 16 Jul 2025 13:59:45 +0200
Subject: [PATCH] DocumentScreen: fix position of "Add" button

---
 .../java/org/mydomain/myscan/view/Scaffold.kt | 32 ++++++++++++-------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/org/mydomain/myscan/view/Scaffold.kt b/app/src/main/java/org/mydomain/myscan/view/Scaffold.kt
index e79b754..daf4390 100644
--- a/app/src/main/java/org/mydomain/myscan/view/Scaffold.kt
+++ b/app/src/main/java/org/mydomain/myscan/view/Scaffold.kt
@@ -64,12 +64,16 @@ fun MyScaffold(
         if (onBack != null) {
             BackButton(
                 onBack,
-                modifier = Modifier.align(Alignment.TopStart).windowInsetsPadding(WindowInsets.safeDrawing)
+                modifier = Modifier
+                    .align(Alignment.TopStart)
+                    .windowInsetsPadding(WindowInsets.safeDrawing)
             )
         }
         AboutScreenNavButton(
             onClick = toAboutScreen,
-            modifier = Modifier.align(Alignment.TopEnd).windowInsetsPadding(WindowInsets.safeDrawing)
+            modifier = Modifier
+                .align(Alignment.TopEnd)
+                .windowInsetsPadding(WindowInsets.safeDrawing)
         )
     }
 }
@@ -81,21 +85,27 @@ fun DocumentBar(
     modifier: Modifier = Modifier,
     pageListButton: (@Composable () -> Unit)? = null,
 ) {
+    val isLandscape = isLandscape(LocalConfiguration.current)
     Column (
         horizontalAlignment = Alignment.CenterHorizontally,
         modifier = modifier.background(MaterialTheme.colorScheme.surfaceContainer)
     ) {
-        var modifier: Modifier = Modifier
-        if (isLandscape(LocalConfiguration.current)) {
-            modifier = modifier.weight(1f).fillMaxWidth()
-        }
-        Box (modifier) {
+        Box (
+            if (isLandscape)
+                Modifier
+                    .weight(1f)
+                    .fillMaxWidth()
+            else
+                Modifier
+        ) {
             CommonPageList(pageListState, modifier = Modifier.fillMaxWidth())
 
             if (pageListButton != null) {
-                Box (Modifier
-                    .align(Alignment.BottomEnd)
-                    .padding(horizontal = 8.dp, vertical = 16.dp)
+                val alignment = if (isLandscape) Alignment.BottomEnd else Alignment.CenterEnd
+                Box(
+                    Modifier
+                        .align(alignment)
+                        .padding(horizontal = 8.dp, vertical = 16.dp)
                 ) {
                     pageListButton()
                 }
@@ -105,7 +115,7 @@ fun DocumentBar(
         BottomAppBar(
             containerColor = MaterialTheme.colorScheme.surfaceContainerHigh,
         ) {
-            if (isLandscape(LocalConfiguration.current)) {
+            if (isLandscape) {
                 Column(
                     horizontalAlignment = Alignment.CenterHorizontally,
                     modifier = Modifier.fillMaxWidth()