mirror of
https://github.com/passepartoutvpn/passepartout-apple.git
synced 2024-12-25 02:42:40 +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
224 lines
5.7 KiB
Swift
224 lines
5.7 KiB
Swift
//
|
|
// ProfileRowView.swift
|
|
// Passepartout
|
|
//
|
|
// Created by Davide De Rosa on 9/5/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 ProfileRowView: View, Routable, SizeClassProviding {
|
|
|
|
@EnvironmentObject
|
|
private var theme: Theme
|
|
|
|
@Environment(\.horizontalSizeClass)
|
|
var hsClass
|
|
|
|
@Environment(\.verticalSizeClass)
|
|
var vsClass
|
|
|
|
let style: ProfileCardView.Style
|
|
|
|
@ObservedObject
|
|
var profileManager: ProfileManager
|
|
|
|
let tunnel: ExtendedTunnel
|
|
|
|
let preview: ProfilePreview
|
|
|
|
let errorHandler: ErrorHandler
|
|
|
|
@Binding
|
|
var nextProfileId: Profile.ID?
|
|
|
|
let withMarker: Bool
|
|
|
|
var flow: ProfileFlow?
|
|
|
|
var body: some View {
|
|
VStack(spacing: .zero) {
|
|
Spacer(minLength: .zero)
|
|
HStack {
|
|
Group {
|
|
if withMarker {
|
|
markerView
|
|
}
|
|
cardView
|
|
}
|
|
Spacer()
|
|
HStack(spacing: 8) {
|
|
attributesView
|
|
infoButton
|
|
}
|
|
}
|
|
Spacer(minLength: .zero)
|
|
}
|
|
}
|
|
}
|
|
|
|
private extension ProfileRowView {
|
|
var profile: Profile? {
|
|
profileManager.profile(withId: preview.id)
|
|
}
|
|
|
|
var attributes: [ProfileAttributesView.Attribute] {
|
|
if isTV {
|
|
return [.tv]
|
|
} else if isShared {
|
|
return [.shared]
|
|
}
|
|
return []
|
|
}
|
|
|
|
var requiredFeatures: Set<AppFeature>? {
|
|
profileManager.requiredFeatures(forProfileWithId: preview.id)
|
|
}
|
|
|
|
var isShared: Bool {
|
|
profileManager.isRemotelyShared(profileWithId: preview.id)
|
|
}
|
|
|
|
var isTV: Bool {
|
|
isShared && profileManager.isAvailableForTV(profileWithId: preview.id)
|
|
}
|
|
}
|
|
|
|
// MARK: - Subviews (observing)
|
|
|
|
private struct MarkerView: View {
|
|
let profileId: Profile.ID
|
|
|
|
let nextProfileId: Profile.ID?
|
|
|
|
@ObservedObject
|
|
var tunnel: ExtendedTunnel
|
|
|
|
let requiredFeatures: Set<AppFeature>?
|
|
|
|
var body: some View {
|
|
ZStack {
|
|
ThemeImage(profileId == nextProfileId ? .pending : tunnel.statusImageName)
|
|
.opaque(requiredFeatures == nil && (profileId == nextProfileId || profileId == tunnel.currentProfile?.id))
|
|
|
|
if let requiredFeatures {
|
|
PurchaseRequiredButton(features: requiredFeatures, paywallReason: .constant(nil))
|
|
}
|
|
}
|
|
.frame(width: 24)
|
|
}
|
|
}
|
|
|
|
private extension ProfileRowView {
|
|
var markerView: some View {
|
|
MarkerView(
|
|
profileId: preview.id,
|
|
nextProfileId: nextProfileId,
|
|
tunnel: tunnel,
|
|
requiredFeatures: requiredFeatures
|
|
)
|
|
}
|
|
|
|
var cardView: some View {
|
|
TunnelToggleButton(
|
|
tunnel: tunnel,
|
|
profile: profile,
|
|
nextProfileId: $nextProfileId,
|
|
errorHandler: errorHandler,
|
|
flow: flow?.connectionFlow,
|
|
label: { _ in
|
|
ProfileCardView(
|
|
style: style,
|
|
preview: preview
|
|
)
|
|
.frame(maxWidth: .infinity)
|
|
.contentShape(.rect)
|
|
}
|
|
)
|
|
.foregroundStyle(.primary)
|
|
.uiAccessibility(.App.profileToggle)
|
|
}
|
|
|
|
var attributesView: some View {
|
|
ProfileAttributesView(
|
|
attributes: attributes,
|
|
isRemoteImportingEnabled: profileManager.isRemoteImportingEnabled
|
|
)
|
|
.imageScale(isBigDevice ? .large : .medium)
|
|
}
|
|
|
|
var infoButton: some View {
|
|
Menu {
|
|
ProfileContextMenu(
|
|
style: preview.id == tunnel.currentProfile?.id ? .installedProfile : .infoButton,
|
|
profileManager: profileManager,
|
|
tunnel: tunnel,
|
|
preview: preview,
|
|
errorHandler: errorHandler,
|
|
flow: flow
|
|
)
|
|
} label: {
|
|
ThemeImage(.moreDetails)
|
|
.imageScale(.large)
|
|
}
|
|
// XXX: #584, necessary to avoid cell selection
|
|
#if os(iOS)
|
|
.menuStyle(.borderlessButton)
|
|
#else
|
|
.foregroundStyle(.secondary)
|
|
.buttonStyle(.plain)
|
|
#endif
|
|
.uiAccessibility(.App.profileMenu)
|
|
}
|
|
}
|
|
|
|
// MARK: - Previews
|
|
|
|
#Preview {
|
|
let profile: Profile = .forPreviews
|
|
let profileManager: ProfileManager = .forPreviews
|
|
|
|
return Form {
|
|
ProfileRowView(
|
|
style: .compact,
|
|
profileManager: profileManager,
|
|
tunnel: .forPreviews,
|
|
preview: .init(profile),
|
|
errorHandler: .default(),
|
|
nextProfileId: .constant(nil),
|
|
withMarker: true
|
|
)
|
|
}
|
|
.task {
|
|
do {
|
|
try await profileManager.observeRemote(true)
|
|
try await profileManager.save(profile, isLocal: true, remotelyShared: true)
|
|
} catch {
|
|
fatalError(error.localizedDescription)
|
|
}
|
|
}
|
|
.themeForm()
|
|
.withMockEnvironment()
|
|
}
|