From c7c60be1d6ac91085bae4fceed5d1781549edb99 Mon Sep 17 00:00:00 2001 From: Igor Solomennikov Date: Wed, 22 Oct 2025 15:13:55 -0700 Subject: [PATCH] Fix shrunken Cancel button in qr code device transfer screen. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • remove navigation bar • make screen scrollable. --- ...strationTransferQRCodeViewController.swift | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/Signal/Registration/UserInterface/RegistrationTransferQRCodeViewController.swift b/Signal/Registration/UserInterface/RegistrationTransferQRCodeViewController.swift index 5da683c15e..1cb77f5009 100644 --- a/Signal/Registration/UserInterface/RegistrationTransferQRCodeViewController.swift +++ b/Signal/Registration/UserInterface/RegistrationTransferQRCodeViewController.swift @@ -10,13 +10,7 @@ public import SignalUI public class RegistrationTransferQRCodeViewController: OWSViewController, OWSNavigationChildController { - public var preferredNavigationBarStyle: OWSNavigationBarStyle { .solid } - - public var navbarBackgroundColorOverride: UIColor? { .clear } - - public override var preferredStatusBarStyle: UIStatusBarStyle { - return isQRCodeExpanded ? .lightContent : super.preferredStatusBarStyle - } + public var prefersNavigationBarHidden: Bool { true } private lazy var qrCodeView = QRCodeView(contentInset: 8) @@ -150,14 +144,18 @@ public class RegistrationTransferQRCodeViewController: OWSViewController, OWSNav ]) // Content view. - let stackView = addStaticContentStackView(arrangedSubviews: [ - titleLabel, - explanationLabel, - qrCodeContainerView, - explanationLabel2, - .vStretchingSpacer(), - bottomButtonsContainer, - ]) + let stackView = addStaticContentStackView( + arrangedSubviews: [ + .spacer(withHeight: 16), + titleLabel, + explanationLabel, + qrCodeContainerView, + explanationLabel2, + .vStretchingSpacer(), + bottomButtonsContainer, + ], + isScrollable: true + ) stackView.setCustomSpacing(24, after: explanationLabel) stackView.setCustomSpacing(24, after: compactQRCodeContainer)