Skip to content
Snippets Groups Projects
Commit 0fffda7b authored by Bruno Muniz's avatar Bruno Muniz :apple:
Browse files

Merge branch 'fix/transition-bug-when-keyboard-visible' into 'dev'

Fix transition bug when the keyboard is presented

See merge request elixxir/client-ios!91
parents 472eb4b3 50241a0d
No related branches found
No related tags found
1 merge request!91Fix transition bug when the keyboard is presented
......@@ -76,12 +76,20 @@ public final class OnboardingCodeController: UIViewController {
}
private func setupScrollView() {
scrollViewController.contentView = screenView
scrollViewController.scrollView.backgroundColor = Asset.neutralWhite.color
addChild(scrollViewController)
view.addSubview(scrollViewController.view)
scrollViewController.view.snp.makeConstraints { $0.edges.equalToSuperview() }
scrollViewController.view.translatesAutoresizingMaskIntoConstraints = false
NSLayoutConstraint.activate([
scrollViewController.view.topAnchor.constraint(equalTo: view.topAnchor),
scrollViewController.view.bottomAnchor.constraint(equalTo: view.bottomAnchor),
scrollViewController.view.leftAnchor.constraint(equalTo: view.leftAnchor),
scrollViewController.view.rightAnchor.constraint(equalTo: view.rightAnchor),
])
view.setNeedsLayout()
view.layoutIfNeeded()
scrollViewController.didMove(toParent: self)
scrollViewController.contentView = screenView
scrollViewController.scrollView.backgroundColor = Asset.neutralWhite.color
}
private func setupBindings() {
......
......@@ -79,6 +79,7 @@ public final class OnboardingPhoneController: UIViewController {
.nextButton
.publisher(for: .touchUpInside)
.sink { [unowned self] in
view.endEditing(true)
viewModel.didTapNext()
}.store(in: &cancellables)
......
......@@ -60,14 +60,20 @@ public final class ProfileCodeController: UIViewController {
}
private func setupScrollView() {
scrollViewController.contentView = screenView
scrollViewController.scrollView.backgroundColor = Asset.neutralWhite.color
addChild(scrollViewController)
view.addSubview(scrollViewController.view)
scrollViewController.view.snp.makeConstraints {
$0.edges.equalToSuperview()
}
scrollViewController.view.translatesAutoresizingMaskIntoConstraints = false
NSLayoutConstraint.activate([
scrollViewController.view.topAnchor.constraint(equalTo: view.topAnchor),
scrollViewController.view.bottomAnchor.constraint(equalTo: view.bottomAnchor),
scrollViewController.view.leftAnchor.constraint(equalTo: view.leftAnchor),
scrollViewController.view.rightAnchor.constraint(equalTo: view.rightAnchor),
])
view.setNeedsLayout()
view.layoutIfNeeded()
scrollViewController.didMove(toParent: self)
scrollViewController.contentView = screenView
scrollViewController.scrollView.backgroundColor = Asset.neutralWhite.color
}
private func setupBindings() {
......
......@@ -107,6 +107,7 @@ public final class ProfilePhoneController: UIViewController {
.saveButton
.publisher(for: .touchUpInside)
.sink { [unowned self] in
view.endEditing(true)
viewModel.didTapNext()
}.store(in: &cancellables)
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment