UI refactor

PIALibrary/Sources/UI/iOS/PurchasePlanCell.swift

@@ -32,7 +32,11 @@ class PurchasePlanCell: UICollectionViewCell, Restylable {
     override func awakeFromNib() {
         super.awakeFromNib()
         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
         self.accessibilityTraits = UIAccessibilityTraits.button
         self.isAccessibilityElement = true

PIALibrary/Sources/UI/iOS/ViewControllers/PurchaseTrialViewController.swift

@@ -175,6 +175,8 @@ class PurchaseTrialViewController: AutolayoutViewController, BrandableNavigation
     
     override func viewShouldRestyle() {
         super.viewShouldRestyle()
+        navigationItem.titleView = NavigationLogoView()
+        Theme.current.applyNavigationBarStyle(to: self)
         Theme.current.applyPrincipalBackground(view)
         Theme.current.applyLinkAttributes(textAgreement)
         Theme.current.applyBigTitle(headerTitleLabel, appearance: .dark)

PIALibrary/Sources/UI/iOS/ViewControllers/PurchaseViewController.swift

@@ -89,10 +89,6 @@ class PurchaseViewController: AutolayoutViewController, BrandableNavigationBar,
         NotificationCenter.default.removeObserver(self)
     }
 
-    override func didRefreshOrientationConstraints() {
-        scrollView.isScrollEnabled = (traitCollection.verticalSizeClass == .compact)
-    }
-    
     @objc private func back(_ sender: Any?) {
         self.navigationController?.popViewController(animated: true)
     }
@@ -176,6 +172,8 @@ class PurchaseViewController: AutolayoutViewController, BrandableNavigationBar,
     
     override func viewShouldRestyle() {
         super.viewShouldRestyle()
+        navigationItem.titleView = NavigationLogoView()
+        Theme.current.applyNavigationBarStyle(to: self)
         Theme.current.applyPrincipalBackground(view)
         Theme.current.applyPrincipalBackground(scrollView)
         Theme.current.applyPrincipalBackground(collectionPlans)