summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJon Petersson <jon.petersson@kvadrat.se>2023-03-06 11:10:18 +0100
committerEmīls <emils@mullvad.net>2023-03-06 13:23:15 +0100
commitead8993b3659b4e3741b9f0eb0f07b273d11c7ca (patch)
treec30c6dd138a8d929d06425db160c859265b7ffbe
parent7fda3ef83c2f1ecb205173134327cbea39b648e9 (diff)
downloadmullvadvpn-ead8993b3659b4e3741b9f0eb0f07b273d11c7ca.tar.xz
mullvadvpn-ead8993b3659b4e3741b9f0eb0f07b273d11c7ca.zip
Swap vertical position of country and city labels on connection view
-rw-r--r--ios/CHANGELOG.md3
-rw-r--r--ios/MullvadVPN/TunnelControlView.swift14
2 files changed, 9 insertions, 8 deletions
diff --git a/ios/CHANGELOG.md b/ios/CHANGELOG.md
index 62f5fae546..5d276d0330 100644
--- a/ios/CHANGELOG.md
+++ b/ios/CHANGELOG.md
@@ -30,7 +30,7 @@ Line wrap the file at 100 chars. Th
- Add revoked device view displayed when the app detects that device is no longer registered on
backend.
- Add ability to manage registered devices if too many devices detected during log-in.
-- Add continuous monitoring of tunnel connection. Verify ping replies to detect whether traffic is
+- Add continuous monitoring of tunnel connection. Verify ping replies to detect whether traffic is
really flowing.
- Check if device is revoked or account has expired when the tunnel fails to connect on each second
failed attempt.
@@ -40,6 +40,7 @@ Line wrap the file at 100 chars. Th
with the option to buy more time.
- Use exponential backoff with jitter for delay interval when retrying REST API requests.
- REST API requests will bypass VPN when tunnel is not functional.
+- Swap vertical position of country and city labels on connection view.
### Fixed
- Improve random port distribution. Should be less biased towards port 53.
diff --git a/ios/MullvadVPN/TunnelControlView.swift b/ios/MullvadVPN/TunnelControlView.swift
index b761d0d124..8d5e782c95 100644
--- a/ios/MullvadVPN/TunnelControlView.swift
+++ b/ios/MullvadVPN/TunnelControlView.swift
@@ -232,7 +232,7 @@ final class TunnelControlView: UIView {
// MARK: - Private
private func addSubviews() {
- for subview in [secureLabel, cityLabel, countryLabel] {
+ for subview in [secureLabel, countryLabel, cityLabel] {
locationContainerView.addSubview(subview)
}
@@ -267,14 +267,14 @@ final class TunnelControlView: UIView {
secureLabel.leadingAnchor.constraint(equalTo: locationContainerView.leadingAnchor),
secureLabel.trailingAnchor.constraint(equalTo: locationContainerView.trailingAnchor),
- cityLabel.topAnchor.constraint(equalTo: secureLabel.bottomAnchor, constant: 8),
- cityLabel.leadingAnchor.constraint(equalTo: locationContainerView.leadingAnchor),
- cityLabel.trailingAnchor.constraint(equalTo: locationContainerView.trailingAnchor),
-
- countryLabel.topAnchor.constraint(equalTo: cityLabel.bottomAnchor, constant: 8),
+ countryLabel.topAnchor.constraint(equalTo: secureLabel.bottomAnchor, constant: 8),
countryLabel.leadingAnchor.constraint(equalTo: locationContainerView.leadingAnchor),
countryLabel.trailingAnchor.constraint(equalTo: locationContainerView.trailingAnchor),
- countryLabel.bottomAnchor.constraint(equalTo: locationContainerView.bottomAnchor),
+
+ cityLabel.topAnchor.constraint(equalTo: countryLabel.bottomAnchor, constant: 8),
+ cityLabel.leadingAnchor.constraint(equalTo: locationContainerView.leadingAnchor),
+ cityLabel.trailingAnchor.constraint(equalTo: locationContainerView.trailingAnchor),
+ cityLabel.bottomAnchor.constraint(equalTo: locationContainerView.bottomAnchor),
connectionPanel.topAnchor.constraint(
equalTo: locationContainerView.bottomAnchor,