mirror of
https://github.com/passepartoutvpn/passepartout-apple.git
synced 2024-12-26 19:32:41 +00:00
0a1886fe31
Let the AppCoordinator take care of the connection requirements via modals: - onInteractiveLogin() - now presented on AppError - onProviderEntityRequired() - onPurchaseRequired() - Any other connection error Subviews must not use tunnel.connect(), rather they route connection requests via the ConnectionFlow callbacks. In particular, migrate to the AppCoordinator the connection logic from: - TunnelToggleButton.perform() - ProviderEntitySelector.onSelect() onInteractiveLogin() and onPurchaseRequired() are now handled internally, while onProviderEntityRequired() is kept public because it's how subviews may present the entity selector. Extras: - Avoid modals overlap with a 500ms delay - Shrink interactive login size on macOS
160 lines
4.2 KiB
Swift
160 lines
4.2 KiB
Swift
//
|
|
// ProfileContextMenu.swift
|
|
// Passepartout
|
|
//
|
|
// Created by Davide De Rosa on 9/3/24.
|
|
// Copyright (c) 2024 Davide De Rosa. All rights reserved.
|
|
//
|
|
// https://github.com/passepartoutvpn
|
|
//
|
|
// This file is part of Passepartout.
|
|
//
|
|
// Passepartout is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// Passepartout is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
|
|
//
|
|
|
|
import CommonLibrary
|
|
import CommonUtils
|
|
import PassepartoutKit
|
|
import SwiftUI
|
|
import UITesting
|
|
|
|
struct ProfileContextMenu: View, Routable {
|
|
enum Style {
|
|
case installedProfile
|
|
|
|
case containerContext
|
|
|
|
case infoButton
|
|
}
|
|
|
|
let style: Style
|
|
|
|
let profileManager: ProfileManager
|
|
|
|
let tunnel: ExtendedTunnel
|
|
|
|
let preview: ProfilePreview
|
|
|
|
let errorHandler: ErrorHandler
|
|
|
|
var flow: ProfileFlow?
|
|
|
|
var body: some View {
|
|
tunnelToggleButton
|
|
if style == .installedProfile {
|
|
tunnelRestartButton
|
|
}
|
|
providerConnectToButton
|
|
Divider()
|
|
profileEditButton
|
|
if style == .containerContext {
|
|
profileDuplicateButton
|
|
profileRemoveButton
|
|
}
|
|
}
|
|
}
|
|
|
|
@MainActor
|
|
private extension ProfileContextMenu {
|
|
var profile: Profile? {
|
|
profileManager.profile(withId: preview.id)
|
|
}
|
|
|
|
var tunnelToggleButton: some View {
|
|
TunnelToggleButton(
|
|
tunnel: tunnel,
|
|
profile: profile,
|
|
nextProfileId: .constant(nil),
|
|
errorHandler: errorHandler,
|
|
flow: flow?.connectionFlow,
|
|
label: {
|
|
ThemeImageLabel(
|
|
$0 ? Strings.Global.Actions.enable : Strings.Global.Actions.disable,
|
|
$0 ? .tunnelEnable : .tunnelDisable
|
|
)
|
|
}
|
|
)
|
|
}
|
|
|
|
var providerConnectToButton: some View {
|
|
profile.map {
|
|
ProviderConnectToButton(
|
|
profile: $0,
|
|
onTap: {
|
|
flow?.connectionFlow?.onProviderEntityRequired($0)
|
|
},
|
|
label: {
|
|
ThemeImageLabel(Strings.Views.App.ProfileContext.connectTo.withTrailingDots, .profileProvider)
|
|
}
|
|
)
|
|
.uiAccessibility(.App.ProfileMenu.connectTo)
|
|
}
|
|
}
|
|
|
|
var tunnelRestartButton: some View {
|
|
TunnelRestartButton(
|
|
tunnel: tunnel,
|
|
profile: profile,
|
|
errorHandler: errorHandler,
|
|
flow: flow?.connectionFlow,
|
|
label: {
|
|
ThemeImageLabel(Strings.Global.Actions.restart, .tunnelRestart)
|
|
}
|
|
)
|
|
}
|
|
|
|
var profileEditButton: some View {
|
|
Button {
|
|
flow?.onEditProfile(preview)
|
|
} label: {
|
|
ThemeImageLabel(Strings.Global.Actions.edit, .profileEdit)
|
|
}
|
|
.uiAccessibility(.App.ProfileMenu.edit)
|
|
}
|
|
|
|
var profileDuplicateButton: some View {
|
|
ProfileDuplicateButton(
|
|
profileManager: profileManager,
|
|
preview: preview,
|
|
errorHandler: errorHandler
|
|
) {
|
|
ThemeImageLabel(Strings.Global.Actions.duplicate, .contextDuplicate)
|
|
}
|
|
}
|
|
|
|
var profileRemoveButton: some View {
|
|
ProfileRemoveButton(
|
|
profileManager: profileManager,
|
|
preview: preview
|
|
) {
|
|
ThemeImageLabel(Strings.Global.Actions.remove, .contextRemove)
|
|
}
|
|
}
|
|
}
|
|
|
|
#Preview {
|
|
List {
|
|
Menu("Menu") {
|
|
ProfileContextMenu(
|
|
style: .installedProfile,
|
|
profileManager: .forPreviews,
|
|
tunnel: .forPreviews,
|
|
preview: .init(.forPreviews),
|
|
errorHandler: .default()
|
|
)
|
|
}
|
|
}
|
|
.withMockEnvironment()
|
|
}
|