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
110 lines
2.8 KiB
Swift
110 lines
2.8 KiB
Swift
//
|
|
// AppCoordinator+ModalRoute.swift
|
|
// Passepartout
|
|
//
|
|
// Created by Davide De Rosa on 11/29/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 Foundation
|
|
import PassepartoutKit
|
|
|
|
extension AppCoordinator {
|
|
enum ModalRoute: Identifiable {
|
|
case about
|
|
|
|
case editProfile(UUID?)
|
|
|
|
case editProviderEntity(Profile, Bool, Module, SerializedProvider)
|
|
|
|
case interactiveLogin
|
|
|
|
case migrateProfiles
|
|
|
|
case preferences
|
|
|
|
var id: Int {
|
|
switch self {
|
|
case .about: return 1
|
|
case .editProfile: return 2
|
|
case .editProviderEntity: return 3
|
|
case .interactiveLogin: return 4
|
|
case .migrateProfiles: return 5
|
|
case .preferences: return 6
|
|
}
|
|
}
|
|
|
|
func options() -> ThemeModalOptions {
|
|
var options = ThemeModalOptions()
|
|
options.size = size
|
|
options.isFixedWidth = isFixedWidth
|
|
options.isFixedHeight = isFixedHeight
|
|
options.isInteractive = isInteractive
|
|
return options
|
|
}
|
|
}
|
|
}
|
|
|
|
extension AppCoordinator.ModalRoute: Equatable {
|
|
static func == (lhs: Self, rhs: Self) -> Bool {
|
|
lhs.id == rhs.id
|
|
}
|
|
}
|
|
|
|
private extension AppCoordinator.ModalRoute {
|
|
var size: ThemeModalSize {
|
|
switch self {
|
|
case .interactiveLogin:
|
|
return .custom(width: 500, height: 200)
|
|
case .migrateProfiles:
|
|
return .custom(width: 700, height: 400)
|
|
default:
|
|
return .large
|
|
}
|
|
}
|
|
|
|
var isFixedWidth: Bool {
|
|
switch self {
|
|
case .migrateProfiles:
|
|
return true
|
|
default:
|
|
return false
|
|
}
|
|
}
|
|
|
|
var isFixedHeight: Bool {
|
|
switch self {
|
|
case .migrateProfiles:
|
|
return true
|
|
default:
|
|
return false
|
|
}
|
|
}
|
|
|
|
var isInteractive: Bool {
|
|
switch self {
|
|
case .editProfile:
|
|
return false
|
|
default:
|
|
return true
|
|
}
|
|
}
|
|
}
|