From 20aca144faf2b858f8ea1b7cdf4d6b7952e1f750 Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Mon, 3 Apr 2023 14:01:00 -0400
Subject: [PATCH] Moves Login QR Button to a leading QR, not a trailing QR

---
 .../ui/screen/loggedOff/LoginScreen.kt        | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/LoginScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/LoginScreen.kt
index 132c997d0..844df8e4d 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/LoginScreen.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/LoginScreen.kt
@@ -134,22 +134,24 @@ fun LoginPage(
                                 }
                             )
                         }
-                        if (dialogOpen) {
-                            SimpleQrCodeScanner {
-                                dialogOpen = false
-                                if (!it.isNullOrEmpty()) {
-                                    key.value = TextFieldValue(it)
-                                }
+                    }
+                },
+                leadingIcon = {
+                    if (dialogOpen) {
+                        SimpleQrCodeScanner {
+                            dialogOpen = false
+                            if (!it.isNullOrEmpty()) {
+                                key.value = TextFieldValue(it)
                             }
                         }
-                        IconButton(onClick = { dialogOpen = true }) {
-                            Icon(
-                                painter = painterResource(R.drawable.ic_qrcode),
-                                null,
-                                modifier = Modifier.size(24.dp),
-                                tint = MaterialTheme.colors.primary
-                            )
-                        }
+                    }
+                    IconButton(onClick = { dialogOpen = true }) {
+                        Icon(
+                            painter = painterResource(R.drawable.ic_qrcode),
+                            null,
+                            modifier = Modifier.size(24.dp),
+                            tint = MaterialTheme.colors.primary
+                        )
                     }
                 },
                 visualTransformation = if (showPassword) VisualTransformation.None else PasswordVisualTransformation(),