From 21f57d362355abae6b88e4081adfb0a4ecc7b5ff Mon Sep 17 00:00:00 2001
From: Nathan Mattes <hallo@bullenscheisse.de>
Date: Wed, 12 Apr 2023 14:04:06 +0200
Subject: [PATCH] Enable missing parallax-effect (IOS-134) (#1008)

---
 .../Welcome/View/WelcomeIllustrationView.swift     | 14 +++-----------
 .../Onboarding/Welcome/WelcomeViewController.swift | 13 +------------
 2 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/Mastodon/Scene/Onboarding/Welcome/View/WelcomeIllustrationView.swift b/Mastodon/Scene/Onboarding/Welcome/View/WelcomeIllustrationView.swift
index 11a51cfeb..7a7b44cba 100644
--- a/Mastodon/Scene/Onboarding/Welcome/View/WelcomeIllustrationView.swift
+++ b/Mastodon/Scene/Onboarding/Welcome/View/WelcomeIllustrationView.swift
@@ -13,12 +13,10 @@ import MastodonLocalization
 
 fileprivate extension CGFloat {
     static let cloudsStartPosition = -20.0
+    static let centerHillStartPosition = 20.0
     static let airplaneStartPosition = -178.0
     static let leftHillStartPosition = 30.0
     static let rightHillStartPosition = -125.0
-    static let leftHillSpeed = 6.0
-    static let centerHillSpeed = 40.0
-    static let rightHillSpeed = 6.0
 }
 
 final class WelcomeIllustrationView: UIView {
@@ -61,7 +59,6 @@ final class WelcomeIllustrationView: UIView {
         let imageView = UIImageView(image: Asset.Scene.Welcome.Illustration.cloudBase.image)
         imageView.translatesAutoresizingMaskIntoConstraints = false
         imageView.contentMode = .scaleAspectFill
-//        imageView.alpha = 0.3
         return imageView
     }()
     
@@ -115,9 +112,9 @@ extension WelcomeIllustrationView {
 
         addSubview(centerHillImageView)
         NSLayoutConstraint.activate([
-            leftAnchor.constraint(equalTo: centerHillImageView.leftAnchor),
+            leftAnchor.constraint(equalTo: centerHillImageView.leftAnchor, constant: .centerHillStartPosition),
             bottomAnchor.constraint(equalTo: centerHillImageView.bottomAnchor),
-            rightAnchor.constraint(equalTo: centerHillImageView.rightAnchor),
+            centerHillImageView.widthAnchor.constraint(equalTo: widthAnchor, multiplier: 1.1),
         ])
 
         NSLayoutConstraint.activate([
@@ -130,11 +127,6 @@ extension WelcomeIllustrationView {
     }
     
     func setup() {
-        
-        // set illustration
-        guard superview == nil else {
-            return
-        }
         contentMode = .scaleAspectFit
         
         cloudBaseImageView.addMotionEffect(
diff --git a/Mastodon/Scene/Onboarding/Welcome/WelcomeViewController.swift b/Mastodon/Scene/Onboarding/Welcome/WelcomeViewController.swift
index d6e27a20d..9ebbc43e1 100644
--- a/Mastodon/Scene/Onboarding/Welcome/WelcomeViewController.swift
+++ b/Mastodon/Scene/Onboarding/Welcome/WelcomeViewController.swift
@@ -215,25 +215,14 @@ extension WelcomeViewController {
                 self.navigationItem.leftBarButtonItem = needsShowDismissEntry ? self.dismissBarButtonItem : nil
             }
             .store(in: &disposeBag)
-    }
-    
 
-    override func viewSafeAreaInsetsDidChange() {
-        super.viewSafeAreaInsetsDidChange()
-        
-        var overlap: CGFloat = 5
-        // shift illustration down for non-notch phone
-        if view.safeAreaInsets.bottom == 0 {
-            overlap += 56
-        }
+        setupIllustrationLayout()
     }
     
     override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
         super.traitCollectionDidChange(previousTraitCollection)
         
         view.layoutIfNeeded()
-        
-        setupIllustrationLayout()
     }
     
     private var computedTopAnchorInset: CGFloat {