From 12d646e8a9d7286bede26d6dfdfd89cb2b409c3a Mon Sep 17 00:00:00 2001
From: David Kaspar <david.kaspar@gmail.com>
Date: Wed, 18 Dec 2024 15:02:38 +0100
Subject: [PATCH] Move QR code next to button

---
 .../ui/screen/loggedIn/AccountBackupDialog.kt | 61 ++++++++++++-------
 1 file changed, 38 insertions(+), 23 deletions(-)

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountBackupDialog.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountBackupDialog.kt
index 88e725b3e..e266ea882 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountBackupDialog.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountBackupDialog.kt
@@ -192,30 +192,14 @@ private fun DialogContents(
 
                 Spacer(modifier = Modifier.height(20.dp))
 
-                NSecCopyButton(accountViewModel)
+                Row {
+                    Column {
+                        NSecCopyButton(accountViewModel)
+                    }
 
-                // store the dialog open or close state
-                var dialogOpen by remember { mutableStateOf(false) }
-                IconButton(
-                    onClick = {
-                        dialogOpen = true
-                        nav.closeDrawer()
-                    },
-                ) {
-                    Icon(
-                        painter = painterResource(R.drawable.ic_qrcode),
-                        contentDescription = stringRes(id = R.string.show_npub_as_a_qr_code),
-                        modifier = Modifier.size(24.dp),
-                        tint = MaterialTheme.colorScheme.primary,
-                    )
-                }
-
-                if (dialogOpen) {
-                    ShowKeyQRDialog(
-                        accountViewModel.account.settings.keyPair.privKey
-                            ?.toNsec(),
-                        onClose = { dialogOpen = false },
-                    )
+                    Column {
+                        QrCodeButton(nav, accountViewModel)
+                    }
                 }
 
                 Spacer(modifier = Modifier.height(30.dp))
@@ -321,6 +305,37 @@ private fun DialogContents(
     }
 }
 
+@Composable
+private fun QrCodeButton(
+    nav: INav,
+    accountViewModel: AccountViewModel,
+) {
+    // store the dialog open or close state
+    var dialogOpen by remember { mutableStateOf(false) }
+
+    IconButton(
+        onClick = {
+            dialogOpen = true
+            nav.closeDrawer()
+        },
+    ) {
+        Icon(
+            painter = painterResource(R.drawable.ic_qrcode),
+            contentDescription = stringRes(id = R.string.show_npub_as_a_qr_code),
+            modifier = Modifier.size(24.dp),
+            tint = MaterialTheme.colorScheme.primary,
+        )
+    }
+
+    if (dialogOpen) {
+        ShowKeyQRDialog(
+            accountViewModel.account.settings.keyPair.privKey
+                ?.toNsec(),
+            onClose = { dialogOpen = false },
+        )
+    }
+}
+
 @Composable
 private fun NSecCopyButton(accountViewModel: AccountViewModel) {
     val clipboardManager = LocalClipboardManager.current