Skip to content

Commit c7c60be

Browse files
authored
Fix shrunken Cancel button in qr code device transfer screen.
• remove navigation bar • make screen scrollable.
1 parent 6fef9fb commit c7c60be

File tree

1 file changed

+13
-15
lines changed

1 file changed

+13
-15
lines changed

Signal/Registration/UserInterface/RegistrationTransferQRCodeViewController.swift

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,7 @@ public import SignalUI
1010

1111
public class RegistrationTransferQRCodeViewController: OWSViewController, OWSNavigationChildController {
1212

13-
public var preferredNavigationBarStyle: OWSNavigationBarStyle { .solid }
14-
15-
public var navbarBackgroundColorOverride: UIColor? { .clear }
16-
17-
public override var preferredStatusBarStyle: UIStatusBarStyle {
18-
return isQRCodeExpanded ? .lightContent : super.preferredStatusBarStyle
19-
}
13+
public var prefersNavigationBarHidden: Bool { true }
2014

2115
private lazy var qrCodeView = QRCodeView(contentInset: 8)
2216

@@ -150,14 +144,18 @@ public class RegistrationTransferQRCodeViewController: OWSViewController, OWSNav
150144
])
151145

152146
// Content view.
153-
let stackView = addStaticContentStackView(arrangedSubviews: [
154-
titleLabel,
155-
explanationLabel,
156-
qrCodeContainerView,
157-
explanationLabel2,
158-
.vStretchingSpacer(),
159-
bottomButtonsContainer,
160-
])
147+
let stackView = addStaticContentStackView(
148+
arrangedSubviews: [
149+
.spacer(withHeight: 16),
150+
titleLabel,
151+
explanationLabel,
152+
qrCodeContainerView,
153+
explanationLabel2,
154+
.vStretchingSpacer(),
155+
bottomButtonsContainer,
156+
],
157+
isScrollable: true
158+
)
161159
stackView.setCustomSpacing(24, after: explanationLabel)
162160
stackView.setCustomSpacing(24, after: compactQRCodeContainer)
163161

0 commit comments

Comments
 (0)