mirror of
https://github.com/passepartoutvpn/passepartout-apple.git
synced 2024-12-24 18:32:36 +00:00
0047d095fb
- Mac
- Drop all styles
- Tweak hide title bar
- Hide navigation bar
- Restore single section for all profiles
- Allows using NavigationLink safely
- Indirectly fixes multitasking
- Retains selection on profile activation
- Clean up presentActiveProfile
- Leave active profile in its position
- Fixes Mac flashing row selection on profile activation
- Unify profile row appearance
- Use fixed .headline font
- Add subtitles to inactive profiles
- Use padding rather than fixed row height
CAVEATS:
- Do not preselect active profile on iPad launch, as doing so
seems to present two ProfileView on top of each other, one from
MainView and one from the NavigationLink.
- Do not touch .listStyle() of master view, as it seems to break
navigation esp. in iPad multitasking.
63 lines
2.2 KiB
Swift
63 lines
2.2 KiB
Swift
//
|
|
// PassepartoutApp.swift
|
|
// Passepartout
|
|
//
|
|
// Created by Davide De Rosa on 12/28/21.
|
|
// Copyright (c) 2022 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 SwiftUI
|
|
import PassepartoutCore
|
|
|
|
@main
|
|
struct PassepartoutApp: App {
|
|
@SceneBuilder var body: some Scene {
|
|
WindowGroup {
|
|
MainView()
|
|
.withoutTitleBar()
|
|
.onIntentActivity(IntentDispatcher.connectVPN)
|
|
.onIntentActivity(IntentDispatcher.disableVPN)
|
|
.onIntentActivity(IntentDispatcher.enableVPN)
|
|
.onIntentActivity(IntentDispatcher.moveToLocation)
|
|
.onIntentActivity(IntentDispatcher.trustCellularNetwork)
|
|
.onIntentActivity(IntentDispatcher.trustCurrentNetwork)
|
|
.onIntentActivity(IntentDispatcher.untrustCellularNetwork)
|
|
.onIntentActivity(IntentDispatcher.untrustCurrentNetwork)
|
|
}
|
|
}
|
|
}
|
|
|
|
extension View {
|
|
|
|
@MainActor
|
|
fileprivate func onIntentActivity(_ activity: IntentActivity<VPNManager>) -> some View {
|
|
onContinueUserActivity(activity.name) { userActivity in
|
|
|
|
// eligibility: ignore Siri shortcuts if not purchased
|
|
guard AppContext.shared.productManager.isEligible(forFeature: .siriShortcuts) else {
|
|
pp_log.warning("Ignore activity handler, not eligible for Siri shortcuts")
|
|
return
|
|
}
|
|
pp_log.info("Handling activity: \(activity.name)")
|
|
activity.handler(userActivity, AppContext.shared.vpnManager)
|
|
}
|
|
}
|
|
}
|