diff options
| author | Bug Magnet <marco.nikic@mullvad.net> | 2025-09-19 14:35:20 +0200 |
|---|---|---|
| committer | Bug Magnet <marco.nikic@mullvad.net> | 2025-09-19 14:35:20 +0200 |
| commit | 6bf008c085d90b33f2a825ba15842e3c3c22e2fd (patch) | |
| tree | 514f8fb73ced1e91fb5c99672c7fddb02b510edd | |
| parent | b01c240cfcaf9fdde5c9dcfdae1379f33f5f984c (diff) | |
| parent | 2155e7298c88122a0ab2000b4f141b480f529b2a (diff) | |
| download | mullvadvpn-6bf008c085d90b33f2a825ba15842e3c3c22e2fd.tar.xz mullvadvpn-6bf008c085d90b33f2a825ba15842e3c3c22e2fd.zip | |
Merge branch 'multihop-configs-can-become-unreadable-in-the-main-view-ios-1283'
| -rw-r--r-- | ios/MullvadVPN/View controllers/Tunnel/ConnectionView/HeaderView.swift | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/ios/MullvadVPN/View controllers/Tunnel/ConnectionView/HeaderView.swift b/ios/MullvadVPN/View controllers/Tunnel/ConnectionView/HeaderView.swift index 5f4ceecdaf..9e670764ea 100644 --- a/ios/MullvadVPN/View controllers/Tunnel/ConnectionView/HeaderView.swift +++ b/ios/MullvadVPN/View controllers/Tunnel/ConnectionView/HeaderView.swift @@ -22,45 +22,45 @@ extension ConnectionView { isExpanded.toggle() } } label: { - HStack(alignment: .top) { - VStack(alignment: .leading, spacing: 0) { + VStack(alignment: .leading, spacing: 0) { + HStack(alignment: .top) { Text(viewModel.localizedTitleForSecureLabel) .textCase(.uppercase) .font(.title3.weight(.semibold)) .foregroundStyle(viewModel.textColorForSecureLabel.color) .accessibilityIdentifier(viewModel.accessibilityIdForSecureLabel.asString) .accessibilityLabel(viewModel.localizedAccessibilityLabelForSecureLabel) - if let titleForCountryAndCity { - Text(titleForCountryAndCity) - .font(.title3.weight(.semibold)) - .foregroundStyle(UIColor.primaryTextColor.color) - .padding(.top, 4) - } - if let titleForServer { - Text(titleForServer) - .font(.body) - .foregroundStyle(UIColor.primaryTextColor.color.opacity(0.6)) - .padding(.top, 2) - .accessibilityIdentifier(AccessibilityIdentifier.connectionPanelServerLabel.asString) - .multilineTextAlignment(.leading) - } - } - - Group { - Spacer() - Button { - withAnimation { - isExpanded.toggle() + Group { + Spacer() + Button { + withAnimation { + isExpanded.toggle() + } + } label: { + Image(.iconChevronUp) + .renderingMode(.template) + .rotationEffect(isExpanded ? .degrees(-180) : .degrees(0)) + .foregroundStyle(.white) + .accessibilityIdentifier(AccessibilityIdentifier.relayStatusCollapseButton.asString) } - } label: { - Image(.iconChevronUp) - .renderingMode(.template) - .rotationEffect(isExpanded ? .degrees(-180) : .degrees(0)) - .foregroundStyle(.white) - .accessibilityIdentifier(AccessibilityIdentifier.relayStatusCollapseButton.asString) } + .showIf(viewModel.showsConnectionDetails) + } + if let titleForCountryAndCity { + Text(titleForCountryAndCity) + .font(.title3.weight(.semibold)) + .foregroundStyle(UIColor.primaryTextColor.color) + .padding(.top, 4) + } + if let titleForServer { + Text(titleForServer) + .font(.body) + .foregroundStyle(UIColor.primaryTextColor.color.opacity(0.6)) + .padding(.top, 2) + .accessibilityIdentifier(AccessibilityIdentifier.connectionPanelServerLabel.asString) + .multilineTextAlignment(.leading) + .fixedSize(horizontal: false, vertical: true) } - .showIf(viewModel.showsConnectionDetails) } .onAppear { titleForServer = viewModel.titleForServer |