passepartout-apple/Packages/App/Sources/UILibrary/Theme/Platforms/Theme+macOS.swift
Davide ce77b4fc6a
Improve the UX of profile editing and management (#1149)
Restart from the v2 flow most users are familiar with.

- Restore the global v2 accent
- Restore the per-profile toggles
- Single tap to edit a profile
- Reuse the same chevron for profile and module navigation
- Improve the iCloud/TV section and rename it to "Synchronization"
- Drop the misleading moon icon from the "Keep alive on sleep" toggle
- Drop the marginal "Enable"/"Disable" action from context menus
- Drop the grid cell highlighting, now marginal with toggles
- Drop the complexity of `nextProfileId`

Ultimately, rework `TunnelToggleButton` into `TunnelToggle` for better
reuse across all platforms.

Things left to improve:

- The duplication of the active profile on top has not changed, but the
toggles may make it more visually apparent
- The "Inactive" subtitle in disabled profiles is there for balance as
it keeps rows and cells of the same height, but it serves no real
purpose
- Access to secondary actions (e.g. provider server, credentials)
- Use of TipKit for less intuitive flows (e.g. context menus, building a
profile from scratch)

Fixes #1111
2025-02-08 11:57:14 +01:00

139 lines
3.1 KiB
Swift

//
// Theme+macOS.swift
// Passepartout
//
// Created by Davide De Rosa on 7/31/24.
// Copyright (c) 2025 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/>.
//
#if os(macOS)
import SwiftUI
extension Theme {
public convenience init() {
self.init(dummy: Void())
animationCategories = [.diagnostics, .profiles, .providers]
}
}
// MARK: - Shortcuts
extension View {
public func themeLockScreen() -> some View {
self
}
}
// MARK: - Modifiers
extension ThemeWindowModifier {
func body(content: Content) -> some View {
content
.frame(width: size.width, height: size.height)
}
}
extension ThemeManualInputModifier {
func body(content: Content) -> some View {
content
.autocorrectionDisabled()
}
}
extension ThemeSectionWithHeaderFooterModifier {
func body(content: Content) -> some View {
Section {
content
if forcesFooter {
footer.map {
Text($0)
.themeSubtitle()
}
}
} header: {
header.map(Text.init)
}
}
}
extension ThemeRowWithSubtitleModifier {
func body(content: Content) -> some View {
VStack {
content
.frame(maxWidth: .infinity, alignment: .leading)
subtitle.map {
Text($0)
.themeSubtitle()
.frame(maxWidth: .infinity, alignment: .leading)
}
}
}
}
// MARK: - Views
extension ThemeTappableText {
public var body: some View {
commonView
.buttonStyle(.plain)
.cursor(.hand)
}
}
extension ThemeTextField {
public var body: some View {
fieldView
}
}
extension ThemeSecureField {
public var body: some View {
fieldView
}
}
extension ThemeRemovableItemRow {
func removeView() -> some View {
Button(action: removeAction) {
ThemeImage(.contextRemove)
}
.buttonStyle(.borderless)
}
}
extension ThemeEditableListSection.RemoveLabel {
public var body: some View {
Button(action: action) {
ThemeImage(.editableSectionRemove)
}
.buttonStyle(.borderless)
}
}
extension ThemeEditableListSection.EditLabel {
public var body: some View {
ThemeImage(.editableSectionEdit)
}
}
#endif