Update: increase bottom spacing when the continue button is hidden

Author: hassaanelgarem

WordPress/Classes/ViewRelated/Jetpack/Branding/Fullscreen Overlay/JetpackFullscreenOverlayViewController.swift

@@ -52,6 +52,7 @@ class JetpackFullscreenOverlayViewController: UIViewController {
     @IBOutlet weak var learnMoreButton: UIButton!
     @IBOutlet weak var switchButton: UIButton!
     @IBOutlet weak var continueButton: UIButton!
+    @IBOutlet weak var buttonsSuperViewBottomConstraint: NSLayoutConstraint!
 
     // MARK: Initializers
 
@@ -72,7 +73,7 @@ class JetpackFullscreenOverlayViewController: UIViewController {
         self.isModalInPresentation = true
         configureNavigationBar()
         applyStyles()
-        addConstraints()
+        setupConstraints()
         setupContent()
         setupColors()
         setupFonts()
@@ -110,10 +111,14 @@ class JetpackFullscreenOverlayViewController: UIViewController {
         titleLabel.numberOfLines = viewModel.titleLabelMaxNumberOfLines
     }
 
-    private func addConstraints() {
+    private func setupConstraints() {
+        // Animation constraint
         let animationSize = animation?.size ?? .init(width: 1, height: 1)
         let ratio = animationSize.width / animationSize.height
         animationView.widthAnchor.constraint(equalTo: animationView.heightAnchor, multiplier: ratio).isActive = true
+
+        // Buttons bottom constraints
+        buttonsSuperViewBottomConstraint.constant = viewModel.continueButtonIsHidden ? Metrics.singleButtonBottomSpacing : Metrics.buttonsNormalBottomSpacing
     }
 
     private func setupContent() {
@@ -252,6 +257,8 @@ private extension JetpackFullscreenOverlayViewController {
         static let switchButtonCornerRadius: CGFloat = 6
         static let titleLineHeightMultiple: CGFloat = 0.88
         static let titleKern: CGFloat = 0.37
+        static let buttonsNormalBottomSpacing: CGFloat = 30
+        static let singleButtonBottomSpacing: CGFloat = 60
     }
 
     enum Constants {

WordPress/Classes/ViewRelated/Jetpack/Branding/Fullscreen Overlay/JetpackFullscreenOverlayViewController.xib

@@ -12,6 +12,7 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="JetpackFullscreenOverlayViewController" customModule="WordPress" customModuleProvider="target">
             <connections>
                 <outlet property="animationView" destination="v3d-AD-Jsf" id="8wg-bB-WH5"/>
+                <outlet property="buttonsSuperViewBottomConstraint" destination="zhh-p2-mZx" id="4cZ-ra-9SF"/>
                 <outlet property="contentStackView" destination="TTg-Z6-h4X" id="rbe-WF-3kb"/>
                 <outlet property="continueButton" destination="hPW-8A-Di4" id="fym-yu-QBz"/>
                 <outlet property="footnoteLabel" destination="1l4-qY-6ZA" id="Szg-6d-q2E"/>
@@ -34,7 +35,7 @@
                             <rect key="frame" x="0.0" y="0.0" width="375" height="514"/>
                             <subviews>
                                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="TTg-Z6-h4X" userLabel="Content Stack View">
-                                    <rect key="frame" x="30" y="115.5" width="315" height="283"/>
+                                    <rect key="frame" x="30" y="115.66666666666666" width="315" height="282.66666666666674"/>
                                     <subviews>
                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bUe-f2-zzc" userLabel="Icon Super View">
                                             <rect key="frame" x="0.0" y="0.0" width="315" height="75"/>
@@ -57,28 +58,28 @@
                                             </constraints>
                                         </view>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Title Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumScaleFactor="0.59999999999999998" translatesAutoresizingMaskIntoConstraints="NO" id="EqD-nO-Q6T">
-                                            <rect key="frame" x="0.0" y="95" width="315" height="20.5"/>
+                                            <rect key="frame" x="0.0" y="94.999999999999986" width="315" height="20.333333333333329"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Subtitle Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumScaleFactor="0.59999999999999998" translatesAutoresizingMaskIntoConstraints="NO" id="n6H-KY-dMw">
-                                            <rect key="frame" x="0.0" y="135.5" width="315" height="20.5"/>
+                                            <rect key="frame" x="0.0" y="135.33333333333331" width="315" height="20.333333333333343"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Footnote Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumScaleFactor="0.59999999999999998" translatesAutoresizingMaskIntoConstraints="NO" id="1l4-qY-6ZA">
-                                            <rect key="frame" x="0.0" y="176" width="315" height="20.5"/>
+                                            <rect key="frame" x="0.0" y="175.66666666666663" width="315" height="20.333333333333343"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0z9-x4-AgY" userLabel="Learn More Super View">
-                                            <rect key="frame" x="0.0" y="216.5" width="315" height="66.5"/>
+                                            <rect key="frame" x="0.0" y="216" width="315" height="66.666666666666686"/>
                                             <subviews>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="leading" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="n55-iX-u43">
-                                                    <rect key="frame" x="0.0" y="0.0" width="128" height="66.5"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="128" height="66.666666666666671"/>
                                                     <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                                                     <state key="normal" title="Learn More Button"/>
                                                     <connections>
@@ -116,7 +117,7 @@
                     </constraints>
                 </scrollView>
                 <stackView opaque="NO" contentMode="scaleToFill" placeholderIntrinsicWidth="354" placeholderIntrinsicHeight="166" axis="vertical" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="vcE-wc-fHe">
-                    <rect key="frame" x="10.5" y="529" width="354" height="108"/>
+                    <rect key="frame" x="10.666666666666657" y="529" width="354" height="108"/>
                     <subviews>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="VGE-FS-gsd">
                             <rect key="frame" x="0.0" y="0.0" width="354" height="50"/>