[PM-10010] Move close/cancel buttons to upper-left (#758)

Author: KatherineInCode

BitwardenShared/UI/Auth/Login/TwoFactorAuth/TwoFactorAuthView.swift

@@ -42,13 +42,15 @@ struct TwoFactorAuthView: View {
                 await store.perform(.listenForNFC)
             }
             .toolbar {
-                ToolbarItemGroup(placement: .navigationBarTrailing) {
-                    authMethodsMenu
-
+                ToolbarItem(placement: .navigationBarLeading) {
                     cancelToolbarButton {
                         store.send(.dismiss)
                     }
                 }
+
+                ToolbarItem(placement: .navigationBarTrailing) {
+                    authMethodsMenu
+                }
             }
     }
 

BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_authApp.1.png

@@ -81,7 +81,7 @@ struct SetMasterPasswordView: View {
         .navigationTitle(Localizations.setMasterPassword)
         .navigationBarTitleDisplayMode(.inline)
         .toolbar {
-            ToolbarItem(placement: .topBarTrailing) {
+            ToolbarItem(placement: .topBarLeading) {
                 if !store.state.isPrivilegeElevation {
                     cancelToolbarButton {
                         Task {

BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_authApp.2.png

@@ -125,7 +125,7 @@ extension View {
     /// - Returns: A `ToolbarItem` with a dismiss button.
     ///
     func cancelToolbarItem(_ action: @escaping () -> Void) -> some ToolbarContent {
-        ToolbarItem(placement: .topBarTrailing) {
+        ToolbarItem(placement: .topBarLeading) {
             cancelToolbarButton(action: action)
         }
     }

BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_authApp.3.png

@@ -48,19 +48,21 @@ struct GeneratorView: View {
             send: GeneratorAction.toastShown
         ))
         .toolbar {
-            ToolbarItemGroup(placement: .topBarTrailing) {
-                optionsToolbarMenu {
-                    Button(Localizations.passwordHistory) {
-                        store.send(.showPasswordHistory)
-                    }
-                }
-
+            ToolbarItem(placement: .topBarLeading) {
                 if store.state.presentationMode.isDismissButtonVisible {
                     cancelToolbarButton {
                         store.send(.dismissPressed)
                     }
                 }
             }
+
+            ToolbarItem(placement: .topBarTrailing) {
+                optionsToolbarMenu {
+                    Button(Localizations.passwordHistory) {
+                        store.send(.showPasswordHistory)
+                    }
+                }
+            }
         }
     }
 

BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_authApp_dark.1.png

@@ -28,7 +28,13 @@ struct PasswordHistoryListView: View {
             send: PasswordHistoryListAction.toastShown
         ))
         .toolbar {
-            ToolbarItemGroup(placement: .navigationBarTrailing) {
+            ToolbarItem(placement: .navigationBarLeading) {
+                closeToolbarButton {
+                    store.send(.dismiss)
+                }
+            }
+
+            ToolbarItem(placement: .navigationBarTrailing) {
                 if store.state.source == .generator {
                     optionsToolbarMenu {
                         AsyncButton(Localizations.clear) {
@@ -37,10 +43,6 @@ struct PasswordHistoryListView: View {
                         .accessibilityIdentifier("ClearPasswordList")
                     }
                 }
-
-                closeToolbarButton {
-                    store.send(.dismiss)
-                }
             }
         }
         .task { await store.perform(.appeared) }

BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_authApp_largeText.1.png

@@ -57,7 +57,11 @@ struct AddEditSendItemView: View { // swiftlint:disable:this type_body_length
             titleDisplayMode: .inline
         )
         .toolbar {
-            ToolbarItem(placement: .topBarLeading) {
+            ToolbarItemGroup(placement: .topBarLeading) {
+                cancelToolbarButton {
+                    store.send(.dismissPressed)
+                }
+
                 switch store.state.mode {
                 case .add,
                      .edit:
@@ -105,10 +109,6 @@ struct AddEditSendItemView: View { // swiftlint:disable:this type_body_length
                      .shareExtension:
                     EmptyView()
                 }
-
-                cancelToolbarButton {
-                    store.send(.dismissPressed)
-                }
             }
         }
         .toast(store.binding(
@@ -636,4 +636,29 @@ struct AddEditSendItemView: View { // swiftlint:disable:this type_body_length
         )
     }
 }
+
+#Preview("Text - Share") {
+    NavigationView {
+        AddEditSendItemView(
+            store: Store(
+                processor: StateProcessor(
+                    state: AddEditSendItemState(
+                        currentAccessCount: 42,
+                        customDeletionDate: Date(),
+                        customExpirationDate: nil,
+                        deletionDate: .custom,
+                        expirationDate: .custom,
+                        isHideTextByDefaultOn: true,
+                        isOptionsExpanded: true,
+                        mode: .shareExtension(.singleAccount),
+                        name: "Sendy",
+                        text: "Example text",
+                        type: .text
+                    )
+                )
+            )
+        )
+    }
+}
+
 #endif // swiftlint:disable:this file_length

BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_authApp_light.1.png

@@ -294,4 +294,13 @@ class AddEditSendItemViewTests: BitwardenTestCase {
         processor.state.isDeactivateThisSendOn = true
         assertSnapshot(of: subject, as: .tallPortrait)
     }
+
+    func test_snapshot_text_extension_withValues() {
+        processor.state.mode = .shareExtension(.singleAccount)
+        processor.state.type = .text
+        processor.state.name = "Name"
+        processor.state.text = "Text"
+        processor.state.isHideTextByDefaultOn = true
+        assertSnapshot(of: subject.navStackWrapped, as: .defaultPortrait)
+    }
 }

BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_email.1.png

@@ -29,6 +29,10 @@ struct VaultAutofillListView: View {
             prompt: Localizations.search
         )
         .toolbar {
+            cancelToolbarItem {
+                store.send(.cancelTapped)
+            }
+
             ToolbarItem(placement: .navigationBarLeading) {
                 ProfileSwitcherToolbarView(
                     store: store.child(
@@ -42,10 +46,6 @@ struct VaultAutofillListView: View {
             addToolbarItem(hidden: store.state.isAutofillingFido2List) {
                 store.send(.addTapped(fromToolbar: true))
             }
-
-            cancelToolbarItem {
-                store.send(.cancelTapped)
-            }
         }
     }
 

BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_email.2.png

@@ -32,6 +32,10 @@ struct VaultItemSelectionView: View {
             prompt: Localizations.search
         )
         .toolbar {
+            cancelToolbarItem {
+                store.send(.cancelTapped)
+            }
+
             ToolbarItem(placement: .navigationBarLeading) {
                 ProfileSwitcherToolbarView(
                     store: store.child(
@@ -45,10 +49,6 @@ struct VaultItemSelectionView: View {
             addToolbarItem {
                 store.send(.addTapped)
             }
-
-            cancelToolbarItem {
-                store.send(.cancelTapped)
-            }
         }
     }
 

BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_email.3.png

@@ -105,7 +105,13 @@ struct AddEditItemView: View {
         content
             .navigationTitle(Localizations.editItem)
             .toolbar {
-                ToolbarItemGroup(placement: .navigationBarTrailing) {
+                ToolbarItem(placement: .navigationBarLeading) {
+                    cancelToolbarButton {
+                        store.send(.dismissPressed)
+                    }
+                }
+
+                ToolbarItem(placement: .navigationBarTrailing) {
                     VaultItemManagementMenuView(
                         isCloneEnabled: false,
                         isCollectionsEnabled: store.state.cipher.organizationId != nil,
@@ -116,10 +122,6 @@ struct AddEditItemView: View {
                             mapEffect: { _ in .deletePressed }
                         )
                     )
-
-                    cancelToolbarButton {
-                        store.send(.dismissPressed)
-                    }
                 }
             }
     }

BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_email_filled.1.png

@@ -19,16 +19,16 @@ struct EditCollectionsView: View {
             .scrollView()
             .task { await store.perform(.fetchCipherOptions) }
             .toolbar {
-                ToolbarItem(placement: .topBarLeading) {
+                cancelToolbarItem {
+                    store.send(.dismissPressed)
+                }
+
+                ToolbarItem(placement: .topBarTrailing) {
                     toolbarButton(Localizations.save) {
                         await store.perform(.save)
                     }
                     .accessibilityIdentifier("SaveButton")
                 }
-
-                cancelToolbarItem {
-                    store.send(.dismissPressed)
-                }
             }
     }
 

BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_email_filled.2.png

@@ -19,16 +19,16 @@ struct MoveToOrganizationView: View {
             .scrollView()
             .task { await store.perform(.fetchCipherOptions) }
             .toolbar {
-                ToolbarItem(placement: .topBarLeading) {
+                cancelToolbarItem {
+                    store.send(.dismissPressed)
+                }
+
+                ToolbarItem(placement: .topBarTrailing) {
                     toolbarButton(Localizations.move) {
                         await store.perform(.moveCipher)
                     }
                     .accessibilityIdentifier("MoveButton")
                 }
-
-                cancelToolbarItem {
-                    store.send(.dismissPressed)
-                }
             }
     }
 

BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_email_filled.3.png

@@ -46,7 +46,26 @@ struct ViewItemView: View {
             send: ViewItemAction.toastShown
         ))
         .toolbar {
+            ToolbarItem(placement: .navigationBarLeading) {
+                closeToolbarButton {
+                    store.send(.dismissPressed)
+                }
+            }
+
             ToolbarItemGroup(placement: .navigationBarTrailing) {
+                if let state = store.state.loadingState.data {
+                    if state.isSoftDeleted {
+                        toolbarButton(Localizations.restore) {
+                            await store.perform(.restorePressed)
+                        }
+                        .accessibilityIdentifier("RestoreButton")
+                    } else {
+                        editToolbarButton {
+                            store.send(.editPressed)
+                        }
+                    }
+                }
+
                 VaultItemManagementMenuView(
                     isCloneEnabled: store.state.canClone,
                     isCollectionsEnabled: isCollectionsEnabled,
@@ -57,10 +76,6 @@ struct ViewItemView: View {
                         mapEffect: { _ in .deletePressed }
                     )
                 )
-
-                closeToolbarButton {
-                    store.send(.dismissPressed)
-                }
             }
         }
         .task {
@@ -93,20 +108,6 @@ struct ViewItemView: View {
             }
             .padding(16)
         }
-        .toolbar {
-            ToolbarItem(placement: .navigationBarLeading) {
-                if state.isSoftDeleted {
-                    toolbarButton(Localizations.restore) {
-                        await store.perform(.restorePressed)
-                    }
-                    .accessibilityIdentifier("RestoreButton")
-                } else {
-                    editToolbarButton {
-                        store.send(.editPressed)
-                    }
-                }
-            }
-        }
     }
 }