summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorBug Magnet <marco.nikic@mullvad.net>2025-02-06 15:13:25 +0100
committerBug Magnet <marco.nikic@mullvad.net>2025-02-06 15:13:25 +0100
commita22fd70eb940c75bfe52b4daa3becd8f3d24ce99 (patch)
tree2e717d32cd02d049591e063553ac024033d346d3
parent51b7943f20d84c6729e6d0bd768eb78788a7da9a (diff)
parente133e35909bd1936b218e73a8b8d57782b01d97a (diff)
downloadmullvadvpn-a22fd70eb940c75bfe52b4daa3becd8f3d24ce99.tar.xz
mullvadvpn-a22fd70eb940c75bfe52b4daa3becd8f3d24ce99.zip
Merge branch 'handle-concurrent-button-presses-in-account-view-gracefully-ios-1044'
-rw-r--r--ios/MullvadVPN/View controllers/Account/AccountContentView.swift1
-rw-r--r--ios/MullvadVPN/View controllers/Account/AccountDeviceRow.swift1
-rw-r--r--ios/MullvadVPN/View controllers/Account/RestorePurchasesView.swift1
3 files changed, 3 insertions, 0 deletions
diff --git a/ios/MullvadVPN/View controllers/Account/AccountContentView.swift b/ios/MullvadVPN/View controllers/Account/AccountContentView.swift
index e7a36263cf..cf6ad054ad 100644
--- a/ios/MullvadVPN/View controllers/Account/AccountContentView.swift
+++ b/ios/MullvadVPN/View controllers/Account/AccountContentView.swift
@@ -109,6 +109,7 @@ class AccountContentView: UIView {
logoutButton,
deleteButton,
])
+ arrangedSubviews.forEach { $0.isExclusiveTouch = true }
let stackView = UIStackView(arrangedSubviews: arrangedSubviews)
stackView.axis = .vertical
stackView.spacing = UIMetrics.padding16
diff --git a/ios/MullvadVPN/View controllers/Account/AccountDeviceRow.swift b/ios/MullvadVPN/View controllers/Account/AccountDeviceRow.swift
index 55c8bccf19..aa1fbe0502 100644
--- a/ios/MullvadVPN/View controllers/Account/AccountDeviceRow.swift
+++ b/ios/MullvadVPN/View controllers/Account/AccountDeviceRow.swift
@@ -41,6 +41,7 @@ class AccountDeviceRow: UIView {
private let infoButton: UIButton = {
let button = IncreasedHitButton(type: .system)
+ button.isExclusiveTouch = true
button.setAccessibilityIdentifier(.infoButton)
button.tintColor = .white
button.setImage(UIImage(named: "IconInfo"), for: .normal)
diff --git a/ios/MullvadVPN/View controllers/Account/RestorePurchasesView.swift b/ios/MullvadVPN/View controllers/Account/RestorePurchasesView.swift
index e1fe907b3e..80cd434f99 100644
--- a/ios/MullvadVPN/View controllers/Account/RestorePurchasesView.swift
+++ b/ios/MullvadVPN/View controllers/Account/RestorePurchasesView.swift
@@ -33,6 +33,7 @@ class RestorePurchasesView: UIView {
private lazy var infoButton: UIButton = {
let button = IncreasedHitButton(type: .custom)
+ button.isExclusiveTouch = true
button.setImage(UIImage(resource: .iconInfo), for: .normal)
button.tintColor = .white
button.addTarget(self, action: #selector(didTapInfoButton), for: .touchUpInside)