mirror of
https://github.com/passepartoutvpn/passepartout-apple.git
synced 2024-12-24 02:21:00 +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
152 lines
4.1 KiB
Swift
152 lines
4.1 KiB
Swift
//
|
|
// ProfileListView.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
|
|
|
|
struct ProfileListView: View, Routable, TunnelInstallationProviding {
|
|
|
|
@Environment(\.horizontalSizeClass)
|
|
private var hsClass
|
|
|
|
@Environment(\.verticalSizeClass)
|
|
private var vsClass
|
|
|
|
@Environment(\.isSearching)
|
|
private var isSearching
|
|
|
|
@ObservedObject
|
|
var profileManager: ProfileManager
|
|
|
|
@ObservedObject
|
|
var tunnel: ExtendedTunnel
|
|
|
|
let errorHandler: ErrorHandler
|
|
|
|
var flow: ProfileFlow?
|
|
|
|
@State
|
|
private var nextProfileId: Profile.ID?
|
|
|
|
var body: some View {
|
|
debugChanges()
|
|
return ScrollViewReader { scrollProxy in
|
|
Form {
|
|
if !isSearching {
|
|
headerView(scrollProxy: scrollProxy)
|
|
.unanimated()
|
|
}
|
|
Group {
|
|
ForEach(allPreviews, content: profileView)
|
|
.onDelete { offsets in
|
|
Task {
|
|
await profileManager.removeProfiles(at: offsets)
|
|
}
|
|
}
|
|
}
|
|
.themeSection(header: Strings.Views.App.Folders.default)
|
|
}
|
|
.themeForm()
|
|
}
|
|
}
|
|
}
|
|
|
|
private extension ProfileListView {
|
|
var allPreviews: [ProfilePreview] {
|
|
profileManager.previews
|
|
}
|
|
|
|
func headerView(scrollProxy: ScrollViewProxy) -> some View {
|
|
InstalledProfileView(
|
|
layout: .list,
|
|
profileManager: profileManager,
|
|
profile: currentProfile,
|
|
tunnel: tunnel,
|
|
errorHandler: errorHandler,
|
|
nextProfileId: $nextProfileId,
|
|
flow: flow
|
|
)
|
|
.contextMenu {
|
|
currentProfile.map {
|
|
ProfileContextMenu(
|
|
style: .installedProfile,
|
|
profileManager: profileManager,
|
|
tunnel: tunnel,
|
|
preview: .init($0),
|
|
errorHandler: errorHandler,
|
|
flow: flow
|
|
)
|
|
}
|
|
}
|
|
}
|
|
|
|
func profileView(for preview: ProfilePreview) -> some View {
|
|
ProfileRowView(
|
|
style: cardStyle,
|
|
profileManager: profileManager,
|
|
tunnel: tunnel,
|
|
preview: preview,
|
|
errorHandler: errorHandler,
|
|
nextProfileId: $nextProfileId,
|
|
withMarker: true,
|
|
flow: flow
|
|
)
|
|
.contextMenu {
|
|
ProfileContextMenu(
|
|
style: .containerContext,
|
|
profileManager: profileManager,
|
|
tunnel: tunnel,
|
|
preview: preview,
|
|
errorHandler: errorHandler,
|
|
flow: flow
|
|
)
|
|
}
|
|
.id(preview.id)
|
|
}
|
|
}
|
|
|
|
private extension ProfileListView {
|
|
var cardStyle: ProfileCardView.Style {
|
|
if hsClass == .compact || vsClass == .compact {
|
|
return .compact
|
|
} else {
|
|
return .full
|
|
}
|
|
}
|
|
}
|
|
|
|
// MARK: - Previews
|
|
|
|
#Preview {
|
|
ProfileListView(
|
|
profileManager: .forPreviews,
|
|
tunnel: .forPreviews,
|
|
errorHandler: .default()
|
|
)
|
|
.withMockEnvironment()
|
|
}
|