From 5167b2c491be79d51abdccdda25dcacfa6089c90 Mon Sep 17 00:00:00 2001
From: Patrick Honkonen <1883101+SaintPatrck@users.noreply.github.com>
Date: Wed, 24 Apr 2024 01:05:13 -0400
Subject: [PATCH] Flip name and key fields in manual entry screen (#46)

---
 .../manualcodeentry/ManualCodeEntryScreen.kt  | 31 +++++++++----------
 app/src/main/res/values/strings.xml           |  1 -
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/app/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/manualcodeentry/ManualCodeEntryScreen.kt b/app/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/manualcodeentry/ManualCodeEntryScreen.kt
index a3f59fe91c..d45afc742a 100644
--- a/app/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/manualcodeentry/ManualCodeEntryScreen.kt
+++ b/app/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/manualcodeentry/ManualCodeEntryScreen.kt
@@ -130,6 +130,21 @@ fun ManualCodeEntryScreen(
                 modifier = Modifier.padding(horizontal = 16.dp),
             )
 
+            Spacer(modifier = Modifier.height(8.dp))
+            BitwardenTextField(
+                label = stringResource(id = R.string.name),
+            value = state.accountName,
+            onValueChange = remember(viewModel) {
+                {
+                    viewModel.trySendAction(
+                        ManualCodeEntryAction.IssuerTextChange(it),
+                    )
+                }
+            },
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 16.dp),
+            )
             Spacer(modifier = Modifier.height(8.dp))
             BitwardenTextField(
                 singleLine = false,
@@ -147,22 +162,6 @@ fun ManualCodeEntryScreen(
                     .padding(horizontal = 16.dp),
             )
 
-            Spacer(modifier = Modifier.height(8.dp))
-            BitwardenTextField(
-                label = stringResource(id = R.string.account_name),
-                value = state.accountName,
-                onValueChange = remember(viewModel) {
-                    {
-                        viewModel.trySendAction(
-                            ManualCodeEntryAction.IssuerTextChange(it),
-                        )
-                    }
-                },
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(horizontal = 16.dp),
-            )
-
             Spacer(modifier = Modifier.height(16.dp))
             BitwardenFilledTonalButton(
                 label = stringResource(id = R.string.add_totp),
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 83a9784473..0ce1d31c20 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -32,7 +32,6 @@
     <string name="you_dont_have_items_to_display">You don\'t have any items to display.</string>
     <string name="empty_item_list_instruction">Add a new code, sync an existing account, or import codes to secure your accounts.</string>
     <string name="add_code">Add code</string>
-    <string name="account_name">Account Name</string>
     <string name="authenticator_key_read_error">Cannot read authenticator key.</string>
     <string name="authenticator_key_added">Authenticator key added.</string>
     <string name="item_added">Item added</string>