summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAndrej Mihajlov <and@mullvad.net>2023-04-19 16:37:55 +0200
committerAndrej Mihajlov <and@mullvad.net>2023-04-19 16:37:55 +0200
commitd1cb72ca9c886f7f2170853e85fd180bff249664 (patch)
treec39c80361ef3d3493b793b1e69da23b6c0d0b5b4
parentcef7a8cb591f7663aee408a28af7fbdc05b6188b (diff)
parent733e942d79a8399255c2a280c899d1299d2ac94b (diff)
downloadmullvadvpn-d1cb72ca9c886f7f2170853e85fd180bff249664.tar.xz
mullvadvpn-d1cb72ca9c886f7f2170853e85fd180bff249664.zip
Merge branch 'fix/device-name-and-time-left-should-be-ios-118'
-rw-r--r--ios/MullvadVPN/Containers/Root/HeaderBarView.swift7
1 files changed, 5 insertions, 2 deletions
diff --git a/ios/MullvadVPN/Containers/Root/HeaderBarView.swift b/ios/MullvadVPN/Containers/Root/HeaderBarView.swift
index 0c309e6947..efa5e392f9 100644
--- a/ios/MullvadVPN/Containers/Root/HeaderBarView.swift
+++ b/ios/MullvadVPN/Containers/Root/HeaderBarView.swift
@@ -29,8 +29,9 @@ class HeaderBarView: UIView {
private let deviceInfoHolder: UIStackView = {
let stackView = UIStackView()
stackView.axis = .horizontal
- stackView.distribution = .fillProportionally
+ stackView.distribution = .fill
stackView.translatesAutoresizingMaskIntoConstraints = false
+ stackView.spacing = 16.0
return stackView
}()
@@ -38,6 +39,7 @@ class HeaderBarView: UIView {
let label = UILabel(frame: .zero)
label.font = UIFont.systemFont(ofSize: 14)
label.textColor = UIColor(white: 1.0, alpha: 0.8)
+ label.setContentHuggingPriority(.defaultHigh, for: .horizontal)
return label
}()
@@ -45,6 +47,7 @@ class HeaderBarView: UIView {
let label = UILabel(frame: .zero)
label.font = UIFont.systemFont(ofSize: 14)
label.textColor = UIColor(white: 1.0, alpha: 0.8)
+ label.setContentHuggingPriority(.defaultLow, for: .horizontal)
return label
}()
@@ -128,7 +131,7 @@ class HeaderBarView: UIView {
brandNameImageView.heightAnchor.constraint(equalToConstant: 18),
layoutMarginsGuide.bottomAnchor.constraint(
equalTo: deviceInfoHolder.bottomAnchor,
- constant: 4
+ constant: 8
),
settingsButton.leadingAnchor.constraint(