Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| // | ||
| // ViewGeometry.swift | ||
| // MullvadVPN | ||
| // | ||
| // Created by Jon Petersson on 2024-11-13. | ||
| // Copyright © 2024 Mullvad VPN AB. All rights reserved. | ||
| // | ||
|
|
||
| import SwiftUI | ||
|
|
||
| /// Struct for measuring view size. Typically used in a `.background()`, | ||
| /// eg. `.background(ViewGeometry { actualViewSize in [...] }). | ||
| struct ViewGeometry: View { | ||
| let onSizeChange: (CGSize) -> Void | ||
|
|
||
| var body: some View { | ||
| GeometryReader { geometry in | ||
| Color.clear | ||
| .preference(key: ViewSizeKey.self, value: geometry.size) | ||
| .onPreferenceChange(ViewSizeKey.self) { | ||
| onSizeChange($0) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private struct ViewSizeKey: PreferenceKey { | ||
| static var defaultValue: CGSize = .zero | ||
|
|
||
| static func reduce(value: inout CGSize, nextValue: () -> CGSize) { | ||
| value = nextValue() | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| // | ||
| // SettingsMultihopView.swift | ||
| // MullvadVPN | ||
| // | ||
| // Created by Andrew Bulhak on 2024-09-23. | ||
| // Copyright © 2024 Mullvad VPN AB. All rights reserved. | ||
| // | ||
|
|
||
| import SwiftUI | ||
|
|
||
| struct SettingsInfoViewModel { | ||
| var body: [String] | ||
| var images: [Image] | ||
| } | ||
|
|
||
| struct SettingsMultihopView: View { | ||
| @State private var enabled = true | ||
|
|
||
| var didToggleEnabled: ((Bool) -> Void)? | ||
|
|
||
| var body: some View { | ||
| ZStack { | ||
| VStack(spacing: 24) { | ||
| SettingsInfoView(viewModel: SettingsInfoViewModel()) | ||
|
|
||
| SwitchRowView( | ||
| enabled: enabled, | ||
| text: NSLocalizedString( | ||
| "SETTINGS_SWITCH_MULTIHOP", | ||
| tableName: "Settings", | ||
| value: "Enable", | ||
| comment: "" | ||
| ), | ||
| didToggle: { didToggleEnabled?($0) } | ||
| ) | ||
|
|
||
| Spacer() | ||
| } | ||
| .padding(UIMetrics.contentInsets.toEdgeInsets) | ||
| } | ||
| .background(Color(.secondaryColor)) | ||
| .foregroundColor(Color(.primaryTextColor)) | ||
| } | ||
| } | ||
|
|
||
| #Preview { | ||
| SettingsMultihopView { enabled in | ||
| print("\(enabled)") | ||
| } | ||
| } | ||
|
|
||
| struct SwitchRowView: View { | ||
| @State private var enabled: Bool | ||
| private let text: String | ||
|
|
||
| let didToggle: ((Bool) -> Void) | ||
| var didTapAction: (() -> Void)? | ||
|
|
||
| init(enabled: Bool, text: String, didToggle: @escaping ((Bool) -> Void)) { | ||
| self.enabled = enabled | ||
| self.text = text | ||
| self.didToggle = didToggle | ||
| } | ||
|
|
||
| var body: some View { | ||
| HStack { | ||
| Toggle(isOn: $enabled, label: { | ||
| Text(text) | ||
| }).onChange(of: enabled, perform: { enabled in | ||
| didToggle(enabled) | ||
| }) | ||
| .toggleStyle(CustomToggleStyle { | ||
| didTapAction?() | ||
| }) | ||
| .font(.body.weight(.semibold)) | ||
| .accessibilityIdentifier(AccessibilityIdentifier.multihopSwitch.rawValue) | ||
| } | ||
| .frame(height: UIMetrics.SettingsViewCell.height) | ||
| .padding(UIMetrics.SettingsViewCell.layoutMargins) | ||
| .background(Color(.primaryColor)) | ||
| .foregroundColor(Color(.primaryTextColor)) | ||
| .cornerRadius(UIMetrics.SettingsViewCell.cornerRadius) | ||
| } | ||
| } | ||
|
|
||
| #Preview { | ||
| SwitchRowView(enabled: true, text: "Enable") { enabled in | ||
| print("\(enabled)") | ||
| } | ||
| } | ||
|
|
||
| struct SettingsInfoView: View { | ||
| let viewModel: SettingsInfoViewModel | ||
|
|
||
| var body: some View { | ||
| VStack(alignment: .leading, spacing: 16) { | ||
| Image(.multihopIllustration) | ||
| .resizable() | ||
| .aspectRatio(contentMode: .fit) | ||
| Text(NSLocalizedString( | ||
| "SETTINGS_INFO_MULTIHOP", | ||
| tableName: "Settings", | ||
| value: """ | ||
| Multihop routes your traffic into one WireGuard server and out another, making it \ | ||
| harder to trace. This results in increased latency but increases anonymity online. | ||
| """, | ||
| comment: "" | ||
| )) | ||
| .font(.body.weight(.semibold)) | ||
| .opacity(0.6) | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| // | ||
| // View+TapAreaSize.swift | ||
| // MullvadVPN | ||
| // | ||
| // Created by Jon Petersson on 2024-11-13. | ||
| // Copyright © 2024 Mullvad VPN AB. All rights reserved. | ||
| // | ||
|
|
||
| import SwiftUI | ||
|
|
||
| extension View { | ||
| /// Adjusts tappable area to at least minimum (default) size without changing | ||
| /// actual view size. | ||
| func adjustingTapAreaSize() -> some View { | ||
| modifier(TappablePadding()) | ||
| } | ||
| } | ||
|
|
||
| private struct TappablePadding: ViewModifier { | ||
| @State var actualViewSize: CGSize = .zero | ||
| let tappableViewSize = UIMetrics.Button.minimumTappableAreaSize | ||
|
|
||
| func body(content: Content) -> some View { | ||
| content | ||
| .background(ViewGeometry { | ||
| actualViewSize = $0 | ||
| }) | ||
| .frame( | ||
| width: max(actualViewSize.width, tappableViewSize.width), | ||
| height: max(actualViewSize.height, tappableViewSize.height) | ||
| ) | ||
| .contentShape(Rectangle()) | ||
| .frame(width: actualViewSize.width, height: actualViewSize.height) | ||
| } | ||
| } |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "filename" : "MultihopIllustration.pdf", | ||
| "idiom" : "universal" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| }, | ||
| "properties" : { | ||
| "preserves-vector-representation" : true | ||
| } | ||
| } |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.