From 496abc6c89fa173c54feea21bf3af99671f46413 Mon Sep 17 00:00:00 2001 From: Davide De Rosa Date: Wed, 27 Apr 2022 16:49:23 +0200 Subject: [PATCH] Move Siri on top of menu --- .../App/Views/ProfileView+MainMenu.swift | 39 ++++++++++--------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/Passepartout/App/Views/ProfileView+MainMenu.swift b/Passepartout/App/Views/ProfileView+MainMenu.swift index d4a8a073..0e5eeda7 100644 --- a/Passepartout/App/Views/ProfileView+MainMenu.swift +++ b/Passepartout/App/Views/ProfileView+MainMenu.swift @@ -67,6 +67,10 @@ extension ProfileView { var body: some View { Menu { + ShortcutsButton( + modalType: $modalType + ) + Divider() RenameButton( modalType: $modalType ) @@ -74,9 +78,6 @@ extension ProfileView { // DuplicateButton( // header: currentProfile.value.header // ) - ShortcutsButton( - modalType: $modalType - ) uninstallVPNButton Divider() deleteProfileButton @@ -134,22 +135,6 @@ extension ProfileView { } } - struct RenameButton: View { - @Binding private var modalType: ModalType? - - init(modalType: Binding) { - _modalType = modalType - } - - var body: some View { - Button { - modalType = .rename - } label: { - Label(L10n.Global.Strings.rename, systemImage: themeRenameProfileImage) - } - } - } - struct ShortcutsButton: View { @ObservedObject private var productManager: ProductManager @@ -183,6 +168,22 @@ extension ProfileView { } } + struct RenameButton: View { + @Binding private var modalType: ModalType? + + init(modalType: Binding) { + _modalType = modalType + } + + var body: some View { + Button { + modalType = .rename + } label: { + Label(L10n.Global.Strings.rename, systemImage: themeRenameProfileImage) + } + } + } + struct DuplicateButton: View { @ObservedObject private var profileManager: ProfileManager