Commit 92e336b9 authored by Jose Blaya's avatar Jose Blaya
Browse files

UI refactor

parent d44f9d2a
...@@ -32,7 +32,11 @@ class PurchasePlanCell: UICollectionViewCell, Restylable { ...@@ -32,7 +32,11 @@ class PurchasePlanCell: UICollectionViewCell, Restylable {
override func awakeFromNib() { override func awakeFromNib() {
super.awakeFromNib() super.awakeFromNib()
isSelected = false isSelected = false
labelBestValue.text = L10n.Welcome.Plan.bestValue.uppercased()
labelBestValue.text = Client.configuration.eligibleForTrial ?
"\(L10n.Welcome.Plan.bestValue.uppercased()) - FREE TRIAL" :
L10n.Welcome.Plan.bestValue.uppercased()
selectedPlanImageView.alpha = 0 selectedPlanImageView.alpha = 0
self.accessibilityTraits = UIAccessibilityTraits.button self.accessibilityTraits = UIAccessibilityTraits.button
self.isAccessibilityElement = true self.isAccessibilityElement = true
......
...@@ -175,6 +175,8 @@ class PurchaseTrialViewController: AutolayoutViewController, BrandableNavigation ...@@ -175,6 +175,8 @@ class PurchaseTrialViewController: AutolayoutViewController, BrandableNavigation
override func viewShouldRestyle() { override func viewShouldRestyle() {
super.viewShouldRestyle() super.viewShouldRestyle()
navigationItem.titleView = NavigationLogoView()
Theme.current.applyNavigationBarStyle(to: self)
Theme.current.applyPrincipalBackground(view) Theme.current.applyPrincipalBackground(view)
Theme.current.applyLinkAttributes(textAgreement) Theme.current.applyLinkAttributes(textAgreement)
Theme.current.applyBigTitle(headerTitleLabel, appearance: .dark) Theme.current.applyBigTitle(headerTitleLabel, appearance: .dark)
......
...@@ -89,10 +89,6 @@ class PurchaseViewController: AutolayoutViewController, BrandableNavigationBar, ...@@ -89,10 +89,6 @@ class PurchaseViewController: AutolayoutViewController, BrandableNavigationBar,
NotificationCenter.default.removeObserver(self) NotificationCenter.default.removeObserver(self)
} }
override func didRefreshOrientationConstraints() {
scrollView.isScrollEnabled = (traitCollection.verticalSizeClass == .compact)
}
@objc private func back(_ sender: Any?) { @objc private func back(_ sender: Any?) {
self.navigationController?.popViewController(animated: true) self.navigationController?.popViewController(animated: true)
} }
...@@ -176,6 +172,8 @@ class PurchaseViewController: AutolayoutViewController, BrandableNavigationBar, ...@@ -176,6 +172,8 @@ class PurchaseViewController: AutolayoutViewController, BrandableNavigationBar,
override func viewShouldRestyle() { override func viewShouldRestyle() {
super.viewShouldRestyle() super.viewShouldRestyle()
navigationItem.titleView = NavigationLogoView()
Theme.current.applyNavigationBarStyle(to: self)
Theme.current.applyPrincipalBackground(view) Theme.current.applyPrincipalBackground(view)
Theme.current.applyPrincipalBackground(scrollView) Theme.current.applyPrincipalBackground(scrollView)
Theme.current.applyPrincipalBackground(collectionPlans) Theme.current.applyPrincipalBackground(collectionPlans)
......
Markdown is supported
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