passepartoutvpn
/
passepartout-apple
mirror of https://github.com/passepartoutvpn/passepartout-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Handle long fields in OpenVPN configuration 

- Use long content for IP settings

- Copy on tap DNS/proxy settings
This commit is contained in:
Davide De Rosa 2022-04-13 09:45:58 +02:00
parent 1532e8808b
commit 56fcee98b4
2 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Passepartout/App/Shared/Constants/Theme.swift
View File

@ -320,7 +320,14 @@ extension View {
.insetGrouped
}
}
func themeLongContentLinkDefault(_ title: String, content: Binding<String>) -> some View {
LongContentLink(title, content: content) {
Text($0)
.foregroundColor(themeSecondaryColor)
}
}
func themeLongContentLink(_ title: String, content: Binding<String>, withPreview preview: String? = nil) -> some View {
LongContentLink(title, content: content, preview: preview) {
Text(preview != nil ? $0 : "")

47
Passepartout/App/iOS/Views/EndpointAdvancedView+OpenVPN.swift
View File

@ -66,14 +66,20 @@ extension EndpointAdvancedView.OpenVPNView {
Section(
header: Text(Unlocalized.Network.ipv4)
) {
Text(L10n.Global.Strings.address)
.withTrailingText(builder.ipv4.localizedAddress, copyOnTap: true)
Text(L10n.NetworkSettings.Gateway.title)
.withTrailingText(builder.ipv4.localizedDefaultGateway, copyOnTap: true)
themeLongContentLinkDefault(
L10n.Global.Strings.address,
content: .constant(builder.ipv4.localizedAddress)
)
themeLongContentLinkDefault(
L10n.NetworkSettings.Gateway.title,
content: .constant(builder.ipv4.localizedDefaultGateway)
)
ForEach(cfg.routes, id: \.self) { route in
Text(L10n.Endpoint.Advanced.Openvpn.Items.Route.caption)
.withTrailingText(route.localizedDescription, copyOnTap: true)
themeLongContentLinkDefault(
L10n.Endpoint.Advanced.Openvpn.Items.Route.caption,
content: .constant(route.localizedDescription)
)
}
}
}
@ -84,15 +90,20 @@ extension EndpointAdvancedView.OpenVPNView {
Section(
header: Text(Unlocalized.Network.ipv6)
) {
Text(L10n.Global.Strings.address)
.withTrailingText(builder.ipv6.localizedAddress, copyOnTap: true)
Text(L10n.NetworkSettings.Gateway.title)
.withTrailingText(builder.ipv6.localizedDefaultGateway, copyOnTap: true)
themeLongContentLinkDefault(
L10n.Global.Strings.address,
content: .constant(builder.ipv6.localizedAddress)
)
themeLongContentLinkDefault(
L10n.NetworkSettings.Gateway.title,
content: .constant(builder.ipv6.localizedDefaultGateway)
)
ForEach(cfg.routes, id: \.self) { route in
Text(L10n.Endpoint.Advanced.Openvpn.Items.Route.caption)
.withTrailingText(route.localizedDescription, copyOnTap: true)
themeLongContentLinkDefault(
L10n.Endpoint.Advanced.Openvpn.Items.Route.caption,
content: .constant(route.localizedDescription)
)
}
}
}
@ -185,11 +196,11 @@ extension EndpointAdvancedView.OpenVPNView {
) {
ForEach(settings.servers, id: \.self) {
Text(L10n.Global.Strings.address)
.withTrailingText($0)
.withTrailingText($0, copyOnTap: true)
}
ForEach(settings.domains, id: \.self) {
Text(L10n.Global.Strings.domain)
.withTrailingText($0)
.withTrailingText($0, copyOnTap: true)
}
}
}
@ -202,15 +213,15 @@ extension EndpointAdvancedView.OpenVPNView {
) {
settings.proxy.map {
Text(L10n.Global.Strings.address)
.withTrailingText($0.rawValue)
.withTrailingText($0.rawValue, copyOnTap: true)
}
settings.pac.map {
Text(Unlocalized.Network.proxyAutoConfiguration)
.withTrailingText($0.absoluteString)
.withTrailingText($0.absoluteString, copyOnTap: true)
}
ForEach(settings.bypass, id: \.self) {
Text(L10n.NetworkSettings.Items.ProxyBypass.caption)
.withTrailingText($0)
.withTrailingText($0, copyOnTap: true)
}
}
}