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

Reusing code from gradient

parent ab702a51
No related branches found
No related tags found
1 merge request!95Fix missing success screen on onboarding
Hide whitespace changes
Inline Side-by-side
Showing
with 63 additions and 90 deletions
Sources/LaunchFeature/LaunchController.swift
+ 5
− 0
View file @ a36dbf14
......@@ -20,6 +20,11 @@ public final class LaunchController: UIViewController {
view = screenView
}
public override func viewDidLayoutSubviews() {
super.viewDidLayoutSubviews()
screenView.gradientLayer.frame = screenView.bounds
}
public override func viewDidLoad() {
super.viewDidLoad()
......
Sources/LaunchFeature/LaunchView.swift
+ 3
− 10
View file @ a36dbf14
......@@ -3,26 +3,19 @@ import AppResources
final class LaunchView: UIView {
let imageView = UIImageView()
let gradientLayer = CAGradientLayer()
let gradientLayer = CAGradientLayer.xxGradient()
init() {
super.init(frame: .zero)
gradientLayer.colors = [
UIColor(red: 122/255, green: 235/255, blue: 239/255, alpha: 1).cgColor,
UIColor(red: 56/255, green: 204/255, blue: 232/255, alpha: 1).cgColor,
UIColor(red: 63/255, green: 186/255, blue: 253/255, alpha: 1).cgColor,
UIColor(red: 98/255, green: 163/255, blue: 255/255, alpha: 1).cgColor
]
gradientLayer.startPoint = CGPoint(x: 1, y: 0)
gradientLayer.endPoint = CGPoint(x: 0, y: 1)
layer.insertSublayer(gradientLayer, at: 0)
imageView.image = Asset.splash.image
imageView.contentMode = .scaleAspectFit
backgroundColor = Asset.neutralWhite.color
addSubview(imageView)
layer.insertSublayer(gradientLayer, at: 0)
imageView.snp.makeConstraints {
$0.center.equalToSuperview()
$0.left.equalToSuperview().offset(100)
......
Sources/OnboardingFeature/Controllers/OnboardingStartController.swift
+ 8
− 16
View file @ a36dbf14
......@@ -17,25 +17,13 @@ public final class OnboardingStartController: UIViewController {
public override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
navigationItem.backButtonTitle = ""
navigationController?.navigationBar.customize(translucent: true)
navigationController?.navigationBar
.customize(translucent: true)
}
public override func viewDidLayoutSubviews() {
super.viewDidLayoutSubviews()
let gradient = CAGradientLayer()
gradient.colors = [
UIColor(red: 122/255, green: 235/255, blue: 239/255, alpha: 1).cgColor,
UIColor(red: 56/255, green: 204/255, blue: 232/255, alpha: 1).cgColor,
UIColor(red: 63/255, green: 186/255, blue: 253/255, alpha: 1).cgColor,
UIColor(red: 98/255, green: 163/255, blue: 255/255, alpha: 1).cgColor
]
gradient.startPoint = CGPoint(x: 0, y: 0)
gradient.endPoint = CGPoint(x: 1, y: 1)
gradient.frame = screenView.bounds
screenView.layer.insertSublayer(gradient, at: 0)
screenView.gradientLayer.frame = screenView.bounds
}
public override func viewDidLoad() {
......@@ -45,7 +33,11 @@ public final class OnboardingStartController: UIViewController {
.startButton
.publisher(for: .touchUpInside)
.sink { [unowned self] in
navigator.perform(PresentTermsAndConditions(replacing: false, on: navigationController!))
navigator.perform(
PresentTermsAndConditions(
replacing: false,
on: navigationController!
))
}.store(in: &cancellables)
}
}
Sources/OnboardingFeature/Controllers/OnboardingSuccessController.swift
+ 1
− 13
View file @ a36dbf14
......@@ -26,19 +26,7 @@ public final class OnboardingSuccessController: UIViewController {
public override func viewDidLayoutSubviews() {
super.viewDidLayoutSubviews()
let gradient = CAGradientLayer()
gradient.colors = [
UIColor(red: 122/255, green: 235/255, blue: 239/255, alpha: 1).cgColor,
UIColor(red: 56/255, green: 204/255, blue: 232/255, alpha: 1).cgColor,
UIColor(red: 63/255, green: 186/255, blue: 253/255, alpha: 1).cgColor,
UIColor(red: 98/255, green: 163/255, blue: 255/255, alpha: 1).cgColor
]
gradient.startPoint = CGPoint(x: 0, y: 0)
gradient.endPoint = CGPoint(x: 1, y: 1)
gradient.frame = screenView.bounds
screenView.layer.insertSublayer(gradient, at: 0)
screenView.gradientLayer.frame = screenView.bounds
}
public override func viewWillAppear(_ animated: Bool) {
......
Sources/OnboardingFeature/Views/OnboardingStartView.swift
+ 3
− 0
View file @ a36dbf14
......@@ -8,6 +8,7 @@ final class OnboardingStartView: UIView {
let logoImageView = UIImageView()
let startButton = CapsuleButton()
let bottomImageView = UIImageView()
let gradientLayer = CAGradientLayer.xxGradient()
init() {
super.init(frame: .zero)
......@@ -34,6 +35,8 @@ final class OnboardingStartView: UIView {
addSubview(logoImageView)
addSubview(stackView)
layer.insertSublayer(gradientLayer, at: 0)
logoImageView.snp.makeConstraints {
$0.top.equalToSuperview().offset(130)
$0.centerX.equalToSuperview()
......
Sources/OnboardingFeature/Views/OnboardingSuccessView.swift
+ 3
− 0
View file @ a36dbf14
......@@ -6,6 +6,7 @@ final class OnboardingSuccessView: UIView {
let titleLabel = UILabel()
let imageView = UIImageView()
let nextButton = CapsuleButton()
let gradientLayer = CAGradientLayer.xxGradient()
init() {
super.init(frame: .zero)
......@@ -15,6 +16,8 @@ final class OnboardingSuccessView: UIView {
addSubview(titleLabel)
addSubview(nextButton)
layer.insertSublayer(gradientLayer, at: 0)
imageView.snp.makeConstraints {
$0.top.equalTo(safeAreaLayoutGuide).offset(40)
$0.left.equalToSuperview().offset(40)
......
Sources/RestoreFeature/Controllers/RestoreSuccessController.swift
+ 1
− 14
View file @ a36dbf14
......@@ -29,20 +29,7 @@ public final class RestoreSuccessController: UIViewController {
public override func viewDidLayoutSubviews() {
super.viewDidLayoutSubviews()
let gradient = CAGradientLayer()
gradient.colors = [
UIColor(red: 122/255, green: 235/255, blue: 239/255, alpha: 1).cgColor,
UIColor(red: 56/255, green: 204/255, blue: 232/255, alpha: 1).cgColor,
UIColor(red: 63/255, green: 186/255, blue: 253/255, alpha: 1).cgColor,
UIColor(red: 98/255, green: 163/255, blue: 255/255, alpha: 1).cgColor
]
gradient.startPoint = CGPoint(x: 0, y: 0)
gradient.endPoint = CGPoint(x: 1, y: 1)
gradient.frame = screenView.bounds
screenView.layer.insertSublayer(gradient, at: 0)
screenView.gradientLayer.frame = screenView.bounds
}
private func setupBindings() {
......
Sources/RestoreFeature/Views/RestoreSuccessView.swift
+ 18
− 18
View file @ a36dbf14
......@@ -7,6 +7,7 @@ final class RestoreSuccessView: UIView {
let titleLabel = UILabel()
let subtitleLabel = UILabel()
let nextButton = CapsuleButton()
let gradientLayer = CAGradientLayer.xxGradient()
init() {
super.init(frame: .zero)
......@@ -24,27 +25,26 @@ final class RestoreSuccessView: UIView {
addSubview(subtitleLabel)
addSubview(nextButton)
iconImageView.snp.makeConstraints { make in
make.top.equalTo(safeAreaLayoutGuide).offset(40)
make.left.equalToSuperview().offset(40)
}
layer.insertSublayer(gradientLayer, at: 0)
titleLabel.snp.makeConstraints { make in
make.top.equalTo(iconImageView.snp.bottom).offset(40)
make.left.equalToSuperview().offset(40)
make.right.equalToSuperview().offset(-90)
iconImageView.snp.makeConstraints {
$0.top.equalTo(safeAreaLayoutGuide).offset(40)
$0.left.equalToSuperview().offset(40)
}
subtitleLabel.snp.makeConstraints { make in
make.top.equalTo(titleLabel.snp.bottom).offset(30)
make.left.equalToSuperview().offset(40)
make.right.equalToSuperview().offset(-90)
titleLabel.snp.makeConstraints {
$0.top.equalTo(iconImageView.snp.bottom).offset(40)
$0.left.equalToSuperview().offset(40)
$0.right.equalToSuperview().offset(-90)
}
nextButton.snp.makeConstraints { make in
make.left.equalToSuperview().offset(24)
make.right.equalToSuperview().offset(-24)
make.bottom.equalToSuperview().offset(-60)
subtitleLabel.snp.makeConstraints {
$0.top.equalTo(titleLabel.snp.bottom).offset(30)
$0.left.equalToSuperview().offset(40)
$0.right.equalToSuperview().offset(-90)
}
nextButton.snp.makeConstraints {
$0.left.equalToSuperview().offset(24)
$0.right.equalToSuperview().offset(-24)
$0.bottom.equalToSuperview().offset(-60)
}
setTitle(Localized.AccountRestore.Success.title)
......
Sources/Shared/Extensions/Gradient.swift 0 → 100644
+ 16
− 0
View file @ a36dbf14
import UIKit
public extension CAGradientLayer {
static func xxGradient() -> CAGradientLayer {
let gradient = CAGradientLayer()
gradient.colors = [
UIColor(red: 122/255, green: 235/255, blue: 239/255, alpha: 1).cgColor,
UIColor(red: 56/255, green: 204/255, blue: 232/255, alpha: 1).cgColor,
UIColor(red: 63/255, green: 186/255, blue: 253/255, alpha: 1).cgColor,
UIColor(red: 98/255, green: 163/255, blue: 255/255, alpha: 1).cgColor
]
gradient.startPoint = CGPoint(x: 0, y: 0)
gradient.endPoint = CGPoint(x: 1, y: 1)
return gradient
}
}
Sources/TermsFeature/TermsConditionsController.swift
+ 1
− 11
View file @ a36dbf14
......@@ -31,17 +31,7 @@ public final class TermsConditionsController: UIViewController {
public override func viewDidLayoutSubviews() {
super.viewDidLayoutSubviews()
let gradient = CAGradientLayer()
gradient.colors = [
UIColor(red: 122/255, green: 235/255, blue: 239/255, alpha: 1).cgColor,
UIColor(red: 56/255, green: 204/255, blue: 232/255, alpha: 1).cgColor,
UIColor(red: 63/255, green: 186/255, blue: 253/255, alpha: 1).cgColor,
UIColor(red: 98/255, green: 163/255, blue: 255/255, alpha: 1).cgColor
]
gradient.startPoint = CGPoint(x: 0, y: 0)
gradient.endPoint = CGPoint(x: 1, y: 1)
gradient.frame = screenView.bounds
screenView.layer.insertSublayer(gradient, at: 0)
screenView.gradientLayer.frame = screenView.bounds
}
public override func viewDidLoad() {
......
Sources/TermsFeature/TermsConditionsView.swift
+ 4
− 8
View file @ a36dbf14
......@@ -7,6 +7,7 @@ final class TermsConditionsView: UIView {
let logoImageView = UIImageView()
let showTermsButton = CapsuleButton()
let radioComponent = RadioTextComponent()
let gradientLayer = CAGradientLayer.xxGradient()
init() {
super.init(frame: .zero)
......@@ -25,33 +26,28 @@ final class TermsConditionsView: UIView {
addSubview(radioComponent)
addSubview(showTermsButton)
setupConstraints()
}
required init?(coder: NSCoder) { nil }
layer.insertSublayer(gradientLayer, at: 0)
private func setupConstraints() {
logoImageView.snp.makeConstraints {
$0.top.equalTo(safeAreaLayoutGuide).offset(30)
$0.centerX.equalToSuperview()
}
radioComponent.snp.makeConstraints {
$0.left.equalToSuperview().offset(40)
$0.right.equalToSuperview().offset(-40)
$0.bottom.equalTo(nextButton.snp.top).offset(-20)
}
nextButton.snp.makeConstraints {
$0.left.equalToSuperview().offset(40)
$0.right.equalToSuperview().offset(-40)
$0.bottom.equalTo(showTermsButton.snp.top).offset(-10)
}
showTermsButton.snp.makeConstraints {
$0.left.equalToSuperview().offset(40)
$0.right.equalToSuperview().offset(-40)
$0.bottom.equalTo(safeAreaLayoutGuide).offset(-40)
}
}
required init?(coder: NSCoder) { nil }
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment